@o3r/schematics 10.0.0-alpha.3 → 10.0.0-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@o3r/schematics",
|
3
|
-
"version": "10.0.0-alpha.
|
3
|
+
"version": "10.0.0-alpha.4",
|
4
4
|
"description": "Schematics module of the Otter framework",
|
5
5
|
"main": "./src/public_api.js",
|
6
6
|
"typings": "./src/public_api.d.ts",
|
@@ -67,8 +67,8 @@
|
|
67
67
|
"@nx/eslint-plugin": "~17.1.1",
|
68
68
|
"@nx/jest": "~17.1.1",
|
69
69
|
"@nx/js": "~17.1.1",
|
70
|
-
"@o3r/build-helpers": "^10.0.0-alpha.
|
71
|
-
"@o3r/eslint-plugin": "^10.0.0-alpha.
|
70
|
+
"@o3r/build-helpers": "^10.0.0-alpha.4",
|
71
|
+
"@o3r/eslint-plugin": "^10.0.0-alpha.4",
|
72
72
|
"@schematics/angular": "~17.0.3",
|
73
73
|
"@types/jest": "~29.5.2",
|
74
74
|
"@types/node": "^20.0.0",
|
@@ -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"}
|