ag-psd 17.0.3 → 17.0.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v17.0.4
+- Fixed incorrect parsing of external linked files
+- Fixed incorrect parsing of compositorUsed section when some fields are missing
+
+## v17.0.4
+- Fixed saving smart layers without placedLayer.warp field present for newer versions of photoshop
+
 ## v17.0.3
 - Added extra error checks and fixed writing PSD without placedLayer.warp field present
 

package/dist/additionalInfo.js

@@ -865,9 +865,10 @@ addHandler('PlLd', hasKey('placedLayer'), function (reader, target, left) {
     for (var i = 0; i < 8; i++)
         (0, psdWriter_1.writeFloat64)(writer, placed.transform[i]);
     (0, psdWriter_1.writeInt32)(writer, 0); // warp version
-    var isQuilt = placed.warp && isQuiltWarp(placed.warp);
+    var warp = getWarpFromPlacedLayer(placed);
+    var isQuilt = isQuiltWarp(warp);
     var type = isQuilt ? 'quiltWarp' : 'warp';
-    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', type, encodeWarp(placed.warp || {}), type);
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', type, encodeWarp(warp), type);
 });
 function uint8ToFloat32(array) {
     return new Float32Array(array.buffer.slice(array.byteOffset), 0, array.byteLength / 4);
@@ -1691,6 +1692,39 @@ function serializeFilterFXItem(f) {
     }
 }
 // let t: any;
+function getWarpFromPlacedLayer(placed) {
+    if (placed.warp)
+        return placed.warp;
+    if (!placed.width || !placed.height)
+        throw new Error('You must provide width and height of the linked image in placedLayer');
+    var w = placed.width;
+    var h = placed.height;
+    var x0 = 0, x1 = w / 3, x2 = w * 2 / 3, x3 = w;
+    var y0 = 0, y1 = h / 3, y2 = h * 2 / 3, y3 = h;
+    return {
+        style: 'custom',
+        value: 0,
+        perspective: 0,
+        perspectiveOther: 0,
+        rotate: 'horizontal',
+        bounds: {
+            top: { value: 0, units: 'Pixels' },
+            left: { value: 0, units: 'Pixels' },
+            bottom: { value: h, units: 'Pixels' },
+            right: { value: w, units: 'Pixels' },
+        },
+        uOrder: 4,
+        vOrder: 4,
+        customEnvelopeWarp: {
+            meshPoints: [
+                { x: x0, y: y0 }, { x: x1, y: y0 }, { x: x2, y: y0 }, { x: x3, y: y0 },
+                { x: x0, y: y1 }, { x: x1, y: y1 }, { x: x2, y: y1 }, { x: x3, y: y1 },
+                { x: x0, y: y2 }, { x: x1, y: y2 }, { x: x2, y: y2 }, { x: x3, y: y2 },
+                { x: x0, y: y3 }, { x: x1, y: y3 }, { x: x2, y: y3 }, { x: x3, y: y3 },
+            ],
+        },
+    };
+}
 addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
     if ((0, psdReader_1.readSignature)(reader) !== 'soLD')
         throw new Error("Invalid SoLd type");
@@ -1742,44 +1776,12 @@ addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
     (0, psdWriter_1.writeSignature)(writer, 'soLD');
     (0, psdWriter_1.writeInt32)(writer, 4); // version
     var placed = target.placedLayer;
