@o3r/apis-manager 10.2.0-prerelease.13 → 10.2.0-prerelease.15

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/apis-manager",
3
- "version": "10.2.0-prerelease.13",
3
+ "version": "10.2.0-prerelease.15",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -11,11 +11,11 @@
11
11
  "otter-module"
12
12
  ],
13
13
  "peerDependencies": {
14
- "@ama-sdk/core": "^10.2.0-prerelease.13",
14
+ "@ama-sdk/core": "^10.2.0-prerelease.15",
15
15
  "@angular-devkit/schematics": "~17.2.0",
16
16
  "@angular/common": "~17.2.0",
17
17
  "@angular/core": "~17.2.0",
18
- "@o3r/schematics": "^10.2.0-prerelease.13",
18
+ "@o3r/schematics": "^10.2.0-prerelease.15",
19
19
  "@schematics/angular": "~17.2.0",
20
20
  "rxjs": "^7.8.1",
21
21
  "typescript": "~5.3.3"
@@ -1,4 +1,4 @@
1
- import { Rule } from '@angular-devkit/schematics';
1
+ import { type Rule } from '@angular-devkit/schematics';
2
2
  import type { NgAddSchematicsSchema } from './schema';
3
3
  /**
4
4
  * Add Otter apis manager to an Angular Project
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAGvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAoDtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiDtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
@@ -2,56 +2,57 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ngAdd = void 0;
4
4
  const schematics_1 = require("@angular-devkit/schematics");
5
- const schematics_2 = require("@o3r/schematics");
6
5
  const path = require("node:path");
6
+ const reportMissingSchematicsDep = (logger) => (reason) => {
7
+ logger.error(`[ERROR]: Adding @o3r/apis-manager has failed.
8
+ You need to install '@o3r/schematics' to be able to use the o3r apis-manager package. Please run 'ng add @o3r/schematics'.`);
9
+ throw reason;
10
+ };
7
11
  /**
8
12
  * Add Otter apis manager to an Angular Project
9
13
  * @param options
10
14
  */
11
15
  function ngAddFn(options) {
12
- return async (tree, context) => {
13
- try {
14
- const { setupDependencies, getO3rPeerDeps, applyEsLintFix, getWorkspaceConfig, getProjectNewDependenciesTypes } = await Promise.resolve().then(() => require('@o3r/schematics'));
15
- const { updateApiDependencies } = await Promise.resolve().then(() => require('../helpers/update-api-deps'));
16
- const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
17
- const depsInfo = getO3rPeerDeps(packageJsonPath);
18
- const rulesToExecute = [];
19
- const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
20
- const projectType = workspaceProject?.projectType || 'application';
21
- if (projectType === 'application') {
22
- rulesToExecute.push(updateApiDependencies(options));
23
- }
24
- const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
25
- acc[dep] = {
26
- inManifest: [{
27
- range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
28
- types: getProjectNewDependenciesTypes(workspaceProject)
29
- }],
30
- ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
31
- };
32
- return acc;
33
- }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
34
- return () => (0, schematics_1.chain)([
35
- ...rulesToExecute,
36
- options.skipLinter ? schematics_1.noop : applyEsLintFix(),
37
- setupDependencies({
38
- projectName: options.projectName,
39
- dependencies,
40
- ngAddToRun: depsInfo.o3rPeerDeps
41
- })
42
- ])(tree, context);
43
- }
44
- catch (e) {
45
- // o3r apis-manager needs o3r/schematics as peer dep.
46
- context.logger.error(`[ERROR]: Adding @o3r/apis-manager has failed.
47
- You need to install '@o3r/schematics' to be able to use the o3r apis-manager package. Please run 'ng add @o3r/schematics' .`);
48
- throw (e);
16
+ return async (tree) => {
17
+ const { getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
18
+ const { setupDependencies, getO3rPeerDeps, applyEsLintFix, getWorkspaceConfig, getProjectNewDependenciesTypes } = await Promise.resolve().then(() => require('@o3r/schematics'));
19
+ const { updateApiDependencies } = await Promise.resolve().then(() => require('../helpers/update-api-deps'));
20
+ const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
21
+ const depsInfo = getO3rPeerDeps(packageJsonPath);
22
+ const rulesToExecute = [];
23
+ const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
24
+ const projectType = workspaceProject?.projectType || 'application';
25
+ if (projectType === 'application') {
26
+ rulesToExecute.push(updateApiDependencies(options));
49
27
  }
28
+ const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
29
+ acc[dep] = {
30
+ inManifest: [{
31
+ range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
32
+ types: getProjectNewDependenciesTypes(workspaceProject)
33
+ }],
34
+ ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
35
+ };
36
+ return acc;
37
+ }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
38
+ return () => (0, schematics_1.chain)([
39
+ ...rulesToExecute,
40
+ options.skipLinter ? schematics_1.noop : applyEsLintFix(),
41
+ setupDependencies({
42
+ projectName: options.projectName,
43
+ dependencies,
44
+ ngAddToRun: depsInfo.o3rPeerDeps
45
+ })
46
+ ]);
50
47
  };
51
48
  }
52
49
  /**
53
50
  * Add Otter apis manager to an Angular Project
54
51
  * @param options
55
52
  */
56
- exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
53
+ const ngAdd = (options) => async (_, { logger }) => {
54
+ const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
55
+ return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
56
+ };
57
+ exports.ngAdd = ngAdd;
57
58
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAuF;AACvF,gDAAiG;AACjG,kCAAkC;AAGlC;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAI,CAAC;YACH,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,8BAA8B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YAClJ,MAAM,EAAE,qBAAqB,EAAE,GAAG,2CAAa,4BAA4B,EAAC,CAAC;YAC7E,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAC5E,MAAM,QAAQ,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;YACjD,MAAM,cAAc,GAAW,EAAE,CAAC;YAClC,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnH,MAAM,WAAW,GAAG,gBAAgB,EAAE,WAAW,IAAI,aAAa,CAAC;YACnE,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;gBAClC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;oBACT,UAAU,EAAE,CAAC;4BACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;4BACxE,KAAK,EAAE,8BAA8B,CAAC,gBAAgB,CAAC;yBACxD,CAAC;oBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;iBAC3D,CAAC;gBACF,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;YAE1G,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;gBACjB,GAAG,cAAc;gBACjB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAI,CAAC,CAAC,CAAC,cAAc,EAAE;gBAC5C,iBAAiB,CAAC;oBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,YAAY;oBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;iBACjC,CAAC;aACH,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,qDAAqD;YACrD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;kIACuG,CAAC,CAAC;YAC9H,MAAM,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACH,CAAC,CAAC;AAGJ,CAAC;AAED;;;GAGG;AACU,QAAA,KAAK,GAAG,IAAA,kDAAqC,EAAC,OAAO,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAAoE;AACpE,kCAAkC;AAGlC,MAAM,0BAA0B,GAAG,CAAC,MAA2C,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,EAAE;IAClG,MAAM,CAAC,KAAK,CAAC;2HAC4G,CAAC,CAAC;IAC3H,MAAM,MAAM,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,EAAE;QACpB,MAAM,EAAE,uBAAuB,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QACpE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAE,kBAAkB,EAAE,8BAA8B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAClJ,MAAM,EAAE,qBAAqB,EAAE,GAAG,2CAAa,4BAA4B,EAAC,CAAC;QAC7E,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;QACjD,MAAM,cAAc,GAAW,EAAE,CAAC;QAClC,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,WAAW,GAAG,gBAAgB,EAAE,WAAW,IAAI,aAAa,CAAC;QACnE,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;YAClC,cAAc,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,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,8BAA8B,CAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,uBAAuB,CAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAE1G,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;YACjB,GAAG,cAAc;YACjB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAI,CAAC,CAAC,CAAC,cAAc,EAAE;YAC5C,iBAAiB,CAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY;gBACZ,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;SACH,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;IACrF,MAAM,EAAE,qCAAqC,EAAE,GAAG,MAAM,qCAAO,iBAAiB,GAAE,KAAK,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5H,OAAO,qCAAqC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AACjE,CAAC,CAAC;AAHW,QAAA,KAAK,SAGhB"}