refactor(build): move to npm @types defs from typings and update code…

… so angular is loaded not from global namespace

- remove bash script for appending manual typings to core.d.ts which doesn't work
- remove typings
- update packages ( ts, ts-node, mocha, chai )

package.json

@@ -3,9 +3,7 @@
   "version": "3.0.3",
   "description": "Angular 2 decorators and utils for Angular 1.x",
   "scripts": {
-    "typings": "typings",
-    "typings:install": "typings install",
-    "prepublish": "npm run typings:install && tsc && ./scripts/create_core.sh",
+    "prepublish": "tsc",
     "start": "tsc -w",
     "test": "mocha ./test/index.ts --require ts-node/register --colors --watch-extensions ts",
     "test:watch": "npm run test -- --watch",
@@ -31,24 +29,28 @@
   },
   "homepage": "https://github.com/ngParty/ng-metadata#readme",
   "devDependencies": {
+    "@types/angular": "1.5.19",
+    "@types/chai": "3.4.34",
+    "@types/jquery": "2.0.34",
+    "@types/mocha": "2.2.32",
+    "@types/node": "6.0.46",
+    "@types/sinon": "1.16.31",
     "angular": "1.4.10",
-    "chai": "3.4.1",
+    "chai": "3.5.0",
     "commitizen": "2.4.6",
     "concurrently": "2.1.0",
     "conventional-changelog": "1.1.0",
     "conventional-recommended-bump": "0.2.1",
     "cz-conventional-changelog": "1.1.4",
     "ghooks": "1.0.1",
     "live-server": "0.8.2",
-    "mocha": "2.3.4",
-    "reflect-metadata": "0.1.3",
+    "mocha": "3.1.2",
+    "reflect-metadata": "0.1.8",
     "rxjs": "5.0.0-rc.1",
-    "sinon": "1.17.2",
+    "sinon": "1.17.6",
     "systemjs": "0.19.6",
-    "systemjs-builder": "0.14.11",
-    "ts-node": "0.7.3",
-    "typescript": "2.0.3",
-    "typings": "1.0.4",
+    "ts-node": "1.7.0",
+    "typescript": "2.0.9",
     "validate-commit-msg": "2.0.0"
   },
   "peerDependencies": {

playground/app/components/change-detector/change-detector.component.ts

@@ -1,3 +1,4 @@
+import * as angular from 'angular';
 import {
   Component,
   ChangeDetectionStrategy,

playground/app/components/tester/tester.component.ts

@@ -1,3 +1,4 @@
+import * as angular from 'angular';
 import { Component, Input, Output } from 'ng-metadata/core';
 
 @Component({

playground/app/directives/my-tester.directive.ts

@@ -1,3 +1,4 @@
+import * as angular from 'angular';
 import { Directive, Input, Output, Attr, HostListener } from 'ng-metadata/core';
 
 @Directive({

playground/app/index.ts

@@ -1,3 +1,6 @@
+// @FIXME remove this line when https://github.com/ngParty/ng-metadata/issues/175 is resolved
+///<reference path="../../manual_typings/globals.d.ts"/>
+
 import * as angular from 'angular';
 import { provide, OpaqueToken, Injectable } from 'ng-metadata/core';
 

playground/app/todo/add-todo.component.ts

@@ -1,5 +1,5 @@
 import { Component, Output, EventEmitter } from 'ng-metadata/core';
-import { TodoModel } from './todo-store.service.ts';
+import { TodoModel } from './todo-store.service';
 
 @Component({
   selector: 'add-todo',

playground/app/todo/todo-store.service.ts

@@ -1,3 +1,4 @@
+import * as angular from 'angular';
 import {Injectable} from 'ng-metadata/core';
 
 export type TodoModel = {

playground/ng-metadata.legacy.d.ts

@@ -1,3 +1,4 @@
+// import * as angular from 'angular';
 // import Subject = require('rxjs/Subject');
 declare type Observable<T> = any;
 declare type Subject<T> = any;
@@ -1014,16 +1015,17 @@ declare module ngMetadataCommon {
     $isEmpty(value: any): boolean;
   }
   export abstract class NgForm implements ng.IFormController {
+    $name: string;
     $pristine: boolean;
     $dirty: boolean;
     $valid: boolean;
     $invalid: boolean;
     $submitted: boolean;
     $error: any;
     $pending: any;
-    $addControl(control: angular.INgModelController): void;
-    $removeControl(control: angular.INgModelController): void;
-    $setValidity(validationErrorKey: string, isValid: boolean, control: angular.INgModelController): void;
+    $addControl(control: ng.INgModelController): void;
+    $removeControl(control: ng.INgModelController): void;
+    $setValidity(validationErrorKey: string, isValid: boolean, control: ng.INgModelController): void;
     $setDirty(): void;
     $setPristine(): void;
     $commitViewValue(): void;
@@ -1067,14 +1069,3 @@ declare module "ng-metadata/common" {
   export = ngMetadataCommon
 }
 declare type Type = Function;
-declare type ProvideSpreadType = string|Type;
-
-declare module angular {
-  interface IModule {
-    // constant(object: Object): IModule;
-    // value(object: Object): IModule;
-    directive(...args: ProvideSpreadType[]): IModule;
-    filter(...args: ProvideSpreadType[]): IModule;
-    service(...args: ProvideSpreadType[]): IModule;
-  }
-}

playground/tsconfig.json

@@ -6,11 +6,15 @@
     "sourceMap": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "pretty": true
+    "pretty": true,
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.promise"
+    ]
   },
   "files": [
-    "app/main.ts",
-    "../typings/index.d.ts",
-    "ng-metadata.legacy.d.ts"
+    "./app/main.ts",
+    "./ng-metadata.legacy.d.ts"
   ]
 }

src/common/directives/ng_form.ts

@@ -11,11 +11,11 @@ export abstract class NgForm implements ng.IFormController {
   $name: string;
   $pending: any;
 
-  $addControl( control: angular.INgModelController ): void {}
+  $addControl( control: ng.INgModelController ): void {}
 
-  $removeControl( control: angular.INgModelController ): void {}
+  $removeControl( control: ng.INgModelController ): void {}
 
-  $setValidity( validationErrorKey: string, isValid: boolean, control: angular.INgModelController ): void {}
+  $setValidity( validationErrorKey: string, isValid: boolean, control: ng.INgModelController ): void {}
 
   $setDirty(): void {}
 

src/core/directives/binding/binding_factory.ts

@@ -110,7 +110,7 @@ export function _createDirectiveBindings(
         oldValue = initialValue;
       }
       recordChanges( propName, newValue, oldValue );
-      ctrl[ propName ] = isImmutable ? angular.copy(newValue) : newValue;
+      ctrl[ propName ] = isImmutable ? global.angular.copy(newValue) : newValue;
     }, parentGet.literal );
 
   }

src/core/directives/host/host_resolver.ts

@@ -1,4 +1,5 @@
 import { HostBindingsProcessed, HostListenersProcessed } from './constants';
+import { global } from '../../../facade/lang';
 import { StringMapWrapper } from '../../../facade/collections';
 import { StringWrapper } from '../../../facade/primitives';
 /**
@@ -171,11 +172,11 @@ function _getGlobalTargetReference( $injector: ng.auto.IInjectorService, targetN
   }
 
   if ( targetName === 'window' ) {
-    return angular.element( $injector.get<ng.IWindowService>( `$${targetName}` ) );
+    return global.angular.element( $injector.get<ng.IWindowService>( `$${targetName}` ) );
   }
 
   if ( targetName === 'body' ) {
-    return angular.element($document[ 0 ][ targetName ]);
+    return global.angular.element($document[ 0 ][ targetName ]);
   }
 
   throw new Error(`unsupported global target '${targetName}', only '${globalEventTargets}' are supported`)

src/facade/lang.ts

@@ -20,10 +20,10 @@ export interface BrowserNodeGlobal {
   setTimeout: Function,
   clearTimeout: Function,
   setInterval: Function,
-  clearInterval: Function
+  clearInterval: Function,
 }
 
-var globalScope: BrowserNodeGlobal;
+let globalScope: BrowserNodeGlobal;
 
 if ( typeof window === 'undefined' ) {
   globalScope = global as any;
@@ -33,7 +33,7 @@ if ( typeof window === 'undefined' ) {
 
 // Need to declare a new variable for global here since TypeScript
 // exports the original value of the symbol.
-var _global: BrowserNodeGlobal = globalScope;
+const _global: BrowserNodeGlobal = globalScope;
 
 export {_global as global};
 

src/platform/browser_utils.ts

@@ -1,4 +1,4 @@
-import { assertionsEnabled } from '../facade/lang';
+import { global, assertionsEnabled } from '../facade/lang';
 import { bundle } from '../core/util/bundler';
 import { Type } from '../facade/type';
 
@@ -19,7 +19,7 @@ function prodModeConfig( $compileProvider: ng.ICompileProvider, $httpProvider: n
   $httpProvider.useApplyAsync( true );
 }
 
-export function createBootstrapFn(bootstrapFn: Function = angular.bootstrap.bind(angular)): Function {
+export function createBootstrapFn(bootstrapFn: Function = global.angular.bootstrap.bind(global.angular)): Function {
 
   /**
    * bootstrap angular app
@@ -40,12 +40,12 @@ export function createBootstrapFn(bootstrapFn: Function = angular.bootstrap.bind
         'Angular is running in the development mode. Call enableProdMode() to enable the production mode.'
       );
     } else {
-      angular.module( angular1ModuleName ).config( prodModeConfig );
+      global.angular.module( angular1ModuleName ).config( prodModeConfig );
     }
 
     const appRoot = _getAppRoot( element );
 
-    angular.element( document ).ready( ()=> {
+    global.angular.element( document ).ready( ()=> {
       bootstrapFn( appRoot, [ angular1ModuleName ], {
         strictDi
       } )

src/testing/utils.ts

@@ -1,6 +1,7 @@
 import { getInjectableName } from '../core/di/provider';
 import { StringWrapper } from '../facade/primitives';
 import { Type } from '../facade/type';
+import { global } from '../facade/lang';
 
 // public helpers
 
@@ -42,7 +43,7 @@ export function renderFactory( $compile: ng.ICompileService, $scope: any ) {
       // is Component
 
       const hostElement = `<${selector}></${selector}>`;
-      jqHost = angular.element( hostElement );
+      jqHost = global.angular.element( hostElement );
 
     }
     // since attributes can be undefined we check them

src/upgrade/upgrade_adapter.ts

@@ -19,7 +19,7 @@ export interface UpgradeAdapterInstance {
   /**
    * Bootstrap a hybrid AngularJS v1 / Angular v2 application.
    */
-  bootstrap(element: Element, modules?: any[], config?: angular.IAngularBootstrapConfig): UpgradeAdapterRef;
+  bootstrap(element: Element, modules?: any[], config?: ng.IAngularBootstrapConfig): UpgradeAdapterRef;
   /**
    * Allows Angular v2 service to be accessible from AngularJS v1.
    */

test/utils.ts

@@ -1,4 +1,3 @@
-import * as angular from 'angular';
 import { isArray, isFunction, assign } from '../src/facade/lang';
 
 // ============================

tsconfig.json

@@ -8,8 +8,17 @@
     "emitDecoratorMetadata": true,
     "declaration": true,
     "pretty": true,
-    "preserveConstEnums": true
+    "preserveConstEnums": true,
+    "moduleResolution": "node",
+    "lib": [
+      "es5",
+      "dom",
+      "es2015.promise"
+    ]
   },
+  "include": [
+    "manual_typings/globals.d.ts"
+  ],
   "exclude": [
     "_book",
     "playground",