ag-psd 17.0.2 → 17.0.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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
+
 ## v17.0.2
 - Fixed issues with writing some layer effects
 

package/dist/additionalInfo.js

@@ -852,6 +852,9 @@ addHandler('PlLd', hasKey('placedLayer'), function (reader, target, left) {
     var placed = target.placedLayer;
     (0, psdWriter_1.writeSignature)(writer, 'plcL');
     (0, psdWriter_1.writeInt32)(writer, 3); // version
+    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)');
+    }
     (0, psdWriter_1.writePascalString)(writer, placed.id, 1);
     (0, psdWriter_1.writeInt32)(writer, 1); // pageNumber
     (0, psdWriter_1.writeInt32)(writer, 1); // totalPages
@@ -862,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);
@@ -1688,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");
@@ -1739,9 +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;
+    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(placed.warp || {}), 'Sz  ': {
+        warp: encodeWarp(getWarpFromPlacedLayer(placed)), 'Sz  ': {
             _name: '',
             _classID: 'Pnt ',
             Wdth: placed.width || 0,
@@ -2009,7 +2049,10 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         var sizeOffset = writer.offset;
         (0, psdWriter_1.writeSignature)(writer, file.data ? 'liFD' : 'liFA');
         (0, psdWriter_1.writeInt32)(writer, version);
-        (0, psdWriter_1.writePascalString)(writer, file.id || '', 1);
+        if (!file.id || typeof file.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(file.id)) {
+            throw new Error('Linked file ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
+        }
+        (0, psdWriter_1.writePascalString)(writer, file.id, 1);
         (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.name || '');
         (0, psdWriter_1.writeSignature)(writer, file.type ? "".concat(file.type, "    ").substring(0, 4) : '    ');
         (0, psdWriter_1.writeSignature)(writer, file.creator ? "".concat(file.creator, "    ").substring(0, 4) : '\0\0\0\0');