@ama-openapi/core 14.1.0-prerelease.4 → 14.1.0-prerelease.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-openapi/core",
-  "version": "14.1.0-prerelease.4",
+  "version": "14.1.0-prerelease.6",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -63,17 +63,17 @@
     "@nx/eslint-plugin": "~22.3.3",
     "@nx/jest": "~22.3.3",
     "@nx/js": "~22.3.3",
-    "@o3r/build-helpers": "~14.1.0-prerelease.4",
-    "@o3r/eslint-plugin": "~14.1.0-prerelease.4",
-    "@o3r/telemetry": "~14.1.0-prerelease.4",
-    "@o3r/test-helpers": "~14.1.0-prerelease.4",
-    "@stylistic/eslint-plugin": "~5.6.0",
+    "@o3r/build-helpers": "~14.1.0-prerelease.6",
+    "@o3r/eslint-plugin": "~14.1.0-prerelease.6",
+    "@o3r/telemetry": "~14.1.0-prerelease.6",
+    "@o3r/test-helpers": "~14.1.0-prerelease.6",
+    "@stylistic/eslint-plugin": "~5.7.0",
     "@types/jest": "~30.0.0",
     "@types/js-yaml": "^4.0.5",
     "@types/minimist": "^1.2.2",
     "@types/node": "~24.10.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.52.0",
+    "@typescript-eslint/parser": "~8.54.0",
     "angular-eslint": "~21.0.1",
     "babel-jest": "^30.0.5",
     "babel-plugin-transform-import-meta": "^2.0.0",
@@ -84,7 +84,7 @@
     "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
     "eslint-plugin-jest": "~29.12.0",
-    "eslint-plugin-jsdoc": "~61.5.0",
+    "eslint-plugin-jsdoc": "~61.7.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~62.0.0",
     "eslint-plugin-unused-imports": "~4.3.0",
@@ -99,7 +99,7 @@
     "ts-jest": "~29.4.0",
     "type-fest": "^5.3.1",
     "typescript": "~5.9.2",
