@o3r/schematics 10.0.0-next.21 → 10.0.0-next.23
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +4 -4
- package/src/interfaces/angular-workspace.d.ts +0 -20
- package/src/interfaces/angular-workspace.d.ts.map +1 -1
- package/src/rule-factories/eslint-fix/index.d.ts.map +1 -1
- package/src/rule-factories/eslint-fix/index.js +1 -2
- package/src/rule-factories/eslint-fix/index.js.map +1 -1
- package/src/tasks/eslint/index.d.ts +0 -7
- package/src/tasks/eslint/index.d.ts.map +1 -1
- package/src/tasks/eslint/index.js +2 -3
- package/src/tasks/eslint/index.js.map +1 -1
- package/src/utility/loaders.d.ts +0 -46
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +3 -96
- package/src/utility/loaders.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "10.0.0-next.
|
|
3
|
+
"version": "10.0.0-next.23",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/public_api.js",
|
|
6
6
|
"keywords": [
|
|
@@ -62,9 +62,9 @@
|
|
|
62
62
|
"@nx/jest": "~16.8.0",
|
|
63
63
|
"@nx/js": "~16.8.0",
|
|
64
64
|
"@nx/linter": "~16.8.0",
|
|
65
|
-
"@o3r/build-helpers": "^10.0.0-next.
|
|
66
|
-
"@o3r/dev-tools": "^10.0.0-next.
|
|
67
|
-
"@o3r/eslint-plugin": "^10.0.0-next.
|
|
65
|
+
"@o3r/build-helpers": "^10.0.0-next.23",
|
|
66
|
+
"@o3r/dev-tools": "^10.0.0-next.23",
|
|
67
|
+
"@o3r/eslint-plugin": "^10.0.0-next.23",
|
|
68
68
|
"@schematics/angular": "~16.2.0",
|
|
69
69
|
"@types/jest": "~29.5.2",
|
|
70
70
|
"@types/node": "^18.0.0",
|
|
@@ -18,26 +18,6 @@ export interface WorkspaceLayout {
|
|
|
18
18
|
appsDir: string;
|
|
19
19
|
}
|
|
20
20
|
export interface WorkspaceSchematics extends SchematicOptions {
|
|
21
|
-
/** @deprecated will be removed in v10 */
|
|
22
|
-
'@otter/ng-tools:api-service'?: {
|
|
23
|
-
path: string;
|
|
24
|
-
};
|
|
25
|
-
/** @deprecated will be removed in v10 */
|
|
26
|
-
'@otter/ng-tools:component'?: {
|
|
27
|
-
path: string;
|
|
28
|
-
};
|
|
29
|
-
/** @deprecated will be removed in v10 */
|
|
30
|
-
'@otter/ng-tools:service'?: {
|
|
31
|
-
path: string;
|
|
32
|
-
};
|
|
33
|
-
/** @deprecated will be removed in v10 */
|
|
34
|
-
'@otter/ng-tools:store'?: {
|
|
35
|
-
path: string;
|
|
36
|
-
};
|
|
37
|
-
/** @deprecated will be removed in v10*/
|
|
38
|
-
'@otter/ng-tools:schematics'?: {
|
|
39
|
-
path: string;
|
|
40
|
-
};
|
|
41
21
|
'@o3r/core:component'?: {
|
|
42
22
|
path: string;
|
|
43
23
|
} & WorkspaceSchematics['*:*'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular-workspace.d.ts","sourceRoot":"","sources":["../../../src/interfaces/angular-workspace.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,IAAI,kBAAkB,EAC9B,MAAM,IAAI,iBAAiB,EAC3B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAAC;AAEzD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,
|
|
1
|
+
{"version":3,"file":"angular-workspace.d.ts","sourceRoot":"","sources":["../../../src/interfaces/angular-workspace.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,IAAI,kBAAkB,EAC9B,MAAM,IAAI,iBAAiB,EAC3B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG,MAAM,GAAG,SAAS,CAAC;AAEzD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,8EAA8E;AAC9E,MAAM,WAAW,eAAe;IAC9B,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,kCAAkC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,qBAAqB,CAAC,EAAE;QACtB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/B,mBAAmB,CAAC,EAAE;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/B,iBAAiB,CAAC,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/B,sBAAsB,CAAC,EAAE;QACvB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/B,UAAU,CAAC,EAAE;QACX,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAChC,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,eAAe,GAAG;QACxB,2FAA2F;QAC3F,aAAa,CAAC,EAAE,uBAAuB,CAAC;KACzC,CAAC;CACH;AACD,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,QAAQ,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;KACjC,CAAC;IACF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAEpF,OAAO,EAAiB,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3D;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAEpF,OAAO,EAAiB,aAAa,EAAE,MAAM,aAAa,CAAC;AAE3D;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CA4D5G"}
|
|
@@ -13,8 +13,7 @@ const tasks_1 = require("../../tasks");
|
|
|
13
13
|
*/
|
|
14
14
|
function applyEsLintFix(_prootPath = '/', extension = ['ts'], options) {
|
|
15
15
|
const linterOptions = {
|
|
16
|
-
continueOnError:
|
|
17
|
-
force: true,
|
|
16
|
+
continueOnError: true,
|
|
18
17
|
hideWarnings: true,
|
|
19
18
|
...options
|
|
20
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAC1C,uCAA2D;AAE3D;;;;;;;GAOG;AACH,SAAgB,cAAc,CAAC,UAAU,GAAG,GAAG,EAAE,YAAsB,CAAC,IAAI,CAAC,EAAE,OAAuB;IACpG,MAAM,aAAa,GAAkB;QACnC,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAC1C,uCAA2D;AAE3D;;;;;;;GAOG;AACH,SAAgB,cAAc,CAAC,UAAU,GAAG,GAAG,EAAE,YAAsB,CAAC,IAAI,CAAC,EAAE,OAAuB;IACpG,MAAM,aAAa,GAAkB;QACnC,eAAe,EAAE,IAAI;QACrB,YAAY,EAAE,IAAI;QAClB,GAAG,OAAO;KACX,CAAC;IAEF,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO;aAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC;aAC7B,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7C,gCAAgC;QAChC,IAAI,GAAG,GAAoB,IAAI,CAAC,MAAM,CACpC,IAAA,mBAAO,EACL,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YACjC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YACrC,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,EAAE;gBACrB,OAAO,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC;aACtB;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC,IAAI,CAC9B,CACF,CAAC;QAEF,IAAI,UAA8B,CAAC;QACnC,GAAG;YACD,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;YACjE,IAAI,UAAU,EAAE;gBACd,UAAU,GAAG,IAAA,gBAAI,EAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBACrD,MAAM;aACP;YAED,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;SAClB,QAAQ,GAAG,KAAK,IAAI,EAAE;QAEvB,IAAI,GAAG,KAAK,IAAI,IAAI,CAAC,UAAU,EAAE;YAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;+GACqF,CAAC,CAAC;SAC5G;QAED,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,GAAgB,EAAE,QAAQ,EAAE,EAAE;YAChE,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACjG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aACnB;YAED,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAI,GAAG,EAAU,CAAC,CAAC;QAEtB,OAAO,CAAC,OAAO,CACb,IAAI,qBAAa,CACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EACjB,SAAS,EACT,UAAU,EACV,aAAa,CACd,CACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AA5DD,wCA4DC"}
|
|
@@ -4,13 +4,6 @@ import { NodePackageTaskOptions } from '@angular-devkit/schematics/tasks/package
|
|
|
4
4
|
* Linter options
|
|
5
5
|
*/
|
|
6
6
|
export interface LinterOptions {
|
|
7
|
-
/**
|
|
8
|
-
* Indicates if the linter process should succeed even if there are lint errors remaining
|
|
9
|
-
*
|
|
10
|
-
* @default true
|
|
11
|
-
* @deprecated will be removed in v10, please use `continueOnError`
|
|
12
|
-
*/
|
|
13
|
-
force?: boolean;
|
|
14
7
|
/**
|
|
15
8
|
* Indicates if the linter process should succeed even if there are lint errors remaining
|
|
16
9
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAGnH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAGnH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,qBAAa,aAAc,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAGnE,KAAK,EAAE,MAAM,EAAE;IAAS,gBAAgB,CAAC;IAAiB,UAAU,CAAC;IAFjF,aAAa,EAAE,aAAa,CAAC;gBAEjB,KAAK,EAAE,MAAM,EAAE,EAAS,gBAAgB,CAAC,oBAAQ,EAAS,UAAU,CAAC,oBAAQ,EAAE,OAAO,CAAC,EAAE,aAAa;IAQlH,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAmBpE"}
|
|
@@ -9,8 +9,7 @@ class EslintFixTask {
|
|
|
9
9
|
this.workingDirectory = workingDirectory;
|
|
10
10
|
this.configFile = configFile;
|
|
11
11
|
this.linterOptions = {
|
|
12
|
-
continueOnError:
|
|
13
|
-
force: true,
|
|
12
|
+
continueOnError: true,
|
|
14
13
|
hideWarnings: true,
|
|
15
14
|
...options
|
|
16
15
|
};
|
|
@@ -28,7 +27,7 @@ class EslintFixTask {
|
|
|
28
27
|
'--fix',
|
|
29
28
|
...(this.linterOptions?.hideWarnings ? ['--quiet'] : []),
|
|
30
29
|
...(this.configFile ? ['--config', this.configFile] : []),
|
|
31
|
-
...(this.linterOptions?.continueOnError
|
|
30
|
+
...(this.linterOptions?.continueOnError ? ['|| exit 0'] : [])
|
|
32
31
|
].join(' '),
|
|
33
32
|
packageManager: (0, package_manager_runner_1.getPackageManager)()
|
|
34
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/eslint/index.ts"],"names":[],"mappings":";;;AACA,sFAAmH;AACnH,iFAAyE;AAoBzE,MAAa,aAAa;IAGxB,YAAmB,KAAe,EAAS,gBAAyB,EAAS,UAAmB,EAAE,OAAuB;QAAtG,UAAK,GAAL,KAAK,CAAU;QAAS,qBAAgB,GAAhB,gBAAgB,CAAS;QAAS,eAAU,GAAV,UAAU,CAAS;QAC9F,IAAI,CAAC,aAAa,GAAG;YACnB,eAAe,EAAE,IAAI;YACrB,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC;IACJ,CAAC;IAEM,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ;gBACjB,KAAK,EAAE,KAAK;gBACZ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,WAAW,EAAE;oBACX,QAAQ;oBACR,GAAG,IAAI,CAAC,KAAK;oBACb,OAAO;oBACP,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxD,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzD,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9D,CAAC,IAAI,CAAC,GAAG,CAAC;gBACX,cAAc,EAAE,IAAA,0CAAiB,GAAE;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AA9BD,sCA8BC"}
|
package/src/utility/loaders.d.ts
CHANGED
|
@@ -11,14 +11,6 @@ import type { WorkspaceProject, WorkspaceSchema } from '../interfaces/index';
|
|
|
11
11
|
* @param ignoreDirectories optional parameter to ignore folders
|
|
12
12
|
*/
|
|
13
13
|
export declare function findFilesInTree(directory: DirEntry, fileMatchesCriteria: (file: string) => boolean, ignoreDirectories?: string[]): FileEntry[];
|
|
14
|
-
/**
|
|
15
|
-
* Load the angular.json file
|
|
16
|
-
* @param tree File tree
|
|
17
|
-
* @param angularJsonFile Angular.json file path
|
|
18
|
-
* @throws Angular JSON invalid or non exist
|
|
19
|
-
* @deprecate use {@link getWorkspaceConfig} function instead, will be removed in Otter v10
|
|
20
|
-
*/
|
|
21
|
-
export declare function readAngularJson(tree: Tree, angularJsonFile?: string): WorkspaceSchema;
|
|
22
14
|
/**
|
|
23
15
|
* Load the Workspace configuration object
|
|
24
16
|
* @param tree File tree
|
|
@@ -40,42 +32,12 @@ export declare function writeAngularJson(tree: Tree, workspace: WorkspaceSchema,
|
|
|
40
32
|
* @throws Package JSON invalid or non exist
|
|
41
33
|
*/
|
|
42
34
|
export declare function readPackageJson(tree: Tree, workspaceProject: WorkspaceProject): PackageJson;
|
|
43
|
-
/**
|
|
44
|
-
* Get the workspace project
|
|
45
|
-
* @param tree File tree
|
|
46
|
-
* @param projectName Name of the Angular project
|
|
47
|
-
* @param projectType
|
|
48
|
-
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
49
|
-
*/
|
|
50
|
-
export declare function getProjectFromTree(tree: Tree, projectName?: string | null, projectType?: 'application' | 'library'): WorkspaceProject & {
|
|
51
|
-
name: string;
|
|
52
|
-
} | undefined;
|
|
53
|
-
/**
|
|
54
|
-
* Returns the root directory of a project with the given name ( a relative path from the project root)
|
|
55
|
-
* @param tree Files tree
|
|
56
|
-
* @param projectName Name of the project inside the workspace
|
|
57
|
-
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
58
|
-
*/
|
|
59
|
-
export declare function getProjectRootDir(tree: Tree, projectName?: string | null): string | undefined;
|
|
60
|
-
/**
|
|
61
|
-
* Return the type of install to run depending on the project type (Peer or default)
|
|
62
|
-
* @deprecated please use {@link getProjectNewDependenciesType} instead. Will be removed in v10
|
|
63
|
-
* @param tree
|
|
64
|
-
*/
|
|
65
|
-
export declare function getProjectDepType(tree: Tree): NodeDependencyType.Default | NodeDependencyType.Peer;
|
|
66
35
|
/**
|
|
67
36
|
* Return the type of install to run depending on the project type (Peer or default)
|
|
68
37
|
* @param project
|
|
69
38
|
* @param tree
|
|
70
39
|
*/
|
|
71
40
|
export declare function getProjectNewDependenciesType(project?: WorkspaceProject): NodeDependencyType.Default | NodeDependencyType.Peer;
|
|
72
|
-
/**
|
|
73
|
-
* Get the default project name
|
|
74
|
-
* @deprecated use {@link getWorkspaceConfig} function instead, will be removed in Otter V10
|
|
75
|
-
* @param projectType
|
|
76
|
-
* @param tree File tree
|
|
77
|
-
*/
|
|
78
|
-
export declare function getDefaultProjectName(tree: Tree, projectType?: 'application' | 'library'): string | undefined;
|
|
79
41
|
/**
|
|
80
42
|
* Get the folder of the templates for a specific sub-schematics
|
|
81
43
|
* @param rootPath Root directory of the schematics ran
|
|
@@ -91,14 +53,6 @@ export declare function getTemplateFolder(rootPath: string, currentPath: string,
|
|
|
91
53
|
* @param recursive determine if the function will walk through the sub folders
|
|
92
54
|
*/
|
|
93
55
|
export declare function getAllFilesInTree(tree: Tree, basePath?: string, excludes?: string[], recursive?: boolean): string[];
|
|
94
|
-
/**
|
|
95
|
-
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
96
|
-
* @deprecated please use {@link getFilesInFolderFromWorkspaceProjectsInTree}, will be removed in v9
|
|
97
|
-
* @param tree
|
|
98
|
-
* @param folderInProject
|
|
99
|
-
* @param extension
|
|
100
|
-
*/
|
|
101
|
-
export declare function getFilesInFolderFromWorkspaceProjects(tree: Tree, folderInProject: string, extension: string): string[];
|
|
102
56
|
/**
|
|
103
57
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
104
58
|
* @param tree
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAG9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiB7E;;;;;;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,eAQ7E;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,CAAC,EAAE,gBAAgB,wDAEvE;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;;;;;GAKG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAGD;;;;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;AAGD;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D"}
|
package/src/utility/loaders.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.
|
|
3
|
+
exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.getAllFilesInTree = exports.getTemplateFolder = exports.getProjectNewDependenciesType = exports.readPackageJson = exports.writeAngularJson = exports.getWorkspaceConfig = exports.findFilesInTree = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
6
|
-
const globby_1 = require("globby");
|
|
7
6
|
const minimatch_1 = require("minimatch");
|
|
8
7
|
const path = require("node:path");
|
|
9
8
|
function findFilesInTreeRec(memory, directory, fileMatchesCriteria, ignoreDirectories) {
|
|
@@ -30,21 +29,6 @@ function findFilesInTree(directory, fileMatchesCriteria, ignoreDirectories = ['n
|
|
|
30
29
|
return Array.from(memory);
|
|
31
30
|
}
|
|
32
31
|
exports.findFilesInTree = findFilesInTree;
|
|
33
|
-
/**
|
|
34
|
-
* Load the angular.json file
|
|
35
|
-
* @param tree File tree
|
|
36
|
-
* @param angularJsonFile Angular.json file path
|
|
37
|
-
* @throws Angular JSON invalid or non exist
|
|
38
|
-
* @deprecate use {@link getWorkspaceConfig} function instead, will be removed in Otter v10
|
|
39
|
-
*/
|
|
40
|
-
function readAngularJson(tree, angularJsonFile = '/angular.json') {
|
|
41
|
-
if (!tree.exists(angularJsonFile)) {
|
|
42
|
-
throw new schematics_1.SchematicsException('Could not find Angular workspace configuration');
|
|
43
|
-
}
|
|
44
|
-
const workspaceConfig = tree.readJson(angularJsonFile);
|
|
45
|
-
return workspaceConfig;
|
|
46
|
-
}
|
|
47
|
-
exports.readAngularJson = readAngularJson;
|
|
48
32
|
/**
|
|
49
33
|
* Load the Workspace configuration object
|
|
50
34
|
* @param tree File tree
|
|
@@ -84,56 +68,6 @@ function readPackageJson(tree, workspaceProject) {
|
|
|
84
68
|
return workspaceConfig;
|
|
85
69
|
}
|
|
86
70
|
exports.readPackageJson = readPackageJson;
|
|
87
|
-
/**
|
|
88
|
-
* Get the workspace project
|
|
89
|
-
* @param tree File tree
|
|
90
|
-
* @param projectName Name of the Angular project
|
|
91
|
-
* @param projectType
|
|
92
|
-
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
93
|
-
*/
|
|
94
|
-
function getProjectFromTree(tree, projectName, projectType) {
|
|
95
|
-
const workspace = getWorkspaceConfig(tree);
|
|
96
|
-
if (!workspace) {
|
|
97
|
-
return undefined;
|
|
98
|
-
}
|
|
99
|
-
const projectGuessedName = projectName || Object.keys(workspace.projects)[0];
|
|
100
|
-
// eslint-disable-next-line max-len
|
|
101
|
-
let workspaceProject = projectGuessedName && workspace.projects[projectGuessedName] && (!projectType || workspace.projects[projectGuessedName]?.projectType === projectType) ?
|
|
102
|
-
{
|
|
103
|
-
...workspace.projects[projectGuessedName],
|
|
104
|
-
name: projectGuessedName
|
|
105
|
-
} :
|
|
106
|
-
undefined;
|
|
107
|
-
// if not found we fallback to the more relevant first one
|
|
108
|
-
if (!workspaceProject) {
|
|
109
|
-
workspaceProject = Object.entries(workspace.projects)
|
|
110
|
-
.filter(([, project]) => !projectType || project.projectType === projectType)
|
|
111
|
-
.map(([name, project]) => ({ ...project, name }))[0];
|
|
112
|
-
}
|
|
113
|
-
return workspaceProject;
|
|
114
|
-
}
|
|
115
|
-
exports.getProjectFromTree = getProjectFromTree;
|
|
116
|
-
/**
|
|
117
|
-
* Returns the root directory of a project with the given name ( a relative path from the project root)
|
|
118
|
-
* @param tree Files tree
|
|
119
|
-
* @param projectName Name of the project inside the workspace
|
|
120
|
-
* @deprecated please use {@link getWorkspaceConfig} instead. Will be removed in v10
|
|
121
|
-
*/
|
|
122
|
-
function getProjectRootDir(tree, projectName) {
|
|
123
|
-
return getProjectFromTree(tree, projectName)?.root;
|
|
124
|
-
}
|
|
125
|
-
exports.getProjectRootDir = getProjectRootDir;
|
|
126
|
-
/**
|
|
127
|
-
* Return the type of install to run depending on the project type (Peer or default)
|
|
128
|
-
* @deprecated please use {@link getProjectNewDependenciesType} instead. Will be removed in v10
|
|
129
|
-
* @param tree
|
|
130
|
-
*/
|
|
131
|
-
function getProjectDepType(tree) {
|
|
132
|
-
const workspaceProject = tree.exists('angular.json') ? getProjectFromTree(tree) : undefined;
|
|
133
|
-
const projectType = workspaceProject?.projectType || 'application';
|
|
134
|
-
return projectType === 'application' ? dependencies_1.NodeDependencyType.Default : dependencies_1.NodeDependencyType.Peer;
|
|
135
|
-
}
|
|
136
|
-
exports.getProjectDepType = getProjectDepType;
|
|
137
71
|
/**
|
|
138
72
|
* Return the type of install to run depending on the project type (Peer or default)
|
|
139
73
|
* @param project
|
|
@@ -143,16 +77,6 @@ function getProjectNewDependenciesType(project) {
|
|
|
143
77
|
return project?.projectType === 'library' ? dependencies_1.NodeDependencyType.Peer : dependencies_1.NodeDependencyType.Default;
|
|
144
78
|
}
|
|
145
79
|
exports.getProjectNewDependenciesType = getProjectNewDependenciesType;
|
|
146
|
-
/**
|
|
147
|
-
* Get the default project name
|
|
148
|
-
* @deprecated use {@link getWorkspaceConfig} function instead, will be removed in Otter V10
|
|
149
|
-
* @param projectType
|
|
150
|
-
* @param tree File tree
|
|
151
|
-
*/
|
|
152
|
-
function getDefaultProjectName(tree, projectType) {
|
|
153
|
-
return getProjectFromTree(tree, null, projectType)?.name;
|
|
154
|
-
}
|
|
155
|
-
exports.getDefaultProjectName = getDefaultProjectName;
|
|
156
80
|
/**
|
|
157
81
|
* Get the folder of the templates for a specific sub-schematics
|
|
158
82
|
* @param rootPath Root directory of the schematics ran
|
|
@@ -181,23 +105,6 @@ function getAllFilesInTree(tree, basePath = '/', excludes = [], recursive = true
|
|
|
181
105
|
];
|
|
182
106
|
}
|
|
183
107
|
exports.getAllFilesInTree = getAllFilesInTree;
|
|
184
|
-
/**
|
|
185
|
-
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
186
|
-
* @deprecated please use {@link getFilesInFolderFromWorkspaceProjectsInTree}, will be removed in v9
|
|
187
|
-
* @param tree
|
|
188
|
-
* @param folderInProject
|
|
189
|
-
* @param extension
|
|
190
|
-
*/
|
|
191
|
-
function getFilesInFolderFromWorkspaceProjects(tree, folderInProject, extension) {
|
|
192
|
-
const workspace = readAngularJson(tree);
|
|
193
|
-
const projectSources = Object.values(workspace.projects)
|
|
194
|
-
.map((project) => path.join(project.root, folderInProject, '**', `*.${extension}`).replace(/\\/g, '/'));
|
|
195
|
-
return projectSources.reduce((acc, projectSource) => {
|
|
196
|
-
acc.push(...(0, globby_1.sync)(projectSource, { ignore: ['**/node_modules/**'] }));
|
|
197
|
-
return acc;
|
|
198
|
-
}, []);
|
|
199
|
-
}
|
|
200
|
-
exports.getFilesInFolderFromWorkspaceProjects = getFilesInFolderFromWorkspaceProjects;
|
|
201
108
|
/**
|
|
202
109
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
203
110
|
* @param tree
|
|
@@ -205,10 +112,10 @@ exports.getFilesInFolderFromWorkspaceProjects = getFilesInFolderFromWorkspacePro
|
|
|
205
112
|
* @param extension
|
|
206
113
|
*/
|
|
207
114
|
function getFilesInFolderFromWorkspaceProjectsInTree(tree, folderInProject, extension) {
|
|
208
|
-
const workspace =
|
|
115
|
+
const workspace = getWorkspaceConfig(tree);
|
|
209
116
|
const extensionMatcher = new RegExp(`\\.${extension.replace(/^\./, '')}$`);
|
|
210
117
|
const excludes = ['**/node_modules/**', '**/.cache/**'];
|
|
211
|
-
return Object.values(workspace
|
|
118
|
+
return Object.values(workspace?.projects || {})
|
|
212
119
|
.flatMap((project) => getAllFilesInTree(tree, path.posix.join(project.root, folderInProject), excludes))
|
|
213
120
|
.filter((filePath) => extensionMatcher.test(filePath));
|
|
214
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":";;;AACA,2DAAuE;AACvE,2EAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
|