@ama-openapi/core 0.0.0-placeholder.1 → 0.0.0-placeholder.10

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ama-openapi/core",
-  "version": "0.0.0-placeholder.1",
+  "version": "0.0.0-placeholder.10",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
-  "typings": "./src/public_api.d.mts",
+  "types": "./src/public_api.d.mts",
   "main": "./src/public_api.mjs",
   "description": "Package exposing core function to manage OpenAPI dependencies",
   "keywords": [
@@ -34,7 +34,7 @@
     },
     ".": {
       "module": "./src/public_api.mjs",
-      "typings": "./src/public_api.d.mts",
+      "types": "./src/public_api.d.mts",
       "default": "./src/public_api.mjs"
     }
   },
@@ -62,10 +62,10 @@
     "@nx/eslint-plugin": "~21.6.0",
     "@nx/jest": "~21.6.0",
     "@nx/js": "~21.6.0",
-    "@o3r/build-helpers": "~0.0.0",
-    "@o3r/eslint-plugin": "~0.0.0",
-    "@o3r/telemetry": "~0.0.0",
-    "@o3r/test-helpers": "~0.0.0",
+    "@o3r/build-helpers": "~0.0.0-placeholder.10",
+    "@o3r/eslint-plugin": "~0.0.0-placeholder.10",
+    "@o3r/telemetry": "~0.0.0-placeholder.10",
+    "@o3r/test-helpers": "~0.0.0-placeholder.10",
     "@stylistic/eslint-plugin": "~5.5.0",
     "@types/jest": "~29.5.2",
     "@types/js-yaml": "^4.0.5",
@@ -73,10 +73,11 @@
     "@types/node": "~22.18.0",
     "@types/semver": "^7.3.13",
     "@typescript-eslint/parser": "~8.46.0",
-    "angular-eslint": "~20.4.0",
+    "angular-eslint": "~20.5.0",
     "babel-jest": "^29.7.0",
+    "babel-plugin-transform-import-meta": "^2.0.0",
     "cpy-cli": "^6.0.0",
-    "eslint": "~9.38.0",
+    "eslint": "~9.39.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~4.4.0",
     "eslint-plugin-import": "~2.32.0",

package/renovate/default.json

@@ -3,5 +3,15 @@
   "description": "Default Renovate configuration for @ama-openapi packages",
   "extends": [
     "github>AmadeusITGroup/otter//tools/renovate/group/otter"
+  ],
+  "packageRules": [
+    {
+      "matchPackageNames": [
+        "/^@ama-openapi/",
+        "/^@redocly/"
+      ],
+      "groupName": "Build Tools dependencies",
+      "groupSlug": "build-tools-dependencies"
+    }
   ]
 }

package/schemas/manifest.schema.json

