ngrx-entity-crud 19.2.1-beta.7 → 19.2.1-beta.8
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.
package/package.json
CHANGED
package/schematics/my-utility.js
CHANGED
|
@@ -210,13 +210,7 @@ function updateTsConfigSelector() {
|
|
|
210
210
|
if (content) {
|
|
211
211
|
strContent = content.toString();
|
|
212
212
|
}
|
|
213
|
-
const
|
|
214
|
-
let isCommentRemoved = false;
|
|
215
|
-
if (strContent.substring(0, 76) === comment) {
|
|
216
|
-
strContent = strContent.replace(strContent.substring(0, 77), '');
|
|
217
|
-
isCommentRemoved = true;
|
|
218
|
-
}
|
|
219
|
-
const tsconfigJson = JSON.parse(strContent);
|
|
213
|
+
const tsconfigJson = JSON.parse(strContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ''));
|
|
220
214
|
const compilerOptionsPaths = tsconfigJson.compilerOptions.paths || {};
|
|
221
215
|
console.log('compilerOptionsPaths', compilerOptionsPaths);
|
|
222
216
|
const compilerOptionsPathsB = {
|
|
@@ -232,10 +226,7 @@ function updateTsConfigSelector() {
|
|
|
232
226
|
tsconfigJson.compilerOptions.strict = false;
|
|
233
227
|
tsconfigJson.angularCompilerOptions.strictPropertyInitialization = false;
|
|
234
228
|
console.log('tsconfigJson', tsconfigJson);
|
|
235
|
-
|
|
236
|
-
if (isCommentRemoved) {
|
|
237
|
-
strContentB = comment.concat('\n' + strContentB);
|
|
238
|
-
}
|
|
229
|
+
const strContentB = JSON.stringify(tsconfigJson, null, '\t');
|
|
239
230
|
tree.overwrite('/tsconfig.json', strContentB);
|
|
240
231
|
return tree;
|
|
241
232
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"my-utility.js","sourceRoot":"","sources":["my-utility.ts"],"names":[],"mappings":";;AAwBA,8BAgBC;AAKD,kCAiBC;AAKD,8BAWC;AAKD,0CAwBC;AA+BD,0BAWC;AAKD,4DAsCC;AAKD,sEAoCC;AA4BD,wBAiBC;AAED,
|
|
1
|
+
{"version":3,"file":"my-utility.js","sourceRoot":"","sources":["my-utility.ts"],"names":[],"mappings":"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"}
|
package/schematics/my-utility.ts
CHANGED
|
@@ -285,14 +285,9 @@ export function updateTsConfigSelector(): Rule {
|
|
|
285
285
|
if (content) {
|
|
286
286
|
strContent = content.toString();
|
|
287
287
|
}
|
|
288
|
-
const
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
if (strContent.substring(0, 76) === comment) {
|
|
292
|
-
strContent = strContent.replace(strContent.substring(0, 77), '');
|
|
293
|
-
isCommentRemoved = true;
|
|
294
|
-
}
|
|
295
|
-
const tsconfigJson = JSON.parse(strContent);
|
|
288
|
+
const tsconfigJson = JSON.parse(
|
|
289
|
+
strContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '')
|
|
290
|
+
);
|
|
296
291
|
|
|
297
292
|
const compilerOptionsPaths = tsconfigJson.compilerOptions.paths || {};
|
|
298
293
|
console.log('compilerOptionsPaths', compilerOptionsPaths);
|
|
@@ -313,10 +308,7 @@ export function updateTsConfigSelector(): Rule {
|
|
|
313
308
|
tsconfigJson.angularCompilerOptions.strictPropertyInitialization = false;
|
|
314
309
|
|
|
315
310
|
console.log('tsconfigJson', tsconfigJson);
|
|
316
|
-
|
|
317
|
-
if (isCommentRemoved) {
|
|
318
|
-
strContentB = comment.concat('\n' + strContentB);
|
|
319
|
-
}
|
|
311
|
+
const strContentB = JSON.stringify(tsconfigJson, null, '\t');
|
|
320
312
|
tree.overwrite('/tsconfig.json', strContentB);
|
|
321
313
|
return tree;
|
|
322
314
|
};
|
|
@@ -12,8 +12,8 @@ function ngAdd(options) {
|
|
|
12
12
|
}
|
|
13
13
|
// convert workspace to string
|
|
14
14
|
const workspaceContent = workspaceConfig.toString();
|
|
15
|
-
// parse workspace string into JSON object
|
|
16
|
-
const workspace = JSON.parse(workspaceContent);
|
|
15
|
+
// parse workspace string into JSON object, removing comments
|
|
16
|
+
const workspace = JSON.parse(workspaceContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ''));
|
|
17
17
|
if (!options.project) {
|
|
18
18
|
options.project = workspace.defaultProject;
|
|
19
19
|
}
|
|
@@ -24,7 +24,7 @@ function ngAdd(options) {
|
|
|
24
24
|
let pathVo = 'src/app/main/models/vo/';
|
|
25
25
|
const conf = tree.read('/ngrx-entity-crud.conf.json');
|
|
26
26
|
if (conf) {
|
|
27
|
-
const confData = JSON.parse(conf.toString());
|
|
27
|
+
const confData = JSON.parse(conf.toString().replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ''));
|
|
28
28
|
pathView = confData.pathView;
|
|
29
29
|
pathStore = confData.pathStore;
|
|
30
30
|
pathApp = confData.pathApp;
|
|
@@ -44,24 +44,24 @@ function ngAdd(options) {
|
|
|
44
44
|
(0, my_utility_1.addDeclarationToNgModule)({
|
|
45
45
|
module: `${pathApp}/app.module.ts`,
|
|
46
46
|
name: 'ThemeJng',
|
|
47
|
-
path: './core/theme/theme-jng.module'
|
|
47
|
+
path: './core/theme/theme-jng.module',
|
|
48
48
|
}),
|
|
49
49
|
(0, my_utility_1.addDeclarationToNgModule)({
|
|
50
50
|
module: `${pathApp}/app.module.ts`,
|
|
51
51
|
name: 'BrowserAnimations',
|
|
52
|
-
path: '@angular/platform-browser/animations'
|
|
52
|
+
path: '@angular/platform-browser/animations',
|
|
53
53
|
}),
|
|
54
54
|
(0, my_utility_1.addDeclarationToNgModule)({
|
|
55
55
|
module: `${pathApp}/app.module.ts`,
|
|
56
56
|
name: 'RootStore',
|
|
57
|
-
path: './root-store'
|
|
57
|
+
path: './root-store',
|
|
58
58
|
}),
|
|
59
59
|
(0, my_utility_1.addDeclarationToNgModule)({
|
|
60
60
|
module: `${pathApp}/app.module.ts`,
|
|
61
61
|
name: 'HttpClient',
|
|
62
|
-
path: '@angular/common/http'
|
|
62
|
+
path: '@angular/common/http',
|
|
63
63
|
}),
|
|
64
|
-
(0, my_utility_1.updateTsConfigSelector)()
|
|
64
|
+
(0, my_utility_1.updateTsConfigSelector)(),
|
|
65
65
|
];
|
|
66
66
|
return (0, schematics_1.chain)(baseRules);
|
|
67
67
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAaA,sBA0EC;AAvFD,2DAKoC;AACpC,8CAIuB;AAEvB,uBAAuB;AACvB,SAAgB,KAAK,CAAC,OAAc;IAClC,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,gCAAmB,CAC3B,gDAAgD,CACjD,CAAC;QACJ,CAAC;QAED,8BAA8B;QAC9B,MAAM,gBAAgB,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEpD,6DAA6D;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAC1B,gBAAgB,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CACzD,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC;QAC7C,CAAC;QAED,IAAI,OAAO,GAAW,SAAS,CAAC;QAChC,IAAI,SAAS,GAAW,oBAAoB,CAAC;QAC7C,IAAI,QAAQ,GAAW,oBAAoB,CAAC;QAC5C,IAAI,WAAW,GAAW,uBAAuB,CAAC;QAClD,IAAI,MAAM,GAAW,yBAAyB,CAAC;QAE/C,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACtD,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CACzB,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC,CACxD,CAAC;YACF,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAC7B,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;YAC/B,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;YAC3B,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;YACnC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC3B,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAE9B,2BAA2B;QAC3B,MAAM,SAAS,GAAW;YACxB,qIAAqI;YACrI,4GAA4G;YAC5G,IAAA,mBAAM,EAAC,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC;YAC9B,IAAA,qCAAwB,EAAC;gBACvB,MAAM,EAAE,GAAG,OAAO,gBAAgB;gBAClC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,+BAA+B;aACtC,CAAC;YACF,IAAA,qCAAwB,EAAC;gBACvB,MAAM,EAAE,GAAG,OAAO,gBAAgB;gBAClC,IAAI,EAAE,mBAAmB;gBACzB,IAAI,EAAE,sCAAsC;aAC7C,CAAC;YACF,IAAA,qCAAwB,EAAC;gBACvB,MAAM,EAAE,GAAG,OAAO,gBAAgB;gBAClC,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,cAAc;aACrB,CAAC;YACF,IAAA,qCAAwB,EAAC;gBACvB,MAAM,EAAE,GAAG,OAAO,gBAAgB;gBAClC,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,sBAAsB;aAC7B,CAAC;YACF,IAAA,mCAAsB,GAAE;SACzB,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,SAAS,CAAC,CAAC;IAC1B,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,19 +1,32 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import {
|
|
2
|
+
chain,
|
|
3
|
+
Rule,
|
|
4
|
+
SchematicsException,
|
|
5
|
+
Tree,
|
|
6
|
+
} from '@angular-devkit/schematics';
|
|
7
|
+
import {
|
|
8
|
+
addDeclarationToNgModule,
|
|
9
|
+
render,
|
|
10
|
+
updateTsConfigSelector,
|
|
11
|
+
} from '../my-utility';
|
|
3
12
|
|
|
4
13
|
// Just return the tree
|
|
5
14
|
export function ngAdd(options: NgAdd): Rule {
|
|
6
15
|
return (tree: Tree) => {
|
|
7
16
|
const workspaceConfig = tree.read('/angular.json');
|
|
8
17
|
if (!workspaceConfig) {
|
|
9
|
-
throw new SchematicsException(
|
|
18
|
+
throw new SchematicsException(
|
|
19
|
+
'Could not find Angular workspace configuration'
|
|
20
|
+
);
|
|
10
21
|
}
|
|
11
22
|
|
|
12
23
|
// convert workspace to string
|
|
13
24
|
const workspaceContent = workspaceConfig.toString();
|
|
14
25
|
|
|
15
|
-
// parse workspace string into JSON object
|
|
16
|
-
const workspace = JSON.parse(
|
|
26
|
+
// parse workspace string into JSON object, removing comments
|
|
27
|
+
const workspace = JSON.parse(
|
|
28
|
+
workspaceContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '')
|
|
29
|
+
);
|
|
17
30
|
if (!options.project) {
|
|
18
31
|
options.project = workspace.defaultProject;
|
|
19
32
|
}
|
|
@@ -26,8 +39,9 @@ export function ngAdd(options: NgAdd): Rule {
|
|
|
26
39
|
|
|
27
40
|
const conf = tree.read('/ngrx-entity-crud.conf.json');
|
|
28
41
|
if (conf) {
|
|
29
|
-
|
|
30
|
-
|
|
42
|
+
const confData = JSON.parse(
|
|
43
|
+
conf.toString().replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '')
|
|
44
|
+
);
|
|
31
45
|
pathView = confData.pathView;
|
|
32
46
|
pathStore = confData.pathStore;
|
|
33
47
|
pathApp = confData.pathApp;
|
|
@@ -46,31 +60,29 @@ export function ngAdd(options: NgAdd): Rule {
|
|
|
46
60
|
// addImport(normalize(`${pathStore}/state.ts`), `import {${options.clazz}} from '@models/vo/${strings.dasherize(options.clazz)}';`),
|
|
47
61
|
// updateState(`${strings.underscore(options.name)}:${options.clazz};`, normalize(`${pathStore}/state.ts`)),
|
|
48
62
|
render(options, './files', ''),
|
|
49
|
-
|
|
63
|
+
addDeclarationToNgModule({
|
|
50
64
|
module: `${pathApp}/app.module.ts`,
|
|
51
65
|
name: 'ThemeJng',
|
|
52
|
-
path: './core/theme/theme-jng.module'
|
|
66
|
+
path: './core/theme/theme-jng.module',
|
|
53
67
|
}),
|
|
54
68
|
addDeclarationToNgModule({
|
|
55
69
|
module: `${pathApp}/app.module.ts`,
|
|
56
70
|
name: 'BrowserAnimations',
|
|
57
|
-
path: '@angular/platform-browser/animations'
|
|
71
|
+
path: '@angular/platform-browser/animations',
|
|
58
72
|
}),
|
|
59
73
|
addDeclarationToNgModule({
|
|
60
74
|
module: `${pathApp}/app.module.ts`,
|
|
61
75
|
name: 'RootStore',
|
|
62
|
-
path: './root-store'
|
|
76
|
+
path: './root-store',
|
|
63
77
|
}),
|
|
64
78
|
addDeclarationToNgModule({
|
|
65
79
|
module: `${pathApp}/app.module.ts`,
|
|
66
80
|
name: 'HttpClient',
|
|
67
|
-
path: '@angular/common/http'
|
|
81
|
+
path: '@angular/common/http',
|
|
68
82
|
}),
|
|
69
|
-
updateTsConfigSelector()
|
|
83
|
+
updateTsConfigSelector(),
|
|
70
84
|
];
|
|
71
85
|
|
|
72
86
|
return chain(baseRules);
|
|
73
|
-
|
|
74
87
|
};
|
|
75
88
|
}
|
|
76
|
-
|