@squiz/dx-json-schema-lib 1.82.3 → 1.82.5

package/lib/JsonSchemaService.js

@@ -65,7 +65,31 @@ class JSONSchemaService {
                     callback(schema, data, pointer);
                 }
                 else {
-                    _1.defaultConfig.each(core, data, callback, schema, pointer);
+                    // CRITICAL FIX: Preserve data integrity during allOf schema traversal
+                    // Only apply protection for allOf schemas that contain arrays with primitive types
+                    if ((schema === null || schema === void 0 ? void 0 : schema.allOf) && Array.isArray(schema.allOf) && this.hasArraysWithPrimitiveTypes(schema)) {
+                        // Get the original input data stored at the beginning of resolveInput
+                        const originalInputData = this.__originalInputData;
+                        // Create a deep clone to prevent Draft library from corrupting original data
+                        const safeDataForTraversal = JSON.parse(JSON.stringify(data));
+                        // Use the safe clone for traversal, but preserve callbacks with original data
+                        _1.defaultConfig.each(core, safeDataForTraversal, (resolvedSchema, corruptedValue, resolvedPointer) => {
+                            // Only preserve data for paths that contain arrays of SquizLink/SquizImage
+                            if (this.isProtectedPrimitivePath(resolvedSchema, resolvedPointer)) {
+                                const originalValueAtPointer = originalInputData
+                                    ? this.getValueAtPointer(originalInputData, resolvedPointer)
+                                    : corruptedValue;
+                                callback(resolvedSchema, originalValueAtPointer, resolvedPointer);
+                            }
+                            else {
+                                // Use normal resolution for non-primitive arrays
+                                callback(resolvedSchema, corruptedValue, resolvedPointer);
+                            }
+                        }, schema, pointer);
+                    }
+                    else {
+                        _1.defaultConfig.each(core, data, callback, schema, pointer);
+                    }
                 }
             },
         }, metaSchema.root);
