@o3r/schematics 10.0.0-alpha.3 → 10.0.0-alpha.6
Sign up to get free protection for your applications and to get access to all the features.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "10.0.0-alpha.
|
|
3
|
+
"version": "10.0.0-alpha.6",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/public_api.js",
|
|
6
6
|
"typings": "./src/public_api.d.ts",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@angular-devkit/build-angular": "~17.0.3",
|
|
53
53
|
"@angular-devkit/core": "~17.0.3",
|
|
54
54
|
"@angular-devkit/schematics": "~17.0.3",
|
|
55
|
-
"@angular-eslint/eslint-plugin": "~17.
|
|
55
|
+
"@angular-eslint/eslint-plugin": "~17.2.0",
|
|
56
56
|
"@angular/cli": "~17.0.3",
|
|
57
57
|
"@angular/common": "~17.0.4",
|
|
58
58
|
"@angular/compiler": "~17.0.4",
|
|
@@ -63,17 +63,17 @@
|
|
|
63
63
|
"@babel/core": "~7.23.0",
|
|
64
64
|
"@babel/preset-typescript": "~7.23.0",
|
|
65
65
|
"@compodoc/compodoc": "^1.1.19",
|
|
66
|
-
"@nx/eslint": "~17.
|
|
67
|
-
"@nx/eslint-plugin": "~17.
|
|
68
|
-
"@nx/jest": "~17.
|
|
69
|
-
"@nx/js": "~17.
|
|
70
|
-
"@o3r/build-helpers": "^10.0.0-alpha.
|
|
71
|
-
"@o3r/eslint-plugin": "^10.0.0-alpha.
|
|
66
|
+
"@nx/eslint": "~17.2.0",
|
|
67
|
+
"@nx/eslint-plugin": "~17.2.0",
|
|
68
|
+
"@nx/jest": "~17.2.0",
|
|
69
|
+
"@nx/js": "~17.2.0",
|
|
70
|
+
"@o3r/build-helpers": "^10.0.0-alpha.6",
|
|
71
|
+
"@o3r/eslint-plugin": "^10.0.0-alpha.6",
|
|
72
72
|
"@schematics/angular": "~17.0.3",
|
|
73
73
|
"@types/jest": "~29.5.2",
|
|
74
74
|
"@types/node": "^20.0.0",
|
|
75
75
|
"@types/semver": "^7.3.13",
|
|
76
|
-
"@typescript-eslint/eslint-plugin": "6.
|
|
76
|
+
"@typescript-eslint/eslint-plugin": "^6.19.0",
|
|
77
77
|
"@typescript-eslint/parser": "^6.11.0",
|
|
78
78
|
"cpy-cli": "^5.0.0",
|
|
79
79
|
"eslint": "^8.42.0",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"jest-junit": "~16.0.0",
|
|
87
87
|
"jsonc-eslint-parser": "~2.4.0",
|
|
88
88
|
"jsonschema": "~1.4.1",
|
|
89
|
-
"nx": "~17.
|
|
89
|
+
"nx": "~17.2.0",
|
|
90
90
|
"rxjs": "^7.8.1",
|
|
91
91
|
"ts-jest": "~29.1.1",
|
|
92
92
|
"type-fest": "^4.3.1",
|
|
@@ -3,20 +3,24 @@
|
|
|
3
3
|
* @param packageJsonPath
|
|
4
4
|
* @param pattern
|
|
5
5
|
*/
|
|
6
|
-
export declare function getPeerDepWithPattern(packageJsonPath: string, pattern?: RegExp): {
|
|
6
|
+
export declare function getPeerDepWithPattern(packageJsonPath: string, pattern?: RegExp | string[]): {
|
|
7
7
|
packageName: string | undefined;
|
|
8
8
|
packageVersion: string | undefined;
|
|
9
9
|
matchingPackages: string[];
|
|
10
|
+
matchingPackagesVersions: {
|
|
11
|
+
[k: string]: string | undefined;
|
|
12
|
+
};
|
|
10
13
|
};
|
|
11
14
|
/**
|
|
12
15
|
* Get the list of o3r peer deps from a given package.json file
|
|
13
16
|
* @param packageJsonPath The package json on which we search for o3r peer deps
|
|
14
17
|
* @param filterBasics If activated it will remove the basic peer deps (o3r/core, o3r/dev-tools, o3r/workspace and o3r/schematics) from the list of results
|
|
15
18
|
* @param packagePattern Pattern of the package name to look in the packages peer dependencies.
|
|
19
|
+
* @param versionRangePrefix Prefix to add to the package version to determine Semver Range
|
|
16
20
|
*/
|
|
17
|
-
export declare function getO3rPeerDeps(packageJsonPath: string, filterBasics?: boolean, packagePattern?: RegExp): {
|
|
21
|
+
export declare function getO3rPeerDeps(packageJsonPath: string, filterBasics?: boolean, packagePattern?: RegExp, versionRangePrefix?: string): {
|
|
18
22
|
packageName: string | undefined;
|
|
19
|
-
packageVersion: string
|
|
23
|
+
packageVersion: string;
|
|
20
24
|
o3rPeerDeps: string[];
|
|
21
25
|
};
|
|
22
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matching-peers.d.ts","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"matching-peers.d.ts","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,GAAE,MAAM,GAAG,MAAM,EAA4B;;;;;;;EAelH;AASD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAO,EAAE,cAAc,SAAsB,EAAE,kBAAkB,SAAM;;;;EAU1I;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,eAAe,EAAE,MAAM,EAAE,cAAc,SAAsB;;;;EAahG"}
|
|
@@ -14,9 +14,10 @@ function getPeerDepWithPattern(packageJsonPath, pattern = /^@(otter|o3r|ama-sdk)
|
|
|
14
14
|
const optionalPackages = Object.entries(packageJsonContent.peerDependenciesMeta || {})
|
|
15
15
|
.filter(([, dep]) => dep?.optional)
|
|
16
16
|
.map(([depName]) => depName);
|
|
17
|
-
const
|
|
18
|
-
.filter(peerDep => pattern.test(peerDep) && !optionalPackages.includes(peerDep));
|
|
19
|
-
|
|
17
|
+
const matchingPackagesVersions = Object.fromEntries(Object.entries(packageJsonContent.peerDependencies || {})
|
|
18
|
+
.filter(([peerDep]) => (Array.isArray(pattern) ? pattern.includes(peerDep) : pattern.test(peerDep)) && !optionalPackages.includes(peerDep)));
|
|
19
|
+
const matchingPackages = Object.keys(matchingPackagesVersions);
|
|
20
|
+
return { packageName, packageVersion, matchingPackages, matchingPackagesVersions };
|
|
20
21
|
}
|
|
21
22
|
exports.getPeerDepWithPattern = getPeerDepWithPattern;
|
|
22
23
|
const basicsPackageName = new Set([
|
|
@@ -30,12 +31,13 @@ const basicsPackageName = new Set([
|
|
|
30
31
|
* @param packageJsonPath The package json on which we search for o3r peer deps
|
|
31
32
|
* @param filterBasics If activated it will remove the basic peer deps (o3r/core, o3r/dev-tools, o3r/workspace and o3r/schematics) from the list of results
|
|
32
33
|
* @param packagePattern Pattern of the package name to look in the packages peer dependencies.
|
|
34
|
+
* @param versionRangePrefix Prefix to add to the package version to determine Semver Range
|
|
33
35
|
*/
|
|
34
|
-
function getO3rPeerDeps(packageJsonPath, filterBasics = true, packagePattern = /^@(?:o3r|ama-sdk)
|
|
36
|
+
function getO3rPeerDeps(packageJsonPath, filterBasics = true, packagePattern = /^@(?:o3r|ama-sdk)/, versionRangePrefix = '^') {
|
|
35
37
|
const depsInfo = getPeerDepWithPattern(packageJsonPath, packagePattern);
|
|
36
38
|
return {
|
|
37
39
|
packageName: depsInfo.packageName,
|
|
38
|
-
packageVersion: depsInfo.packageVersion,
|
|
40
|
+
packageVersion: versionRangePrefix + depsInfo.packageVersion,
|
|
39
41
|
o3rPeerDeps: filterBasics ?
|
|
40
42
|
depsInfo.matchingPackages.filter((peerDep) => !basicsPackageName.has(peerDep))
|
|
41
43
|
: depsInfo.matchingPackages
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matching-peers.js","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAG9B;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,eAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"matching-peers.js","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAG9B;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,eAAuB,EAAE,UAA6B,uBAAuB;IACjH,MAAM,kBAAkB,GAAgB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC5G,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,IAAI,EAAE,CAAC;SACnF,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,wBAAwB,GAAG,MAAM,CAAC,WAAW,CACjD,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC;SACtD,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAC9I,CAAC;IACF,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAE/D,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AACrF,CAAC;AAfD,sDAeC;AAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC;IAChC,WAAW;IACX,iBAAiB;IACjB,gBAAgB;IAChB,gBAAgB;CACjB,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,eAAuB,EAAE,YAAY,GAAG,IAAI,EAAE,cAAc,GAAG,mBAAmB,EAAE,kBAAkB,GAAG,GAAG;IACzI,MAAM,QAAQ,GAAG,qBAAqB,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IACxE,OAAO;QACL,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,cAAc,EAAE,kBAAkB,GAAG,QAAQ,CAAC,cAAc;QAC5D,WAAW,EAAE,YAAY,CAAC,CAAC;YACzB,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9E,CAAC,CAAC,QAAQ,CAAC,gBAAgB;KAC9B,CAAC;AAEJ,CAAC;AAVD,wCAUC;AAED;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,eAAuB,EAAE,cAAc,GAAG,mBAAmB;IAC/F,MAAM,kBAAkB,GAAgB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC5G,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,qBAAqB,IAAI,EAAE,CAAC;SACpF,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC;SAC5E,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAE1F,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;AAE3D,CAAC;AAbD,kDAaC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template-property.helper.js","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAE7C;;;GAGG;AACH,SAAS,uBAAuB,CAAC,aAAqB;IACpD,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,aAAqB;IACzD,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;IACpE,OAAO,oBAAoB,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC/D,CAAC;AAHD,sDAGC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,aAAqB;IAC1D,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,cAAO,CAAC,SAAS,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"template-property.helper.js","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":"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"}
|