fix(manual_typings): make custom global angular overrides work with b…

…oth global and module type definitions (#167)

- now it will work for both type defs for angular ( from typings or from npm @types/angular )
- ofc you can use just one not both types from typings and @types/angular
- if you are using @types you have to introduce within your tests `import * as angular from 'angular'` to be able to do `angular.mock....`, angular is no longer exposed on global

* fix(manual_typings): revert auto from namespace back to module

manual_typings/globals.d.ts

@@ -1,9 +1,19 @@
-declare type StringMap = {[key:string]:string};
-declare type Type = Function;
-declare type ProvideSpreadType = string|Type;
+import * as angular from 'angular';
 
-// @TODO add angular1 module overrides for proper ...provide handling
-declare module angular {
+///////////////////////////////////////////////////////////////////////////////
+// functions attached to global object (window)
+///////////////////////////////////////////////////////////////////////////////
+declare global {
+  type StringMap = {[key: string]: string};
+  type Type = Function;
+  type ProvideSpreadType = string|Type;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// custom angular module overrides
+// - add angular1 module overrides for proper ...provide handling
+///////////////////////////////////////////////////////////////////////////////
+declare module 'angular' {
   interface IParseService{
     ( exp: string, interceptorFn?: Function, expensiveChecks?: boolean ): ng.ICompiledExpression
   }

test/utils.ts

@@ -1,3 +1,4 @@
+import * as angular from 'angular';
 import { isArray, isFunction, assign } from '../src/facade/lang';
 
 // ============================
@@ -117,7 +118,7 @@ function __injectionArgs(fn, locals, serviceName){
  * @internal
  * @returns {any}
  */
-export function getNg1InjectorMock(): ng.auto.IInjectorService {
+export function getNg1InjectorMock(): angular.auto.IInjectorService {
   return {
     instantiate( classFactory ){
       return new classFactory();