chore: reorganise exports

tbozhikov · tbozhikov · commit 10b92531f182 · 2019-10-17T16:17:33.000+03:00
diff --git a/nativescript-angular-package/element-registry.ts b/nativescript-angular-package/element-registry.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/element-registry";
diff --git a/nativescript-angular-package/index.ts b/nativescript-angular-package/index.ts
@@ -1 +1,9 @@
-export * from "@nativescript/angular";
+export * from "@nativescript/angular";
+export * from "@nativescript/angular/forms";
+export * from "@nativescript/angular/router";
+export * from "@nativescript/angular/file-system/ns-file-system";
+export * from "@nativescript/angular/modal-dialog";
+export * from "@nativescript/angular/forms/value-accessors/base-value-accessor";
+export * from "@nativescript/angular/trace";
+export * from "@nativescript/angular/renderer";
+export * from "@nativescript/angular/view-util";
diff --git a/nativescript-angular-package/platform-providers.ts b/nativescript-angular-package/platform-providers.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/platform-providers";
diff --git a/nativescript-angular-package/renderer.ts b/nativescript-angular-package/renderer.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/renderer";
diff --git a/nativescript-angular-package/resource-loader.ts b/nativescript-angular-package/resource-loader.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/resource-loader";
diff --git a/nativescript-angular-package/router/ns-route-reuse-strategy.ts b/nativescript-angular-package/router/ns-route-reuse-strategy.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/router/ns-route-reuse-strategy";
diff --git a/nativescript-angular-package/router/ns-router-link.ts b/nativescript-angular-package/router/ns-router-link.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/router/ns-router-link";
diff --git a/nativescript-angular-package/view-util.ts b/nativescript-angular-package/view-util.ts
@@ -0,0 +1 @@
+export * from "@nativescript/angular/view-util";
diff --git a/nativescript-angular/common.ts b/nativescript-angular/common.ts
@@ -38,3 +38,5 @@ import { NS_DIRECTIVES } from "./directives";
 })
 export class NativeScriptCommonModule {
 }
+
+export * from "./directives";
diff --git a/nativescript-angular/directives/index.ts b/nativescript-angular/directives/index.ts
@@ -1,5 +1,5 @@
 import { ListViewComponent } from "./list-view-comp";
