ag-psd 17.0.1 → 17.0.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 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
+
 ## v17.0.1
 - Fixed incorrect reading and writing of slice bounds
 - Fixed missing bounds and boundingBox fields on `layer.text`

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
@@ -1739,9 +1742,44 @@ 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(placed.warp || {}), 'Sz  ': {
+        warp: encodeWarp(warp || {}), 'Sz  ': {
             _name: '',
             _classID: 'Pnt ',
             Wdth: placed.width || 0,
@@ -2009,7 +2047,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');
@@ -2898,14 +2939,14 @@ addHandler('lfx2', function (target) { return target.effects !== undefined && !h
     if (version !== 0)
         throw new Error("Invalid lfx2 version");
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    // console.log(require('util').inspect(desc, false, 99, true));
+    // console.log('READ', require('util').inspect(desc, false, 99, true));
     // TODO: don't discard if we got it from lmfx
     // discard if read in 'lrFX' section
     target.effects = (0, descriptor_1.parseEffects)(desc, !!options.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
-    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, false);
-    // console.log(require('util').inspect(desc, false, 99, true));
+    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, true);
+    // console.log('WRITE', require('util').inspect(desc, false, 99, true));
     (0, psdWriter_1.writeUint32)(writer, 0); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });