@ama-sdk/schematics 12.5.0-prerelease.3 → 12.5.0-prerelease.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "12.5.0-prerelease.3",
+  "version": "12.5.0-prerelease.30",
   "publishConfig": {
     "access": "public"
   },
@@ -54,9 +54,6 @@
     "@openapitools/openapi-generator-cli": {
       "optional": true
     },
-    "openapi-types": {
-      "optional": true
-    },
     "type-fest": {
       "optional": true
     },
@@ -65,12 +62,12 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^12.5.0-prerelease.3",
+    "@ama-sdk/core": "^12.5.0-prerelease.30",
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics-cli": "^19.0.0",
     "@angular/cli": "^19.0.0",
-    "@o3r/schematics": "^12.5.0-prerelease.3",
-    "@o3r/telemetry": "^12.5.0-prerelease.3",
+    "@o3r/schematics": "^12.5.0-prerelease.30",
+    "@o3r/telemetry": "^12.5.0-prerelease.30",
     "@openapitools/openapi-generator-cli": "^2.15.0",
     "openapi-types": "^12.0.0",
     "ts-node": "~10.9.2",
@@ -80,7 +77,7 @@
   "dependencies": {
     "@angular-devkit/core": "~19.2.0",
     "@angular-devkit/schematics": "~19.2.0",
-    "@o3r/schematics": "^12.5.0-prerelease.3",
+    "@o3r/schematics": "^12.5.0-prerelease.30",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
@@ -91,17 +88,17 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^12.5.0-prerelease.3",
+    "@ama-sdk/core": "^12.5.0-prerelease.30",
     "@angular-devkit/schematics-cli": "~19.2.0",
     "@angular/cli": "~19.2.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@nx/eslint-plugin": "~20.8.0",
     "@nx/jest": "~20.8.0",
-    "@o3r/build-helpers": "^12.5.0-prerelease.3",
-    "@o3r/eslint-plugin": "^12.5.0-prerelease.3",
-    "@o3r/telemetry": "^12.5.0-prerelease.3",
-    "@o3r/test-helpers": "^12.5.0-prerelease.3",
-    "@openapitools/openapi-generator-cli": "~2.20.0",
+    "@o3r/build-helpers": "^12.5.0-prerelease.30",
+    "@o3r/eslint-plugin": "^12.5.0-prerelease.30",
+    "@o3r/telemetry": "^12.5.0-prerelease.30",
+    "@o3r/test-helpers": "^12.5.0-prerelease.30",
+    "@openapitools/openapi-generator-cli": "~2.21.0",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",
@@ -111,17 +108,17 @@
     "@types/node": "^20.0.0",
     "@types/pid-from-port": "^1.1.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.34.0",
+    "@typescript-eslint/parser": "~8.35.0",
     "angular-eslint": "~19.4.0",
     "commit-and-tag-version": "^12.0.0",
     "copyfiles": "^2.4.1",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.28.0",
+    "eslint": "~9.30.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
-    "eslint-plugin-import": "~2.31.0",
+    "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~28.13.0",
+    "eslint-plugin-jest": "~28.14.0",
     "eslint-plugin-jsdoc": "~50.8.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~56.0.0",
@@ -141,16 +138,16 @@
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.34.0"
+    "typescript-eslint": "~8.35.0"
   },
   "generatorDependencies": {
-    "@angular-eslint/eslint-plugin": "^19.0.0",
+    "@angular-eslint/eslint-plugin": "~19.2.0",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
     "@swc/cli": "~0.7.7",
     "@swc/core": "~1.12.0",
     "@swc/helpers": "~0.5.0",
-    "@typescript-eslint/eslint-plugin": "~8.34.0",
+    "@typescript-eslint/eslint-plugin": "~8.35.0",
     "jest-junit": "~16.0.0",
     "lint-staged": "^15.0.0",
     "minimist": "^1.2.6",

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAOlB;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAwCtC,CAAC;AAoGF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,MAAM,qBAAqB,SAAwC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAqBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqBlB;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAwCtC,CAAC;AA6GF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,MAAM,qBAAqB,SAAwC,CAAC"}

package/schematics/ng-add/index.js

@@ -8,17 +8,28 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const rxjs_1 = require("rxjs");
 const node_install_1 = require("../helpers/node-install");
-const packageJsonPath = '/package.json';
+const rootPackageJsonPath = '/package.json';
+const schematicsPackageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 const swaggerIgnorePath = '/.swagger-codegen-ignore';
 const openApiIgnorePath = '/.openapi-generator-ignore';
 const openApiConfigPath = 'openapitools.json';
+/**
+ * List of external dependencies to be added to the project as peer dependencies
+ */
+const dependenciesToInstall = [];
+/**
+ * List of external dependencies to be added to the project as dev dependencies
+ */
+const devDependenciesToInstall = [
+    '@openapitools/openapi-generator-cli'
+];
 /**
  * Rule to update package.json scripts using yeoman generator from `@ama-sdk/generator-sdk`
  * @param tree Tree
  * @param context SchematicContext
  */
 const updatePackageJsonScripts = (tree, context) => {
-    const packageJson = tree.readJson(packageJsonPath);
+    const packageJson = tree.readJson(rootPackageJsonPath);
     if (!(0, core_1.isJsonObject)(packageJson)) {
         context.logger.error('Failed to read correctly the package.json');
         return tree;
@@ -42,7 +53,7 @@ const updatePackageJsonScripts = (tree, context) => {
         return acc;
     }, packageJson.scripts);
     packageJson.scripts = scripts;
-    tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    tree.overwrite(rootPackageJsonPath, JSON.stringify(packageJson, null, 2));
     return tree;
 };
 exports.updatePackageJsonScripts = updatePackageJsonScripts;
@@ -57,7 +68,10 @@ const createOpenApiToolsConfig = (tree) => {
     const openApiDefaultStorageDir = '.openapi-generator';
     if (tree.exists(openApiConfigPath)) {
         const openapitoolsConfig = tree.readJson(openApiConfigPath);
-        openapitoolsConfig['generator-cli'] = { storageDir: openApiDefaultStorageDir, ...openapitoolsConfig['generator-cli'], version: openApiGeneratorVersion };
+        openapitoolsConfig['generator-cli'] = {
+            storageDir: openApiDefaultStorageDir, ...openapitoolsConfig['generator-cli'],
+            version: openApiGeneratorVersion
+        };
         tree.overwrite(openApiConfigPath, JSON.stringify(openapitoolsConfig));
     }
     else {
@@ -74,22 +88,25 @@ const createOpenApiToolsConfig = (tree) => {
 };
 /**
  * Install the npm open api generator cli package
- * @param tree
- * @param context
+ * @param options
  */
-const installOpenApiToolsCli = async (tree, context) => {
-    const packageJsonContent = tree.readJson(packageJsonPath);
-    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
-    const amaSdkSchematicsOpenApiCliVersion = amaSdkSchematicsPackageJsonContent.peerDependencies?.['@openapitools/openapi-generator-cli'] || '';
-    packageJsonContent.devDependencies = { ...packageJsonContent.devDependencies, '@openapitools/openapi-generator-cli': amaSdkSchematicsOpenApiCliVersion };
-    context.addTask(new node_install_1.DevInstall({
-        packageName: `@openapitools/openapi-generator-cli@${amaSdkSchematicsOpenApiCliVersion}`,
-        hideOutput: false,
-        quiet: false
-    }));
-    await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
-    tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
-    return () => tree;
+const installDependencies = (options) => {
+    return (tree, context) => {
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const projectDirectory = workspaceProject?.root || '.';
+        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall: devDependenciesToInstall,
+            dependenciesToInstall: dependenciesToInstall,
+            o3rPackageJsonPath: schematicsPackageJsonPath,
+            projectPackageJson,
+            projectType: workspaceProject?.projectType
+        }, context.logger);
+        return (0, schematics_2.setupDependencies)({
+            projectName: options.projectName,
+            dependencies: externalDependenciesInfo
+        });
+    };
 };
 /**
  * Replace the swagger ignore file with an openapi one
@@ -128,17 +145,16 @@ const registerPackageSchematics = async (tree, context) => {
 };
 /**
  * Add Otter ama-sdk-schematics to a Project
+ * @param options
  */
-function ngAddFn() {
-    return (tree, context) => (0, schematics_1.chain)([
+function ngAddFn(options) {
+    return () => (0, schematics_1.chain)([
         registerPackageSchematics,
         exports.updatePackageJsonScripts,
-        (t) => {
-            const packageJson = tree.readText(packageJsonPath);
-            const needsToInstallOpenApiGeneratorCli = /@ama-sdk\/schematics:typescript-/.test(packageJson);
-            return needsToInstallOpenApiGeneratorCli ? (0, schematics_1.chain)([replaceSwaggerIgnore, installOpenApiToolsCli, createOpenApiToolsConfig]) : t;
-        }
-    ])(tree, context);
+        replaceSwaggerIgnore,
+        installDependencies(options),
+        createOpenApiToolsConfig
+    ]);
 }
 /**
  * Add Otter ama-sdk-schematics to a Project

package/schematics/ng-update/typescript/v12.3/coverage-ignore.js

@@ -51,7 +51,7 @@ const updateJestConfigCoveragePathIgnorePatterns = (tree, context) => {
         const match = line.match(/^ */);
         const numberSpaces = match ? match[0].length : 0;
         const newNumber = (numberSpaces - numberSpaces % 2) / 2;
-        return line.replace(/^ */, Array.from({ length: newNumber }).fill(' ').join(''));
+        return line.replace(/^ */, ' '.repeat(newNumber));
     })
         .join('\n');
     tree.overwrite(filePath, content);