Merge remote-tracking branch 'origin/master' into merge-release-in-master

Author: SvetoslavTsenov

build-docs.sh

@@ -0,0 +1,9 @@
+set -e
+
+ENV="${ENV:-dev}"
+DIST_DIR="nativescript-angular/bin/dist"
+APIREF_DIR="$DIST_DIR/ng-api-reference"
+rm -rf "$APIREF_DIR"
+cd "nativescript-angular"
+npm install
+npm run typedoc

nativescript-angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-angular",
-  "version": "7.2.3",
+  "version": "7.3.0",
   "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
   "homepage": "https://www.nativescript.org/",
   "bugs": "https://github.com/NativeScript/nativescript-angular/issues",
@@ -34,7 +34,8 @@
     "tsc-w": "tsc -p tsconfig.json -w",
     "ngc": "ngc -p tsconfig.json",
     "prepare": "npm run ngc",
-    "version": "rm -rf package-lock.json && conventional-changelog -p angular -i ../CHANGELOG.md -s && git add ../CHANGELOG.md"
+    "version": "rm -rf package-lock.json && conventional-changelog -p angular -i ../CHANGELOG.md -s && git add ../CHANGELOG.md",
+    "typedoc": "typedoc --tsconfig \"./tsconfig.typedoc.json\" --out ./bin/dist/ng-api-reference --includeDeclarations --name \"NativeScript Angular\" --theme ./node_modules/nativescript-typedoc-theme --excludeExternals --externalPattern \"**/+(tns-core-modules|module|declarations).d.ts\""
   },
   "bin": {
     "update-app-ng-deps": "./bin/update-app-ng-deps"
@@ -73,6 +74,8 @@
     "tns-core-modules": "next",
     "tslint": "^5.5.0",
     "typescript": "~3.1.1",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.4",
+    "nativescript-typedoc-theme": "git://github.com/NativeScript/nativescript-typedoc-theme.git#master",
+    "typedoc": "^0.13.0"
   }
 }

nativescript-angular/router/router.module.ts

@@ -19,32 +19,39 @@ export { NSEmptyOutletComponent } from "./ns-empty-outlet.component";
 
 export type LocationState = LocationState;
 