-import { TemplateKeyDirective } from "./templated-items-comp";
+import { TemplateKeyDirective, SetupItemViewArgs } from "./templated-items-comp";
 import { TabViewDirective, TabViewItemDirective } from "./tab-view";
 import {
     ActionBarComponent,
@@ -8,22 +8,25 @@ import {
     NavigationButtonDirective
 } from "./action-bar";
 import { AndroidFilterComponent, IosFilterComponent } from "./platform-filters";
+import { ModalDialogHost, ModalDialogOptions, ModalDialogParams, ModalDialogService } from "./dialogs";
 
-export { ListViewComponent } from "./list-view-comp";
-export { SetupItemViewArgs, TemplateKeyDirective } from "./templated-items-comp";
-
-export { TabViewDirective, TabViewItemDirective } from "./tab-view";
-export {
+export const NS_DIRECTIVES = [
+    ListViewComponent,
+    TemplateKeyDirective,
+    TabViewDirective,
+    TabViewItemDirective,
     ActionBarComponent,
     ActionBarScope,
     ActionItemDirective,
-    NavigationButtonDirective
-} from "./action-bar";
-export { AndroidFilterComponent, IosFilterComponent } from "./platform-filters";
+    NavigationButtonDirective,
+    AndroidFilterComponent,
+    IosFilterComponent,
+];
 
-export const NS_DIRECTIVES = [
+export {
     ListViewComponent,
     TemplateKeyDirective,
+    SetupItemViewArgs,
     TabViewDirective,
     TabViewItemDirective,
     ActionBarComponent,
@@ -32,4 +35,8 @@ export const NS_DIRECTIVES = [
     NavigationButtonDirective,
     AndroidFilterComponent,
     IosFilterComponent,
-];
+    ModalDialogHost,
+    ModalDialogOptions,
+    ModalDialogParams,
+    ModalDialogService
+};
diff --git a/nativescript-angular/forms/forms.module.ts b/nativescript-angular/forms/forms.module.ts
@@ -18,6 +18,15 @@ export const FORMS_DIRECTIVES = [
     NumberValueAccessor,
 ];
 
+export {
+    TextValueAccessor,
+    CheckedValueAccessor,
+    DateValueAccessor,
+    TimeValueAccessor,
+    SelectedIndexValueAccessor,
+    NumberValueAccessor
+};
+
 @NgModule({
     declarations: FORMS_DIRECTIVES,
     providers: [
diff --git a/nativescript-angular/index.ts b/nativescript-angular/index.ts
@@ -3,20 +3,11 @@ import "tns-core-modules/application";
 export * from "./platform-common";
 export * from "./platform";
 export * from "./platform-static";
-export * from "./router";
-export * from "./forms";
-export * from "./directives";
-export * from "./common/detached-loader";
-export * from "./trace";
 export * from "./platform-providers";
-export * from "./file-system/ns-file-system";
-export * from "./modal-dialog";
-export * from "./renderer";
-export * from "./view-util";
 export * from "./resource-loader";
 
 export * from "./nativescript.module";
-export * from "./platform";
+export * from "./common";
 
 export {
     ViewClass,
@@ -27,5 +18,3 @@ export {
     isKnownView,
     registerElement,
 } from "./element-registry";
-
-export * from "./forms/value-accessors/base-value-accessor";
diff --git a/nativescript-angular/nativescript.module.ts b/nativescript-angular/nativescript.module.ts
@@ -33,6 +33,8 @@ export function errorHandlerFactory() {
     return new ErrorHandler();
 }
 
+export { DetachedLoader };
+
 @NgModule({
     declarations: [
         DetachedLoader,
diff --git a/nativescript-angular/router/router.module.ts b/nativescript-angular/router/router.module.ts
@@ -16,11 +16,7 @@ export { PageRoute } from "./page-router-outlet";
 export { RouterExtensions } from "./router-extensions";
 export { NSModuleFactoryLoader } from "./ns-module-factory-loader";
 
-export { NSRouterLink } from "./ns-router-link";
-export { NSRouterLinkActive } from "./ns-router-link-active";
-export { PageRouterOutlet } from "./page-router-outlet";
-export { NSEmptyOutletComponent } from "./ns-empty-outlet.component";
-export { NSLocationStrategy } from "./ns-location-strategy";
+export { NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent, NSLocationStrategy };
 
 const ROUTER_DIRECTIVES = [NSRouterLink, NSRouterLinkActive, PageRouterOutlet, NSEmptyOutletComponent];
 
diff --git a/tests/package.json b/tests/package.json
@@ -1,6 +1,12 @@
 {
   "nativescript": {
-    "id": "org.nativescript.ngtests"
+    "id": "org.nativescript.ngtests",
+    "tns-ios": {
+      "version": "6.1.1"
+    },
+    "tns-android": {
+      "version": "6.1.2"
+    }
   },
   "name": "ngtests",
   "version": "1.0.0",
@@ -27,7 +33,7 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "../nativescript-angular",
+    "nativescript-angular": "../nativescript-angular-package",
     "nativescript-unit-test-runner": "0.7.0",
     "rxjs": "^6.4.0",
     "tns-core-modules": "next",
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
@@ -23,10 +23,13 @@
         }
     },
     "include": [
+        "../nativescript-angular-package",
         "../nativescript-angular",
         "**/*"
     ],
     "exclude": [
+        "../nativescript-angular-package/node_modules",
+        "../nativescript-angular-package/**/*.d.ts",
         "../nativescript-angular/node_modules",
         "../nativescript-angular/**/*.d.ts",
         "node_modules",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from "@nativescript/angular/element-registry";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from "@nativescript/angular/platform-providers";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from "@nativescript/angular/renderer";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from "@nativescript/angular/view-util";`
Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,5 @@ import { NS_DIRECTIVES } from "./directives";`
`38`	`38`	`})`
`39`	`39`	`export class NativeScriptCommonModule {`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+export * from "./directives";`