@@ -152,14 +176,41 @@ class JSONSchemaService {
      * @returns the input object with all resolvable shapes resolved
      */
     async resolveInput(input, inputSchema, ctx = {}) {
+        // Store the original input data to prevent corruption during nested allOf processing
+        this.__originalInputData = JSON.parse(JSON.stringify(input));
         const setters = [];
         this.schema.each(input, async (schema, value, pointer) => {
+            // Debug logging for investigation of resolution path
+            // console.debug('JSONSchemaService.each', {
+            //   pointer,
+            //   title: (schema as any)?.title,
+            //   type: (schema as any)?.type,
+            //   value,
+            // });
+            // Guard: if value is an array of already-resolved primitives (e.g., SquizLink/SquizImage), skip
+            if (Array.isArray(value)) {
+                const isLinkLike = (v) => v && typeof v === 'object' && typeof v.text === 'string' && typeof v.url === 'string';
+                const isImageLike = (v) => v &&
+                    typeof v === 'object' &&
+                    typeof v.name === 'string' &&
+                    v.imageVariations &&
+                    typeof v.imageVariations === 'object';
+                const allResolvedPrimitives = value.every((v) => isLinkLike(v) || isImageLike(v));
+                if (allResolvedPrimitives) {
+                    return;
+                }
+            }
             // Bug in library for Array item schemas which won't resolve the oneOf schema
             if (Array.isArray(schema === null || schema === void 0 ? void 0 : schema.oneOf)) {
                 const oldSchema = schema;
                 schema = this.schema.resolveOneOf(value, schema);
                 schema.oneOfSchema = oldSchema;
             }
+            // Skip resolution if this is already a complete SquizLink or SquizImage
+            // This prevents primitive types from being incorrectly processed when they're already in final form
+            if (this.isAlreadyResolvedPrimitive(schema, value)) {
+                return;
+            }
             if (!this.typeResolver.isResolvableSchema(schema))
                 return;
             // If its a resolvable schema, it should exist in a oneOf array with other schemas
@@ -188,8 +239,121 @@ class JSONSchemaService {
         if (potentialResolutionErrors.length) {
             throw new Error(`Error(s) occurred when resolving JSON:\n${potentialResolutionErrors.join('\n')}`);
         }
+        // Clean up stored original data to prevent memory leaks
+        delete this.__originalInputData;
         return input;
     }
+    /**
+     * Check if the allOf schema contains arrays with primitive types (SquizLink/SquizImage)
+     * Used to determine if we need to apply data preservation
+     */
+    hasArraysWithPrimitiveTypes(schema) {
+        if (!(schema === null || schema === void 0 ? void 0 : schema.allOf) || !Array.isArray(schema.allOf))
+            return false;
+        const checkForPrimitiveArrays = (obj) => {
+            var _a;
+            if (!obj || typeof obj !== 'object')
+                return false;
+            // Check if this is an array with SquizLink/SquizImage items
+            if (obj.type === 'array' && ((_a = obj.items) === null || _a === void 0 ? void 0 : _a.type)) {
+                return obj.items.type === 'SquizLink' || obj.items.type === 'SquizImage';
+            }
+            // Recursively check properties
+            if (obj.properties) {
+                return Object.values(obj.properties).some((prop) => checkForPrimitiveArrays(prop));
+            }
+            // Check in then/else branches and nested allOf
+            if (obj.then && checkForPrimitiveArrays(obj.then))
+                return true;
+            if (obj.else && checkForPrimitiveArrays(obj.else))
+                return true;
+            if (obj.allOf && Array.isArray(obj.allOf)) {
+                return obj.allOf.some((item) => checkForPrimitiveArrays(item));
+            }
+            return false;
+        };
+        // Check both inside allOf conditions AND in the main schema properties
+        // because primitive arrays in main properties can be affected by allOf processing
+        const hasInAllOf = schema.allOf.some((condition) => checkForPrimitiveArrays(condition));
+        const hasInMainSchema = checkForPrimitiveArrays(schema);
+        return hasInAllOf || hasInMainSchema;
+    }
+    /**
+     * Check if a specific schema path should be protected from data corruption
+     * Only protects arrays of SquizLink/SquizImage types
+     */
+    isProtectedPrimitivePath(resolvedSchema, _resolvedPointer) {
+        var _a;
+        if (!resolvedSchema)
+            return false;
+        // Check if this is an array of SquizLink/SquizImage
+        if (resolvedSchema.type === 'array' && ((_a = resolvedSchema.items) === null || _a === void 0 ? void 0 : _a.type)) {
+            return resolvedSchema.items.type === 'SquizLink' || resolvedSchema.items.type === 'SquizImage';
+        }
+        // Check if this is a direct SquizLink/SquizImage type
+        if (resolvedSchema.type === 'SquizLink' || resolvedSchema.type === 'SquizImage') {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Get value at a specific JSON pointer path from the data structure
+     * Used to preserve original data during schema traversal
+     */
+    getValueAtPointer(data, pointer) {
+        if (pointer === '#')
+            return data;
+        // Remove the '#/' prefix and split by '/'
+        const path = pointer.replace(/^#\//, '').split('/');
+        let current = data;
+        for (const segment of path) {
+            if (current === null || current === undefined)
+                return undefined;
+            // Handle array indices
+            if (Array.isArray(current)) {
+                const index = parseInt(segment, 10);
+                if (isNaN(index) || index < 0 || index >= current.length)
+                    return undefined;
+                current = current[index];
+            }
+            else if (typeof current === 'object') {
+                // Handle object properties
+                current = current[segment];
+            }
+            else {
+                return undefined;
+            }
+        }
+        return current;
+    }
+    /**
+     * Check if the value is already a resolved primitive type (SquizLink, SquizImage)
+     * and doesn't need further resolution
+     */
+    isAlreadyResolvedPrimitive(schema, value) {
+        var _a;
+        if (!value || typeof value !== 'object')
+            return false;
+        // Schema hints: check either title or type when present
+        const schemaType = (_a = schema === null || schema === void 0 ? void 0 : schema.type) !== null && _a !== void 0 ? _a : schema === null || schema === void 0 ? void 0 : schema.title;
+        // Shape-based detection for SquizLink
+        const v = value;
+        const looksLikeSquizLink = typeof v.text === 'string' && typeof v.url === 'string';
+        if (looksLikeSquizLink) {
+            if (schemaType === 'SquizLink' || schemaType === undefined)
+                return true;
+            // Even if schema hint differs (e.g., through allOf), preserve already-formed link objects
+            return true;
+        }
+        // Shape-based detection for SquizImage
+        const looksLikeSquizImage = typeof v.name === 'string' && v.imageVariations && typeof v.imageVariations === 'object';
+        if (looksLikeSquizImage) {
+            if (schemaType === 'SquizImage' || schemaType === undefined)
+                return true;
+            return true;
+        }
+        return false;
+    }
 }
 exports.JSONSchemaService = JSONSchemaService;
 //# sourceMappingURL=JsonSchemaService.js.map

package/lib/JsonSchemaService.js.map

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

package/lib/resolvableTypes/MatrixAsset.d.ts

@@ -7,6 +7,7 @@ interface MatrixAssetShape {
 export declare const MatrixAssetType: ResolvableType<"MatrixAsset", MatrixAssetShape>;
 export type MatrixAssetType = typeof MatrixAssetType;
 interface MatrixAssetLinkShape extends MatrixAssetShape {
+    text?: string;
     target: '_blank' | '_parent' | '_self' | '_top';
 }
 export declare const MatrixAssetLinkType: ResolvableType<"MatrixAssetLink", MatrixAssetLinkShape>;

package/lib/resolvableTypes/MatrixAsset.js

@@ -31,6 +31,9 @@ exports.MatrixAssetLinkType = (0, TypeResolver_1.ResolvableType)({
         matrixDomain: {
             type: 'string',
         },
+        text: {
+            type: 'string',
+        },
         target: {
             type: 'string',
             enum: ['_blank', '_parent', '_self', '_top'],

package/lib/resolvableTypes/MatrixAsset.js.map

@@ -1 +1 @@
-{"version":3,"file":"MatrixAsset.js","sourceRoot":"","sources":["../../src/resolvableTypes/MatrixAsset.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AAQvD,QAAA,eAAe,GAAG,IAAA,6BAAc,EAAkC;IAC7E,KAAK,EAAE,aAAa;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,QAAQ;SACf;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;SACf;KACF;IACD,QAAQ,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC;CAChD,CAAC,CAAC;AAOU,QAAA,mBAAmB,GAAG,IAAA,6BAAc,EAA0C;IACzF,KAAK,EAAE,iBAAiB;IACxB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,QAAQ;SACf;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC;SAC7C;KACF;IACD,QAAQ,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC;CAChD,CAAC,CAAC"}
+{"version":3,"file":"MatrixAsset.js","sourceRoot":"","sources":["../../src/resolvableTypes/MatrixAsset.ts"],"names":[],"mappings":";;;AAAA,qEAAoE;AAQvD,QAAA,eAAe,GAAG,IAAA,6BAAc,EAAkC;IAC7E,KAAK,EAAE,aAAa;IACpB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,QAAQ;SACf;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;SACf;KACF;IACD,QAAQ,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC;CAChD,CAAC,CAAC;AAQU,QAAA,mBAAmB,GAAG,IAAA,6BAAc,EAA0C;IACzF,KAAK,EAAE,iBAAiB;IACxB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,aAAa,EAAE;YACb,IAAI,EAAE,QAAQ;SACf;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,QAAQ;SACf;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;SACf;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC;SAC7C;KACF;IACD,QAAQ,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC;CAChD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dx-json-schema-lib",
-  "version": "1.82.3",
+  "version": "1.82.5",
   "description": "",
   "main": "lib/index.js",
   "private": false,
@@ -20,7 +20,7 @@
     "@types/jest": "28.1.8",
     "@types/lodash.clonedeep": "4.5.9",
     "@types/node": "20.12.12",
-    "dotenv": "16.0.3",
+    "dotenv": "16.6.1",
     "jest": "29.4.1",
     "json-schema-to-typescript": "14.1.0",
     "ts-jest": "29.0.5",