@tech4good/angular-schematics 13.0.0 → 13.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/README.md +10 -10
  2. package/package.json +1 -1
  3. package/src/collection.json +9 -4
  4. package/src/component/files/__name@dasherize__/__name@dasherize__.animations.ts.template +4 -0
  5. package/src/component/files/__name@dasherize__/__name@dasherize__.component.html.template +3 -0
  6. package/src/component/files/__name@dasherize__/__name@dasherize__.component.scss.template +7 -0
  7. package/src/component/files/__name@dasherize__/__name@dasherize__.component.spec.ts.template +25 -0
  8. package/src/component/files/__name@dasherize__/__name@dasherize__.component.ts.template +30 -0
  9. package/src/component/index.d.ts +1 -1
  10. package/src/component/index.js +85 -94
  11. package/src/component/index.js.map +1 -1
  12. package/src/component/schema.json +27 -13
  13. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.actions.ts.template +27 -0
  14. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.effects.ts.template +47 -0
  15. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.model.ts.template +0 -0
  16. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.selectors.ts.template +20 -0
  17. package/src/container/files/__name@dasherize__/+state/__name@dasherize__.state.ts.template +13 -0
  18. package/src/container/files/__name@dasherize__/__name@dasherize__.animations.ts.template +4 -0
  19. package/src/container/files/__name@dasherize__/__name@dasherize__.component.html.template +3 -0
  20. package/src/container/files/__name@dasherize__/__name@dasherize__.component.scss.template +5 -0
  21. package/src/container/files/__name@dasherize__/__name@dasherize__.component.spec.ts.template +25 -0
  22. package/src/container/files/__name@dasherize__/__name@dasherize__.component.ts.template +81 -0
  23. package/src/container/index.d.ts +1 -1
  24. package/src/container/index.js +106 -273
  25. package/src/container/index.js.map +1 -1
  26. package/src/container/schema.json +28 -9
  27. package/src/entity/files/__name@dasherize__/__name@dasherize__.actions.ts.template +270 -0
  28. package/src/entity/files/__name@dasherize__/__name@dasherize__.effects.ts.template +131 -0
  29. package/src/entity/files/__name@dasherize__/__name@dasherize__.model.ts.template +7 -0
  30. package/src/entity/files/__name@dasherize__/__name@dasherize__.reducer.spec.ts.template +13 -0
  31. package/src/entity/files/__name@dasherize__/__name@dasherize__.reducer.ts.template +51 -0
  32. package/src/entity/files/__name@dasherize__/__name@dasherize__.service.ts.template +50 -0
  33. package/src/entity/index.d.ts +1 -1
  34. package/src/entity/index.js +105 -506
  35. package/src/entity/index.js.map +1 -1
  36. package/src/entity/schema.json +25 -6
  37. package/src/init/files/.eslintrc.json +120 -0
  38. package/src/init/files/.gitattributes +11 -0
  39. package/src/init/files/.github/workflows/angular-github-ci.yml.template +60 -0
  40. package/src/init/files/angular.json.template +132 -0
  41. package/src/init/files/package.json.template +60 -0
  42. package/src/init/files/src/app/app.component.html +3 -0
  43. package/src/init/files/src/app/app.component.scss +4 -0
  44. package/src/init/files/src/app/general/e404/e404.component.html +1 -0
  45. package/src/init/files/src/app/general/e404/e404.component.scss +0 -0
  46. package/src/init/files/src/app/general/login/login.component.html +11 -0
  47. package/src/init/files/src/app/general/login/login.component.scss +29 -0
  48. package/src/init/files/src/index.html.template +19 -0
  49. package/src/init/files/src/styles/_variables.scss +0 -0
  50. package/src/init/files/src/styles.scss +13 -0
  51. package/src/init/index.d.ts +2 -0
  52. package/src/init/index.js +50 -0
  53. package/src/init/index.js.map +1 -0
  54. package/src/init/schema.json +28 -0
  55. package/src/module/files/__name@dasherize__/__name@dasherize__-routing.module.ts.template +13 -0
  56. package/src/module/files/__name@dasherize__/__name@dasherize__.module.spec.ts.template +13 -0
  57. package/src/module/files/__name@dasherize__/__name@dasherize__.module.ts.template +24 -0
  58. package/src/module/index.d.ts +1 -1
  59. package/src/module/index.js +87 -78
  60. package/src/module/index.js.map +1 -1
  61. package/src/module/schema.json +21 -6
  62. package/src/shared/statements-adder.d.ts +3 -0
  63. package/src/shared/statements-adder.js +22 -1
  64. package/src/shared/statements-adder.js.map +1 -1