@@ -1,6 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "OpenApi specification package manifest",
+  "$id": "@ama-openapi/core/schemas/manifest.schema.json",
   "type": "object",
   "properties": {
     "models": {
@@ -19,31 +20,7 @@
     "transform": {
       "oneOf": [
         {
-          "type": "object",
-          "examples": [
-            {
-              "mask": { "data": true },
-              "fileRename": "MyPrefix_$1"
-            }
-          ],
-          "properties": {
-            "mask": {
-              "type": "object",
-              "description": "Mask to apply"
-            },
-            "titleRename": {
-              "type": "string",
-              "description": "Rename the model title. The keyword `$1` can be used to refer to original name (ex: a prefix would be `myPrefix_$1`)"
-            },
-            "fileRename": {
-              "type": "string",
-              "description": "Rename the outputted file (to be specified without extension)."
-            }
-          },
-          "additionalProperties": false,
-          "required": [
-            "fileRename"
-          ]
+          "$ref": "./transform.schema.json"
         },
         {
           "type": "string",
@@ -58,7 +35,7 @@
         {
           "path": "models/ExampleModel.v1.yaml",
           "transform": {
-            "mask": { "data": true },
+            "mask": { "properties": { "field": true } },
             "fileRename": "MyPrefix_$1"
           }
         }
@@ -67,32 +44,22 @@
         {
           "type": "boolean",
           "default": true,
-          "description": "Include the default model from the artifact"
+          "description": "Include the default model exposed by the artifact"
         },
         {
           "type": "string",
-          "description": "Path to the model to include as is"
+          "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": "object",
-          "description": "Model definition within a dependency",
+          "description": "Detailed model inclusion with optional transformations to apply",
           "properties": {
             "path": {
               "type": "string",
-              "description": "Path to the model in the artifact"
+              "description": "Path to the specific model to include as is. The path is relative to the artifact root (e.g., 'models/ExampleModel.v1.yaml')"
             },
             "transform": {
-              "oneOf": [
-                {
-                  "$ref": "#/definitions/transform"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/definitions/transform"
-                  }
-                }
-              ]
+              "$ref": "#/definitions/transform"
             }
           },
           "required": [

package/schemas/transform.schema.json

@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "@ama-openapi/core/schemas/transform.schema.json",
+  "title": "OpenApi mask definition",
+  "type": "object",
+  "examples": [
+    {
+      "mask": {
+        "data": true
+      }
+    },
+    {
+      "fileRename": "MyPrefix_$1"
+    },
+    {
+      "mask": {
+        "data": true
+      },
+      "fileRename": "MyPrefix_$1"
+    }
+  ],
+  "properties": {
+    "mask": {
+      "type": "object",
+      "description": "Mask to apply"
+    },
+    "titleRename": {
+      "type": "string",
+      "description": "Rename the model title. The keyword `$1` can be used to refer to original name (ex: a prefix would be `myPrefix_$1`)",
+      "examples": [
+        "myPrefix_$1",
+        "myModel"
+      ]
+    },
+    "fileRename": {
+      "type": "string",
+      "description": "Rename the outputted file. The keyword `$1` can be used to refer to the original name (ex: a prefix would be `my-prefix-$1`)",
+      "examples": [
+        "my-prefix-$1",
+        "myModel.v1.yaml"
+      ]
+    }
+  },
+  "additionalProperties": false
+}

package/src/constants.d.mts

@@ -1,15 +1,19 @@
 /** Directory containing the extracted module */
 export declare const OUTPUT_DIRECTORY = "models_external";
+/** Directory containing masked model when the mask is applied to referenced models */
+export declare const SUB_MASK_DIRECTORY = "sub-masks";
 /** Default manifest filenames to look for */
-export declare const DEFAULT_MANIFEST_FILENAMES: readonly ["package.json", "ama-openapi.manifest.json", "ama-openapi.manifest.yaml", "openapi.manifest.json", "openapi.manifest.yaml"];
+export declare const DEFAULT_MANIFEST_FILENAMES: readonly ["ama-openapi.manifest.json", "ama-openapi.manifest.yaml", "ama-openapi.manifest.yml", "openapi.manifest.json", "openapi.manifest.yaml", "openapi.manifest.yml", "package.json"];
 /** Key to mark masked properties */
 export declare const MASKED_PROPERTY_KEY = "x-internal-masked";
 /** Key to mark touched properties */
 export declare const TOUCHED_PROPERTY_KEY = "x-internal-touched";
-/** Key to indicate the source of the model */
+/** Key to indicate the source of the model (e.g: `<package>/<model-path>`) */
 export declare const SOURCE_PROPERTY_KEY = "x-internal-source";
 /** Key to indicate the version of the model */
 export declare const VERSION_PROPERTY_KEY = "x-internal-version";
-/** Key to indicate reference rewrites */
-export declare const REF_REWRITE_PROPERTY_KEY = "x-internal-reference-rewrite";
+/** Key to indicate the reference is rewritten */
+export declare const REF_REWRITTEN_PROPERTY_KEY = "x-internal-reference-rewritten";
+/** Key to indicate generated $ref references */
+export declare const GENERATED_REF_PROPERTY_KEY = "x-internal-reference-generated";
 //# sourceMappingURL=constants.d.mts.map

package/src/constants.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.mts","sourceRoot":"","sources":["../../src/constants.mts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAElD,6CAA6C;AAC7C,eAAO,MAAM,0BAA0B,uIAM7B,CAAC;AAIX,oCAAoC;AACpC,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AACvD,qCAAqC;AACrC,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,8CAA8C;AAC9C,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AACvD,+CAA+C;AAC/C,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,yCAAyC;AACzC,eAAO,MAAM,wBAAwB,iCAAiC,CAAC"}
+{"version":3,"file":"constants.d.mts","sourceRoot":"","sources":["../../src/constants.mts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAElD,sFAAsF;AACtF,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAE9C,6CAA6C;AAC7C,eAAO,MAAM,0BAA0B,2LAQ7B,CAAC;AAIX,oCAAoC;AACpC,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AACvD,qCAAqC;AACrC,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,8EAA8E;AAC9E,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AACvD,+CAA+C;AAC/C,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AACzD,iDAAiD;AACjD,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAC3E,gDAAgD;AAChD,eAAO,MAAM,0BAA0B,mCAAmC,CAAC"}

package/src/constants.mjs

@@ -1,22 +1,28 @@
 /** Directory containing the extracted module */
 export const OUTPUT_DIRECTORY = 'models_external';
+/** Directory containing masked model when the mask is applied to referenced models */
+export const SUB_MASK_DIRECTORY = 'sub-masks';
 /** Default manifest filenames to look for */
 export const DEFAULT_MANIFEST_FILENAMES = [
-    'package.json',
     'ama-openapi.manifest.json',
     'ama-openapi.manifest.yaml',
+    'ama-openapi.manifest.yml',
     'openapi.manifest.json',
-    'openapi.manifest.yaml'
+    'openapi.manifest.yaml',
+    'openapi.manifest.yml',
+    'package.json'
 ];
 // Internal property keys :
 /** Key to mark masked properties */
 export const MASKED_PROPERTY_KEY = 'x-internal-masked';
 /** Key to mark touched properties */
 export const TOUCHED_PROPERTY_KEY = 'x-internal-touched';
-/** Key to indicate the source of the model */
+/** Key to indicate the source of the model (e.g: `<package>/<model-path>`) */
 export const SOURCE_PROPERTY_KEY = 'x-internal-source';
 /** Key to indicate the version of the model */
 export const VERSION_PROPERTY_KEY = 'x-internal-version';
-/** Key to indicate reference rewrites */
-export const REF_REWRITE_PROPERTY_KEY = 'x-internal-reference-rewrite';
+/** Key to indicate the reference is rewritten */
+export const REF_REWRITTEN_PROPERTY_KEY = 'x-internal-reference-rewritten';
+/** Key to indicate generated $ref references */
+export const GENERATED_REF_PROPERTY_KEY = 'x-internal-reference-generated';
 //# sourceMappingURL=constants.mjs.map

package/src/constants.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"constants.mjs","sourceRoot":"","sources":["../../src/constants.mts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAElD,6CAA6C;AAC7C,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,cAAc;IACd,2BAA2B;IAC3B,2BAA2B;IAC3B,uBAAuB;IACvB,uBAAuB;CACf,CAAC;AAEX,2BAA2B;AAE3B,oCAAoC;AACpC,MAAM,CAAC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AACvD,qCAAqC;AACrC,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AACzD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AACvD,+CAA+C;AAC/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AACzD,yCAAyC;AACzC,MAAM,CAAC,MAAM,wBAAwB,GAAG,8BAA8B,CAAC"}
+{"version":3,"file":"constants.mjs","sourceRoot":"","sources":["../../src/constants.mts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAElD,sFAAsF;AACtF,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC;AAE9C,6CAA6C;AAC7C,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,2BAA2B;IAC3B,2BAA2B;IAC3B,0BAA0B;IAC1B,uBAAuB;IACvB,uBAAuB;IACvB,sBAAsB;IACtB,cAAc;CACN,CAAC;AAEX,2BAA2B;AAE3B,oCAAoC;AACpC,MAAM,CAAC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AACvD,qCAAqC;AACrC,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AACzD,8EAA8E;AAC9E,MAAM,CAAC,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;AACvD,+CAA+C;AAC/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AACzD,iDAAiD;AACjD,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAC;AAC3E,gDAAgD;AAChD,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAC"}

package/src/context.d.mts

@@ -0,0 +1,11 @@
+import type { Logger } from './logger.mjs';
+/**
+ * Context interface for Ama OpenAPI processing
+ */
+export interface Context {
+    /** Current working directory */
+    cwd: string;
+    /** Logger instance */
+    logger?: Logger;
+}
+//# sourceMappingURL=context.d.mts.map

package/src/context.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.mts","sourceRoot":"","sources":["../../src/context.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACP,MAAM,cAAc,CAAC;AAEtB;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,gCAAgC;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}

package/src/context.mjs

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=context.mjs.map

package/src/context.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.mjs","sourceRoot":"","sources":["../../src/context.mts"],"names":[],"mappings":""}

package/src/core/file-system/cleaner.d.mts

@@ -1,6 +1,7 @@
+import type { Context } from '../../context.mjs';
 /**
  * Clean the dependency output directory
- * @param cwd
+ * @param context
  */
-export declare const cleanOutputDirectory: (cwd: string) => Promise<void>;
+export declare const cleanOutputDirectory: (context: Context) => Promise<void>;
 //# sourceMappingURL=cleaner.d.mts.map

package/src/core/file-system/cleaner.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"cleaner.d.mts","sourceRoot":"","sources":["../../../../src/core/file-system/cleaner.mts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,kBAE/C,CAAC"}
+{"version":3,"file":"cleaner.d.mts","sourceRoot":"","sources":["../../../../src/core/file-system/cleaner.mts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAE3B;;;GAGG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,OAAO,kBAKpD,CAAC"}

package/src/core/file-system/cleaner.mjs

@@ -3,9 +3,12 @@ import { resolve, } from 'node:path';
 import { OUTPUT_DIRECTORY, } from '../../constants.mjs';
 /**
  * Clean the dependency output directory
- * @param cwd
+ * @param context
  */
-export const cleanOutputDirectory = (cwd) => {
-    return fs.rm(resolve(cwd, OUTPUT_DIRECTORY), { force: true, recursive: true });
+export const cleanOutputDirectory = (context) => {
+    const { cwd, logger } = context;
+    const outputDirectory = resolve(cwd, OUTPUT_DIRECTORY);
+    logger?.debug?.(`Removing directory ${outputDirectory}`);
+    return fs.rm(outputDirectory, { force: true, recursive: true });
 };
 //# sourceMappingURL=cleaner.mjs.map

package/src/core/file-system/cleaner.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"cleaner.mjs","sourceRoot":"","sources":["../../../../src/core/file-system/cleaner.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,IAAI,EAAE,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,OAAO,GACR,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAW,EAAE,EAAE;IAClD,OAAO,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACjF,CAAC,CAAC"}
+{"version":3,"file":"cleaner.mjs","sourceRoot":"","sources":["../../../../src/core/file-system/cleaner.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,IAAI,EAAE,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,OAAO,GACR,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAK7B;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACvD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACvD,MAAM,EAAE,KAAK,EAAE,CAAC,sBAAsB,eAAe,EAAE,CAAC,CAAC;IACzD,OAAO,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AAClE,CAAC,CAAC"}

package/src/core/file-system/parse-file.d.mts

@@ -1,10 +1,10 @@
 /**
- * Check if the file is a JSON file
+ * Parse a file content based on its extension
  * @param filePath
  */
 export declare const isJsonFile: (filePath: string) => boolean;
 /**
- *n Parse a file content based on its extension
+ * Parse a file content based on its extension
  * @param filePath
  */
 export declare const parseFile: <S>(filePath: string) => Promise<S>;

package/src/core/file-system/parse-file.mjs

@@ -1,14 +1,14 @@
 import { promises as fs, } from 'node:fs';
 import { load, } from 'js-yaml';
 /**
- * Check if the file is a JSON file
+ * Parse a file content based on its extension
  * @param filePath
  */
 export const isJsonFile = (filePath) => {
     return filePath.toLowerCase().endsWith('.json');
 };
 /**
- *n Parse a file content based on its extension
+ * Parse a file content based on its extension
  * @param filePath
  */
 export const parseFile = async (filePath) => {

package/src/core/file-system/relative-path.d.mts

@@ -0,0 +1,6 @@
+/**
+ *  Determine if a path is relative
+ * @param path
+ */
+export declare const isRelativePath: (path: string) => boolean;
+//# sourceMappingURL=relative-path.d.mts.map

package/src/core/file-system/relative-path.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relative-path.d.mts","sourceRoot":"","sources":["../../../../src/core/file-system/relative-path.mts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,OAE7C,CAAC"}

package/src/core/file-system/relative-path.mjs

@@ -0,0 +1,9 @@
+import { isAbsolute, } from 'node:path/posix';
+/**
+ *  Determine if a path is relative
+ * @param path
+ */
+export const isRelativePath = (path) => {
+    return !URL.canParse(path) && !isAbsolute(path);
+};
+//# sourceMappingURL=relative-path.mjs.map

package/src/core/file-system/relative-path.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"relative-path.mjs","sourceRoot":"","sources":["../../../../src/core/file-system/relative-path.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GACX,MAAM,iBAAiB,CAAC;AAEzB;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAW,EAAE;IACtD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC"}

package/src/core/file-system/write-model.d.mts

@@ -1,7 +1,9 @@
+import type { Context } from '../../context.mjs';
 import type { RetrievedDependencyModel } from '../manifest/extract-dependency-models.mjs';
 /**
  * Write the model file in the dependencies folder.
  * @param retrievedModel
+ * @param context
  */
-export declare const writeModelFile: (retrievedModel: RetrievedDependencyModel) => Promise<void>;
+export declare const writeModelFile: (retrievedModel: RetrievedDependencyModel, context: Context) => Promise<void>;
 //# sourceMappingURL=write-model.d.mts.map

package/src/core/file-system/write-model.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"write-model.d.mts","sourceRoot":"","sources":["../../../../src/core/file-system/write-model.mts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAEnD;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAU,gBAAgB,wBAAwB,kBAS5E,CAAC"}
+{"version":3,"file":"write-model.d.mts","sourceRoot":"","sources":["../../../../src/core/file-system/write-model.mts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAEnD;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAU,gBAAgB,wBAAwB,EAAE,SAAS,OAAO,kBAiB9F,CAAC"}

package/src/core/file-system/write-model.mjs

@@ -1,16 +1,25 @@
-import { promises as fs, } from 'node:fs';
+import { existsSync, promises as fs, } from 'node:fs';
+import { EOL, } from 'node:os';
 import { dirname, } from 'node:path';
 /**
  * Write the model file in the dependencies folder.
  * @param retrievedModel
+ * @param context
  */
-export const writeModelFile = async (retrievedModel) => {
+export const writeModelFile = async (retrievedModel, context) => {
     const { outputFilePath, content } = retrievedModel;
+    const { logger } = context;
+    const directory = dirname(outputFilePath);
     try {
-        await fs.mkdir(dirname(outputFilePath), { recursive: true });
+        logger?.debug?.(`Creating directory for model file at ${directory}`);
+        await fs.mkdir(directory, { recursive: true });
     }
     catch {
-        // ignore folder creation failure because it can be due to existing one. If not the next command will fail.
+        logger?.debug?.(`Directory ${directory} may already exist, continuing...`);
+    }
+    if (existsSync(outputFilePath)) {
+        logger?.warn(`The file ${outputFilePath} already exist and will be replaced.`
+            + `${EOL}This may be due to a previous model extraction, please verify or apply a "fileRename" value to the associated Transform.`);
     }
     await fs.writeFile(outputFilePath, content, { encoding: 'utf8' });
 };

package/src/core/file-system/write-model.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"write-model.mjs","sourceRoot":"","sources":["../../../../src/core/file-system/write-model.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,IAAI,EAAE,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,OAAO,GACR,MAAM,WAAW,CAAC;AAKnB;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,cAAwC,EAAE,EAAE;IAC/E,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;IACnD,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,2GAA2G;IAC7G,CAAC;IAED,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC,CAAC"}
+{"version":3,"file":"write-model.mjs","sourceRoot":"","sources":["../../../../src/core/file-system/write-model.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,QAAQ,IAAI,EAAE,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,GAAG,GACJ,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,OAAO,GACR,MAAM,WAAW,CAAC;AAQnB;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,cAAwC,EAAE,OAAgB,EAAE,EAAE;IACjG,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;IACnD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1C,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC;QACrE,MAAM,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,EAAE,KAAK,EAAE,CAAC,aAAa,SAAS,mCAAmC,CAAC,CAAC;IAC7E,CAAC;IAED,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/B,MAAM,EAAE,IAAI,CAAC,YAAY,cAAc,sCAAsC;cACzE,GAAG,GAAG,0HAA0H,CAAC,CAAC;IACxI,CAAC;IAED,MAAM,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;AACpE,CAAC,CAAC"}

package/src/core/manifest/extract-dependency-models.d.mts

@@ -1,4 +1,4 @@
-import type { Logger } from '../../logger.mjs';
+import type { Context } from '../../context.mjs';
 import type { Manifest, Model, Transform } from './manifest.mjs';
 /**
  * Extracted dependency model information
@@ -13,11 +13,11 @@ export interface RetrievedDependencyModel {
     /** Content of the model file */
     content: string;
     /** Model definition from the manifest */
-    model: Model & {
-        path: string;
-    };
-    /** Indicates if the model file is a JSON file */
-    isJson: boolean;
+    model: Model & Required<Pick<Model, 'path'>>;
+    /** Indicates if the input model file is a JSON file */
+    isInputJson: boolean;
+    /** Indicates if the output model file is a JSON file */
+    isOutputJson: boolean;
     /** Absolute path to the artifact root folder */
     artifactBasePath: string;
     /** Absolute path to the output for the generated file */
@@ -25,11 +25,19 @@ export interface RetrievedDependencyModel {
     /** Mask to apply */
     transform?: Transform;
 }
+/**
+ * Extract dependency model given full model definition
+ * @param artifactName
+ * @param model
+ * @param transformPromise
+ * @param context
+ * @param outputDirectory
+ */
+export declare const extractDependencyModelsObject: (artifactName: string, model: Model, transformPromise: Promise<Transform | undefined>, context: Context, outputDirectory?: string) => Promise<RetrievedDependencyModel>;
 /**
  * Extract dependency models from the manifest
- * @param cwd
  * @param manifest
- * @param _logger
+ * @param context
  */
-export declare const extractDependencyModels: (cwd: string, manifest: Manifest, _logger?: Logger) => Promise<RetrievedDependencyModel>[];
+export declare const extractDependencyModels: (manifest: Manifest, context: Context) => Promise<RetrievedDependencyModel>[];
 //# sourceMappingURL=extract-dependency-models.d.mts.map

package/src/core/manifest/extract-dependency-models.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-dependency-models.d.mts","sourceRoot":"","sources":["../../../../src/core/manifest/extract-dependency-models.mts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EACV,MAAM,EACP,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EACV,QAAQ,EACR,KAAK,EACL,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,sCAAsC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,KAAK,EAAE,KAAK,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,iDAAiD;IACjD,MAAM,EAAE,OAAO,CAAC;IAChB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAiGD;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,KAAK,MAAM,EAAE,UAAU,QAAQ,EAAE,UAAU,MAAM,wCAUxF,CAAC"}
+{"version":3,"file":"extract-dependency-models.d.mts","sourceRoot":"","sources":["../../../../src/core/manifest/extract-dependency-models.mts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,KAAK,EACV,QAAQ,EACR,KAAK,EACL,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,2BAA2B;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,sCAAsC;IACtC,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,KAAK,EAAE,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7C,uDAAuD;IACvD,WAAW,EAAE,OAAO,CAAC;IACrB,wDAAwD;IACxD,YAAY,EAAE,OAAO,CAAC;IACtB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AA4ED;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,GACxC,cAAc,MAAM,EACpB,OAAO,KAAK,EACZ,kBAAkB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,EAChD,SAAS,OAAO,EAChB,wBAAkC,KAAG,OAAO,CAAC,wBAAwB,CA2BtE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,UAAU,QAAQ,EAAE,SAAS,OAAO,wCAU3E,CAAC"}