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

package/src/core/transforms/apply-mask.mjs

@@ -1,57 +1,157 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument -- due to unknown object structure */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access -- due to unknown object structure */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment -- due to unknown object structure */
+import { existsSync, promises as fs, } from 'node:fs';
+import { basename, dirname, posix, relative, resolve, sep, } from 'node:path';
+import { GENERATED_REF_PROPERTY_KEY, SUB_MASK_DIRECTORY, } from '../../constants.mjs';
+import { isRelativePath, } from '../file-system/relative-path.mjs';
+import { extractDependencyModelsObject, } from '../manifest/extract-dependency-models.mjs';
 /**
- * Recursively apply the mask to model properties
- * @param modelProperties
- * @param maskProperties
+ * Determine the sub-mask file name for a given $ref and parent keys
+ * @param ref
+ * @param parents
  */
-const maskModelProperties = (modelProperties, maskProperties) => {
-    return Object.fromEntries(Object.entries(modelProperties)
-        .filter(([key]) => !!maskProperties && key in maskProperties && maskProperties[key] !== false)
-        .map(([key, value]) => typeof maskProperties[key] === 'object' ? [key, maskModelProperties(value, maskProperties[key])] : [key, value]));
-};
+const determineSubMaskFileName = (ref, parents) => `${parents.map((parent) => parent.charAt(0)?.toLocaleUpperCase() + parent.substring(1)).join('')}_${basename(ref)}`;
 /**
- * Recursively apply the sub-mask to the specification
- * @param specification
- * @param mask
+ * Determine the sub-mask path for a given retrieved model and mask file name
+ * @param retrievedModel
  */
