@o3r/schematics 11.6.0-prerelease.4 → 11.6.0-prerelease.41
Sign up to get free protection for your applications and to get access to all the features.
- package/cli/environment.js +1 -0
- package/package.json +28 -20
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +2 -2
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/src/interfaces/angular-workspace.d.ts.map +1 -1
- package/src/interfaces/index.d.ts +1 -1
- package/src/interfaces/index.d.ts.map +1 -1
- package/src/interfaces/index.js +1 -1
- package/src/interfaces/index.js.map +1 -1
- package/src/interfaces/rule-factories.d.ts.map +1 -1
- package/src/interfaces/schematic-option.d.ts.map +1 -1
- package/src/modules/index.d.ts +1 -1
- package/src/modules/index.d.ts.map +1 -1
- package/src/modules/index.js +1 -1
- package/src/modules/index.js.map +1 -1
- package/src/modules/modules.constants.d.ts.map +1 -1
- package/src/modules/modules.constants.js.map +1 -1
- package/src/modules/modules.display.rule.d.ts.map +1 -1
- package/src/modules/modules.display.rule.js +1 -2
- package/src/modules/modules.display.rule.js.map +1 -1
- package/src/modules/modules.helpers.d.ts +1 -1
- package/src/modules/modules.helpers.d.ts.map +1 -1
- package/src/modules/modules.helpers.js +5 -6
- package/src/modules/modules.helpers.js.map +1 -1
- package/src/public_api.d.ts +1 -1
- package/src/public_api.d.ts.map +1 -1
- package/src/public_api.js +1 -1
- package/src/public_api.js.map +1 -1
- package/src/rule-factories/add-imports/index.d.ts.map +1 -1
- package/src/rule-factories/add-imports/index.js +9 -5
- package/src/rule-factories/add-imports/index.js.map +1 -1
- package/src/rule-factories/check-packages-peers/index.d.ts.map +1 -1
- package/src/rule-factories/check-packages-peers/index.js +13 -12
- package/src/rule-factories/check-packages-peers/index.js.map +1 -1
- package/src/rule-factories/dev-tools/devtools-registration.d.ts +1 -3
- package/src/rule-factories/dev-tools/devtools-registration.d.ts.map +1 -1
- package/src/rule-factories/dev-tools/devtools-registration.js +34 -19
- package/src/rule-factories/dev-tools/devtools-registration.js.map +1 -1
- package/src/rule-factories/eslint-fix/index.d.ts +1 -2
- package/src/rule-factories/eslint-fix/index.d.ts.map +1 -1
- package/src/rule-factories/eslint-fix/index.js +17 -18
- package/src/rule-factories/eslint-fix/index.js.map +1 -1
- package/src/rule-factories/get-test-frameworks/index.d.ts.map +1 -1
- package/src/rule-factories/get-test-frameworks/index.js +2 -2
- package/src/rule-factories/get-test-frameworks/index.js.map +1 -1
- package/src/rule-factories/index.d.ts +2 -3
- package/src/rule-factories/index.d.ts.map +1 -1
- package/src/rule-factories/index.js +2 -3
- package/src/rule-factories/index.js.map +1 -1
- package/src/rule-factories/ng-add/dependencies.d.ts +16 -1
- package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
- package/src/rule-factories/ng-add/dependencies.js +32 -17
- package/src/rule-factories/ng-add/dependencies.js.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts +1 -1
- package/src/rule-factories/ng-add/index.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.js +1 -1
- package/src/rule-factories/ng-add/index.js.map +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.d.ts +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.d.ts.map +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.js +22 -23
- package/src/rule-factories/ng-add/ng-add.helpers.js.map +1 -1
- package/src/rule-factories/ng-add/schematics-register.d.ts.map +1 -1
- package/src/rule-factories/ng-add/schematics-register.js +36 -28
- package/src/rule-factories/ng-add/schematics-register.js.map +1 -1
- package/src/rule-factories/remove-packages/index.d.ts.map +1 -1
- package/src/rule-factories/remove-packages/index.js +9 -9
- package/src/rule-factories/remove-packages/index.js.map +1 -1
- package/src/rule-factories/update-imports/list-of-vars.js.map +1 -1
- package/src/rule-factories/update-imports/update-imports-with-scope.d.ts.map +1 -1
- package/src/rule-factories/update-imports/update-imports-with-scope.js +3 -2
- package/src/rule-factories/update-imports/update-imports-with-scope.js.map +1 -1
- package/src/rule-factories/update-imports/update-ts-imports.d.ts.map +1 -1
- package/src/rule-factories/update-imports/update-ts-imports.js +3 -3
- package/src/rule-factories/update-imports/update-ts-imports.js.map +1 -1
- package/src/rule-factories/vscode-extensions/index.d.ts.map +1 -1
- package/src/rule-factories/vscode-extensions/index.js +5 -5
- package/src/rule-factories/vscode-extensions/index.js.map +1 -1
- package/src/tasks/eslint/index.d.ts +1 -1
- package/src/tasks/eslint/index.d.ts.map +1 -1
- package/src/tasks/eslint/index.js +2 -2
- package/src/tasks/eslint/index.js.map +1 -1
- package/src/tasks/link/index.d.ts.map +1 -1
- package/src/tasks/link/index.js.map +1 -1
- package/src/tasks/ng-add/index.d.ts.map +1 -1
- package/src/tasks/package-manager/interfaces.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-exec.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-exec.js.map +1 -1
- package/src/tasks/package-manager/npm-install.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-install.js +1 -1
- package/src/tasks/package-manager/npm-install.js.map +1 -1
- package/src/tasks/package-manager/npm-run.d.ts.map +1 -1
- package/src/tasks/package-manager/npm-run.js.map +1 -1
- package/src/utility/ast.d.ts.map +1 -1
- package/src/utility/ast.js +12 -15
- package/src/utility/ast.js.map +1 -1
- package/src/utility/builder.d.ts.map +1 -1
- package/src/utility/builder.js.map +1 -1
- package/src/utility/collection.d.ts.map +1 -1
- package/src/utility/collection.js +2 -3
- package/src/utility/collection.js.map +1 -1
- package/src/utility/component.d.ts.map +1 -1
- package/src/utility/component.js +2 -2
- package/src/utility/component.js.map +1 -1
- package/src/utility/dependencies.d.ts +1 -1
- package/src/utility/dependencies.d.ts.map +1 -1
- package/src/utility/dependencies.js +4 -5
- package/src/utility/dependencies.js.map +1 -1
- package/src/utility/environment.d.ts.map +1 -1
- package/src/utility/environment.js.map +1 -1
- package/src/utility/error.d.ts.map +1 -1
- package/src/utility/error.js.map +1 -1
- package/src/utility/file-info.d.ts +1 -1
- package/src/utility/file-info.d.ts.map +1 -1
- package/src/utility/file-info.js +1 -1
- package/src/utility/file-info.js.map +1 -1
- package/src/utility/generation.d.ts +1 -1
- package/src/utility/generation.d.ts.map +1 -1
- package/src/utility/generation.js +2 -15
- package/src/utility/generation.js.map +1 -1
- package/src/utility/gitignore.d.ts.map +1 -1
- package/src/utility/gitignore.js +2 -2
- package/src/utility/gitignore.js.map +1 -1
- package/src/utility/index.d.ts +2 -2
- package/src/utility/index.d.ts.map +1 -1
- package/src/utility/index.js +2 -2
- package/src/utility/index.js.map +1 -1
- package/src/utility/loaders.d.ts +1 -1
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +6 -6
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/logo.d.ts +1 -1
- package/src/utility/logo.d.ts.map +1 -1
- package/src/utility/logo.js.map +1 -1
- package/src/utility/matching-peers.d.ts +3 -1
- package/src/utility/matching-peers.d.ts.map +1 -1
- package/src/utility/matching-peers.js +8 -6
- package/src/utility/matching-peers.js.map +1 -1
- package/src/utility/migration/migration.d.ts.map +1 -1
- package/src/utility/migration/migration.js +3 -3
- package/src/utility/migration/migration.js.map +1 -1
- package/src/utility/modules.d.ts +1 -1
- package/src/utility/modules.d.ts.map +1 -1
- package/src/utility/modules.js +16 -16
- package/src/utility/modules.js.map +1 -1
- package/src/utility/monorepo.d.ts +9 -4
- package/src/utility/monorepo.d.ts.map +1 -1
- package/src/utility/monorepo.js +0 -2
- package/src/utility/monorepo.js.map +1 -1
- package/src/utility/package-manager-runner.d.ts +2 -3
- package/src/utility/package-manager-runner.d.ts.map +1 -1
- package/src/utility/package-manager-runner.js +1 -4
- package/src/utility/package-manager-runner.js.map +1 -1
- package/src/utility/package-version.d.ts +0 -1
- package/src/utility/package-version.d.ts.map +1 -1
- package/src/utility/package-version.js +3 -4
- package/src/utility/package-version.js.map +1 -1
- package/src/utility/question.d.ts.map +1 -1
- package/src/utility/question.js.map +1 -1
- package/src/utility/routes.d.ts.map +1 -1
- package/src/utility/routes.js +6 -6
- package/src/utility/routes.js.map +1 -1
- package/src/utility/sub-entry.d.ts.map +1 -1
- package/src/utility/sub-entry.js.map +1 -1
- package/src/utility/template-property.helper.d.ts.map +1 -1
- package/src/utility/template-property.helper.js +2 -2
- package/src/utility/template-property.helper.js.map +1 -1
- package/src/utility/update-imports.d.ts +1 -1
- package/src/utility/update-imports.d.ts.map +1 -1
- package/src/utility/update-imports.js +10 -14
- package/src/utility/update-imports.js.map +1 -1
- package/src/utility/update-pipes.d.ts.map +1 -1
- package/src/utility/update-pipes.js +5 -5
- package/src/utility/update-pipes.js.map +1 -1
- package/src/utility/wrapper.d.ts.map +1 -1
- package/src/utility/wrapper.js +12 -11
- package/src/utility/wrapper.js.map +1 -1
package/src/utility/ast.js
CHANGED
|
@@ -5,8 +5,8 @@ exports.findFirstNodeOfKind = findFirstNodeOfKind;
|
|
|
5
5
|
exports.findLastNodeOfKind = findLastNodeOfKind;
|
|
6
6
|
exports.parseImportsFromFile = parseImportsFromFile;
|
|
7
7
|
exports.getExportedSymbolsFromFile = getExportedSymbolsFromFile;
|
|
8
|
-
const ts = require("typescript");
|
|
9
8
|
const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
9
|
+
const ts = require("typescript");
|
|
10
10
|
/**
|
|
11
11
|
* Find the first node with the specific syntax kind
|
|
12
12
|
* @param sourceFile Typescript file
|
|
@@ -18,12 +18,7 @@ function findFirstNodeOfKind(sourceFile, searchKind, node) {
|
|
|
18
18
|
let ret = null;
|
|
19
19
|
currentNode.forEachChild((n) => {
|
|
20
20
|
if (!ret) {
|
|
21
|
-
|
|
22
|
-
ret = n;
|
|
23
|
-
}
|
|
24
|
-
else {
|
|
25
|
-
ret = findFirstNodeOfKind(sourceFile, searchKind, n);
|
|
26
|
-
}
|
|
21
|
+
ret = n.kind === searchKind ? n : findFirstNodeOfKind(sourceFile, searchKind, n);
|
|
27
22
|
}
|
|
28
23
|
});
|
|
29
24
|
return ret;
|
|
@@ -44,7 +39,7 @@ function findLastNodeOfKind(sourceFile, searchKind, node) {
|
|
|
44
39
|
else {
|
|
45
40
|
const found = findLastNodeOfKind(sourceFile, searchKind, n);
|
|
46
41
|
if (found) {
|
|
47
|
-
ret =
|
|
42
|
+
ret = ret ? (found.pos > ret.pos ? found : ret) : found;
|
|
48
43
|
}
|
|
49
44
|
}
|
|
50
45
|
});
|
|
@@ -58,12 +53,12 @@ function parseImportsFromFile(sourceFile) {
|
|
|
58
53
|
// First we look for all imports lines targeting an Otter package for which we know a mapping
|
|
59
54
|
return (0, ast_utils_1.findNodes)(sourceFile, ts.SyntaxKind.ImportDeclaration).map((nodeImp) => {
|
|
60
55
|
const imp = nodeImp;
|
|
61
|
-
const importFrom = imp.moduleSpecifier.getText().replace(/['
|
|
56
|
+
const importFrom = imp.moduleSpecifier.getText().replace(/["']/g, '');
|
|
62
57
|
// We retrieve all the symbols listed in the import statement
|
|
63
58
|
const namedImport = imp.importClause && imp.importClause.getChildAt(0);
|
|
64
|
-
const imports = namedImport && ts.isNamedImports(namedImport)
|
|
65
|
-
namedImport.elements.map((element) => element.getText())
|
|
66
|
-
[];
|
|
59
|
+
const imports = namedImport && ts.isNamedImports(namedImport)
|
|
60
|
+
? namedImport.elements.map((element) => element.getText())
|
|
61
|
+
: [];
|
|
67
62
|
return { node: imp, symbols: imports, module: importFrom };
|
|
68
63
|
});
|
|
69
64
|
}
|
|
@@ -193,7 +188,7 @@ const addInterfaceToClassTransformerFactory = (interfaceToAdd, classIdentifier =
|
|
|
193
188
|
const interfaceToImplements = (0, exports.generateImplementsExpressionWithTypeArguments)(interfaceToAdd);
|
|
194
189
|
const newImplementsClauses = implementsClauses
|
|
195
190
|
? factory.updateHeritageClause(implementsClauses, [
|
|
196
|
-
...implementsClauses.types.filter((interfaceNode) =>
|
|
191
|
+
...implementsClauses.types.filter((interfaceNode) => interfacesToRemove.size === 0
|
|
197
192
|
|| (ts.isIdentifier(interfaceNode.expression)
|
|
198
193
|
&& !interfacesToRemove.has(interfaceNode.expression.escapedText.toString()))),
|
|
199
194
|
...interfaceToImplements
|
|
@@ -263,7 +258,9 @@ const getSimpleUpdatedMethod = (node, factory, methodName, blockStatements) => {
|
|
|
263
258
|
const originalMethod = node.members.find((0, exports.findMethodByName)(methodName));
|
|
264
259
|
return originalMethod
|
|
265
260
|
? factory.updateMethodDeclaration(originalMethod, ts.getModifiers(originalMethod), originalMethod.asteriskToken, originalMethod.name, originalMethod.questionToken, originalMethod.typeParameters, originalMethod.parameters, originalMethod.type, originalMethod.body
|
|
266
|
-
? factory.updateBlock(originalMethod.body, originalMethod.body.statements.concat(blockStatements))
|
|
261
|
+
? factory.updateBlock(originalMethod.body, originalMethod.body.statements.concat(blockStatements))
|
|
262
|
+
: factory.createBlock(blockStatements, true))
|
|
263
|
+
: factory.createMethodDeclaration([factory.createToken(ts.SyntaxKind.PublicKeyword)], undefined, factory.createIdentifier(methodName), undefined, undefined, [], undefined, factory.createBlock(blockStatements, true));
|
|
267
264
|
};
|
|
268
265
|
exports.getSimpleUpdatedMethod = getSimpleUpdatedMethod;
|
|
269
266
|
/**
|
|
@@ -286,7 +283,7 @@ exports.isTestBedConfiguration = isTestBedConfiguration;
|
|
|
286
283
|
const addImportsAndCodeBlockStatementAtSpecInitializationTransformerFactory = (imports, code) => (ctx) => (rootNode) => {
|
|
287
284
|
const { factory } = ctx;
|
|
288
285
|
const visit = (node) => {
|
|
289
|
-
if (ts.isBlock(node) &&
|
|
286
|
+
if (ts.isBlock(node) && node.statements.some((statement) => (0, exports.isTestBedConfiguration)(statement))) {
|
|
290
287
|
return factory.updateBlock(node, node.statements
|
|
291
288
|
.reduce((acc, statement) => {
|
|
292
289
|
if ((0, exports.isTestBedConfiguration)(statement)) {
|
package/src/utility/ast.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ast.js","sourceRoot":"","sources":["../../../src/utility/ast.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,qBAAqB,EAAE,KAAK,UAAQ,GAAG,gBAAgB,CAO5J"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/utility/builder.ts"],"names":[],"mappings":";;AAaA,0CAOC;AAfD;;;;;;;GAOG;AACH,SAAgB,eAAe,CAAC,gBAAkC,EAAE,QAAgB,EAAE,cAAqC,EAAE,KAAK,GAAG,KAAK;IACxI,gBAAgB,CAAC,SAAS,KAAK,EAAE,CAAC;IAClC,IAAI,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,gBAAgB,CAAC,CAAC;IAChE,CAAC;IACD,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC;IACtD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EACpB,MAAM,eAAe,CAAC;AAEvB;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAO5G;AAED;;;;;;;;GAQG;AACH,wBAAgB,6BAA6B,CAAC,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAC7G,SAAS,EAAE,eAAe,GAAG,IAAI,EACjC,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC7C,CAAC,CAoBH;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS,CASxK"}
|
|
@@ -39,7 +39,7 @@ function getDefaultOptionsForSchematic(workspace, collection, schematicName, opt
|
|
|
39
39
|
return acc;
|
|
40
40
|
}
|
|
41
41
|
return Object.entries(schematics)
|
|
42
|
-
.filter(([key, _]) => new RegExp(key.replace(
|
|
42
|
+
.filter(([key, _]) => new RegExp(key.replace(/\*/g, '.*')).test(`${collection}:${schematicName}`))
|
|
43
43
|
.sort(([a], [b]) => (a.match(/\*/g)?.length || 0) - (b.match(/\*/g)?.length || 0))
|
|
44
44
|
.map(([_, value]) => value)
|
|
45
45
|
.reduce((config, value) => ({ ...config, ...value }), acc);
|
|
@@ -53,11 +53,10 @@ function getDefaultOptionsForSchematic(workspace, collection, schematicName, opt
|
|
|
53
53
|
*/
|
|
54
54
|
function getSchematicOptions(config, context) {
|
|
55
55
|
const schematicName = `${context.schematic.description.collection.name}:${context.schematic.description.name}`;
|
|
56
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
57
56
|
const options = config.schematics && Object.entries(config.schematics)
|
|
58
57
|
.filter(([name]) => new RegExp(name.replace(/\*/g, '.*')).test(schematicName))
|
|
59
58
|
.sort(([a], [b]) => ((a.match(/\*/g)?.length || 0) - (b.match(/\*/g)?.length || 0)))
|
|
60
59
|
.reduce((acc, [, opts]) => ({ ...acc, ...opts }), {});
|
|
61
|
-
return options && Object.keys(options).length ? options : config.schematics?.['*:*'];
|
|
60
|
+
return options && Object.keys(options).length > 0 ? options : config.schematics?.['*:*'];
|
|
62
61
|
}
|
|
63
62
|
//# sourceMappingURL=collection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/utility/component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/utility/component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EACL,gBAAgB,EAGjB,MAAM,OAAO,CAAC;AAKf;;;GAGG;AACH,eAAO,MAAM,kBAAkB,SAAU,EAAE,CAAC,IAAI,KAAG,IAAI,IAAI,gBAEW,CAAC;AAEvE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,SAAU,EAAE,CAAC,IAAI,KAAG,IAAI,IAAI,gBAEa,CAAC;AAE1E;;;GAGG;AACH,eAAO,MAAM,kBAAkB,qBAAsB,EAAE,CAAC,gBAAgB,YAAkG,CAAC;AAE3K;;;GAGG;AACH,eAAO,MAAM,mBAAmB,qBAAsB,EAAE,CAAC,gBAAgB,YAE0B,CAAC;AAEpG,eAAO,MAAM,iCAAiC,wBACyG,CAAC;AAExJ,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,aAAa,EAAE,MAAM;CAOlC;AAED;;;;GAIG;AACH,eAAO,MAAM,oCAAoC,SAAU,IAAI,iBAAiB,MAAM;;;;;CA2DrF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kDAAkD,YACpD,MAAM,EAAE,KAChB,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,IAAI,CA4B/B,CAAC"}
|
package/src/utility/component.js
CHANGED
|
@@ -22,14 +22,14 @@ exports.isO3rClassDecorator = isO3rClassDecorator;
|
|
|
22
22
|
* Returns true if `classDeclaration` is an Otter component
|
|
23
23
|
* @param classDeclaration
|
|
24
24
|
*/
|
|
25
|
-
const isNgClassComponent = (classDeclaration) => (ts.getDecorators(classDeclaration) || []).some(exports.isNgClassDecorator);
|
|
25
|
+
const isNgClassComponent = (classDeclaration) => (ts.getDecorators(classDeclaration) || []).some((decorator) => (0, exports.isNgClassDecorator)(decorator));
|
|
26
26
|
exports.isNgClassComponent = isNgClassComponent;
|
|
27
27
|
/**
|
|
28
28
|
* Returns true if `classDeclaration` is an Otter component
|
|
29
29
|
* @param classDeclaration
|
|
30
30
|
*/
|
|
31
31
|
const isO3rClassComponent = (classDeclaration) => (0, exports.isNgClassComponent)(classDeclaration)
|
|
32
|
-
&& (ts.getDecorators(classDeclaration) || []).some(exports.isO3rClassDecorator);
|
|
32
|
+
&& (ts.getDecorators(classDeclaration) || []).some((decorator) => (0, exports.isO3rClassDecorator)(decorator));
|
|
33
33
|
exports.isO3rClassComponent = isO3rClassComponent;
|
|
34
34
|
const askConfirmationToConvertComponent = async () => (await Promise.resolve().then(() => require('@angular/cli/src/utilities/prompt'))).askConfirmation('Component found is not an Otter component. Would you like to convert it?', true);
|
|
35
35
|
exports.askConfirmationToConvertComponent = askConfirmationToConvertComponent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/utility/component.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/utility/component.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { NodeDependency, NodeDependencyType } from '@schematics/angular/utility/dependencies';
|
|
2
1
|
import { logging } from '@angular-devkit/core';
|
|
2
|
+
import { NodeDependency, NodeDependencyType } from '@schematics/angular/utility/dependencies';
|
|
3
3
|
/**
|
|
4
4
|
* Method to extract the provided package version range from a package.json file
|
|
5
5
|
* @param packageNames list of package we want to retrieve the version
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../src/utility/dependencies.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../src/utility/dependencies.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,cAAc,EACd,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAKlD;;;;;;GAMG;AACH,wBAAgB,mCAAmC,CAAC,CAAC,SAAS,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAa9J;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,kBAAkB,GAAG,cAAc,EAAE,CAE3I"}
|
|
@@ -13,11 +13,10 @@ const fs = require("node:fs");
|
|
|
13
13
|
function getExternalDependenciesVersionRange(packageNames, packageJsonPath, logger) {
|
|
14
14
|
const packageJsonContent = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
|
|
15
15
|
return packageNames.reduce((acc, packageName) => {
|
|
16
|
-
acc[packageName] =
|
|
17
|
-
packageJsonContent.
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
packageJsonContent.devDependencies?.[packageName];
|
|
16
|
+
acc[packageName] = packageJsonContent.generatorDependencies?.[packageName]
|
|
17
|
+
|| packageJsonContent.peerDependencies?.[packageName]
|
|
18
|
+
|| packageJsonContent.dependencies?.[packageName]
|
|
19
|
+
|| packageJsonContent.devDependencies?.[packageName];
|
|
21
20
|
if (!acc[packageName]) {
|
|
22
21
|
logger.warn(`Unable to retrieve version for ${packageName} in ${packageJsonPath}. Version set to "latest".`);
|
|
23
22
|
acc[packageName] = 'latest';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../src/utility/dependencies.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../src/utility/dependencies.ts"],"names":[],"mappings":";;AAmBA,kFAaC;AAQD,sDAEC;AA1CD,8BAA8B;AAY9B;;;;;;GAMG;AACH,SAAgB,mCAAmC,CAAmB,YAAiB,EAAE,eAAuB,EAAE,MAAyB;IACzI,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAoE,CAAC;IACjK,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,GAA+B,EAAE,WAAW,EAAE,EAAE;QAC1E,GAAG,CAAC,WAAW,CAAC,GAAG,kBAAkB,CAAC,qBAAqB,EAAE,CAAC,WAAW,CAAC;eACvE,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,WAAW,CAAC;eAClD,kBAAkB,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC;eAC9C,kBAAkB,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,kCAAkC,WAAW,OAAO,eAAe,4BAA4B,CAAC,CAAC;YAC7G,GAAG,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC;QAC9B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAsB,CAAC;AAC9B,CAAC;AAED;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAmB,oBAAuC,EAAE,IAAwB;IACvH,OAAO,MAAM,CAAC,OAAO,CAAS,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAC3H,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/utility/environment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/utility/environment.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;CAmB9B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,cAWvC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/utility/environment.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,8BAA8B;AAC9B,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/utility/environment.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,8BAA8B;AAC9B,iCAAiC;AACjC,qEAEkC;AAElC;;;GAGG;AACI,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG;QACb,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE;QACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;KACtB,CAAC;IACF,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE,WAAW,IAAI,GAAG,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;KACzF,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,8CAAqB,GAAE,CAAC;IACnD,IAAI,wBAA4C,CAAC;IACjD,IAAI,CAAC;QACH,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IACV,MAAM,SAAS,GAAG;QAChB,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,OAAiB,CAAC,CAAC,CAAC,SAAS;KAC9I,CAAC;IACF,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC9F,CAAC,CAAC;AAnBW,QAAA,kBAAkB,sBAmB7B;AAEF;;;GAGG;AACI,MAAM,2BAA2B,GAAG,GAAG,EAAE;IAC9C,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAA,0BAAkB,GAAE,CAAC;IAClH,OAAO;6BACoB,MAAM,CAAC,YAAY;yBACvB,MAAM,CAAC,QAAQ;wBAChB,MAAM,CAAC,OAAO;kBACpB,QAAQ,CAAC,OAAO,IAAI,WAAW;0BACvB,kBAAkB,CAAC,IAAI;6BACpB,kBAAkB,CAAC,OAAO,IAAI,WAAW;mBACnD,SAAS,CAAC,OAAO,IAAI,WAAW;CAClD,CAAC;AACF,CAAC,CAAC;AAXW,QAAA,2BAA2B,+BAWtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/utility/error.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/utility/error.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,qBAAa,WAAY,SAAQ,KAAK;gBACxB,KAAK,EAAE,GAAG;CAQvB"}
|
package/src/utility/error.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/utility/error.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/utility/error.ts"],"names":[],"mappings":";;;AAAA,+CAEuB;AAEvB;;GAEG;AACH,MAAa,WAAY,SAAQ,KAAK;IACpC,YAAY,KAAU;QACpB,KAAK,CACH,KAAK,CAAC,QAAQ,EAAY;cACxB,mKAAmK;cACnK,8GAA8G;cAC9G,IAAA,yCAA2B,GAAE,CAChC,CAAC;IACJ,CAAC;CACF;AATD,kCASC"}
|
|
@@ -29,5 +29,5 @@ export declare function getModuleIndex(sourceFile: ts.SourceFile, sourceContent:
|
|
|
29
29
|
* @param context
|
|
30
30
|
* @param projectName
|
|
31
31
|
*/
|
|
32
|
-
export declare function getFileInfo(tree: Tree, context: SchematicContext, projectName?: string
|
|
32
|
+
export declare function getFileInfo(tree: Tree, context: SchematicContext, projectName?: string): FileInfo;
|
|
33
33
|
//# sourceMappingURL=file-info.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-info.d.ts","sourceRoot":"","sources":["../../../src/utility/file-info.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"file-info.d.ts","sourceRoot":"","sources":["../../../src/utility/file-info.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAKjC;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,uCAAuC;IACvC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC,4CAA4C;IAC5C,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC;IAEtC,8CAA8C;IAC9C,iBAAiB,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC;IAEzC,6BAA6B;IAC7B,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,iEAAiE;IACjE,WAAW,EAAE,MAAM,CAAC;IAEpB,gFAAgF;IAChF,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,mBAAmB,GAAG,aAAa,GAAG,cAAc,CAAC,CA8BrJ;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAE,MAAM,YAmCtF"}
|
package/src/utility/file-info.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../src/utility/file-info.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"file-info.js","sourceRoot":"","sources":["../../../src/utility/file-info.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { Tree } from '@angular-devkit/schematics';
|
|
|
2
2
|
/** Type of generated item */
|
|
3
3
|
export type GeneratedItemType = '@o3r/core:component' | '@o3r/core:page' | '@o3r/core:service' | '@o3r/core:store' | '@o3r/core:schematics-update' | '@o3r/testing:playwright-scenario' | '@o3r/testing:playwright-sanity';
|
|
4
4
|
/** List of Otter items types */
|
|
5
|
-
export declare const OTTER_ITEM_TYPES:
|
|
5
|
+
export declare const OTTER_ITEM_TYPES: ["@o3r/core:component", "@o3r/core:page", "@o3r/core:service", "@o3r/core:store", "@o3r/core:schematics-update", "@o3r/testing:playwright-scenario", "@o3r/testing:playwright-sanity"];
|
|
6
6
|
/** List of the default destination paths for each generated entity */
|
|
7
7
|
export declare const TYPES_DEFAULT_FOLDER: {
|
|
8
8
|
[key in GeneratedItemType]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generation.d.ts","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generation.d.ts","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAWpC,6BAA6B;AAC7B,MAAM,MAAM,iBAAiB,GAC3B,qBAAqB,GACrB,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,6BAA6B,GAC7B,kCAAkC,GAClC,gCAAgC,CAAC;AAEnC,gCAAgC;AAChC,eAAO,MAAM,gBAAgB,wLAQW,CAAC;AAEzC,sEAAsE;AACtE,eAAO,MAAM,oBAAoB,EAAE;KAAG,GAAG,IAAI,iBAAiB,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE;CAQ9F,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAmBnJ"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TYPES_DEFAULT_FOLDER = exports.OTTER_ITEM_TYPES = void 0;
|
|
4
4
|
exports.getDestinationPath = getDestinationPath;
|
|
5
|
+
const collection_1 = require("./collection");
|
|
5
6
|
const error_1 = require("./error");
|
|
6
7
|
const loaders_1 = require("./loaders");
|
|
7
|
-
const collection_1 = require("./collection");
|
|
8
8
|
/** List of Otter items types */
|
|
9
9
|
exports.OTTER_ITEM_TYPES = [
|
|
10
10
|
'@o3r/core:component',
|
|
@@ -17,19 +17,12 @@ exports.OTTER_ITEM_TYPES = [
|
|
|
17
17
|
];
|
|
18
18
|
/** List of the default destination paths for each generated entity */
|
|
19
19
|
exports.TYPES_DEFAULT_FOLDER = {
|
|
20
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
21
20
|
'@o3r/core:component': { app: 'src/components', lib: 'src/components' },
|
|
22
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
23
21
|
'@o3r/core:page': { app: 'src/app' },
|
|
24
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
25
22
|
'@o3r/core:service': { app: 'src/services', lib: 'src/services' },
|
|
26
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
27
23
|
'@o3r/core:store': { app: 'src/store', lib: 'src/store' },
|
|
28
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
29
24
|
'@o3r/core:schematics-update': { app: 'src/schematics', lib: 'src/schematics' },
|
|
30
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
31
25
|
'@o3r/testing:playwright-scenario': { app: 'e2e-playwright/scenarios' },
|
|
32
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
33
26
|
'@o3r/testing:playwright-sanity': { app: 'e2e-playwright/sanity' }
|
|
34
27
|
};
|
|
35
28
|
/**
|
|
@@ -43,16 +36,10 @@ function getDestinationPath(typeOfItem, directory, tree, project) {
|
|
|
43
36
|
if (directory) {
|
|
44
37
|
return directory;
|
|
45
38
|
}
|
|
46
|
-
/**
|
|
47
|
-
* @param generatorName
|
|
48
|
-
* @param propTree
|
|
49
|
-
* @param propProject
|
|
50
|
-
*/
|
|
51
39
|
const getSchematicsProperty = (generatorName, propTree, propProject) => {
|
|
52
40
|
const workspace = (0, loaders_1.getWorkspaceConfig)(propTree);
|
|
53
41
|
const [collection, schematicName] = generatorName.split(':');
|
|
54
|
-
//
|
|
55
|
-
return workspace && (0, collection_1.getDefaultOptionsForSchematic)(workspace, collection, schematicName, { projectName: propProject || undefined }) || null;
|
|
42
|
+
return ((workspace && (0, collection_1.getDefaultOptionsForSchematic)(workspace, collection, schematicName, { projectName: propProject || undefined })) || null); // TODO: Check why `getDefaultOptionsForSchematic` expect a type matching `WorkspaceLayout`
|
|
56
43
|
};
|
|
57
44
|
const config = getSchematicsProperty(typeOfItem, tree, project);
|
|
58
45
|
if (config && config.path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generation.js","sourceRoot":"","sources":["../../../src/utility/generation.ts"],"names":[],"mappings":";;;AAuDA,gDAmBC;AApED,6CAEsB;AACtB,mCAEiB;AACjB,uCAEmB;AAYnB,gCAAgC;AACnB,QAAA,gBAAgB,GAAG;IAC9B,qBAAqB;IACrB,gBAAgB;IAChB,mBAAmB;IACnB,iBAAiB;IACjB,6BAA6B;IAC7B,kCAAkC;IAClC,gCAAgC;CACM,CAAC;AAEzC,sEAAsE;AACzD,QAAA,oBAAoB,GAAmE;IAClG,qBAAqB,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAE;IACvE,gBAAgB,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE;IACpC,mBAAmB,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;IACjE,iBAAiB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE;IACzD,6BAA6B,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB,EAAE;IAC/E,kCAAkC,EAAE,EAAE,GAAG,EAAE,0BAA0B,EAAE;IACvE,gCAAgC,EAAE,EAAE,GAAG,EAAE,uBAAuB,EAAE;CACnE,CAAC;AAEF;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAAC,UAA6B,EAAE,SAAoC,EAAE,IAAU,EAAE,OAAuB;IACzI,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,qBAAqB,GAAG,CAAoE,aAAgC,EAAE,QAAc,EAAE,WAA2B,EAAY,EAAE;QAC3L,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7D,OAAO,CAAC,CACN,SAAS,IAAI,IAAA,0CAA6B,EAAM,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,WAAW,EAAE,WAAW,IAAI,SAAS,EAAE,CAAC,CACjI,IAAI,IAAI,CAAa,CAAC,CAAC,2FAA2F;IACrH,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAChE,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,IAAc,CAAC;IAC/B,CAAC;IAED,MAAM,IAAI,mBAAW,CAAC,sCAAsC,CAAC,CAAC;AAChE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAEpC;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,EAAE,gEA2BvG"}
|
package/src/utility/gitignore.js
CHANGED
|
@@ -11,9 +11,9 @@ function ignorePatterns(tree, patternsToAdd) {
|
|
|
11
11
|
const isGitIgnorePresent = tree.exists(gitIgnoreFileName);
|
|
12
12
|
let gitIgnoreFileContent = isGitIgnorePresent ? tree.readText(gitIgnoreFileName) : '';
|
|
13
13
|
const filteredPatternsToAdd = patternsToAdd
|
|
14
|
-
.map(({ description, patterns }) => ({ description, patterns: patterns.filter((pattern) => !new RegExp('^' + pattern.replace(/([
|
|
14
|
+
.map(({ description, patterns }) => ({ description, patterns: patterns.filter((pattern) => !new RegExp('^' + pattern.replace(/([*./\\])/g, '\\$1')).test(gitIgnoreFileContent)) }))
|
|
15
15
|
.filter(({ patterns }) => patterns.length);
|
|
16
|
-
if (
|
|
16
|
+
if (filteredPatternsToAdd.length === 0) {
|
|
17
17
|
return tree;
|
|
18
18
|
}
|
|
19
19
|
gitIgnoreFileContent += '\n' + filteredPatternsToAdd
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitignore.js","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"gitignore.js","sourceRoot":"","sources":["../../../src/utility/gitignore.ts"],"names":[],"mappings":";;AASA,wCA2BC;AAhCD;;;;GAIG;AACH,SAAgB,cAAc,CAAC,IAAU,EAAE,aAA6D;IACtG,MAAM,iBAAiB,GAAG,aAAa,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC1D,IAAI,oBAAoB,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtF,MAAM,qBAAqB,GAAG,aAAa;SACxC,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC;SAClL,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAE7C,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oBAAoB,IAAI,IAAI,GAAG,qBAAqB;SACjD,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;UACvC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACtB;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/src/utility/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from './ast';
|
|
2
|
+
export * from './builder';
|
|
2
3
|
export * from './collection';
|
|
3
4
|
export * from './component';
|
|
4
5
|
export * from './dependencies';
|
|
@@ -10,6 +11,7 @@ export * from './gitignore';
|
|
|
10
11
|
export * from './loaders';
|
|
11
12
|
export * from './logo';
|
|
12
13
|
export * from './matching-peers';
|
|
14
|
+
export * from './migration/migration';
|
|
13
15
|
export * from './modules';
|
|
14
16
|
export * from './monorepo';
|
|
15
17
|
export * from './package-manager-runner';
|
|
@@ -20,7 +22,5 @@ export * from './sub-entry';
|
|
|
20
22
|
export * from './template-property.helper';
|
|
21
23
|
export * from './update-imports';
|
|
22
24
|
export * from './update-pipes';
|
|
23
|
-
export * from './builder';
|
|
24
25
|
export * from './wrapper';
|
|
25
|
-
export * from './migration/migration';
|
|
26
26
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC"}
|
package/src/utility/index.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./ast"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./builder"), exports);
|
|
5
6
|
tslib_1.__exportStar(require("./collection"), exports);
|
|
6
7
|
tslib_1.__exportStar(require("./component"), exports);
|
|
7
8
|
tslib_1.__exportStar(require("./dependencies"), exports);
|
|
@@ -13,6 +14,7 @@ tslib_1.__exportStar(require("./gitignore"), exports);
|
|
|
13
14
|
tslib_1.__exportStar(require("./loaders"), exports);
|
|
14
15
|
tslib_1.__exportStar(require("./logo"), exports);
|
|
15
16
|
tslib_1.__exportStar(require("./matching-peers"), exports);
|
|
17
|
+
tslib_1.__exportStar(require("./migration/migration"), exports);
|
|
16
18
|
tslib_1.__exportStar(require("./modules"), exports);
|
|
17
19
|
tslib_1.__exportStar(require("./monorepo"), exports);
|
|
18
20
|
tslib_1.__exportStar(require("./package-manager-runner"), exports);
|
|
@@ -23,7 +25,5 @@ tslib_1.__exportStar(require("./sub-entry"), exports);
|
|
|
23
25
|
tslib_1.__exportStar(require("./template-property.helper"), exports);
|
|
24
26
|
tslib_1.__exportStar(require("./update-imports"), exports);
|
|
25
27
|
tslib_1.__exportStar(require("./update-pipes"), exports);
|
|
26
|
-
tslib_1.__exportStar(require("./builder"), exports);
|
|
27
28
|
tslib_1.__exportStar(require("./wrapper"), exports);
|
|
28
|
-
tslib_1.__exportStar(require("./migration/migration"), exports);
|
|
29
29
|
//# sourceMappingURL=index.js.map
|
package/src/utility/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,uDAA6B;AAC7B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,kDAAwB;AACxB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,2DAAiC;AACjC,oDAA0B;AAC1B,qDAA2B;AAC3B,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,yDAA+B;AAC/B,oDAA0B
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,oDAA0B;AAC1B,uDAA6B;AAC7B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,kDAAwB;AACxB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,2DAAiC;AACjC,gEAAsC;AACtC,oDAA0B;AAC1B,qDAA2B;AAC3B,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,yDAA+B;AAC/B,oDAA0B"}
|
package/src/utility/loaders.d.ts
CHANGED
|
@@ -46,8 +46,8 @@ export declare function getProjectNewDependenciesTypes(project?: WorkspaceProjec
|
|
|
46
46
|
export declare function getTemplateFolder(rootPath: string, currentPath: string, templateFolder?: string): string;
|
|
47
47
|
/**
|
|
48
48
|
* Get the path of all the files in the Tree
|
|
49
|
-
* @param basePath Base path from which starting the list
|
|
50
49
|
* @param tree Schematics file tree
|
|
50
|
+
* @param basePath Base path from which starting the list
|
|
51
51
|
* @param excludes Array of globs to be ignored
|
|
52
52
|
* @param recursive determine if the function will walk through the sub folders
|
|
53
53
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,QAAQ,EACR,SAAS,EACV,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,kBAAkB,EACnB,MAAM,0CAA0C,CAAC;AAIlD,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAiB7B;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EAAE,iBAAiB,GAAE,MAAM,EAAsC,eAInK;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,SAAkB,GAAG,eAAe,GAAG,IAAI,CAKzJ;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,SAAkB,gEAGzG;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,GAOlD,WAAW,CACtC;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,kBAAkB,EAAE,CAE/F;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,SAAc,UAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,SAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,EAAE,SAAS,UAAO,GAAG,MAAM,EAAE,CAQjH;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAGnE;AAED;;;;;GAKG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAK1E;AAED;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D"}
|
package/src/utility/loaders.js
CHANGED
|
@@ -13,16 +13,16 @@ exports.getFilesWithExtensionFromTree = getFilesWithExtensionFromTree;
|
|
|
13
13
|
exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProjects;
|
|
14
14
|
exports.getFilesFromWorkspaceProjects = getFilesFromWorkspaceProjects;
|
|
15
15
|
exports.getSourceFilesFromWorkspaceProjects = getSourceFilesFromWorkspaceProjects;
|
|
16
|
+
const path = require("node:path");
|
|
16
17
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
17
18
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
18
19
|
const minimatch_1 = require("minimatch");
|
|
19
|
-
const path = require("node:path");
|
|
20
20
|
function findFilesInTreeRec(memory, directory, fileMatchesCriteria, ignoreDirectories) {
|
|
21
|
-
if (ignoreDirectories.some(i => directory.path.split(path.posix.sep).includes(i))) {
|
|
21
|
+
if (ignoreDirectories.some((i) => directory.path.split(path.posix.sep).includes(i))) {
|
|
22
22
|
return memory;
|
|
23
23
|
}
|
|
24
24
|
directory.subfiles
|
|
25
|
-
.filter(fileMatchesCriteria)
|
|
25
|
+
.filter((file) => fileMatchesCriteria(file))
|
|
26
26
|
.forEach((file) => memory.add(directory.file(file)));
|
|
27
27
|
directory.subdirs
|
|
28
28
|
.forEach((dir) => findFilesInTreeRec(memory, directory.dir(dir), fileMatchesCriteria, ignoreDirectories));
|
|
@@ -90,18 +90,18 @@ function getProjectNewDependenciesTypes(project) {
|
|
|
90
90
|
* @param templateFolder Folder containing the templates
|
|
91
91
|
*/
|
|
92
92
|
function getTemplateFolder(rootPath, currentPath, templateFolder = 'templates') {
|
|
93
|
-
const templateFolderPath = path.resolve(currentPath, templateFolder).replace(
|
|
93
|
+
const templateFolderPath = path.resolve(currentPath, templateFolder).replace(/\\/g, '/');
|
|
94
94
|
return path.relative(rootPath, templateFolderPath);
|
|
95
95
|
}
|
|
96
96
|
/**
|
|
97
97
|
* Get the path of all the files in the Tree
|
|
98
|
-
* @param basePath Base path from which starting the list
|
|
99
98
|
* @param tree Schematics file tree
|
|
99
|
+
* @param basePath Base path from which starting the list
|
|
100
100
|
* @param excludes Array of globs to be ignored
|
|
101
101
|
* @param recursive determine if the function will walk through the sub folders
|
|
102
102
|
*/
|
|
103
103
|
function getAllFilesInTree(tree, basePath = '/', excludes = [], recursive = true) {
|
|
104
|
-
if (excludes.
|
|
104
|
+
if (excludes.some((e) => (0, minimatch_1.minimatch)(basePath, e, { dot: true }))) {
|
|
105
105
|
return [];
|
|
106
106
|
}
|
|
107
107
|
return [
|