@ama-sdk/schematics 11.2.0-prerelease.9 → 11.3.0-prerelease.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "11.2.0-prerelease.9",
+  "version": "11.3.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -57,18 +57,18 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^11.2.0-prerelease.9",
-    "@angular-devkit/core": "~18.1.0",
-    "@angular-devkit/schematics": "~18.1.0",
+    "@ama-sdk/core": "^11.3.0-prerelease.0",
+    "@angular-devkit/core": "~18.2.0",
+    "@angular-devkit/schematics": "~18.2.0",
     "@angular-devkit/schematics-cli": "^18.0.5",
-    "@angular/cli": "~18.1.0",
-    "@o3r/schematics": "^11.2.0-prerelease.9",
+    "@angular/cli": "~18.2.0",
+    "@o3r/schematics": "^11.3.0-prerelease.0",
     "@openapitools/openapi-generator-cli": "~2.13.0",
-    "@schematics/angular": "~18.1.0"
+    "@schematics/angular": "~18.2.0"
   },
   "dependencies": {
-    "@angular-devkit/core": "~18.1.0",
-    "@angular-devkit/schematics": "~18.1.0",
+    "@angular-devkit/core": "~18.2.0",
+    "@angular-devkit/schematics": "~18.2.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
@@ -79,18 +79,18 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^11.2.0-prerelease.9",
+    "@ama-sdk/core": "^11.3.0-prerelease.0",
     "@angular-devkit/schematics-cli": "^18.0.5",
-    "@angular-eslint/eslint-plugin": "~18.1.0",
-    "@angular/cli": "~18.1.0",
+    "@angular-eslint/eslint-plugin": "~18.3.0",
+    "@angular/cli": "~18.2.0",
     "@nx/eslint-plugin": "~19.5.0",
     "@nx/jest": "~19.5.0",
-    "@o3r/build-helpers": "^11.2.0-prerelease.9",
-    "@o3r/eslint-plugin": "^11.2.0-prerelease.9",
-    "@o3r/schematics": "^11.2.0-prerelease.9",
-    "@o3r/test-helpers": "^11.2.0-prerelease.9",
+    "@o3r/build-helpers": "^11.3.0-prerelease.0",
+    "@o3r/eslint-plugin": "^11.3.0-prerelease.0",
+    "@o3r/schematics": "^11.3.0-prerelease.0",
+    "@o3r/test-helpers": "^11.3.0-prerelease.0",
     "@openapitools/openapi-generator-cli": "~2.13.0",
-    "@schematics/angular": "~18.1.0",
+    "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin-ts": "~2.4.0",
     "@types/jest": "~29.5.2",
     "@types/js-yaml": "^4.0.5",
@@ -107,7 +107,7 @@
     "cpy-cli": "^5.0.0",
     "eslint": "^8.57.0",
     "eslint-import-resolver-node": "^0.3.9",
-    "eslint-plugin-jest": "~28.7.0",
+    "eslint-plugin-jest": "~28.8.0",
     "eslint-plugin-jsdoc": "~48.11.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "^54.0.0",
@@ -140,7 +140,7 @@
     "tsc-watch": "^6.0.4",
     "yaml-eslint-parser": "^1.2.2"
   },
-  "openApiSupportedVersion": "~7.4.0",
+  "openApiSupportedVersion": "~7.8.0",
   "engines": {
     "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
   },

package/schematics/helpers/read-package.js

@@ -6,7 +6,7 @@ const path = require("node:path");
 /** Get generator package.json */
 const readPackageJson = async () => {
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-    return JSON.parse(await node_fs_1.promises.readFile(packageJsonPath, { encoding: 'utf-8' }));
+    return JSON.parse(await node_fs_1.promises.readFile(packageJsonPath, { encoding: 'utf8' }));
 };
 exports.readPackageJson = readPackageJson;
 //# sourceMappingURL=read-package.js.map

package/schematics/migrate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAqC1D;;;GAGG;AACH,eAAO,MAAM,OAAO,YAAa,8BAA8B,wBAG9D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAsC1D;;;GAGG;AACH,eAAO,MAAM,OAAO,YAAa,8BAA8B,wBAG9D,CAAC"}

package/schematics/migrate/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate = void 0;
 const schematics_1 = require("@o3r/schematics");
 const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
 const update_regen_script_1 = require("../ng-update/typescript/v11.0/update-regen-script");
 const semver_1 = require("semver");
 const is_typescript_project_1 = require("../helpers/is-typescript-project");
