@lukfel/ng-scaffold 20.0.53 → 20.0.54
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
|
@@ -54,8 +54,6 @@ function addConfig() {
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
|
-
const classStart = classNode.getStart(sourceFile);
|
|
58
|
-
const classHeaderEnd = content.indexOf('{', classStart) + 1;
|
|
59
57
|
const snippet = `
|
|
60
58
|
private scaffoldService = inject(ScaffoldService);
|
|
61
59
|
private scaffoldConfig: ScaffoldConfig = {
|
|
@@ -66,7 +64,7 @@ constructor() {
|
|
|
66
64
|
this.scaffoldService.scaffoldConfig = this.scaffoldConfig;
|
|
67
65
|
}
|
|
68
66
|
`;
|
|
69
|
-
recorder.insertLeft(
|
|
67
|
+
recorder.insertLeft(classNode.members.pos, snippet);
|
|
70
68
|
}
|
|
71
69
|
tree.commitUpdate(recorder);
|
|
72
70
|
context.logger.info('[Config] ScaffoldService configuration added successfully.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-config.js","sourceRoot":"","sources":["../../../../projects/ng-scaffold/schematics/ng-add/add-config.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"add-config.js","sourceRoot":"","sources":["../../../../projects/ng-scaffold/schematics/ng-add/add-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,28 +5,27 @@ const ts = require("typescript");
|
|
|
5
5
|
function addModule() {
|
|
6
6
|
return (tree, context) => {
|
|
7
7
|
context.logger.info('[Module] Searching for root module ...');
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
return addToNgModule(tree, context);
|
|
8
|
+
const possiblePaths = ['src/app/app.module.ts', 'src/app/app-module.ts'];
|
|
9
|
+
const path = possiblePaths.find(p => tree.exists(p));
|
|
10
|
+
if (path) {
|
|
11
|
+
return addToNgModule(tree, context, path);
|
|
12
12
|
}
|
|
13
|
-
context.logger.info('[Module] Standalone app detected');
|
|
14
13
|
return addToStandalone(tree, context);
|
|
15
14
|
};
|
|
16
15
|
}
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
/** Add ScaffoldModule to NgModule app */
|
|
17
|
+
function addToNgModule(tree, context, path) {
|
|
19
18
|
const text = tree.read(path).toString('utf-8');
|
|
20
|
-
const sourceFile = ts.createSourceFile(path, text, ts.ScriptTarget.Latest, true);
|
|
21
19
|
if (text.includes('ScaffoldModule')) {
|
|
22
|
-
context.logger.info('[Module]
|
|
20
|
+
context.logger.info('[Module] ScaffoldModule already imported. Skip.');
|
|
23
21
|
return tree;
|
|
24
22
|
}
|
|
25
23
|
const recorder = tree.beginUpdate(path);
|
|
26
24
|
recorder.insertLeft(0, 'import { ScaffoldModule } from \'@lukfel/ng-scaffold\';\n');
|
|
25
|
+
const sourceFile = ts.createSourceFile(path, text, ts.ScriptTarget.Latest, true);
|
|
27
26
|
const ngModuleDecoratorCall = findNgModuleDecorator(sourceFile);
|
|
28
27
|
if (!ngModuleDecoratorCall) {
|
|
29
|
-
context.logger.warn('No @NgModule decorator found. Skip.');
|
|
28
|
+
context.logger.warn('[Module] No @NgModule decorator found. Skip.');
|
|
30
29
|
tree.commitUpdate(recorder);
|
|
31
30
|
return tree;
|
|
32
31
|
}
|
|
@@ -36,9 +35,7 @@ function addToNgModule(tree, context) {
|
|
|
36
35
|
tree.commitUpdate(recorder);
|
|
37
36
|
return tree;
|
|
38
37
|
}
|
|
39
|
-
const importsProp = arg.properties.find(
|
|
40
|
-
ts.isIdentifier(p.name) &&
|
|
41
|
-
p.name.text === 'imports');
|
|
38
|
+
const importsProp = arg.properties.find(p => ts.isPropertyAssignment(p) && ts.isIdentifier(p.name) && p.name.text === 'imports');
|
|
42
39
|
if (!importsProp || !ts.isArrayLiteralExpression(importsProp.initializer)) {
|
|
43
40
|
context.logger.warn('[Module] No imports[] found in @NgModule. Skip.');
|
|
44
41
|
tree.commitUpdate(recorder);
|
|
@@ -47,7 +44,7 @@ function addToNgModule(tree, context) {
|
|
|
47
44
|
const importsArray = importsProp.initializer;
|
|
48
45
|
recorder.insertRight(importsArray.getEnd() - 1, `${importsArray.elements.length ? ', ' : ''}ScaffoldModule`);
|
|
49
46
|
tree.commitUpdate(recorder);
|
|
50
|
-
context.logger.info('[Module] Successfully added.');
|
|
47
|
+
context.logger.info('[Module] Successfully added ScaffoldModule to NgModule.');
|
|
51
48
|
return tree;
|
|
52
49
|
}
|
|
53
50
|
/** Helper to find @NgModule decorator in a class */
|
|
@@ -76,7 +73,7 @@ function addToStandalone(tree, context) {
|
|
|
76
73
|
}
|
|
77
74
|
const text = tree.read(path).toString('utf8');
|
|
78
75
|
if (text.includes('ScaffoldModule')) {
|
|
79
|
-
context.logger.info('[Module]
|
|
76
|
+
context.logger.info('[Module] ScaffoldModule already imported. Skip.');
|
|
80
77
|
return tree;
|
|
81
78
|
}
|
|
82
79
|
const importText = `
|
|
@@ -96,7 +93,7 @@ import { ScaffoldModule } from '@lukfel/ng-scaffold';
|
|
|
96
93
|
recorder.remove(0, text.length);
|
|
97
94
|
recorder.insertLeft(0, newText);
|
|
98
95
|
tree.commitUpdate(recorder);
|
|
99
|
-
context.logger.info('[Module] Added to standalone providers.');
|
|
96
|
+
context.logger.info('[Module] Added ScaffoldModule to standalone providers.');
|
|
100
97
|
return tree;
|
|
101
98
|
}
|
|
102
99
|
context.logger.warn('[Module] No providers[] found in bootstrapApplication. Skip.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-module.js","sourceRoot":"","sources":["../../../../projects/ng-scaffold/schematics/ng-add/add-module.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"add-module.js","sourceRoot":"","sources":["../../../../projects/ng-scaffold/schematics/ng-add/add-module.ts"],"names":[],"mappings":"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"}
|