@o3r/core 10.2.8 → 10.2.9

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/core",
3
- "version": "10.2.8",
3
+ "version": "10.2.9",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -26,7 +26,7 @@
26
26
  "@ngrx/store": "~17.2.0",
27
27
  "@nrwl/devkit": "~18.2.0",
28
28
  "@nx/angular": "~18.2.0",
29
- "@o3r/telemetry": "^10.2.8",
29
+ "@o3r/telemetry": "^10.2.9",
30
30
  "@schematics/angular": "~17.3.0",
31
31
  "chokidar": "^3.5.2",
32
32
  "globby": "^11.1.0",
@@ -64,7 +64,7 @@
64
64
  }
65
65
  },
66
66
  "dependencies": {
67
- "@o3r/schematics": "^10.2.8",
67
+ "@o3r/schematics": "^10.2.9",
68
68
  "tslib": "^2.6.2",
69
69
  "uuid": "^9.0.0"
70
70
  },
@@ -74,7 +74,7 @@
74
74
  "@ngrx/router-store": "~17.2.0",
75
75
  "@ngrx/effects": "~17.2.0",
76
76
  "@ngrx/store-devtools": "~17.2.0",
77
- "@o3r/store-sync": "^10.2.8",
77
+ "@o3r/store-sync": "^10.2.9",
78
78
  "@types/jest": "~29.5.2",
79
79
  "nx": "~18.2.0",
80
80
  "@typescript-eslint/parser": "^7.2.0",
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAGlK,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AA8F7D;;;GAGG;AACH,eAAO,MAAM,iBAAiB,sDAA6D,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAGlK,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAkG7D;;;GAGG;AACH,eAAO,MAAM,iBAAiB,sDAA6D,CAAC"}
@@ -40,11 +40,16 @@ function ngGenerateServiceFn(options) {
40
40
  const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
41
41
  let packageName = destination;
42
42
  if (workspaceProject?.projectType !== 'application') {
43
- let rec = '..';
44
- while (!tree.exists(path.resolve(destination, rec, 'package.json')) && path.resolve(destination, rec) !== '/') {
45
- rec = path.join('..', rec);
43
+ let currentDirectory = path.normalize(destination);
44
+ const parent = '..';
45
+ // Find the package.json file in the project directory
46
+ while (!currentDirectory.includes(parent) && !tree.exists(path.join(currentDirectory, 'package.json'))) {
47
+ currentDirectory = path.join(currentDirectory, parent);
46
48
  }
47
- packageName = JSON.parse(tree.read(path.resolve(destination, rec, 'package.json')).toString()).name?.split('/')[0] || destination;
49
+ if (currentDirectory.includes(parent)) {
50
+ throw new schematics_2.O3rCliError('Could not find package.json in the project directory.');
51
+ }
52
+ packageName = JSON.parse(tree.read(path.join(currentDirectory, 'package.json')).toString()).name?.split('/')[0] || destination;
48
53
  }
49
54
  const templateData = {
50
55
  ...core_1.strings,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/service/index.ts"],"names":[],"mappings":"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"}