Skip to content

Commit b19b813

Browse files
author
vakrilov
committed
chore(cleanup): Use index files and move module definitionss in folders
1 parent 3ccb378 commit b19b813

19 files changed

+72
-66
lines changed

nativescript-angular/animations.ts renamed to nativescript-angular/animations/animations.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import {
1313
ɵBrowserAnimationBuilder as BrowserAnimationBuilder,
1414
} from "@angular/platform-browser/animations";
1515

16-
import { NativeScriptAnimationEngine } from "./animations/animation-engine";
17-
import { NativeScriptAnimationDriver } from "./animations/animation-driver";
18-
import { NativeScriptModule } from "./nativescript.module";
19-
import { NativeScriptRendererFactory } from "./renderer";
16+
import { NativeScriptAnimationEngine } from "./animation-engine";
17+
import { NativeScriptAnimationDriver } from "./animation-driver";
18+
import { NativeScriptModule } from "../nativescript.module";
19+
import { NativeScriptRendererFactory } from "../renderer";
2020

2121
@Injectable()
2222
export class InjectableAnimationEngine extends NativeScriptAnimationEngine {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "./animations.module";

nativescript-angular/directives.ts

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import { ListViewComponent, TemplateKeyDirective } from "./list-view-comp";
2+
import { TabViewDirective, TabViewItemDirective } from "./tab-view";
3+
import {
4+
ActionBarComponent,
5+
ActionBarScope,
6+
ActionItemDirective,
7+
NavigationButtonDirective
8+
} from "./action-bar";
9+
import { AndroidFilterComponent, IosFilterComponent } from "./platform-filters";
10+
11+
export {
12+
ListViewComponent,
13+
SetupItemViewArgs,
14+
TemplateKeyDirective
15+
} from "./list-view-comp";
16+
17+
export { TabViewDirective, TabViewItemDirective } from "./tab-view";
18+
export {
19+
ActionBarComponent,
20+
ActionBarScope,
21+
ActionItemDirective,
22+
NavigationButtonDirective
23+
} from "./action-bar";
24+
export { AndroidFilterComponent, IosFilterComponent } from "./platform-filters";
25+
26+
export const NS_DIRECTIVES = [
27+
ListViewComponent,
28+
TemplateKeyDirective,
29+
TabViewDirective,
30+
TabViewItemDirective,
31+
ActionBarComponent,
32+
ActionBarScope,
33+
ActionItemDirective,
34+
NavigationButtonDirective,
35+
AndroidFilterComponent,
36+
IosFilterComponent,
37+
];

nativescript-angular/forms.ts renamed to nativescript-angular/forms/forms.module.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { NgModule } from "@angular/core";
22
import { FormsModule } from "@angular/forms";
3-
import { TextValueAccessor } from "./value-accessors/text-value-accessor";
4-
import { CheckedValueAccessor } from "./value-accessors/checked-value-accessor";
5-
import { DateValueAccessor } from "./value-accessors/date-value-accessor";
6-
import { TimeValueAccessor } from "./value-accessors/time-value-accessor";
7-
import { NumberValueAccessor } from "./value-accessors/number-value-accessor";
8-
import { SelectedIndexValueAccessor } from "./value-accessors/selectedIndex-value-accessor";
3+
import {
4+
TextValueAccessor,
5+
CheckedValueAccessor,
6+
DateValueAccessor,
7+
TimeValueAccessor,
8+
NumberValueAccessor,
9+
SelectedIndexValueAccessor
10+
} from "./value-accessors";
911

1012
export const FORMS_DIRECTIVES = [
1113
TextValueAccessor,

nativescript-angular/forms/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "./forms.module";
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export * from "./base-value-accessor";
2+
export * from "./text-value-accessor";
3+
export * from "./checked-value-accessor";
4+
export * from "./date-value-accessor";
5+
export * from "./time-value-accessor";
6+
export * from "./number-value-accessor";
7+
export * from "./selectedIndex-value-accessor";

nativescript-angular/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ export {
2626
registerElement,
2727
} from "./element-registry";
2828

29-
export * from "./value-accessors/base-value-accessor";
29+
export * from "./forms/value-accessors/base-value-accessor";

nativescript-angular/router/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from "./router.module";

nativescript-angular/router/ns-router-link-active.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
import { Subscription } from "rxjs/Subscription";
77

88
import { NavigationEnd, Router, UrlTree } from "@angular/router";
9-
import { containsTree } from "../router-url-tree";
9+
import { containsTree } from "./private-imports/router-url-tree";
1010

1111
import { NSRouterLink } from "./ns-router-link";
1212

@@ -127,5 +127,4 @@ export class NSRouterLinkActive implements OnChanges, OnDestroy, AfterContentIni
127127
private hasActiveLinks(): boolean {
128128
return this.links.some(this.isLinkActive(this.router));
129129
}
130-
131130
}

nativescript-angular/router.ts renamed to nativescript-angular/router/router.module.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ import {
88
import { RouterModule, Routes, ExtraOptions, RouteReuseStrategy } from "@angular/router";
99
import { LocationStrategy, PlatformLocation } from "@angular/common";
1010
import { Frame } from "tns-core-modules/ui/frame";
11-
import { NSRouterLink } from "./router/ns-router-link";
12-
import { NSRouterLinkActive } from "./router/ns-router-link-active";
13-
import { PageRouterOutlet } from "./router/page-router-outlet";
14-
import { NSLocationStrategy, LocationState } from "./router/ns-location-strategy";
15-
import { NativescriptPlatformLocation } from "./router/ns-platform-location";
16-
import { NSRouteReuseStrategy } from "./router/ns-route-reuse-strategy";
17-
import { RouterExtensions } from "./router/router-extensions";
18-
import { NativeScriptCommonModule } from "./common";
11+
import { NSRouterLink } from "./ns-router-link";
12+
import { NSRouterLinkActive } from "./ns-router-link-active";
13+
import { PageRouterOutlet } from "./page-router-outlet";
14+
import { NSLocationStrategy, LocationState } from "./ns-location-strategy";
15+
import { NativescriptPlatformLocation } from "./ns-platform-location";
16+
import { NSRouteReuseStrategy } from "./ns-route-reuse-strategy";
17+
import { RouterExtensions } from "./router-extensions";
18+
import { NativeScriptCommonModule } from "../common";
1919

20-
export { PageRoute } from "./router/page-router-outlet";
21-
export { RouterExtensions } from "./router/router-extensions";
22-
export { NSModuleFactoryLoader } from "./router/ns-module-factory-loader";
20+
export { PageRoute } from "./page-router-outlet";
21+
export { RouterExtensions } from "./router-extensions";
22+
export { NSModuleFactoryLoader } from "./ns-module-factory-loader";
2323
export type LocationState = LocationState;
2424

2525
@NgModule({

0 commit comments

Comments
 (0)