@@ -20,7 +21,7 @@ const tsMigrationMap = {
  * @param options
  */
 function migrateFn(options) {
-    const currentVersion = require((0, node_path_1.resolve)(__dirname, '..', '..', 'package.json')).version;
+    const currentVersion = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' })).version;
     const to = options.to || currentVersion;
     const minimumVersion = (0, semver_1.minVersion)(to);
     return (tree, context) => {

package/schematics/ng-add/index.js

@@ -56,7 +56,7 @@ exports.updatePackageJsonScripts = updatePackageJsonScripts;
  * @param tree
  */
 const createOpenApiToolsConfig = (tree) => {
-    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
+    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
     const openApiGeneratorVersion = amaSdkSchematicsPackageJsonContent.openApiSupportedVersion.replace(/\^|~/, '');
     const openApiDefaultStorageDir = '.openapi-generator';
     if (tree.exists(openApiConfigPath)) {
@@ -85,7 +85,7 @@ const createOpenApiToolsConfig = (tree) => {
  */
 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: 'utf-8' }));
+    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
     const amaSdkSchematicsOpenApiCliVersion = amaSdkSchematicsPackageJsonContent.peerDependencies?.['@openapitools/openapi-generator-cli'] || '';
     // eslint-disable-next-line @typescript-eslint/naming-convention
     packageJsonContent.devDependencies = { ...packageJsonContent.devDependencies, '@openapitools/openapi-generator-cli': amaSdkSchematicsOpenApiCliVersion };
@@ -114,7 +114,7 @@ const registerPackageSchematics = async (tree, context) => {
     if (!tree.exists('angular.json')) {
         return () => tree;
     }
-    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
+    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf8' }));
     const amaSdkSchematicsVersion = amaSdkSchematicsPackageJsonContent.version?.replace(/^v/, '');
     const schematicsDependencies = ['@o3r/schematics'];
     for (const dependency of schematicsDependencies) {

package/schematics/typescript/core/helpers/copy-referenced-files.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Replace all the local relative references using the new base relative path
+ * @param specContent
+ * @param newBaseRelativePath
+ */
+export declare function updateLocalRelativeRefs(specContent: string, newBaseRelativePath: string): string;
+/**
+ * Copy the local files referenced in the input spec file to the output directory
+ * @param specFilePath
+ * @param outputDirectory
+ */
+export declare function copyReferencedFiles(specFilePath: string, outputDirectory: string): Promise<string>;
+//# sourceMappingURL=copy-referenced-files.d.ts.map

package/schematics/typescript/core/helpers/copy-referenced-files.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copy-referenced-files.d.ts","sourceRoot":"","sources":["../../../../../schematics/typescript/core/helpers/copy-referenced-files.ts"],"names":[],"mappings":"AA6CA;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,UAQvF;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,mBA2BtF"}

package/schematics/typescript/core/helpers/copy-referenced-files.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateLocalRelativeRefs = updateLocalRelativeRefs;
+exports.copyReferencedFiles = copyReferencedFiles;
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const refMatcher = /\B['"]?[$]ref['"]?\s*:\s*([^#\n]+)/g;
+/**
+ * Extract the list of local references from a single spec file content
+ * @param specContent
+ * @param basePath
+ */
+function extractRefPaths(specContent, basePath) {
+    const refs = specContent.match(refMatcher);
+    return refs ?
+        refs
+            .map((capture) => capture.replace(refMatcher, '$1').replace(/['"]/g, ''))
+            .filter((refPath) => refPath.startsWith('.'))
+            .map((refPath) => (0, node_path_1.join)(basePath, refPath))
+        : [];
+}
+/**
+ * Recursively extract the list of local references starting from the input spec file
+ * @param specFilePath
+ * @param referenceFilePath
+ * @param visited
+ */
+async function extractRefPathRecursive(specFilePath, referenceFilePath, visited) {
+    const resolvedFilePath = (0, node_path_1.resolve)(specFilePath);
+    if (!visited.has(resolvedFilePath)) {
+        visited.add(resolvedFilePath);
+        const specContent = await (0, promises_1.readFile)(specFilePath, { encoding: 'utf8' });
+        const refPaths = extractRefPaths(specContent, (0, node_path_1.relative)((0, node_path_1.dirname)(referenceFilePath), (0, node_path_1.dirname)(specFilePath)));
+        const recursiveRefPaths = await Promise.all(refPaths.map((refPath) => extractRefPathRecursive((0, node_path_1.join)((0, node_path_1.dirname)(referenceFilePath), refPath), referenceFilePath, visited)));
+        return [
+            ...refPaths,
+            ...recursiveRefPaths.flat()
+        ];
+    }
+    return [];
+}
+/**
+ * Replace all the local relative references using the new base relative path
+ * @param specContent
+ * @param newBaseRelativePath
+ */
+function updateLocalRelativeRefs(specContent, newBaseRelativePath) {
+    const formatPath = (inputPath) => (inputPath.startsWith('.') ? inputPath : `./${inputPath}`).replace(/\\+/g, '/');
+    return specContent.replace(refMatcher, (match, ref) => {
+        const refPath = ref.replace(/['"]/g, '');
+        return refPath.startsWith('.') ?
+            match.replace(refPath, formatPath((0, node_path_1.normalize)(node_path_1.posix.join(newBaseRelativePath.replaceAll(node_path_1.sep, node_path_1.posix.sep), refPath))))
+            : match;
+    });
+}
+/**
+ * Copy the local files referenced in the input spec file to the output directory
+ * @param specFilePath
+ * @param outputDirectory
+ */
+async function copyReferencedFiles(specFilePath, outputDirectory) {
+    const dedupe = (paths) => ([...new Set(paths)]);
+    const allRefPaths = await extractRefPathRecursive(specFilePath, specFilePath, new Set());
+    const refPaths = dedupe(allRefPaths);
+    if (refPaths.length) {
+        if ((0, node_fs_1.existsSync)(outputDirectory)) {
+            await (0, promises_1.rm)(outputDirectory, { recursive: true });
+        }
+        // Calculate the lowest level base path to keep the same directory structure
+        const maxDepth = Math.max(...refPaths.map((refPath) => refPath.split('..').length));
+        const basePath = (0, node_path_1.join)(specFilePath, '../'.repeat(maxDepth));
+        const baseRelativePath = (0, node_path_1.relative)(basePath, (0, node_path_1.dirname)(specFilePath));
+        // Copy the files
+        await Promise.all(refPaths.map(async (refPath) => {
+            const sourcePath = (0, node_path_1.join)((0, node_path_1.dirname)(specFilePath), refPath);
+            const destPath = (0, node_path_1.join)(outputDirectory, baseRelativePath, refPath);
+            if (!(0, node_fs_1.existsSync)((0, node_path_1.dirname)(destPath))) {
+                await (0, promises_1.mkdir)((0, node_path_1.dirname)(destPath), { recursive: true });
+            }
+            await (0, promises_1.copyFile)(sourcePath, destPath);
+        }));
+        return (0, node_path_1.join)(outputDirectory, baseRelativePath);
+    }
+    return '';
+}
+//# sourceMappingURL=copy-referenced-files.js.map

package/schematics/typescript/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAgPvE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,2CAA2C,wBAG3F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AA2PvE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,2CAA2C,wBAG3F,CAAC"}

package/schematics/typescript/core/index.js

@@ -9,6 +9,7 @@ const node_url_1 = require("node:url");
 const semver = require("semver");
 const tree_glob_1 = require("../../helpers/tree-glob");
 const open_api_cli_generator_1 = require("../../code-generator/open-api-cli-generator/open-api-cli.generator");
+const copy_referenced_files_1 = require("./helpers/copy-referenced-files");
 const path_extractor_1 = require("./helpers/path-extractor");
 const JAVA_OPTIONS = ['specPath', 'specConfigPath', 'globalProperty', 'outputPath'];
 const OPEN_API_TOOLS_OPTIONS = ['generatorName', 'output', 'inputSpec', 'config', 'globalProperty'];
@@ -123,11 +124,20 @@ function ngGenerateTypescriptSDKFn(options) {
         let specContent;
         if (node_url_1.URL.canParse(generatorOptions.specPath) && (new node_url_1.URL(generatorOptions.specPath)).protocol.startsWith('http')) {
             specContent = await (await fetch(generatorOptions.specPath)).text();
+            specContent = (0, copy_referenced_files_1.updateLocalRelativeRefs)(specContent, path.dirname(generatorOptions.specPath));
         }
         else {
             const specPath = path.isAbsolute(generatorOptions.specPath) || !options.directory ?
                 generatorOptions.specPath : path.join(options.directory, generatorOptions.specPath);
-            specContent = (0, node_fs_1.readFileSync)(specPath, { encoding: 'utf-8' }).toString();
+            specContent = (0, node_fs_1.readFileSync)(specPath, { encoding: 'utf8' }).toString();
+            if (path.relative(process.cwd(), specPath).startsWith('..')) {
+                // TODO would be better to create files on tree instead of FS
+                // https://github.com/AmadeusITGroup/otter/issues/2078
+                const newRelativePath = await (0, copy_referenced_files_1.copyReferencedFiles)(specPath, './spec-local-references');
+                if (newRelativePath) {
+                    specContent = (0, copy_referenced_files_1.updateLocalRelativeRefs)(specContent, newRelativePath);
+                }
+            }
         }
         try {
             JSON.parse(specContent);