@@ -0,0 +1,81 @@
1
+ import { Component, OnInit, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
2
+ import { <%= classify(name) %>Animations } from './<%= dasherize(name) %>.animations';
3
+ import { ParamMap, ActivatedRoute } from '@angular/router';
4
+ import { Store, select } from '@ngrx/store';
5
+ import * as fromStore from '../../core/store/app.reducer';
6
+ import * as fromAuth from '../../core/store/auth/auth.reducer';
7
+ import { FirebaseService } from '../../core/firebase/firebase.service';
8
+ import { Observable, Subject, BehaviorSubject, combineLatest } from 'rxjs';
9
+ import { withLatestFrom, take, takeUntil } from 'rxjs/operators';
10
+
11
+ import { <%= classify(name) %>State } from './+state/<%= dasherize(name) %>.state';
12
+ import { <%= classify(name) %>Selectors } from './+state/<%= dasherize(name) %>.selectors';
13
+
14
+ import { LoadData, Cleanup } from './+state/<%= dasherize(name) %>.actions';
15
+ import { RouterNavigate } from '../../core/store/app.actions';
16
+
17
+ import { User } from '../../core/store/user/user.model';
18
+
19
+ @Component({
20
+ selector: 'app-<%= dasherize(name) %>',
21
+ templateUrl: './<%= dasherize(name) %>.component.html',
22
+ styleUrls: ['./<%= dasherize(name) %>.component.scss'],
23
+ changeDetection: ChangeDetectionStrategy.OnPush,
24
+ animations: <%= classify(name) %>Animations,
25
+ })
26
+ export class <%= classify(name) %>Component implements OnInit, OnDestroy {
27
+ // --------------- ROUTE PARAMS & CURRENT USER ---------
28
+
29
+
30
+ // --------------- LOCAL UI STATE ----------------------
31
+
32
+
33
+ // --------------- DB ENTITY DATA ----------------------
34
+
35
+ /** Container id for selectors and loading. */
36
+ containerId: string = this.db.createId();
37
+
38
+ // --------------- DATA BINDING STREAMS ----------------
39
+
40
+
41
+ // --------------- EVENT BINDING STREAMS ---------------
42
+
43
+
44
+ // --------------- OTHER -------------------------------
45
+
46
+ /** Unsubscribe observable for subscriptions. */
47
+ unsubscribe$: Subject<void> = new Subject();
48
+
49
+ constructor(
50
+ private state: <%= classify(name) %>State,
51
+ private route: ActivatedRoute,
52
+ private selectors: <%= classify(name) %>Selectors,
53
+ private store: Store<fromStore.State>,
54
+ private db: FirebaseService,
55
+ ) {
56
+ }
57
+
58
+ ngOnInit() {
59
+ // --------------- EVENT HANDLING ----------------------
60
+
61
+
62
+ // --------------- LOAD DATA ---------------------------
63
+
64
+ // Once everything is set up, load the data for the role.
65
+ this.store.dispatch( new LoadData({
66
+ containerId: this.containerId,
67
+ }) );
68
+ }
69
+
70
+ ngOnDestroy() {
71
+ // Unsubscribe subscriptions.
72
+ this.unsubscribe$.next();
73
+ this.unsubscribe$.complete();
74
+
75
+ // Unsubscribe from firebase connection from load and free up memoized selector values.
76
+ this.store.dispatch( new Cleanup({
77
+ containerId: this.containerId,
78
+ }) );
79
+ this.selectors.cleanup(this.containerId);
80
+ }
81
+ }
@@ -1,2 +1,2 @@
1
1
  import { Rule } from '@angular-devkit/schematics';
2
- export declare function container(_options: any): Rule;
2
+ export declare function container(options: any): Rule;
@@ -1,283 +1,116 @@
1
1
  "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
2
11
  Object.defineProperty(exports, "__esModule", { value: true });
3
12
  exports.container = void 0;
4
- const camelcase_formatter_1 = require("../shared/camelcase-formatter");
13
+ const schematics_1 = require("@angular-devkit/schematics");
14
+ const change_1 = require("@schematics/angular/utility/change");
15
+ const find_module_1 = require("@schematics/angular/utility/find-module");
16
+ const parse_name_1 = require("@schematics/angular/utility/parse-name");
17
+ const validation_1 = require("@schematics/angular/utility/validation");
18
+ const workspace_1 = require("@schematics/angular/utility/workspace");
19
+ const core_1 = require("@angular-devkit/core");
5
20
  const statements_adder_1 = require("../shared/statements-adder");
6
- const fs = require('fs');
7
- // You don't have to export the function as default. You can also have more than one rule factory
8
- // per file.
9
- function container(_options) {
10
- return (tree, _context) => {
11
- const { name, module, description } = _options;
12
- const camelName = (0, camelcase_formatter_1.CamelCaseFormatter)(name, false);
13
- const ActionsFile = `import { Action } from '@ngrx/store';
14
-
15
- export enum ${camelName}ActionTypes {
16
- LOAD_DATA = '[${camelName}] load data',
17
- CLEANUP = '[${camelName}] cleanup',
18
- }
19
-
20
- /** Action for loading required DB data. */
21
- export class LoadData implements Action {
22
- readonly type = ${camelName}ActionTypes.LOAD_DATA;
23
-
24
- constructor(public payload: {
25
- containerId: string,
26
- }) { }
27
- }
28
-
29
- /** Action for cleaning up loading subscriptions. */
30
- export class Cleanup implements Action {
31
- readonly type = ${camelName}ActionTypes.CLEANUP;
32
- constructor(public payload: {
33
- containerId: string,
34
- }) { }
35
- }
36
-
37
- export type ${camelName}Actions =
38
- LoadData |
39
- Cleanup;
40
- `;
41
- const EffectsFile = `import { Injectable } from '@angular/core';
42
- import { Action } from '@ngrx/store';
43
- import { Actions, createEffect, Effect, ofType } from '@ngrx/effects';
44
-
45
- import { of, Observable } from 'rxjs';
46
- import { mergeMap, tap, map } from 'rxjs/operators';
47
-
48
- import { select, Store } from '@ngrx/store';
49
- import * as fromStore from '../../../core/store/app.reducer';
50
- import { FirebaseService } from '../../../core/firebase/firebase.service';
51
- import { EffectsHelpers } from '../../../core/store/effects.helpers';
52
- import { ${camelName}State } from './${name}.state';
53
-
54
- import { ActionFlow, RouterNavigate, LoadAction, Unsubscribe } from '../../../core/store/app.actions';
55
- import { ${camelName}ActionTypes, Cleanup, LoadData } from './${name}.actions';
56
-
57
- @Injectable()
58
- export class ${camelName}Effects {
59
-
60
- /** Load data from Firebase. */
61
- loadData$: Observable<Action> = createEffect(
62
- () => this.actions$.pipe(
63
- ofType<LoadData>(${camelName}ActionTypes.LOAD_DATA),
64
- mergeMap((action: LoadData) => {
65
-
66
- const loadId = action.payload.containerId;
67
-
68
- return [
69
- ];
70
- }),
71
- ),
72
- );
73
-
74
- /** Unsubscribe connections from Firebase. */
75
- cleanup$: Observable<Action> = createEffect(
76
- () => this.actions$.pipe(
77
- ofType<Cleanup>(${camelName}ActionTypes.CLEANUP),
78
- map((action: Cleanup) => new Unsubscribe(action.payload.containerId)),
79
- ),
80
- );
81
-
82
- constructor(
83
- private actions$: Actions,
84
- private store: Store<fromStore.State>,
85
- private state: ${camelName}State,
86
- private db: FirebaseService,
87
- private eh: EffectsHelpers,
88
- ) {}
89
- }
90
- `;
91
- const SelectorsFile = `import { Injectable } from '@angular/core';
92
- import { Store, select } from '@ngrx/store';
93
- import * as fromStore from '../../../core/store/app.reducer';
94
- import { EntitySelectorService } from '../../../core/store/app.selectors';
95
-
96
- import { Observable, of, combineLatest } from 'rxjs';
97
- import { bufferTime, distinctUntilChanged, shareReplay, mergeMap, filter, switchMap, map } from 'rxjs/operators';
98
-
99
- @Injectable({
100
- providedIn: 'root',
101
- })
102
- export class ${camelName}Selectors {
103
-
104
- constructor(
105
- private slRx: EntitySelectorService,
106
- ) { }
107
-
108
- cleanup(cId: string) {
109
- this.slRx.release(cId);
110
- }
111
- }
112
- `;
113
- const StateFile = `import { Injectable } from '@angular/core';
114
-
115
- import { BehaviorSubject } from 'rxjs';
116
-
117
- @Injectable({
118
- providedIn: 'root',
119
- })
120
- export class ${camelName}State {
121
-
122
- // --------------- LOCAL UI STATE ----------------------
123
-
124
-
125
- constructor(
126
- ) { }
127
- }
128
- `;
129
- const AnimationsFile = `import { trigger, group, query, animateChild, state, style, animate, transition } from '@angular/animations';
130
-
131
- export const ${camelName}Animations = [
132
- ];
133
- `;
134
- const HTMLFile = `<div class="${name}-container">
135
- ${name} works!
136
- </div>`;
137
- const CSSFile = `.${name}-container {
138
- }`;
139
- const SpecFile = `import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
140
-
141
- import { ${camelName}Component } from './${name}.component';
142
-
143
- describe('${camelName}Component', () => {
144
- let component: ${camelName}Component;
145
- let fixture: ComponentFixture<${camelName}Component>;
146
-
147
- beforeEach(waitForAsync(() => {
148
- TestBed.configureTestingModule({
149
- declarations: [ ${camelName}Component ],
150
- })
151
- .compileComponents();
152
- }));
153
-
154
- beforeEach(() => {
155
- fixture = TestBed.createComponent(${camelName}Component);
156
- component = fixture.componentInstance;
157
- fixture.detectChanges();
158
- });
159
-
160
- it('should create', () => {
161
- expect(component).toBeTruthy();
162
- });
163
- });
164
- `;
165
- const ComponentFile = `import { Component, OnInit, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
166
- import { ${camelName}Animations } from './${name}.animations';
167
- import { ParamMap, ActivatedRoute } from '@angular/router';
168
- import { Store, select } from '@ngrx/store';
169
- import * as fromStore from '../../core/store/app.reducer';
170
- import * as fromAuth from '../../core/store/auth/auth.reducer';
171
- import { FirebaseService } from '../../core/firebase/firebase.service';
172
- import { Observable, Subject, BehaviorSubject, combineLatest } from 'rxjs';
173
- import { withLatestFrom, take, takeUntil } from 'rxjs/operators';
174
-
175
- import { ${camelName}State } from './+state/${name}.state';
176
- import { ${camelName}Selectors } from './+state/${name}.selectors';
177
-
178
- import { LoadData, Cleanup } from './+state/${name}.actions';
179
- import { RouterNavigate } from '../../core/store/app.actions';
180
-
181
- import { User } from '../../core/store/user/user.model';
182
-
183
- /** ${description} */
184
- @Component({
185
- selector: 'app-${name}',
186
- templateUrl: './${name}.component.html',
187
- styleUrls: ['./${name}.component.scss'],
188
- changeDetection: ChangeDetectionStrategy.OnPush,
189
- animations: ${camelName}Animations,
190
- })
191
- export class ${camelName}Component implements OnInit, OnDestroy {
192
-
193
- // --------------- ROUTE PARAMS & CURRENT USER ---------
194
-
195
-
196
- // --------------- LOCAL UI STATE ----------------------
197
-
198
-
199
- // --------------- DB ENTITY DATA ----------------------
200
-
201
- /** Container id for selectors and loading. */
202
- containerId: string = this.db.createId();
203
-
204
- // --------------- DATA BINDING STREAMS ----------------
205
-
206
-
207
- // --------------- EVENT BINDING STREAMS ---------------
208
-
209
-
210
- // --------------- OTHER -------------------------------
211
-
212
- /** Unsubscribe observable for subscriptions. */
213
- unsubscribe$: Subject<void> = new Subject();
214
-
215
- constructor(
216
- private state: ${camelName}State,
217
- private route: ActivatedRoute,
218
- private selectors: ${camelName}Selectors,
219
- private store: Store<fromStore.State>,
220
- private db: FirebaseService,
221
- ) {
222
- }
223
-
224
- ngOnInit() {
225
-
226
- // --------------- EVENT HANDLING ----------------------
227
-
228
-
229
- // --------------- LOAD DATA ---------------------------
230
-
231
- // Once everything is set up, load the data for the role.
232
- this.store.dispatch( new LoadData({
233
- containerId: this.containerId,
234
- }) );
235
- }
236
-
237
- ngOnDestroy() {
238
- // Unsubscribe subscriptions.
239
- this.unsubscribe$.next();
240
- this.unsubscribe$.complete();
241
-
242
- // Unsubscribe from firebase connection from load and free up memoized selector values.
243
- this.store.dispatch( new Cleanup({
244
- containerId: this.containerId,
245
- }) );
246
- this.selectors.cleanup(this.containerId);
247
- }
21
+ function addInserts(options) {
22
+ return (host, context) => {
23
+ if (!options.module) {
24
+ return host;
25
+ }
26
+ const classifiedName = core_1.strings.classify(options.name);
27
+ const dasherizedName = core_1.strings.dasherize(options.name);
28
+ const containerPath = `/${options.path}/` +
29
+ core_1.strings.dasherize(options.name) + '/' +
30
+ core_1.strings.dasherize(options.name) + '.component';
31
+ // Add to module
32
+ const modulePath = options.module;
33
+ const moduleText = (0, statements_adder_1.getSourceText)(host, modulePath);
34
+ const moduleToContainerPath = (0, find_module_1.buildRelativePath)(modulePath, containerPath);
35
+ const effectsPath = `/${options.path}/` +
36
+ core_1.strings.dasherize(options.name) + '/+state/' +
37
+ core_1.strings.dasherize(options.name) + '.effects';
38
+ const moduleToEffectsPath = (0, find_module_1.buildRelativePath)(modulePath, effectsPath);
39
+ let insertChangesInModule = (0, statements_adder_1.simpleInsert)(moduleText, modulePath, [
40
+ '// Containers',
41
+ 'EffectsModule.forFeature([',
42
+ '// Containers'
43
+ ], [
44
+ `import { ${classifiedName}Component } from '${moduleToContainerPath}';\nimport { ${classifiedName}Effects } from '${moduleToEffectsPath}';`,
45
+ ` ${classifiedName}Effects,`,
46
+ ` ${classifiedName}Component,`
47
+ ]);
48
+ // Add routing module changes
49
+ context.logger.info(modulePath);
50
+ const moduleDir = (0, core_1.normalize)(modulePath).split('/').slice(0, -1).join('/');
51
+ const moduleFileName = (0, core_1.normalize)(modulePath).split('/').pop() || '';
52
+ const moduleName = moduleFileName.split('.')[0];
53
+ const moduleRoutingPath = `${moduleDir}/${moduleName}-routing.module.ts`;
54
+ context.logger.info(moduleRoutingPath);
55
+ const moduleRoutingText = (0, statements_adder_1.getSourceText)(host, moduleRoutingPath);
56
+ const moduleRoutingToContainerPath = (0, find_module_1.buildRelativePath)(moduleRoutingPath, containerPath);
57
+ context.logger.info("moduleRoutingPath: " + moduleRoutingPath);
58
+ let insertChangesInRoutingModule = (0, statements_adder_1.simpleInsert)(moduleRoutingText, moduleRoutingPath, [
59
+ '// Containers',
60
+ 'const routes: Routes = ['
61
+ ], [
62
+ `import { ${classifiedName}Component } from '${moduleRoutingToContainerPath}';`,
63
+ ` { path: '${dasherizedName}', component: ${classifiedName}Component },`
64
+ ]);
65
+ context.logger.info(`about to start committing`);
66
+ // For each of the files and corresponding set of changes, commit to the tree
67
+ [
68
+ [modulePath, insertChangesInModule],
69
+ [moduleRoutingPath, insertChangesInRoutingModule],
70
+ ].map(([filePath, insertChanges]) => {
71
+ const declarationRecorder = host.beginUpdate(filePath);
72
+ for (const change of insertChanges) {
73
+ if (change instanceof change_1.InsertChange) {
74
+ declarationRecorder.insertLeft(change.pos, change.toAdd);
75
+ }
76
+ }
77
+ host.commitUpdate(declarationRecorder);
78
+ });
79
+ return host;
80
+ };
248
81
  }
249
- `;
250
- const ModuleRoutingFile = `${module}-routing.module.ts`;
251
- const ModuleFile = `${module}.module.ts`;
252
- const filePath = `./src/app/${module}/${ModuleRoutingFile}`;
253
- const labels = ['// Containers', 'const routes: Routes = ['];
254
- const statements = [`import { ${camelName}Component } from './${name}/${name}.component';`, ` { path: '${name}', component: ${camelName}Component }`];
255
- (0, statements_adder_1.AddStatements)(filePath, labels, statements, tree);
256
- const filePath2 = `./src/app/${module}/${ModuleFile}`;
257
- const labels2 = ['// Containers', 'EffectsModule.forFeature([', '// Containers'];
258
- const statements2 = [`import { ${camelName}Component } from './${name}/${name}.component';\nimport { ${camelName}Effects } from './${name}/+state/${name}.effects';`, ` ${camelName}Effects,`, ` ${camelName}Component,`];
259
- (0, statements_adder_1.AddStatements)(filePath2, labels2, statements2, tree);
260
- // create directories before adding files
261
- const dir = `./src/app/${module}/${name}`;
262
- if (!fs.existsSync(dir)) {
263
- fs.mkdirSync(dir);
82
+ function container(options) {
83
+ return (tree, context) => __awaiter(this, void 0, void 0, function* () {
84
+ // Make sure the command is executed in the directory where the container should be generated
85
+ if (!options.inDirectory) {
86
+ context.logger.info("Please navigate to the directory where you want to generate the container.");
87
+ return (0, schematics_1.noop)();
264
88
  }
265
- const statePath = `${dir}/+state`;
266
- if (!fs.existsSync(statePath)) {
267
- fs.mkdirSync(statePath);
89
+ const workspace = yield (0, workspace_1.getWorkspace)(tree);
90
+ const project = workspace.projects.get(options.project);
91
+ if (!project) {
92
+ throw new schematics_1.SchematicsException(`Project "${options.project}" does not exist.`);
268
93
  }
269
- tree.create(`${statePath}/${name}.actions.ts`, ActionsFile);
270
- tree.create(`${statePath}/${name}.effects.ts`, EffectsFile);
271
- tree.create(`${statePath}/${name}.model.ts`, '');
272
- tree.create(`${statePath}/${name}.selectors.ts`, SelectorsFile);
273
- tree.create(`${statePath}/${name}.state.ts`, StateFile);
274
- tree.create(`${dir}/${name}.animations.ts`, AnimationsFile);
275
- tree.create(`${dir}/${name}.component.html`, HTMLFile);
276
- tree.create(`${dir}/${name}.component.scss`, CSSFile);
277
- tree.create(`${dir}/${name}.component.spec.ts`, SpecFile);
278
- tree.create(`${dir}/${name}.component.ts`, ComponentFile);
279
- return tree;
280
- };
94
+ context.logger.info(`options.path: ${options.path}`);
95
+ if (options.path === undefined) {
96
+ options.path = (0, workspace_1.buildDefaultPath)(project);
97
+ }
98
+ context.logger.info(`options.path: ${options.path}`);
99
+ options.module = (0, find_module_1.findModuleFromOptions)(tree, options);
100
+ context.logger.info(`options.module: ${options.module}`);
101
+ const parsedPath = (0, parse_name_1.parseName)(options.path, options.name);
102
+ options.name = parsedPath.name;
103
+ options.path = parsedPath.path;
104
+ (0, validation_1.validateHtmlSelector)(options.selector);
105
+ const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('./files'), [
106
+ (0, schematics_1.applyTemplates)(Object.assign(Object.assign({}, core_1.strings), options)),
107
+ (0, schematics_1.move)(parsedPath.path),
108
+ ]);
109
+ return (0, schematics_1.chain)([
110
+ addInserts(options),
111
+ (0, schematics_1.mergeWith)(templateSource)
112
+ ]);
113
+ });
281
114
  }
282
115
  exports.container = container;
283
116
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAEA,uEAAmE;AACnE,iEAA2D;AAE3D,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzB,iGAAiG;AACjG,YAAY;AACZ,SAAgB,SAAS,CAAC,QAAa;IACrC,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QAC/C,MAAM,SAAS,GAAG,IAAA,wCAAkB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAElD,MAAM,WAAW,GAAG;;cAEV,SAAS;kBACL,SAAS;gBACX,SAAS;;;;;oBAKL,SAAS;;;;;;;;;oBAST,SAAS;;;;;;cAMf,SAAS;;;CAGtB,CAAC;QAEE,MAAM,WAAW,GAAG;;;;;;;;;;;WAWb,SAAS,mBAAmB,IAAI;;;WAGhC,SAAS,4CAA4C,IAAI;;;eAGrD,SAAS;;;;;yBAKC,SAAS;;;;;;;;;;;;;;wBAcV,SAAS;;;;;;;;qBAQZ,SAAS;;;;;CAK7B,CAAC;QAEE,MAAM,aAAa,GAAG;;;;;;;;;;;eAWX,SAAS;;;;;;;;;;CAUvB,CAAC;QAEE,MAAM,SAAS,GAAG;;;;;;;eAOP,SAAS;;;;;;;;CAQvB,CAAC;QAEE,MAAM,cAAc,GAAG;;eAEZ,SAAS;;CAEvB,CAAC;QAEE,MAAM,QAAQ,GAAG,eAAe,IAAI;IACpC,IAAI;OACD,CAAC;QAEJ,MAAM,OAAO,GAAG,IAAI,IAAI;EAC1B,CAAC;QAEC,MAAM,QAAQ,GAAG;;WAEV,SAAS,uBAAuB,IAAI;;YAEnC,SAAS;mBACF,SAAS;kCACM,SAAS;;;;wBAInB,SAAS;;;;;;wCAMO,SAAS;;;;;;;;;CAShD,CAAC;QAEE,MAAM,aAAa,GAAG;WACf,SAAS,wBAAwB,IAAI;;;;;;;;;WASrC,SAAS,0BAA0B,IAAI;WACvC,SAAS,8BAA8B,IAAI;;8CAER,IAAI;;;;;MAK5C,WAAW;;mBAEE,IAAI;oBACH,IAAI;mBACL,IAAI;;gBAEP,SAAS;;eAEV,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;qBAyBH,SAAS;;yBAEL,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BjC,CAAC;QAEE,MAAM,iBAAiB,GAAG,GAAG,MAAM,oBAAoB,CAAC;QACxD,MAAM,UAAU,GAAG,GAAG,MAAM,YAAY,CAAC;QAEzC,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,iBAAiB,EAAE,CAAC;QAC5D,MAAM,MAAM,GAAG,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,CAAC,YAAY,SAAS,uBAAuB,IAAI,IAAI,IAAI,cAAc,EAAE,cAAc,IAAI,iBAAiB,SAAS,aAAa,CAAC,CAAC;QACvJ,IAAA,gCAAa,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAElD,MAAM,SAAS,GAAG,aAAa,MAAM,IAAI,UAAU,EAAE,CAAC;QACtD,MAAM,OAAO,GAAG,CAAC,eAAe,EAAE,4BAA4B,EAAE,eAAe,CAAC,CAAC;QACjF,MAAM,WAAW,GAAG,CAAC,YAAY,SAAS,uBAAuB,IAAI,IAAI,IAAI,0BAA0B,SAAS,qBAAqB,IAAI,WAAW,IAAI,YAAY,EAAE,SAAS,SAAS,UAAU,EAAE,OAAO,SAAS,YAAY,CAAC,CAAC;QAClO,IAAA,gCAAa,EAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;QAErD,yCAAyC;QACzC,MAAM,GAAG,GAAG,aAAa,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC;YACpB,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;SACrB;QACD,MAAM,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAC;YAC5B,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;SAC3B;QAEC,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,IAAI,aAAa,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,IAAI,aAAa,EAAE,WAAW,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,IAAI,WAAW,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,IAAI,eAAe,EAAE,aAAa,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,GAAG,SAAS,IAAI,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,oBAAoB,EAAE,QAAQ,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,IAAI,eAAe,EAAE,aAAa,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AA9RD,8BA8RC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
@@ -1,28 +1,47 @@
1
1
  {
2
2
  "$schema": "http://json-schema.org/schema",
3
- "$id": "MyFullSchematicsSchema",
4
- "title": "My Full Schematics Schema",
3
+ "$id": "ContainerSchema",
4
+ "title": "Container Schema",
5
5
  "type": "object",
6
+ "description": "Creates a new container in the default project.",
6
7
  "properties": {
7
8
  "index": {
8
9
  "type": "number",
9
10
  "default": 1
10
11
  },
12
+ "path": {
13
+ "type": "string",
14
+ "format": "path",
15
+ "description": "The path at which to create the container file, relative to the current workspace. Should be organized according to the view hierarchy to the extent possible.",
16
+ "visible": false
17
+ },
18
+ "project": {
19
+ "type": "string",
20
+ "description": "The name of the project.",
21
+ "$default": {
22
+ "$source": "projectName"
23
+ }
24
+ },
11
25
  "name": {
12
26
  "type": "string",
13
- "x-prompt": "What should we name the files?"
27
+ "description": "The name of the container.",
28
+ "$default": {
29
+ "$source": "argv",
30
+ "index": 0
31
+ },
32
+ "x-prompt": "What name would you like to use for the container?"
14
33
  },
15
34
  "module": {
16
35
  "type": "string",
17
- "x-prompt": "Which module should we generate the container in?"
36
+ "description": "The declaring NgModule.",
37
+ "alias": "m"
18
38
  },
19
- "description": {
20
- "type": "string",
21
- "x-prompt": "Short description of the module (inserted as a comment):"
39
+ "inDirectory": {
40
+ "type": "boolean",
41
+ "x-prompt": "Are you currently in the directory where you want to generate the container? (please organize your container according to the view hierarchy to the extent possible)"
22
42
  }
23
43
  },
24
44
  "required": [
25
- "name",
26
- "module"
45
+ "name"
27
46
  ]
28
47
  }