-const applySubMask = (specification, mask) => {
-    const result = { ...specification };
-    if (!mask || typeof mask !== 'object') {
-        return result;
-    }
-    if ('properties' in mask && 'properties' in result) {
-        result.properties = maskModelProperties(result.properties, mask.properties);
+const determineSubMaskPath = (retrievedModel) => {
+    return resolve(dirname(retrievedModel.outputFilePath), SUB_MASK_DIRECTORY, basename(retrievedModel.outputFilePath).replace(/\.[^.]+$/, ''));
+};
+const splitArtifactModelPaths = async (modelPath, context) => {
+    const { logger } = context;
+    let projectRoot = modelPath;
+    let artifactName = '';
+    while (!artifactName && projectRoot !== dirname(projectRoot)) {
+        projectRoot = dirname(projectRoot);
+        const packageJsonPath = resolve(projectRoot, 'package.json');
+        if (existsSync(packageJsonPath)) {
+            artifactName = JSON.parse(await fs.readFile(packageJsonPath, { encoding: 'utf8' })).name;
+            logger?.debug?.(`Found artifact named ${artifactName} for ${modelPath} sub reference`);
+        }
     }
-    const maskAdditionalProperties = Object.entries(mask)
-        .filter(([key]) => key !== 'properties');
-    if (maskAdditionalProperties.length > 0) {
-        delete result.type;
-        delete result.properties;
-        for (const [key, value] of maskAdditionalProperties) {
-            if (typeof value === 'object') {
-                result[key] = Array.isArray(value)
-                    ? value.map((subMask) => applyMask(result[key], subMask))
-                    : value && Object.fromEntries(Object.entries(value).map(([maskKey, subMask]) => ([maskKey, applyMask(result[key][maskKey], subMask)])));
+    return {
+        artifactName,
+        path: relative(projectRoot, modelPath)
+    };
+};
+/**
+ * Create the function to apply mask to a given model
+ * @param retrievedModel
+ * @param context
+ */
+const createMaskApplier = (retrievedModel, context) => {
+    const { logger } = context;
+    /**
+     * Handle a $ref in the specification during mask application when the mask needs to be applied to the referenced model
+     * @param node
+     * @param mask
+     * @param parents
+     */
+    const handleReference = async (node, mask, parents) => {
+        if (!isRelativePath(node.$ref)) {
+            logger?.debug?.(`Skipping $ref "${node.$ref}" from mask application as it is not a relative path`);
+            return node;
+        }
+        if (node.$ref.startsWith('#')) {
+            logger?.debug?.(`Skipping $ref "${node.$ref}" from mask application as it is local reference`);
+            return node;
+        }
+        const modelPath = resolve(dirname(retrievedModel.modelPath), node.$ref);
+        const maskFileName = determineSubMaskFileName(node.$ref, parents);
+        const outputFileDirectory = determineSubMaskPath(retrievedModel);
+        const transform = {
+            fileRename: maskFileName,
+            mask
+        };
+        const { artifactName, path } = await splitArtifactModelPaths(modelPath, context);
+        const model = {
+            path,
+            transform
+        };
+        const extractedModel = await extractDependencyModelsObject(artifactName, model, Promise.resolve(transform), context, outputFileDirectory);
+        const { processModel } = await import('../process.mjs');
+        await Promise.all(processModel([Promise.resolve(extractedModel)], context));
+        return {
+            ...node,
+            $ref: relative(dirname(retrievedModel.outputFilePath), extractedModel.outputFilePath).replaceAll(sep, posix.sep),
+            [GENERATED_REF_PROPERTY_KEY]: true
+        };
+    };
+    /**
+     * Apply the property field mask to the specification
+     * @param node
+     * @param mask
+     * @param parents
+     */
+    const applyPropertyFieldMask = async (node, mask, parents) => {
+        if (node === null || node === undefined) {
+            return node;
+        }
+        if (typeof mask !== 'object') {
+            return node;
+        }
+        if (typeof node !== 'object') {
+            return undefined;
+        }
+        return Object.fromEntries(await Promise.all(Object.entries(mask)
+            .filter(([key]) => key in node)
+            .map(async ([key, subMask]) => ([key, await applySubMask(node[key], subMask, [...parents, key])]))));
+    };
+    /**
+     * Recursively apply the sub-mask to the specification
+     * @param node
+     * @param mask
+     * @param parents
+     */
+    const applySubMask = async (node, mask, parents) => {
+        if (node === null || node === undefined) {
+            return node;
+        }
+        if (typeof node !== 'object') {
+            return typeof mask === 'object' ? node : mask;
+        }
+        else if (Array.isArray(node)) {
+            if (Array.isArray(mask)) {
+                return (await Promise.all(node
+                    .map((item, index) => applySubMask(item, mask[index] ?? {}, parents)))).filter((item) => item !== undefined);
             }
-            else {
-                result[key] = value;
+        }
+        else {
+            if ('$ref' in node && typeof node.$ref === 'string' && mask && typeof mask === 'object' && 'properties' in mask) {
+                return handleReference(node, mask, parents);
             }
+            return typeof mask === 'object'
+                ? {
+                    ...node,
+                    ...Object.fromEntries(await Promise.all(Object.entries(mask)
+                        .filter(([key]) => key in node)
+                        .map(async ([key, subMask]) => {
+                        const newParents = [...parents, key];
+                        return [
+                            key,
+                            key === 'properties'
+                                ? await applyPropertyFieldMask(node[key], subMask, parents)
+                                : await applySubMask(node[key], subMask, newParents)
+                        ];
+                    })))
+                }
+                : (mask ? node : undefined);
         }
-    }
-    return result;
+    };
+    return applySubMask;
 };
 /**
  * Apply the mask to the model
  * @param specification
  * @param retrievedModel
- * @param _logger
+ * @param context
  */
-export const applyMask = (specification, retrievedModel, _logger) => {
-    if (!retrievedModel.transform) {
+export const applyMask = (specification, retrievedModel, context) => {
+    const { logger } = context;
+    if (!retrievedModel.transform || !retrievedModel.transform.mask) {
+        logger?.debug?.(`No mask found for model from ${retrievedModel.artifactName} at ${retrievedModel.model.path}, skipping mask application`);
         return specification;
     }
-    return applySubMask(specification, retrievedModel.transform.mask);
+    const maskApplier = createMaskApplier(retrievedModel, context);
+    return maskApplier(specification, retrievedModel.transform.mask, []);
 };
 //# sourceMappingURL=apply-mask.mjs.map

package/src/core/transforms/apply-mask.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"apply-mask.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/apply-mask.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apply-mask.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/apply-mask.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,QAAQ,IAAI,EAAE,GACf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,QAAQ,EACR,OAAO,EACP,KAAK,EACL,QAAQ,EACR,OAAO,EACP,GAAG,GACJ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EACL,cAAc,GACf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,6BAA6B,GAE9B,MAAM,2CAA2C,CAAC;AAUnD;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAU,EAAE,CAC1E,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;AAEtH;;;GAGG;AACH,MAAM,oBAAoB,GAAG,CAAC,cAAwC,EAAU,EAAE;IAChF,OAAO,OAAO,CACZ,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,EACtC,kBAAkB,EAClB,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAChE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,KAAK,EAAE,SAAiB,EAAE,OAAgB,EAAmD,EAAE;IAC7H,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,IAAI,WAAW,GAAG,SAAS,CAAC;IAC5B,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,OAAO,CAAC,YAAY,IAAI,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7D,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QACnC,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC7D,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAChC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACzF,MAAM,EAAE,KAAK,EAAE,CAAC,wBAAwB,YAAY,QAAQ,SAAS,gBAAgB,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IACD,OAAO;QACL,YAAY;QACZ,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,iBAAiB,GAAG,CAAC,cAAwC,EAAE,OAAgB,EAAE,EAAE;IACvF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B;;;;;OAKG;IACH,MAAM,eAAe,GAAG,KAAK,EAAoC,IAAO,EAAE,IAAS,EAAE,OAAiB,EAAc,EAAE;QACpH,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,KAAK,EAAE,CAAC,kBAAkB,IAAI,CAAC,IAAI,sDAAsD,CAAC,CAAC;YACnG,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,EAAE,KAAK,EAAE,CAAC,kBAAkB,IAAI,CAAC,IAAI,kDAAkD,CAAC,CAAC;YAC/F,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,wBAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClE,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG;YAChB,UAAU,EAAE,YAAY;YACxB,IAAI;SACL,CAAC;QAEF,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,MAAM,uBAAuB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjF,MAAM,KAAK,GAAG;YACZ,IAAI;YACJ,SAAS;SACM,CAAC;QAElB,MAAM,cAAc,GAAG,MAAM,6BAA6B,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAC1I,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACxD,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAE5E,OAAO;YACL,GAAG,IAAI;YACP,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;YAChH,CAAC,0BAA0B,CAAC,EAAE,IAAI;SACnC,CAAC;IACJ,CAAC,CAAC;IAEF;;;;;OAKG;IACH,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAS,EAAE,IAAS,EAAE,OAAiB,EAAgB,EAAE;QAC7F,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aACjB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC;aAC9B,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CACrG,CACF,CAAC;IACJ,CAAC,CAAC;IAEF;;;;;OAKG;IACH,MAAM,YAAY,GAAG,KAAK,EAAE,IAAS,EAAE,IAAS,EAAE,OAAiB,EAAgB,EAAE;QACnF,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CACvB,IAAI;qBACD,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC,CACxE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,MAAM,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBAChH,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC;YACD,OAAO,OAAO,IAAI,KAAK,QAAQ;gBAC7B,CAAC,CAAC;oBACA,GAAG,IAAI;oBACP,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;yBACjB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC;yBAC9B,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE;wBAC5B,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC;wBACrC,OAAO;4BACL,GAAG;4BACH,GAAG,KAAK,YAAY;gCAClB,CAAC,CAAC,MAAM,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;gCAC3D,CAAC,CAAC,MAAM,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC;yBACvD,CAAC;oBACJ,CAAC,CAAC,CACL,CACF;iBACF;gBACD,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAA8B,aAAgB,EAAE,cAAwC,EAAE,OAAgB,EAAkB,EAAE;IACrJ,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,IAAI,CAAC,cAAc,CAAC,SAAS,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAChE,MAAM,EAAE,KAAK,EAAE,CAAC,gCAAgC,cAAc,CAAC,YAAY,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,CAAC;QAC1I,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC/D,OAAO,WAAW,CAAC,aAAa,EAAE,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAe,CAAC;AACrF,CAAC,CAAC"}

package/src/core/transforms/rename.d.mts

@@ -1,10 +1,13 @@
-import type { Logger } from '../../logger.mjs';
+import type { Context } from '../../context.mjs';
 import type { RetrievedDependencyModel } from '../manifest/extract-dependency-models.mjs';
+import type { SpecificationFile } from './transform.mjs';
 /**
  * Rename the title of the specification
  * @param specification
  * @param retrievedModel
- * @param _logger
+ * @param context
  */
-export declare const renameTitle: <S extends object>(specification: S, retrievedModel: RetrievedDependencyModel, _logger?: Logger) => S;
+export declare const renameTitle: <S extends SpecificationFile>(specification: S, retrievedModel: RetrievedDependencyModel, context: Context) => S & {
+    title?: string;
+};
 //# sourceMappingURL=rename.d.mts.map

package/src/core/transforms/rename.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"rename.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/rename.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,eAAe,CAAC,EAAE,gBAAgB,wBAAwB,EAAE,UAAU,MAAM,KAAG,CAU5H,CAAC"}
+{"version":3,"file":"rename.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/rename.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,iBAAiB,EAAE,eAAe,CAAC,EAAE,gBAAgB,wBAAwB,EAAE,SAAS,OAAO,KAAG,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAY3J,CAAC"}

package/src/core/transforms/rename.mjs

@@ -2,12 +2,14 @@
  * Rename the title of the specification
  * @param specification
  * @param retrievedModel
- * @param _logger
+ * @param context
  */
-export const renameTitle = (specification, retrievedModel, _logger) => {
+export const renameTitle = (specification, retrievedModel, context) => {
+    const { logger } = context;
     if (retrievedModel.transform?.titleRename) {
-        let title = 'title' in specification ? specification.title : undefined;
-        title = title && title.replace(new RegExp(`^(${title})$`), retrievedModel.transform.titleRename);
+        logger?.debug?.(`Renaming title in model from ${retrievedModel.artifactName} at ${retrievedModel.modelPath}`);
+        let title = specification.title ?? undefined;
+        title = title?.replace(/^(.*)$/, retrievedModel.transform.titleRename);
         specification = {
             ...specification,
             title

package/src/core/transforms/rename.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"rename.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/rename.mts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAmB,aAAgB,EAAE,cAAwC,EAAE,OAAgB,EAAK,EAAE;IAC/H,IAAI,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;QAC1C,IAAI,KAAK,GAAuB,OAAO,IAAI,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAe,CAAC,CAAC,CAAC,SAAS,CAAC;QACrG,KAAK,GAAG,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACjG,aAAa,GAAG;YACd,GAAG,aAAa;YAChB,KAAK;SACN,CAAC;IACJ,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}
+{"version":3,"file":"rename.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/rename.mts"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAA8B,aAAgB,EAAE,cAAwC,EAAE,OAAgB,EAA0B,EAAE;IAC/J,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,IAAI,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;QAC1C,MAAM,EAAE,KAAK,EAAE,CAAC,gCAAgC,cAAc,CAAC,YAAY,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9G,IAAI,KAAK,GAAuB,aAAa,CAAC,KAAK,IAAI,SAAS,CAAC;QACjE,KAAK,GAAG,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACvE,aAAa,GAAG;YACd,GAAG,aAAa;YAChB,KAAK;SACN,CAAC;IACJ,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC"}

package/src/core/transforms/to-reference.d.mts

@@ -1,7 +1,10 @@
-import type { Logger } from '../../logger.mjs';
+import { GENERATED_REF_PROPERTY_KEY } from '../../constants.mjs';
+import type { Context } from '../../context.mjs';
 import type { RetrievedDependencyModel } from '../manifest/extract-dependency-models.mjs';
+import type { SpecificationFile } from './transform.mjs';
 type ReferenceSpecification = {
     $ref: string;
+    [GENERATED_REF_PROPERTY_KEY]: boolean;
     [x: string]: any;
 };
 /**
@@ -9,8 +12,8 @@ type ReferenceSpecification = {
  * The process will keep the x-vendor properties from the retrieved model
  * @param specification
  * @param retrievedModel
- * @param logger
+ * @param context
  */
-export declare const toReference: <S extends object>(specification: S, retrievedModel: RetrievedDependencyModel, logger?: Logger) => S | ReferenceSpecification;
+export declare const toReference: <S extends SpecificationFile>(specification: S, retrievedModel: RetrievedDependencyModel, context: Context) => S | ReferenceSpecification;
 export {};
 //# sourceMappingURL=to-reference.d.mts.map

package/src/core/transforms/to-reference.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"to-reference.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/to-reference.mts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,MAAM,EACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAEnD,KAAK,sBAAsB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,eAAe,CAAC,EAAE,gBAAgB,wBAAwB,EAAE,SAAS,MAAM,KAAG,CAAC,GAAG,sBAU/H,CAAC"}
+{"version":3,"file":"to-reference.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/to-reference.mts"],"names":[],"mappings":"AAMA,OAAO,EACL,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB,KAAK,sBAAsB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACtC,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,iBAAiB,EAAE,eAAe,CAAC,EAAE,gBAAgB,wBAAwB,EAAE,SAAS,OAAO,KAAG,CAAC,GAAG,sBAa3I,CAAC"}

package/src/core/transforms/to-reference.mjs

@@ -1,19 +1,23 @@
-import { relative, } from 'node:path';
+import { dirname, posix, relative, sep, } from 'node:path';
+import { GENERATED_REF_PROPERTY_KEY, } from '../../constants.mjs';
 /**
  * Transform the specification to a single reference if no transformation required
  * The process will keep the x-vendor properties from the retrieved model
  * @param specification
  * @param retrievedModel
- * @param logger
+ * @param context
  */
-export const toReference = (specification, retrievedModel, logger) => {
+export const toReference = (specification, retrievedModel, context) => {
+    const { logger } = context;
     if (retrievedModel.transform) {
         logger?.debug?.(`The specification ${retrievedModel.modelPath} has transform, the conversion to reference will be ignored`);
         return specification;
     }
+    logger?.debug?.(`Converting specification ${retrievedModel.modelPath} to a $ref`);
     return {
-        $ref: relative(retrievedModel.outputFilePath, retrievedModel.modelPath),
-        ...Object.fromEntries(Object.entries(retrievedModel).filter(([key]) => key.startsWith('x-')))
+        ...Object.fromEntries(Object.entries(retrievedModel).filter(([key]) => key.startsWith('x-'))),
+        [GENERATED_REF_PROPERTY_KEY]: true,
+        $ref: relative(dirname(retrievedModel.outputFilePath), retrievedModel.modelPath).replaceAll(sep, posix.sep)
     };
 };
 //# sourceMappingURL=to-reference.mjs.map

package/src/core/transforms/to-reference.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"to-reference.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/to-reference.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,GACT,MAAM,WAAW,CAAC;AAanB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAmB,aAAgB,EAAE,cAAwC,EAAE,MAAe,EAA8B,EAAE;IACvJ,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,CAAC,qBAAqB,cAAc,CAAC,SAAS,6DAA6D,CAAC,CAAC;QAC5H,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,CAAC,SAAS,CAAC;QACvE,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;KAC9F,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"to-reference.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/to-reference.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,KAAK,EACL,QAAQ,EACR,GAAG,GACJ,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAiB7B;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAA8B,aAAgB,EAAE,cAAwC,EAAE,OAAgB,EAA8B,EAAE;IACnK,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,CAAC,qBAAqB,cAAc,CAAC,SAAS,6DAA6D,CAAC,CAAC;QAC5H,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,CAAC,4BAA4B,cAAc,CAAC,SAAS,YAAY,CAAC,CAAC;IAClF,OAAO;QACL,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7F,CAAC,0BAA0B,CAAC,EAAE,IAAI;QAClC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;KAC5G,CAAC;AACJ,CAAC,CAAC"}

package/src/core/transforms/transform.d.mts

@@ -1,7 +1,11 @@
-import type { Logger } from '../../logger.mjs';
+import type { Context } from '../../context.mjs';
 import type { RetrievedDependencyModel } from '../manifest/extract-dependency-models.mjs';
+/**
+ * Specification file as supported by {@link https://redocly.com/| Redocly}
+ */
+export type SpecificationFile = Record<string, any>;
 /**
  * Transform a specification with specified transformation function
  */
-export type Transform<S extends object = object, T = any> = (specification: S, retrievedModel: RetrievedDependencyModel, logger?: Logger) => T | Promise<T>;
+export type Transform<S extends SpecificationFile = SpecificationFile, T = any> = (specification: S, retrievedModel: RetrievedDependencyModel, context: Context) => T | Promise<T>;
 //# sourceMappingURL=transform.d.mts.map

package/src/core/transforms/transform.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/transform.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE,cAAc,EAAE,wBAAwB,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"transform.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/transform.mts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE,cAAc,EAAE,wBAAwB,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC"}

package/src/core/transforms/update-references.d.mts

@@ -1,15 +1,11 @@
-import { REF_REWRITE_PROPERTY_KEY } from '../../constants.mjs';
-import type { Logger } from '../../logger.mjs';
+import type { Context } from '../../context.mjs';
 import type { RetrievedDependencyModel } from '../manifest/extract-dependency-models.mjs';
-type AdditionalAnnotation = {
-    [REF_REWRITE_PROPERTY_KEY]: boolean;
-};
+import type { SpecificationFile } from './transform.mjs';
 /**
  * Update the $ref references in the specification to be relative to the model path
  * @param specification
  * @param receivedModel
- * @param _logger
+ * @param context
  */
-export declare const updateReferences: <S extends object>(specification: S, receivedModel: RetrievedDependencyModel, _logger?: Logger) => S & AdditionalAnnotation;
-export {};
+export declare const updateReferences: <S extends SpecificationFile>(specification: S, receivedModel: RetrievedDependencyModel, context: Context) => S;
 //# sourceMappingURL=update-references.d.mts.map

package/src/core/transforms/update-references.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"update-references.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/update-references.mts"],"names":[],"mappings":"AAQA,OAAO,EACL,wBAAwB,EACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EACV,MAAM,EACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AAMnD,KAAK,oBAAoB,GAAG;IAC1B,CAAC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe,wBAAwB,EAAE,UAAU,MAAM,KAAG,CAAC,GAAG,oBA4BpI,CAAC"}
+{"version":3,"file":"update-references.d.mts","sourceRoot":"","sources":["../../../../src/core/transforms/update-references.mts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAI3B,OAAO,KAAK,EACV,wBAAwB,EACzB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,iBAAiB,EAAE,eAAe,CAAC,EAAE,eAAe,wBAAwB,EAAE,SAAS,OAAO,KAAG,CAoD3I,CAAC"}

package/src/core/transforms/update-references.mjs

@@ -1,17 +1,14 @@
-import { isAbsolute, resolve, } from 'node:path';
-import { dirname, relative, } from 'node:path/posix';
-import { REF_REWRITE_PROPERTY_KEY, } from '../../constants.mjs';
-const isRelativePath = (path) => {
-    return !URL.canParse(path) && !isAbsolute(path);
-};
+import { basename, dirname, posix, relative, resolve, sep, } from 'node:path';
+import { GENERATED_REF_PROPERTY_KEY, REF_REWRITTEN_PROPERTY_KEY, } from '../../constants.mjs';
+import { isRelativePath, } from '../file-system/relative-path.mjs';
 /**
  * Update the $ref references in the specification to be relative to the model path
  * @param specification
  * @param receivedModel
- * @param _logger
+ * @param context
  */
-export const updateReferences = (specification, receivedModel, _logger) => {
-    let hasTouchedReference = false;
+export const updateReferences = (specification, receivedModel, context) => {
+    const { logger } = context;
     const walkSpecification = (specItem) => {
         if (typeof specItem === 'object') {
             if (specItem === null) {
@@ -21,19 +18,40 @@ export const updateReferences = (specification, receivedModel, _logger) => {
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-return -- due to unknown object structure
                 return specItem.map((item) => walkSpecification(item));
             }
-            return Object.fromEntries(Object.entries(specItem).map(([key, value]) => {
+            let hasTouchedReference = false;
+            const newSpecItem = Object.fromEntries(Object.entries(specItem).map(([key, value]) => {
                 if (key === '$ref' && typeof value === 'string' && isRelativePath(value)) {
-                    value = relative(dirname(receivedModel.outputFilePath), resolve(dirname(receivedModel.modelPath), value));
-                    hasTouchedReference = true;
+                    if (GENERATED_REF_PROPERTY_KEY in specItem && !!specItem[GENERATED_REF_PROPERTY_KEY]) {
+                        logger?.debug?.(`Skipping the rewriting of the generated $ref reference "${value}" in model from ${receivedModel.artifactName} at ${receivedModel.modelPath}`);
+                    }
+                    else {
+                        if (value.startsWith('#')) {
+                            const localRefItem = value.slice(1).split('/').reduce((acc, part) => part ? acc?.[part] : acc, specification);
+                            if (localRefItem) {
+                                logger?.debug?.(`The local reference "${value}"  in model from ${receivedModel.artifactName} at ${receivedModel.modelPath} `
+                                    + 'is still valid, no rewriting needed');
+                                return [key, value];
+                            }
+                            logger?.debug?.(`The local reference "${value}"  in model from ${receivedModel.artifactName} at ${receivedModel.modelPath} `
+                                + 'is not valid anymore, the original model will be used as base for rewriting');
+                            value = basename(receivedModel.modelPath) + value;
+                        }
+                        const rewrittenReference = relative(dirname(receivedModel.outputFilePath), resolve(dirname(receivedModel.modelPath), value)).replaceAll(sep, posix.sep);
+                        logger?.debug?.(`Rewriting $ref reference "${value}" to "${rewrittenReference}" in model from ${receivedModel.artifactName} at ${receivedModel.modelPath}`);
+                        value = rewrittenReference;
+                        hasTouchedReference = true;
+                    }
+                    return [key, value];
                 }
                 return [key, walkSpecification(value)];
             }));
+            return {
+                ...newSpecItem,
+                ...(hasTouchedReference ? { [REF_REWRITTEN_PROPERTY_KEY]: true } : {})
+            };
         }
         return specItem;
     };
-    return {
-        ...walkSpecification(specification),
-        [REF_REWRITE_PROPERTY_KEY]: hasTouchedReference
-    };
+    return walkSpecification(specification);
 };
 //# sourceMappingURL=update-references.mjs.map

package/src/core/transforms/update-references.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"update-references.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/update-references.mts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,OAAO,GACR,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,OAAO,EACP,QAAQ,GACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,cAAc,GAAG,CAAC,IAAY,EAAW,EAAE;IAC/C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AAClD,CAAC,CAAC;AAMF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAmB,aAAgB,EAAE,aAAuC,EAAE,OAAgB,EAA4B,EAAE;IAC1J,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAChC,MAAM,iBAAiB,GAAG,CAAK,QAAW,EAAK,EAAE;QAC/C,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,kGAAkG;gBAClG,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAM,CAAC;YAC9D,CAAC;YAED,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,QAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAChF,IAAI,GAAG,KAAK,MAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzE,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;oBAC1G,mBAAmB,GAAG,IAAI,CAAC;gBAC7B,CAAC;gBACD,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACzC,CAAC,CAAC,CAAM,CAAC;QACX,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,iBAAiB,CAAC,aAAa,CAAC;QACnC,CAAC,wBAAwB,CAAC,EAAE,mBAAmB;KAChD,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"update-references.mjs","sourceRoot":"","sources":["../../../../src/core/transforms/update-references.mts"],"names":[],"mappings":"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"}

package/src/main.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.mts","sourceRoot":"","sources":["../../src/main.mts"],"names":[],"mappings":"AAkCA,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,CA2CtH,CAAC"}
+{"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,14 +1,8 @@
 import { cwd, } from 'node:process';
 import { cleanOutputDirectory, } from './core/file-system/cleaner.mjs';
-import { writeModelFile, } from './core/file-system/write-model.mjs';
 import { extractDependencyModels, } from './core/manifest/extract-dependency-models.mjs';
 import { retrieveManifest, } from './core/manifest/manifest.mjs';
-import { deserialize, serialize, } from './core/serialization.mjs';
-import { addAnnotation, } from './core/transforms/add-annotation.mjs';
-import { applyMask, } from './core/transforms/apply-mask.mjs';
-import { renameTitle, } from './core/transforms/rename.mjs';
-import { toReference, } from './core/transforms/to-reference.mjs';
-import { updateReferences, } from './core/transforms/update-references.mjs';
+import { processModel, } from './core/process.mjs';
 /**
  * Run the process to download and write dependency models
  * @param workingDirectory
@@ -17,33 +11,23 @@ import { updateReferences, } from './core/transforms/update-references.mjs';
 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(workingDirectory);
-    const models = extractDependencyModels(workingDirectory, manifest, logger);
-    await cleanOutputDirectory(workingDirectory);
-    const results = await Promise.allSettled(models
-        .map(async (retrievedModelPromise) => {
-        const retrievedModel = await retrievedModelPromise;
-        logger?.debug?.(`Retrieving model from ${retrievedModel.artifactName} at ${retrievedModel.modelPath}`);
-        const modelObj = deserialize(retrievedModel.content, retrievedModel);
-        const transforms = [toReference, addAnnotation, applyMask, updateReferences, renameTitle];
-        transforms.reduce((acc, transform) => transform(acc, retrievedModel, logger), deserialize(retrievedModel.content, retrievedModel));
-        return {
-            ...retrievedModel,
-            content: serialize(modelObj, retrievedModel)
-        };
-    })
-        .map(async (processedModel) => {
-        await writeModelFile(await processedModel);
-    }));
+    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`);

package/src/main.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"main.mjs","sourceRoot":"","sources":["../../src/main.mts"],"names":[],"mappings":"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"}
+{"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"}