@ama-sdk/create 10.1.0-prerelease.8 → 10.1.0-rc.0

package/README.md

@@ -33,6 +33,7 @@ npm create @ama-sdk typescript <project-name> -- --package-manager=yarn [...opti
 - `--spec-path`: Path to the swagger/open-api specification used to generate the SDK
 - `--package-manager`: Node package manager to be used (`npm` and `yarn` are available).
 - `--debug`: Enable schematics debug mode (including dry run).
+- `--exact-o3r-version` : use a pinned version for [otter packages](https://github.com/AmadeusITGroup/otter/blob/main/docs/README.md).
 
 > [!NOTE]
 > If the `--spec-path` is specified, the SDK will be generated based on this specification at the creation time.

package/index.js

@@ -3,6 +3,7 @@
 /* eslint-disable no-console */
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_child_process_1 = require("node:child_process");
+const url = require("node:url");
 const node_path_1 = require("node:path");
 const minimist = require("minimist");
 const packageManagerEnv = process.env.npm_config_user_agent?.split('/')[0];
@@ -33,10 +34,6 @@ if (!pck) {
 }
 const targetDirectory = (0, node_path_1.join)('.', name, pck);
 const schematicsPackage = (0, node_path_1.dirname)(require.resolve('@ama-sdk/schematics/package.json'));
-const schematicsToRun = [
-    `${schematicsPackage}:typescript-shell`,
-    ...(argv['spec-path'] ? [`${schematicsPackage}:typescript-core`] : [])
-];
 const getYarnVersion = () => {
     try {
         return (0, node_child_process_1.execSync)('yarn --version', {
@@ -61,21 +58,27 @@ const schematicArgs = [
     '--name', name,
     '--package', pck,
     '--package-manager', packageManager,
-    '--directory', targetDirectory,
-    ...(argv['spec-path'] ? ['--spec-path', argv['spec-path']] : []),
+    ...(argv['exact-o3r-version'] ? ['--exact-o3r-version'] : []),
     ...(typeof argv['o3r-metrics'] !== 'undefined' ? [`--${!argv['o3r-metrics'] ? 'no-' : ''}o3r-metrics`] : [])
 ];
-const getSchematicStepInfo = (schematic) => ({
-    args: [binPath, schematic, ...schematicArgs]
-});
+const resolveTargetDirectory = (0, node_path_1.resolve)(process.cwd(), targetDirectory);
 const run = () => {
+    const isSpecPathUrl = url.URL.canParse(argv['spec-path']);
     const runner = process.platform === 'win32' ? `${packageManager}.cmd` : packageManager;
     const steps = [
-        getSchematicStepInfo(schematicsToRun[0]),
+        { args: [binPath, `${schematicsPackage}:typescript-shell`, ...schematicArgs, '--directory', targetDirectory] },
         ...(packageManager === 'yarn'
-            ? [{ runner, args: ['set', 'version', getYarnVersion()], cwd: (0, node_path_1.resolve)(process.cwd(), targetDirectory) }]
+            ? [{ runner, args: ['set', 'version', getYarnVersion()], cwd: resolveTargetDirectory }]
             : []),
-        ...schematicsToRun.slice(1).map(getSchematicStepInfo)
+        ...(argv['spec-path'] ? [{
+                args: [
+                    binPath,
+                    `${schematicsPackage}:typescript-core`,
+                    ...schematicArgs,
+                    '--spec-path', isSpecPathUrl ? argv['spec-path'] : (0, node_path_1.relative)(resolveTargetDirectory, (0, node_path_1.resolve)(process.cwd(), argv['spec-path']))
+                ],
+                cwd: resolveTargetDirectory
+            }] : [])
     ];
     const errors = steps
         .map((step) => (0, node_child_process_1.spawnSync)(step.runner || process.execPath, step.args, { stdio: 'inherit', cwd: step.cwd || process.cwd() }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/create",
-  "version": "10.1.0-prerelease.8",
+  "version": "10.1.0-rc.0",
   "publishConfig": {
     "access": "public"
   },
@@ -17,14 +17,14 @@
     "prepare:publish": "prepare-publish ./dist"
   },
   "dependencies": {
-    "@ama-sdk/core": "^10.1.0-prerelease.8",
-    "@ama-sdk/schematics": "^10.1.0-prerelease.8",
+    "@ama-sdk/core": "10.1.0-rc.0",
+    "@ama-sdk/schematics": "10.1.0-rc.0",
     "@angular-devkit/core": "~17.2.0",
     "@angular-devkit/schematics": "~17.2.0",
     "@angular-devkit/schematics-cli": "~17.2.0",
     "@angular/cli": "~17.2.0",
-    "@o3r/schematics": "^10.1.0-prerelease.8",
-    "@openapitools/openapi-generator-cli": "~2.9.0",
+    "@o3r/schematics": "10.1.0-rc.0",
+    "@openapitools/openapi-generator-cli": "~2.10.0",
     "@schematics/angular": "~17.2.0",
     "minimist": "^1.2.6",
     "rxjs": "^7.8.1",
@@ -37,10 +37,10 @@
     "@nx/eslint-plugin": "~18.0.2",
     "@nx/jest": "~18.0.2",
     "@nx/js": "~18.0.2",
-    "@o3r/build-helpers": "^10.1.0-prerelease.8",
-    "@o3r/eslint-config-otter": "^10.1.0-prerelease.8",
-    "@o3r/eslint-plugin": "^10.1.0-prerelease.8",
-    "@o3r/test-helpers": "^10.1.0-prerelease.8",
+    "@o3r/build-helpers": "^10.1.0-rc.0",
+    "@o3r/eslint-config-otter": "^10.1.0-rc.0",
+    "@o3r/eslint-plugin": "^10.1.0-rc.0",
+    "@o3r/test-helpers": "^10.1.0-rc.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",