Merge pull request #62 from NativeScript/hdeshev/dts-compat

hdeshev · hdeshev · commit 20834077f401 · 2016-02-12T13:03:25.000+02:00
Making d.ts files play nice with angular without needing regex replaces at build time
diff --git a/ng-sample/app/performance/profiling.ts b/ng-sample/app/performance/profiling.ts
@@ -5,12 +5,14 @@ declare var __stopCPUProfiler: any;
 
 export var ENABLE_PROFILING = true;
 
+var anyGlobal = <any>global;
+
 export function time(): number {
     if (!ENABLE_PROFILING) {
         return;
     }
 
-    if (global.android) {
+    if (anyGlobal.android) {
         return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
     }
     else {
@@ -25,17 +27,17 @@ interface TimerInfo {
     currentStart: number;
 }
 
-if (!global.timers) {
-    global.timers = new Map<string, TimerInfo>();
+if (!anyGlobal.timers) {
+    anyGlobal.timers = new Map<string, TimerInfo>();
 }
 export function start(name: string): void {
     if (!ENABLE_PROFILING) {
         return;
     }
 
     var info: TimerInfo;
-    if (global.timers.has(name)) {
-        info = global.timers.get(name);
+    if (anyGlobal.timers.has(name)) {
+        info = anyGlobal.timers.get(name);
         if (info.currentStart != 0) {
             throw new Error(`Timer already started: ${name}`);
         }
@@ -47,7 +49,7 @@ export function start(name: string): void {
             count: 0,
             currentStart: time()
         };
-        global.timers.set(name, info);
+        anyGlobal.timers.set(name, info);
     }
 }
 
@@ -68,11 +70,11 @@ export function stop(name: string) {
     var info = pauseInternal(name);
     console.log(`---- [${name}] STOP total: ${info.totalTime} count:${info.count}`);
 
-    global.timers.delete(name);
+    anyGlobal.timers.delete(name);
 }
 
 function pauseInternal(name: string): TimerInfo {
-    var info = global.timers.get(name);
+    var info = anyGlobal.timers.get(name);
     if (!info) {
         throw new Error(`No timer started: ${name}`);
     }
@@ -90,7 +92,7 @@ export function startCPUProfile(name: string) {
         return;
     }
 
-    if (global.android) {
+    if (anyGlobal.android) {
         __startCPUProfiler(name);
     }
 }
@@ -100,7 +102,7 @@ export function stopCPUProfile(name: string) {
         return;
     }
 
-    if (global.android) {
+    if (anyGlobal.android) {
         __stopCPUProfiler(name);
     }
 }
diff --git a/ng-sample/app/starter.ts b/ng-sample/app/starter.ts
@@ -1,12 +1,14 @@
 declare var java: any;
 declare var CACurrentMediaTime: any;
 
-if (!global.timers) {
-    global.timers = new Map();
+var anyGlobal = <any>global;
+
+if (!anyGlobal.timers) {
+    anyGlobal.timers = new Map();
 }
 
 function time() {
-    if (global.android) {
+    if (anyGlobal.android) {
         return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns
     }
     else {
@@ -20,6 +22,6 @@ var timerEntry = {
     currentStart: time()
 };
 
-global.timers.set("application-start", timerEntry);
+anyGlobal.timers.set("application-start", timerEntry);
 
 import "./app.js"
diff --git a/ng-sample/hooks/before-prepare/15-remove-unsupported-angular-typings.js b/ng-sample/hooks/before-prepare/15-remove-unsupported-angular-typings.js
diff --git a/ng-sample/package.json b/ng-sample/package.json
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/NativeScript/template-hello-world",
   "dependencies": {
-    "tns-core-modules": "^1.6.0-angular-2",
+    "tns-core-modules": "^1.6.0-angular-4",
     "angular2": "2.0.0-beta.2",
     "parse5": "1.4.2",
     "punycode": "1.3.2",
diff --git a/ng-sample/tsconfig.json b/ng-sample/tsconfig.json
@@ -11,9 +11,37 @@
         "noEmitOnError": true
     },
     "filesGlob": [
-        "node_modules/tns-core-modules/tns-core-modules.d.ts",
         "app/**/*.ts"
     ],
+    "files": [
+        "node_modules/tns-core-modules/tns-core-modules.base.d.ts",
+        "app/nativescript-angular/application.ts",
+        "app/nativescript-angular/dom_adapter.ts",
+        "app/nativescript-angular/text-value-accessor.ts",
+        "app/nativescript-angular/element-registry.d.ts",
+        "app/nativescript-angular/zone.ts",
+        "app/nativescript-angular/application.d.ts",
+        "app/nativescript-angular/renderer.ts",
+        "app/nativescript-angular/element-registry.ts",
+        "app/nativescript-angular/xhr.ts",
+        "app/nativescript-angular/zone_patch.ts",
+        "app/nativescript-angular/directives/ns-directives.ts",
+        "app/nativescript-angular/directives/tab-view.ts",
+        "app/nativescript-angular/directives/list-view.ts",
+        "app/nativescript-angular/polyfills/array.ts",
+        "app/nativescript-angular/view-util.ts",
+        "app/examples/list/list-test.ts",
+        "app/examples/list/list-test-async.ts",
+        "app/examples/image/image-test.ts",
+        "app/examples/renderer-test.ts",
+        "app/main-page.ts",
+        "app/performance/benchmark.ts",
+        "app/performance/profiling.ts",
+        "app/main-view-model.ts",
+        "app/app.ts",
+        "app/global.d.ts",
+        "app/starter.ts"
+    ],
     "exclude": [
         "node_modules",
         "platforms"
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {},
   "dependencies": {
-      "tns-core-modules": "^1.6.0-angular-2",
+      "tns-core-modules": "^1.6.0-angular-4",
       "angular2": "2.0.0-beta.2",
       "es6-shim": "^0.33.3",
       "parse5": "1.4.2",
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -1,13 +1,15 @@
-/// <reference path="../node_modules/tns-core-modules/tns-core-modules.d.ts" />
 declare var assert: any;
 
 interface Map<K, V> {
     keys(): Array<K>;
     values(): Array<V>;
 }
 
-declare type MapConstructor = typeof Map;
-declare type SetConstructor = typeof Set;
+declare type NativeScriptModule = NodeModule
+declare type NativeScriptRequire = NodeRequire
+
+//declare type MapConstructor = typeof Map;
+//declare type SetConstructor = typeof Set;
 
 interface NumberConstructor {
     isInteger(number: number): boolean;
diff --git a/src/nativescript-angular/renderer.ts b/src/nativescript-angular/renderer.ts
@@ -149,7 +149,7 @@ export class NativeScriptRenderer extends Renderer {
 
     public listen(renderElement: util.NgView, eventName: string, callback: Function): Function {
         console.log('NativeScriptRenderer.listen: ' + eventName);
-        let zonedCallback = global.zone.bind(callback);
+        let zonedCallback = (<any>global).zone.bind(callback);
         renderElement.on(eventName, zonedCallback);
         return () => renderElement.off(eventName, zonedCallback);
     }
diff --git a/src/nativescript-angular/router/page-router-outlet.ts b/src/nativescript-angular/router/page-router-outlet.ts
@@ -279,7 +279,7 @@ class PageShim implements OnActivate, OnDeactivate {
                                     resolve()
                                 });
 
-                                page.on('navigatingFrom', global.zone.bind((args: NavigatedData) => {
+                                page.on('navigatingFrom', (<any>global).zone.bind((args: NavigatedData) => {
                                     if (args.isBackNavigation) {
                                         startGoBack();
                                         this.locationStrategy.back();
@@ -313,4 +313,4 @@ class PageShim implements OnActivate, OnDeactivate {
     private log(methodName: string) {
         log("PageShim(" + this.id + ")." + methodName)
     }
-}
+}
diff --git a/src/nativescript-angular/zone.ts b/src/nativescript-angular/zone.ts
@@ -4,7 +4,7 @@ import NativeScriptPatch from "./zone_patch"
 
 var core = require('zone.js/lib/core.js');
 
-global.Zone = core.Zone;
-global.zone = new core.Zone();
+(<any>global).Zone = core.Zone;
+(<any>global).zone = new core.Zone();
 
 NativeScriptPatch.apply();
diff --git a/tests/package.json b/tests/package.json
@@ -37,7 +37,7 @@
 		"querystring": "0.2.0",
 		"reflect-metadata": "0.1.2",
 		"rxjs": "5.0.0-beta.0",
-		"tns-core-modules": "1.6.0-angular-2",
+		"tns-core-modules": "1.6.0-angular-4",
 		"url": "0.10.3",
 		"zone.js": "0.5.10"
 	},
@@ -52,4 +52,4 @@
 		"shelljs": "^0.5.3",
 		"typescript": "^1.7.5"
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,14 @@ declare var __stopCPUProfiler: any;`
`5`	`5`
`6`	`6`	`export var ENABLE_PROFILING = true;`
`7`	`7`
	`8`	`+var anyGlobal = <any>global;`
	`9`	`+`
`8`	`10`	`export function time(): number {`
`9`	`11`	`if (!ENABLE_PROFILING) {`
`10`	`12`	`return;`
`11`	`13`	`}`
`12`	`14`
`13`		`- if (global.android) {`
	`15`	`+ if (anyGlobal.android) {`
`14`	`16`	`return java.lang.System.nanoTime() / 1000000; // 1 ms = 1000000 ns`
`15`	`17`	`}`
`16`	`18`	`else {`
`@@ -25,17 +27,17 @@ interface TimerInfo {`
`25`	`27`	`currentStart: number;`
`26`	`28`	`}`
`27`	`29`
`28`		`-if (!global.timers) {`
`29`		`- global.timers = new Map<string, TimerInfo>();`
	`30`	`+if (!anyGlobal.timers) {`
	`31`	`+ anyGlobal.timers = new Map<string, TimerInfo>();`
`30`	`32`	`}`
`31`	`33`	`export function start(name: string): void {`
`32`	`34`	`if (!ENABLE_PROFILING) {`
`33`	`35`	`return;`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`var info: TimerInfo;`
`37`		`- if (global.timers.has(name)) {`
`38`		`- info = global.timers.get(name);`
	`39`	`+ if (anyGlobal.timers.has(name)) {`
	`40`	`+ info = anyGlobal.timers.get(name);`
`39`	`41`	`if (info.currentStart != 0) {`
`40`	`42`	throw new Error(`Timer already started: ${name}`);
`41`	`43`	`}`
`@@ -47,7 +49,7 @@ export function start(name: string): void {`
`47`	`49`	`count: 0,`
`48`	`50`	`currentStart: time()`
`49`	`51`	`};`
`50`		`- global.timers.set(name, info);`
	`52`	`+ anyGlobal.timers.set(name, info);`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`
`@@ -68,11 +70,11 @@ export function stop(name: string) {`
`68`	`70`	`var info = pauseInternal(name);`
`69`	`71`	console.log(`---- [${name}] STOP total: ${info.totalTime} count:${info.count}`);
`70`	`72`
`71`		`- global.timers.delete(name);`
	`73`	`+ anyGlobal.timers.delete(name);`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`function pauseInternal(name: string): TimerInfo {`
`75`		`- var info = global.timers.get(name);`
	`77`	`+ var info = anyGlobal.timers.get(name);`
`76`	`78`	`if (!info) {`
`77`	`79`	throw new Error(`No timer started: ${name}`);
`78`	`80`	`}`
`@@ -90,7 +92,7 @@ export function startCPUProfile(name: string) {`
`90`	`92`	`return;`
`91`	`93`	`}`
`92`	`94`
`93`		`- if (global.android) {`
	`95`	`+ if (anyGlobal.android) {`
`94`	`96`	`__startCPUProfiler(name);`
`95`	`97`	`}`
`96`	`98`	`}`
`@@ -100,7 +102,7 @@ export function stopCPUProfile(name: string) {`
`100`	`102`	`return;`
`101`	`103`	`}`
`102`	`104`
`103`		`- if (global.android) {`
	`105`	`+ if (anyGlobal.android) {`
`104`	`106`	`__stopCPUProfiler(name);`
`105`	`107`	`}`
`106`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ export class NativeScriptRenderer extends Renderer {`
`149`	`149`
`150`	`150`	`public listen(renderElement: util.NgView, eventName: string, callback: Function): Function {`
`151`	`151`	`console.log('NativeScriptRenderer.listen: ' + eventName);`
`152`		`- let zonedCallback = global.zone.bind(callback);`
	`152`	`+ let zonedCallback = (<any>global).zone.bind(callback);`
`153`	`153`	`renderElement.on(eventName, zonedCallback);`
`154`	`154`	`return () => renderElement.off(eventName, zonedCallback);`
`155`	`155`	`}`