+const ROUTER_DIRECTIVES = [NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent];
+
+const NS_ROUTER_PROVIDERS = [
+    {
+        provide: NSLocationStrategy,
+        useFactory: provideLocationStrategy,
+        deps: [[NSLocationStrategy, new Optional(), new SkipSelf()], FrameService],
+    },
+    { provide: LocationStrategy, useExisting: NSLocationStrategy },
+    NativescriptPlatformLocation,
+    { provide: PlatformLocation, useClass: NativescriptPlatformLocation },
+    RouterExtensions,
+    NSRouteReuseStrategy,
+    { provide: RouteReuseStrategy, useExisting: NSRouteReuseStrategy },
+];
+
 @NgModule({
-    declarations: [NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent],
-    providers: [
-        {
-            provide: NSLocationStrategy,
-            useFactory: provideLocationStrategy,
-            deps: [[NSLocationStrategy, new Optional(), new SkipSelf()], FrameService],
-        },
-        { provide: LocationStrategy, useExisting: NSLocationStrategy },
-        NativescriptPlatformLocation,
-        { provide: PlatformLocation, useClass: NativescriptPlatformLocation },
-        RouterExtensions,
-        NSRouteReuseStrategy,
-        { provide: RouteReuseStrategy, useExisting: NSRouteReuseStrategy },
-    ],
+    declarations: ROUTER_DIRECTIVES,
+    entryComponents: [NSEmptyOutletComponent],
     imports: [RouterModule, NativeScriptCommonModule],
-    exports: [RouterModule, NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent],
+    exports: [RouterModule, ...ROUTER_DIRECTIVES],
     schemas: [NO_ERRORS_SCHEMA],
 })
 export class NativeScriptRouterModule {
-    static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders {
-        return RouterModule.forRoot(routes, config);
+    static forRoot(routes: Routes, config?: ExtraOptions): ModuleWithProviders<NativeScriptRouterModule> {
+        return {
+            ngModule: NativeScriptRouterModule,
+            providers: [...RouterModule.forRoot(routes, config).providers, ...NS_ROUTER_PROVIDERS]
+        };
     }
 
-    static forChild(routes: Routes): ModuleWithProviders {
-        return RouterModule.forChild(routes);
+    static forChild(routes: Routes): ModuleWithProviders<NativeScriptRouterModule> {
+        return { ngModule: NativeScriptRouterModule, providers: RouterModule.forChild(routes).providers };
     }
 }
 

nativescript-angular/tsconfig.typedoc.json

@@ -0,0 +1,61 @@
+{"compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "noImplicitUseStrict": true,
+    "noEmitHelpers": true,
+    "declaration": true,
+    "removeComments": false,
+    "noEmitOnError": true,
+    "noImplicitAny": false,
+    "lib": [
+        "dom",
+        "es6",
+        "es2015.iterable"
+    ],
+    "baseUrl": ".",
+    "paths": {
+        "*": [
+            "./node_modules/tns-core-modules/*",
+            "./node_modules/*"
+        ]
+    }
+  },
+  "angularCompilerOptions": {
+    "genDir": ".",
+    "skipMetadataEmit": false,
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true
+  },
+"exclude": [
+        "./node_modules",
+        "tns-core-modules/references.d.ts",
+        "tns-core-modules/node_modules",
+        "tns-core-modules/ui/frame/transition-definitions.android.d.ts",
+        "./zone-js",
+        "./index.ts",
+        "./bin",
+        "./index.d.ts",
+        "./testing",
+        "./animations/index.ts",
+        "./animations/utils.ts",
+        "./app-host-view.ts",
+        "./common/utils.ts",
+        "./dom-adapter.ts",
+        "./file-system",
+        "./forms/index.ts",
+        "./forms/value-accessors/index.ts",
+        "./lang-facade.ts",
+        "./polyfills",
+        "./router/private-imports",
+        "./schema-registry.ts",
+        "./http-client/index.ts",
+        "./http/index.ts",
+        "./router/index.ts",
+        ""
+
+    ]
+}

tests/app/tests/router-module-tests.ts

@@ -0,0 +1,74 @@
+// make sure you import mocha-config before @angular/core
+import { Component, ViewChild } from "@angular/core";
+import { nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender } from "nativescript-angular/testing";
+import { NativeScriptRouterModule, RouterExtensions } from "nativescript-angular/router";
+import { NSRouterLink } from "nativescript-angular/router/ns-router-link";
+import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
+import { assert } from "~/tests/test-config";
+import { ActivatedRoute, Router, RouteReuseStrategy } from "@angular/router";
+import { LocationStrategy, PlatformLocation } from "@angular/common";
+import { NSRouteReuseStrategy } from "nativescript-angular/router/ns-route-reuse-strategy";
+
+@Component({
+    template: `<StackLayout><Label nsRouterLink text="COMPONENT"></Label></StackLayout>`
+})
+class RouterTestComponent {
+    @ViewChild(NSRouterLink)
+    nsRouterLink: NSRouterLink;
+}
+
+describe("NativeScriptRouterModule.forRoot", () => {
+    beforeEach(nsTestBedBeforeEach(
+        [RouterTestComponent],
+        [],
+        [NativeScriptRouterModule.forRoot([])],
+        []));
+
+    afterEach(nsTestBedAfterEach());
+
+    it("should provide nativescript routing services", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const injector = fixture.componentRef.injector
+
+            assert.instanceOf(injector.get(LocationStrategy, null), NSLocationStrategy);
+            assert.instanceOf(injector.get(RouterExtensions, null), RouterExtensions);
+            assert.instanceOf(injector.get(RouteReuseStrategy, null), NSRouteReuseStrategy);
+        });
+    });
+
+    it("should provide nativescript routing directives", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const linkDirective = fixture.componentRef.instance.nsRouterLink;
+            assert.instanceOf(linkDirective, NSRouterLink);
+        });
+    });
+});
+
+describe("NativeScriptRouterModule.forChild", () => {
+    beforeEach(nsTestBedBeforeEach(
+        [RouterTestComponent],
+        [
+            { provide: Router, useValue: {} },
+            { provide: RouterExtensions, useValue: {} },
+            { provide: ActivatedRoute, useValue: {} },
+        ],
+        [NativeScriptRouterModule.forChild([])],
+        []));
+    afterEach(nsTestBedAfterEach());
+
+    it("should not provide nativescript routing services", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const injector = fixture.componentRef.injector
+            assert.isNull(injector.get(LocationStrategy, null));
+            assert.isNull(injector.get(RouteReuseStrategy, null));
+        });
+    });
+
+    it("should provide nativescript routing directives", () => {
+        return nsTestBedRender(RouterTestComponent).then((fixture) => {
+            const linkDirective = fixture.componentRef.instance.nsRouterLink;
+            assert.instanceOf(linkDirective, NSRouterLink);
+        });
+    });
+});
+