-    "typescript-eslint": "~8.52.0"
+    "typescript-eslint": "~8.54.0"
   },
   "engines": {
     "node": "^20.19.0 || ^22.17.0 || ^24.0.0"

package/src/schema/configurations/model-definitions.d.mts

@@ -6,18 +6,19 @@ import type { SpecificationArtifact } from '../list-artifacts.mjs';
 export declare const getModelDefinitions: (artifacts: SpecificationArtifact[]) => {
     [k: string]: {
         oneOf: ({
-            type: string;
-            default: boolean;
-            description: string;
-            const?: undefined;
-            properties?: undefined;
-            required?: undefined;
-            additionalProperties?: undefined;
-        } | {
             const: string;
+            description: string;
             type?: undefined;
-            default?: undefined;
+            pattern?: undefined;
+        } | {
+            type: string;
+            pattern: string;
+            const?: undefined;
             description?: undefined;
+        } | {
+            type: string;
+            default: boolean;
+            description: string;
             properties?: undefined;
             required?: undefined;
             additionalProperties?: undefined;
@@ -26,8 +27,17 @@ export declare const getModelDefinitions: (artifacts: SpecificationArtifact[]) =
             description: string;
             properties: {
                 path: {
-                    const: string;
-                    description: string;
+                    oneOf: ({
+                        const: string;
+                        description: string;
+                        type?: undefined;
+                        pattern?: undefined;
+                    } | {
+                        type: string;
+                        pattern: string;
+                        const?: undefined;
+                        description?: undefined;
+                    })[];
                 };
                 transform: {
                     $ref: string;
@@ -36,7 +46,6 @@ export declare const getModelDefinitions: (artifacts: SpecificationArtifact[]) =
             required: string[];
             additionalProperties: boolean;
             default?: undefined;
-            const?: undefined;
         })[];
     };
 };

package/src/schema/configurations/model-definitions.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"model-definitions.d.mts","sourceRoot":"","sources":["../../../../src/schema/configurations/model-definitions.mts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAE/B;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,WAAW,qBAAqB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CrE,CAAC"}
+{"version":3,"file":"model-definitions.d.mts","sourceRoot":"","sources":["../../../../src/schema/configurations/model-definitions.mts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAW/B;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,WAAW,qBAAqB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDrE,CAAC"}

package/src/schema/configurations/model-definitions.mjs

@@ -1,5 +1,13 @@
 import { basename, } from 'node:path';
 import { generateModelNameRef, } from '../generate-model-name.mjs';
+/**
+ * Escape special characters in a string for use in a regular expression
+ * Note: This function can be removed on node >= 24 as `RegExp.escape` will be available natively
+ * @param str String to escape
+ */
+const regExpEscape = (str) => {
+    return str.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+};
 /**
  * Generate model definitions for the given artifacts
  * @param artifacts
@@ -11,6 +19,17 @@ export const getModelDefinitions = (artifacts) => {
             .filter((modelObj) => !!modelObj)
             .map(({ model }) => {
             const modelRef = generateModelNameRef(packageManifestName, model);
+            const pathSchemas = [
+                {
+                    const: model,
+                    description: 'Path to the specific model to include as is. The path is relative to the artifact root (e.g., "models/ExampleModel.v1.yaml")'
+                },
+                {
+                    type: 'string',
+                    // TODO: give users hint on the available inner paths (cf #3938)
+                    pattern: `^${regExpEscape(model)}#/.*$`
+                }
+            ];
             return [
                 `model-${modelRef}`,
                 {
@@ -22,16 +41,13 @@ export const getModelDefinitions = (artifacts) => {
                                     description: 'Include the default model exposed by the artifact'
                                 }]
                             : [],
-                        {
-                            const: model
-                        },
+                        ...pathSchemas,
                         {
                             type: 'object',
                             description: 'Detailed model inclusion with optional transformations to apply',
                             properties: {
                                 path: {
-                                    const: model,
-                                    description: "Path to the specific model to include as is. The path is relative to the artifact root (e.g., 'models/ExampleModel.v1.yaml')"
+                                    oneOf: pathSchemas
                                 },
                                 transform: {
                                     $ref: `#/definitions/transform-${modelRef}`

package/src/schema/configurations/model-definitions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"model-definitions.mjs","sourceRoot":"","sources":["../../../../src/schema/configurations/model-definitions.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AAKpC;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,SAAkC,EAAE,EAAE;IACxE,OAAO,MAAM,CAAC,WAAW,CACvB,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE;QAC/D,MAAM,mBAAmB,GAAG,eAAe,CAAC,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC5E,OAAO,MAAM;aACV,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aAChC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;YACjB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAClE,OAAO;gBACL,SAAS,QAAQ,EAAE;gBACnB;oBACE,KAAK,EAAE;wBACL,GAAG,eAAe,CAAC,IAAI;4BACrB,CAAC,CAAC,CAAC;oCACD,IAAI,EAAE,SAAS;oCACf,OAAO,EAAE,IAAI;oCACb,WAAW,EAAE,mDAAmD;iCACjE,CAAC;4BACF,CAAC,CAAC,EAAE;wBACN;4BACE,KAAK,EAAE,KAAK;yBACb;wBACD;4BACE,IAAI,EAAE,QAAQ;4BACd,WAAW,EAAE,iEAAiE;4BAC9E,UAAU,EAAE;gCACV,IAAI,EAAE;oCACJ,KAAK,EAAE,KAAK;oCACZ,WAAW,EAAE,8HAA8H;iCAC5I;gCACD,SAAS,EAAE;oCACT,IAAI,EAAE,2BAA2B,QAAQ,EAAE;iCAC5C;6BACF;4BACD,QAAQ,EAAE;gCACR,MAAM;6BACP;4BACD,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"model-definitions.mjs","sourceRoot":"","sources":["../../../../src/schema/configurations/model-definitions.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AAKpC;;;;GAIG;AACH,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC3C,OAAO,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,SAAkC,EAAE,EAAE;IACxE,OAAO,MAAM,CAAC,WAAW,CACvB,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE;QAC/D,MAAM,mBAAmB,GAAG,eAAe,CAAC,IAAI,IAAI,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC5E,OAAO,MAAM;aACV,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aAChC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;YACjB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,WAAW,GAAG;gBAClB;oBACE,KAAK,EAAE,KAAK;oBACZ,WAAW,EAAE,8HAA8H;iBAC5I;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,gEAAgE;oBAChE,OAAO,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,OAAO;iBACxC;aACF,CAAC;YAEF,OAAO;gBACL,SAAS,QAAQ,EAAE;gBACnB;oBACE,KAAK,EAAE;wBACL,GAAG,eAAe,CAAC,IAAI;4BACrB,CAAC,CAAC,CAAC;oCACD,IAAI,EAAE,SAAS;oCACf,OAAO,EAAE,IAAI;oCACb,WAAW,EAAE,mDAAmD;iCACjE,CAAC;4BACF,CAAC,CAAC,EAAE;wBACN,GAAG,WAAW;wBACd;4BACE,IAAI,EAAE,QAAQ;4BACd,WAAW,EAAE,iEAAiE;4BAC9E,UAAU,EAAE;gCACV,IAAI,EAAE;oCACJ,KAAK,EAAE,WAAW;iCACnB;gCACD,SAAS,EAAE;oCACT,IAAI,EAAE,2BAA2B,QAAQ,EAAE;iCAC5C;6BACF;4BACD,QAAQ,EAAE;gCACR,MAAM;6BACP;4BACD,oBAAoB,EAAE,KAAK;yBAC5B;qBACF;iBACF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC"}

package/src/main.d.mts

@@ -1,13 +0,0 @@
-import type { Logger } from './logger.mjs';
-/** Options for Install Dependencies */
-export interface InstallDependenciesOptions {
-    /** Logger instance */
-    logger?: Logger;
-}
-/**
- * Run the process to download and write dependency models
- * @param workingDirectory
- * @param options
- */
-export declare const installDependencies: (workingDirectory?: string, options?: InstallDependenciesOptions) => Promise<void>;
-//# sourceMappingURL=main.d.mts.map

package/src/main.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"main.d.mts","sourceRoot":"","sources":["../../src/main.mts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,MAAM,EACP,MAAM,cAAc,CAAC;AAEtB,uCAAuC;AACvC,MAAM,WAAW,0BAA0B;IACzC,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAU,yBAAwB,EAAE,UAAU,0BAA0B,KAAG,OAAO,CAAC,IAAI,CA6BtH,CAAC"}

package/src/main.mjs

@@ -1,35 +0,0 @@
-import { cwd, } from 'node:process';
-import { cleanOutputDirectory, } from './core/file-system/cleaner.mjs';
-import { extractDependencyModels, } from './core/manifest/extract-dependency-models.mjs';
-import { retrieveManifest, } from './core/manifest/manifest.mjs';
-import { processModel, } from './core/process.mjs';
-/**
- * Run the process to download and write dependency models
- * @param workingDirectory
- * @param options
- */
-export const installDependencies = async (workingDirectory = cwd(), options) => {
-    const { logger = console } = options || {};
-    const manifest = await retrieveManifest(workingDirectory, logger);
-    const context = {
-        cwd: workingDirectory,
-        logger
-    };
-    if (!manifest) {
-        logger?.info('No Manifest file discovered');
-        return;
-    }
-    await cleanOutputDirectory(context);
-    const models = extractDependencyModels(manifest, context);
-    const results = await Promise.allSettled(processModel(models, context));
-    const rejected = results
-        .filter((result) => result.status === 'rejected');
-    if (rejected.length > 0) {
-        logger?.error(`Failed to retrieve some models:`);
-        rejected.forEach((result) => logger?.error(result.reason));
-        await cleanOutputDirectory(context);
-        throw new Error('Failed to retrieve some models');
-    }
-    logger?.info(`Successfully retrieved all models`);
-};
-//# sourceMappingURL=main.mjs.map

package/src/main.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"main.mjs","sourceRoot":"","sources":["../../src/main.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,GACJ,MAAM,cAAc,CAAC;AAItB,OAAO,EACL,oBAAoB,GACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,uBAAuB,GACxB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EACL,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,YAAY,GACb,MAAM,oBAAoB,CAAC;AAW5B;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,gBAAgB,GAAG,GAAG,EAAE,EAAE,OAAoC,EAAiB,EAAE;IACzH,MAAM,EAAE,MAAM,GAAG,OAAO,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAClE,MAAM,OAAO,GAAG;QACd,GAAG,EAAE,gBAAgB;QACrB,MAAM;KACW,CAAC;IAEpB,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,EAAE,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC5C,OAAO;IACT,CAAC;IAED,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,uBAAuB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAExE,MAAM,QAAQ,GAAG,OAAO;SACrB,MAAM,CAAC,CAAC,MAAM,EAAmC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC;IAErF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACjD,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,EAAE,IAAI,CAAC,mCAAmC,CAAC,CAAC;AACpD,CAAC,CAAC"}