-    var warp = placed.warp;
-    if (!warp) {
-        if (!placed.width || !placed.height)
-            throw new Error('You must provide width and height of the linked image in placedLayer');
-        var w = placed.width;
-        var h = placed.height;
-        var x0 = 0, x1 = w / 3, x2 = w * 2 / 3, x3 = w;
-        var y0 = 0, y1 = h / 3, y2 = h * 2 / 3, y3 = h;
-        warp = {
-            style: 'custom',
-            value: 0,
-            perspective: 0,
-            perspectiveOther: 0,
-            rotate: 'horizontal',
-            bounds: {
-                top: { value: 0, units: 'Pixels' },
-                left: { value: 0, units: 'Pixels' },
-                bottom: { value: h, units: 'Pixels' },
-                right: { value: w, units: 'Pixels' },
-            },
-            uOrder: 4,
-            vOrder: 4,
-            customEnvelopeWarp: {
-                meshPoints: [
-                    { x: x0, y: y0 }, { x: x1, y: y0 }, { x: x2, y: y0 }, { x: x3, y: y0 },
-                    { x: x0, y: y1 }, { x: x1, y: y1 }, { x: x2, y: y1 }, { x: x3, y: y1 },
-                    { x: x0, y: y2 }, { x: x1, y: y2 }, { x: x2, y: y2 }, { x: x3, y: y2 },
-                    { x: x0, y: y3 }, { x: x1, y: y3 }, { x: x2, y: y3 }, { x: x3, y: y3 },
-                ],
-            },
-        };
-    }
     if (!placed.id || typeof placed.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(placed.id)) {
         throw new Error('Placed layer ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
     }
     var desc = __assign(__assign({ Idnt: placed.id, placed: (_a = placed.placed) !== null && _a !== void 0 ? _a : placed.id, PgNm: placed.pageNumber || 1, totalPages: placed.totalPages || 1 }, (placed.crop ? { Crop: placed.crop } : {})), { frameStep: placed.frameStep || { numerator: 0, denominator: 600 }, duration: placed.duration || { numerator: 0, denominator: 600 }, frameCount: placed.frameCount || 0, Annt: 16, Type: placedLayerTypes.indexOf(placed.type), Trnf: placed.transform, nonAffineTransform: (_b = placed.nonAffineTransform) !== null && _b !== void 0 ? _b : placed.transform, 
         // quiltWarp: {} as any,
-        warp: encodeWarp(warp || {}), 'Sz  ': {
+        warp: encodeWarp(getWarpFromPlacedLayer(placed)), 'Sz  ': {
             _name: '',
             _classID: 'Pnt ',
             Wdth: placed.width || 0,
@@ -1859,6 +1861,42 @@ else {
     }, function (_writer, _target) {
     });
 }
+/*
+interface CAIDesc {
+    enab: boolean;
+    generationalGuid: string;
+}
+
+addHandler(
+    'CAI ', // content credentials ? something to do with generative tech
+    () => false,
+    (reader, _target, left) => {
+        const version = readUint32(reader); // 3
+        const desc = readVersionAndDescriptor(reader) as CAIDesc;
+        console.log('CAI', require('util').inspect(desc, false, 99, true));
+        console.log('CAI', { version });
+        console.log('CAI left', readBytes(reader, left())); // 8 bytes left, all zeroes
+    },
+    (_writer, _target) => {
+    },
+);
+*/
+/*
+interface GenIDesc {
+    isUsingGenTech: number;
+}
+
+addHandler(
+    'GenI', // generative tech
+    () => false,
+    (reader, _target, left) => {
+        const desc = readVersionAndDescriptor(reader) as GenIDesc;
+        console.log('GenI', require('util').inspect(desc, false, 99, true));
+    },
+    (_writer, _target) => {
+    },
+);
+*/
 function readRect(reader) {
     var top = (0, psdReader_1.readInt32)(reader);
     var left = (0, psdReader_1.readInt32)(reader);
@@ -1975,6 +2013,9 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         var size = readLength64(reader); // size
         var startOffset = reader.offset;
         var type = (0, psdReader_1.readSignature)(reader);
+        // liFD - linked file data
+        // liFE - linked file external
+        // liFA - linked file alias
         var version = (0, psdReader_1.readInt32)(reader);
         var id = (0, psdReader_1.readPascalString)(reader, 1);
         var name_3 = (0, psdReader_1.readUnicodeString)(reader);
@@ -1984,7 +2025,7 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         var hasFileOpenDescriptor = (0, psdReader_1.readUint8)(reader);
         var fileOpenDescriptor = hasFileOpenDescriptor ? (0, descriptor_1.readVersionAndDescriptor)(reader) : undefined;
         var linkedFileDescriptor = type === 'liFE' ? (0, descriptor_1.readVersionAndDescriptor)(reader) : undefined;
-        var file = { id: id, name: name_3, data: undefined };
+        var file = { id: id, name: name_3 };
         if (fileType)
             file.type = fileType;
         if (fileCreator)
@@ -2012,14 +2053,14 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         if (type === 'liFA')
             (0, psdReader_1.skipBytes)(reader, 8);
         if (type === 'liFD')
-            file.data = (0, psdReader_1.readBytes)(reader, dataSize);
+            file.data = (0, psdReader_1.readBytes)(reader, dataSize); // seems to be a typo in docs
         if (version >= 5)
             file.childDocumentID = (0, psdReader_1.readUnicodeString)(reader);
         if (version >= 6)
             file.assetModTime = (0, psdReader_1.readFloat64)(reader);
         if (version >= 7)
             file.assetLockedState = (0, psdReader_1.readUint8)(reader);
-        if (type === 'liFE')
+        if (type === 'liFE' && version === 2)
             file.data = (0, psdReader_1.readBytes)(reader, fileSize);
         if (options.skipLinkedFilesData)
             file.data = undefined;
@@ -2960,11 +3001,15 @@ addHandler('cinf', hasKey('compositorUsed'), function (reader, target, left) {
         description: desc.description,
         reason: desc.reason,
         engine: enumValue(desc.Engn),
-        enableCompCore: enumValue(desc.enableCompCore),
-        enableCompCoreGPU: enumValue(desc.enableCompCoreGPU),
-        compCoreSupport: enumValue(desc.compCoreSupport),
-        compCoreGPUSupport: enumValue(desc.compCoreGPUSupport),
     };
+    if (desc.enableCompCore)
+        target.compositorUsed.enableCompCore = enumValue(desc.enableCompCore);
+    if (desc.enableCompCoreGPU)
+        target.compositorUsed.enableCompCoreGPU = enumValue(desc.enableCompCoreGPU);
+    if (desc.compCoreSupport)
+        target.compositorUsed.compCoreSupport = enumValue(desc.compCoreSupport);
+    if (desc.compCoreGPUSupport)
+        target.compositorUsed.compCoreGPUSupport = enumValue(desc.compCoreGPUSupport);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target) {
     var cinf = target.compositorUsed;
@@ -2974,12 +3019,16 @@ addHandler('cinf', hasKey('compositorUsed'), function (reader, target, left) {
         description: cinf.description,
         reason: cinf.reason,
         Engn: "Engn.".concat(cinf.engine),
-        enableCompCore: "enable.".concat(cinf.enableCompCore),
-        enableCompCoreGPU: "enable.".concat(cinf.enableCompCoreGPU),
-        // enableCompCoreThreads: `enable.feature`, // TESTING
-        compCoreSupport: "reason.".concat(cinf.compCoreSupport),
-        compCoreGPUSupport: "reason.".concat(cinf.compCoreGPUSupport),
     };
+    if (cinf.enableCompCore)
+        desc.enableCompCore = "enable.".concat(cinf.enableCompCore);
+    if (cinf.enableCompCoreGPU)
+        desc.enableCompCoreGPU = "enable.".concat(cinf.enableCompCoreGPU);
+    // desc.enableCompCoreThreads = `enable.feature`; // TESTING
+    if (cinf.compCoreSupport)
+        desc.compCoreSupport = "reason.".concat(cinf.compCoreSupport);
+    if (cinf.compCoreGPUSupport)
+        desc.compCoreGPUSupport = "reason.".concat(cinf.compCoreGPUSupport);
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
 // extension settings ?, ignore it