@o3r/extractors 12.3.7 → 12.3.8

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
@@ -2,7 +2,7 @@
2
2
  "name": "@o3r/extractors",
3
3
  "main": "./src/public_api.js",
4
4
  "types": "./src/public_api.d.ts",
5
- "version": "12.3.7",
5
+ "version": "12.3.8",
6
6
  "publishConfig": {
7
7
  "access": "public"
8
8
  },
@@ -24,9 +24,9 @@
24
24
  "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
25
25
  "@angular-devkit/core": "^19.0.0",
26
26
  "@angular-devkit/schematics": "^19.0.0",
27
- "@o3r/core": "^12.3.7",
28
- "@o3r/schematics": "^12.3.7",
29
- "@o3r/telemetry": "^12.3.7",
27
+ "@o3r/core": "^12.3.8",
28
+ "@o3r/schematics": "^12.3.8",
29
+ "@o3r/telemetry": "^12.3.8",
30
30
  "@schematics/angular": "^19.0.0",
31
31
  "@yarnpkg/cli": "^4.0.0",
32
32
  "@yarnpkg/core": "^4.1.1",
@@ -36,7 +36,7 @@
36
36
  "globby": "^11.1.0",
37
37
  "semver": "^7.5.2",
38
38
  "ts-node": "~10.9.2",
39
- "type-fest": "^4.10.2",
39
+ "type-fest": "^4.30.1",
40
40
  "typescript": "^5.5.4"
41
41
  },
42
42
  "peerDependenciesMeta": {
@@ -67,9 +67,6 @@
67
67
  "globby": {
68
68
  "optional": true
69
69
  },
70
- "semver": {
71
- "optional": true
72
- },
73
70
  "type-fest": {
74
71
  "optional": true
75
72
  }
@@ -101,13 +98,13 @@
101
98
  "@nx/eslint-plugin": "~20.8.0",
102
99
  "@nx/jest": "~20.8.0",
103
100
  "@nx/js": "~20.8.0",
104
- "@o3r/build-helpers": "^12.3.7",
105
- "@o3r/core": "^12.3.7",
106
- "@o3r/eslint-config": "^12.3.7",
107
- "@o3r/eslint-plugin": "^12.3.7",
108
- "@o3r/schematics": "^12.3.7",
109
- "@o3r/telemetry": "^12.3.7",
110
- "@o3r/test-helpers": "^12.3.7",
101
+ "@o3r/build-helpers": "^12.3.8",
102
+ "@o3r/core": "^12.3.8",
103
+ "@o3r/eslint-config": "^12.3.8",
104
+ "@o3r/eslint-plugin": "^12.3.8",
105
+ "@o3r/schematics": "^12.3.8",
106
+ "@o3r/telemetry": "^12.3.8",
107
+ "@o3r/test-helpers": "^12.3.8",
111
108
  "@schematics/angular": "~19.2.0",
112
109
  "@stylistic/eslint-plugin": "~3.1.0",
113
110
  "@swc/helpers": "~0.5.0",
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6ClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
@@ -5,7 +5,16 @@ const path = require("node:path");
5
5
  const schematics_1 = require("@angular-devkit/schematics");
6
6
  const schematics_2 = require("@o3r/schematics");
7
7
  const cms_adapter_1 = require("../cms-adapter");
8
- const dependenciesToInstall = [
8
+ /**
9
+ * List of external dependencies to be added to the project as peer dependencies
10
+ */
11
+ const dependenciesToInstall = [];
12
+ /**
13
+ * List of external dependencies to be added to the project as dev dependencies
14
+ */
15
+ const devDependenciesToInstall = [
16
+ '@angular-devkit/architect',
17
+ '@angular-devkit/core',
9
18
  'semver'
10
19
  ];
11
20
  /**
@@ -13,11 +22,12 @@ const dependenciesToInstall = [
13
22
  * @param options
14
23
  */
15
24
  function ngAddFn(options) {
16
- return async (tree, context) => {
17
- const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies')).catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' } }));
25
+ return (tree, context) => {
18
26
  const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
19
27
  const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
20
28
  const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
29
+ const projectDirectory = workspaceProject?.root || '.';
30
+ const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
21
31
  const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
22
32
  acc[dep] = {
23
33
  inManifest: [{
@@ -28,18 +38,20 @@ function ngAddFn(options) {
28
38
  };
29
39
  return acc;
30
40
  }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
31
- Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
32
- dependencies[dep] = {
33
- inManifest: [{
34
- range,
35
- types: [NodeDependencyType.Dev]
36
- }]
37
- };
38
- });
41
+ const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
42
+ devDependenciesToInstall,
43
+ dependenciesToInstall,
44
+ projectPackageJson,
45
+ o3rPackageJsonPath: packageJsonPath,
46
+ projectType: workspaceProject?.projectType
47
+ }, context.logger);
39
48
  return (0, schematics_1.chain)([
40
49
  (0, schematics_2.setupDependencies)({
41
50
  projectName: options.projectName,
42
- dependencies,
51
+ dependencies: {
52
+ ...dependencies,
53
+ ...externalDependenciesInfo
54
+ },
43
55
  ngAddToRun: depsInfo.o3rPeerDeps
44
56
  }),
45
57
  (0, cms_adapter_1.updateCmsAdapter)(options, __dirname)
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAEoC;AAIpC,gDAQyB;AAIzB,gDAEwB;AAKxB,MAAM,qBAAqB,GAAG;IAC5B,QAAQ;CACT,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,qCAAO,0CAA0C,GAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,GAAG,EAAE,iBAA+C,EAAE,EAAE,CAAC,CAAC,CAAC;QACxL,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;wBACxE,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QACzG,MAAM,CAAC,OAAO,CAAC,IAAA,gDAAmC,EAAC,qBAAqB,EAAE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACnI,YAAY,CAAC,GAAG,CAAC,GAAG;gBAClB,UAAU,EAAE,CAAC;wBACX,KAAK;wBACL,KAAK,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;qBAChC,CAAC;aACH,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;YACF,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC;SACrC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAEoC;AAIpC,gDAQyB;AAIzB,gDAEwB;AAKxB;;GAEG;AACH,MAAM,qBAAqB,GAAa,EACvC,CAAC;AAEF;;GAEG;AACH,MAAM,wBAAwB,GAAG;IAC/B,2BAA2B;IAC3B,sBAAsB;IACtB,QAAQ;CACT,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC;QACjD,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,gBAAgB,GAAG,gBAAgB,EAAE,IAAI,IAAI,GAAG,CAAC;QACvD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAgB,CAAC;QAE3G,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;wBACxE,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAEzG,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAAC;YAC3D,wBAAwB;YACxB,qBAAqB;YACrB,kBAAkB;YAClB,kBAAkB,EAAE,eAAe;YACnC,WAAW,EAAE,gBAAgB,EAAE,WAAW;SAC3C,EACD,OAAO,CAAC,MAAM,CACb,CAAC;QACF,OAAO,IAAA,kBAAK,EAAC;YACX,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE;oBACZ,GAAG,YAAY;oBACf,GAAG,wBAAwB;iBAC5B;gBACD,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;YACF,IAAA,8BAAgB,EAAC,OAAO,EAAE,SAAS,CAAC;SACrC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}