@o3r/schematics 9.1.0-alpha.53 → 9.1.0-alpha.54
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +4 -4
- package/src/utility/collection.d.ts +3 -2
- package/src/utility/collection.d.ts.map +1 -1
- package/src/utility/collection.js +4 -6
- package/src/utility/collection.js.map +1 -1
- package/src/utility/monorepo.d.ts +5 -5
- package/src/utility/monorepo.d.ts.map +1 -1
- package/src/utility/monorepo.js +5 -5
- package/src/utility/monorepo.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "9.1.0-alpha.
|
|
3
|
+
"version": "9.1.0-alpha.54",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -58,9 +58,9 @@
|
|
|
58
58
|
"@nx/jest": "~16.6.0",
|
|
59
59
|
"@nx/js": "~16.6.0",
|
|
60
60
|
"@nx/linter": "~16.6.0",
|
|
61
|
-
"@o3r/build-helpers": "^9.1.0-alpha.
|
|
62
|
-
"@o3r/dev-tools": "^9.1.0-alpha.
|
|
63
|
-
"@o3r/eslint-plugin": "^9.1.0-alpha.
|
|
61
|
+
"@o3r/build-helpers": "^9.1.0-alpha.54",
|
|
62
|
+
"@o3r/dev-tools": "^9.1.0-alpha.54",
|
|
63
|
+
"@o3r/eslint-plugin": "^9.1.0-alpha.54",
|
|
64
64
|
"@schematics/angular": "~16.1.6",
|
|
65
65
|
"@types/jest": "~29.5.2",
|
|
66
66
|
"@types/node": "^18.0.0",
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SchematicContext } from '@angular-devkit/schematics';
|
|
1
2
|
import type { WorkspaceSchema, WorkspaceSchematics } from '../interfaces';
|
|
2
3
|
/**
|
|
3
4
|
* Register the collection schematic to the workspace
|
|
@@ -25,7 +26,7 @@ export declare function getDefaultOptionsForSchematic(workspace: WorkspaceSchema
|
|
|
25
26
|
* If the schematics name is not found, then the generic options (*:*) will be returned. If the latter is not present the function returns undefined
|
|
26
27
|
*
|
|
27
28
|
* @param config
|
|
28
|
-
* @param
|
|
29
|
+
* @param context
|
|
29
30
|
*/
|
|
30
|
-
export declare function getSchematicOptions<T extends WorkspaceSchematics['*:*'] = WorkspaceSchematics['*:*']>(config: WorkspaceSchema,
|
|
31
|
+
export declare function getSchematicOptions<T extends WorkspaceSchematics['*:*'] = WorkspaceSchematics['*:*']>(config: WorkspaceSchema, context: SchematicContext): T | undefined;
|
|
31
32
|
//# sourceMappingURL=collection.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE1E;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAO5G;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,0BAcxK;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../src/utility/collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAE1E;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAO5G;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,0BAcxK;AAED;;;;;;GAMG;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,CAUxK"}
|
|
@@ -47,18 +47,16 @@ exports.getDefaultOptionsForSchematic = getDefaultOptionsForSchematic;
|
|
|
47
47
|
* If the schematics name is not found, then the generic options (*:*) will be returned. If the latter is not present the function returns undefined
|
|
48
48
|
*
|
|
49
49
|
* @param config
|
|
50
|
-
* @param
|
|
50
|
+
* @param context
|
|
51
51
|
*/
|
|
52
|
-
function getSchematicOptions(config,
|
|
53
|
-
|
|
54
|
-
return config.schematics?.['*:*'];
|
|
55
|
-
}
|
|
52
|
+
function getSchematicOptions(config, context) {
|
|
53
|
+
const schematicName = `${context.schematic.description.collection.name}:${context.schematic.description.name}`;
|
|
56
54
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
57
55
|
const options = config.schematics && Object.entries(config.schematics)
|
|
58
56
|
.filter(([name]) => new RegExp(name.replace(/\*/g, '.*')).test(schematicName))
|
|
59
57
|
.sort(([a], [b]) => ((a.match(/\*/g)?.length || 0) - (b.match(/\*/g)?.length || 0)))
|
|
60
58
|
.reduce((acc, [, opts]) => ({ ...acc, ...opts }), {});
|
|
61
|
-
return options && Object.keys(options).length ? options :
|
|
59
|
+
return options && Object.keys(options).length ? options : config.schematics?.['*:*'];
|
|
62
60
|
}
|
|
63
61
|
exports.getSchematicOptions = getSchematicOptions;
|
|
64
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":";;;AAGA;;;;;;GAMG;AACH,SAAgB,4BAA4B,CAAC,SAA0B,EAAE,UAAkB;IACzF,SAAS,CAAC,GAAG,KAAK,EAAE,CAAC;IACrB,SAAS,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC/D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC5D,SAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KACxD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAPD,oEAOC;AAED;;;;;;;;;GASG;AACH,SAAgB,6BAA6B,CAAC,SAAiC,EAAE,UAAkB,EAAE,aAAqB,EAAE,OAA6C;IACvK,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,EAAE,CAAC;KACX;IACD,MAAM,uBAAuB,GAAG;QAC9B,SAAS,CAAC,UAAU;QACpB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE;KACpF,CAAC;IACF,OAAO,uBAAuB,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,CAAyB,UAAU,CAAC;aAC/C,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,KAAK,aAAa,EAAE,IAAI,GAAG,KAAK,GAAG,UAAU,IAAI,CAAC;aAC/E,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/B,EAAE,CACH,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC,EAAC,GAAG,GAAG,EAAE,GAAG,aAAa,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACrE,CAAC;AAdD,sEAcC;AAED;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAAoE,MAAuB,EAAE,OAAyB;IACvJ,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAE/G,mEAAmE;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;SACnE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC7E,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;SACnF,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,EAAS,CAAC,CAAC;IAE/D,OAAO,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC;AACvF,CAAC;AAVD,kDAUC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Tree } from '@angular-devkit/schematics';
|
|
1
|
+
import type { SchematicContext, Tree } from '@angular-devkit/schematics';
|
|
2
2
|
import { WorkspaceLayout, WorkspaceProject, WorkspaceSchema } from '../interfaces';
|
|
3
3
|
/**
|
|
4
4
|
* Find the relative path to a configuration file at the monorepo root
|
|
@@ -30,14 +30,14 @@ export declare const DEFAULT_ROOT_FOLDERS: WorkspaceLayout;
|
|
|
30
30
|
/** Root folders map for apps/libs inside a monorepo */
|
|
31
31
|
export declare const BASE_ROOT_FOLDERS_MAP: Record<WorkspaceProject['projectType'], keyof WorkspaceLayout>;
|
|
32
32
|
/**
|
|
33
|
-
*
|
|
33
|
+
* Retrieve the project base root generation folder, based on the given projectType.
|
|
34
34
|
* - The default project root will be returned if there is no project root found in nx.json or angular.json (in schematics options)
|
|
35
35
|
* - The root path '/' will be returned if no project type given
|
|
36
36
|
*
|
|
37
|
-
* @param config
|
|
38
37
|
* @param tree
|
|
38
|
+
* @param context
|
|
39
|
+
* @param config
|
|
39
40
|
* @param projectType
|
|
40
|
-
* @param schematicName
|
|
41
41
|
*/
|
|
42
|
-
export declare function getPackagesBaseRootFolder(
|
|
42
|
+
export declare function getPackagesBaseRootFolder(tree: Tree, context: SchematicContext, config: WorkspaceSchema, projectType?: WorkspaceProject['projectType']): any;
|
|
43
43
|
//# sourceMappingURL=monorepo.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monorepo.d.ts","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"monorepo.d.ts","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAInF;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,UAOzF;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,WAErC;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,WAEhD;AAED,mFAAmF;AACnF,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAC5C,sFAAsF;AACtF,eAAO,MAAM,wBAAwB,SAAS,CAAC;AAE/C,oEAAoE;AACpE,eAAO,MAAM,oBAAoB,EAAE,eAGlC,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,MAAM,eAAe,CAGhG,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,OAQtJ"}
|
package/src/utility/monorepo.js
CHANGED
|
@@ -52,19 +52,19 @@ exports.BASE_ROOT_FOLDERS_MAP = {
|
|
|
52
52
|
application: 'appsDir'
|
|
53
53
|
};
|
|
54
54
|
/**
|
|
55
|
-
*
|
|
55
|
+
* Retrieve the project base root generation folder, based on the given projectType.
|
|
56
56
|
* - The default project root will be returned if there is no project root found in nx.json or angular.json (in schematics options)
|
|
57
57
|
* - The root path '/' will be returned if no project type given
|
|
58
58
|
*
|
|
59
|
-
* @param config
|
|
60
59
|
* @param tree
|
|
60
|
+
* @param context
|
|
61
|
+
* @param config
|
|
61
62
|
* @param projectType
|
|
62
|
-
* @param schematicName
|
|
63
63
|
*/
|
|
64
|
-
function getPackagesBaseRootFolder(
|
|
64
|
+
function getPackagesBaseRootFolder(tree, context, config, projectType) {
|
|
65
65
|
const configName = projectType && exports.BASE_ROOT_FOLDERS_MAP[projectType];
|
|
66
66
|
const nxExplicitDir = configName && isNxContext(tree) && tree.readJson('/nx.json')?.workspaceLayout[configName];
|
|
67
|
-
const schematicConfigDir = configName &&
|
|
67
|
+
const schematicConfigDir = configName && (0, collection_1.getSchematicOptions)(config, context)?.[configName];
|
|
68
68
|
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
|
|
69
69
|
return schematicConfigDir || nxExplicitDir || ((projectType && configName) ? exports.DEFAULT_ROOT_FOLDERS[configName] : '.');
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monorepo.js","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":";;;AACA,kCAAkC;AAElC,6CAAmD;AAGnD;;;;;;;GAOG;AACH,SAAgB,0BAA0B,CAAC,IAAU,EAAE,KAAe,EAAE,UAAkB;IACxF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,CAAC;KACX;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;AAC1D,CAAC;AAPD,gEAOC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU;IACpC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAFD,kCAEC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,IAAU;IAC/C,OAAO,CAAC,CAAE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAiB,CAAC,SAAS,CAAC;AACrE,CAAC;AAFD,wDAEC;AAED,mFAAmF;AACtE,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC5C,sFAAsF;AACzE,QAAA,wBAAwB,GAAG,MAAM,CAAC;AAE/C,oEAAoE;AACvD,QAAA,oBAAoB,GAAoB;IACnD,OAAO,EAAE,6BAAqB;IAC9B,OAAO,EAAE,gCAAwB;CAClC,CAAC;AAEF,uDAAuD;AAC1C,QAAA,qBAAqB,GAAmE;IACnG,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,SAAS;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,SAAgB,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"monorepo.js","sourceRoot":"","sources":["../../../src/utility/monorepo.ts"],"names":[],"mappings":";;;AACA,kCAAkC;AAElC,6CAAmD;AAGnD;;;;;;;GAOG;AACH,SAAgB,0BAA0B,CAAC,IAAU,EAAE,KAAe,EAAE,UAAkB;IACxF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO,EAAE,CAAC;KACX;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;AAC1D,CAAC;AAPD,gEAOC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU;IACpC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AACjC,CAAC;AAFD,kCAEC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,IAAU;IAC/C,OAAO,CAAC,CAAE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAiB,CAAC,SAAS,CAAC;AACrE,CAAC;AAFD,wDAEC;AAED,mFAAmF;AACtE,QAAA,qBAAqB,GAAG,MAAM,CAAC;AAC5C,sFAAsF;AACzE,QAAA,wBAAwB,GAAG,MAAM,CAAC;AAE/C,oEAAoE;AACvD,QAAA,oBAAoB,GAAoB;IACnD,OAAO,EAAE,6BAAqB;IAC9B,OAAO,EAAE,gCAAwB;CAClC,CAAC;AAEF,uDAAuD;AAC1C,QAAA,qBAAqB,GAAmE;IACnG,OAAO,EAAE,SAAS;IAClB,WAAW,EAAE,SAAS;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAyB,EAAE,MAAuB,EAAE,WAA6C;IACrJ,MAAM,UAAU,GAAG,WAAW,IAAI,6BAAqB,CAAC,WAAW,CAAC,CAAC;IACrE,MAAM,aAAa,GAAG,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC,IAAK,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAS,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IAEzH,MAAM,kBAAkB,GAAG,UAAU,IAAI,IAAA,gCAAmB,EAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;IAE5F,qEAAqE;IACrE,OAAO,kBAAkB,IAAI,aAAa,IAAI,CAAC,CAAC,WAAW,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,4BAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACvH,CAAC;AARD,8DAQC"}
|