ag-psd 21.0.2 → 22.0.0

package/dist-es/additionalInfo.js

@@ -383,14 +383,14 @@ addHandler('vogk', hasKey('vectorOrigination'), function (reader, target, left)
     writeInt32(writer, 1); // version
     writeVersionAndDescriptor(writer, '', 'null', desc);
 });
-addHandler('lmfx', function (target) { return target.effects !== undefined && hasMultiEffects(target.effects); }, function (reader, target, left, _, options) {
+addHandler('lmfx', function (target) { return target.effects !== undefined && hasMultiEffects(target.effects); }, function (reader, target, left) {
     var version = readUint32(reader);
     if (version !== 0)
         throw new Error('Invalid lmfx version');
     var desc = readVersionAndDescriptor(reader);
     // console.log(require('util').inspect(info, false, 99, true));
     // discard if read in 'lrFX' or 'lfx2' section
-    target.effects = parseEffects(desc, !!options.logMissingFeatures);
+    target.effects = parseEffects(desc, !!reader.logMissingFeatures);
     skipBytes(reader, left());
 }, function (writer, target, _, options) {
     var desc = serializeEffects(target.effects, !!options.logMissingFeatures, true);
@@ -405,7 +405,20 @@ addHandler('lrFX', hasKey('effects'), function (reader, target, left) {
     writeEffects(writer, target.effects);
 });
 addHandler('luni', hasKey('name'), function (reader, target, left) {
-    target.name = readUnicodeString(reader);
+    if (left() > 4) {
+        var length_1 = readUint32(reader);
+        if (left() >= (length_1 * 2)) {
+            target.name = readUnicodeStringWithLength(reader, length_1);
+        }
+        else {
+            if (reader.logDevFeatures)
+                reader.log('name in luni section is too long');
+        }
+    }
+    else {
+        if (reader.logDevFeatures)
+            reader.log('empty luni section');
+    }
     skipBytes(reader, left());
 }, function (writer, target) {
     writeUnicodeString(writer, target.name);
@@ -496,7 +509,7 @@ addHandler('lclr', hasKey('layerColor'), function (reader, target) {
     writeZeros(writer, 6);
 });
 addHandler('shmd', function (target) { return target.timestamp !== undefined || target.animationFrames !== undefined ||
-    target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined; }, function (reader, target, left, _, options) {
+    target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined; }, function (reader, target, left) {
     var count = readUint32(reader);
     var _loop_1 = function (i) {
         checkSignature(reader, '8BIM');
@@ -524,7 +537,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                     if (f.FXRf)
                         frame.referencePoint = horzVrtcToXY(f.FXRf);
                     if (f.Lefx)
-                        frame.effects = parseEffects(f.Lefx, !!options.logMissingFeatures);
+                        frame.effects = parseEffects(f.Lefx, !!reader.logMissingFeatures);
                     if (f.blendOptions && f.blendOptions.Opct)
                         frame.opacity = parsePercent(f.blendOptions.Opct);
                     target.animationFrames.push(frame);
@@ -555,7 +568,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                     audioLevel: desc.audioLevel,
                 };
                 if (desc.trackList) {
-                    timeline.tracks = parseTrackList(desc.trackList, !!options.logMissingFeatures);
+                    timeline.tracks = parseTrackList(desc.trackList, !!reader.logMissingFeatures);
                 }
                 target.timeline = timeline;
                 // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
@@ -581,7 +594,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                 }
             }
             else {
-                options.logMissingFeatures && console.log('Unhandled "shmd" section key', key);
+                reader.logMissingFeatures && reader.log('Unhandled "shmd" section key', key);
             }
             skipBytes(reader, left());
         });
@@ -1795,7 +1808,7 @@ function getWarpFromPlacedLayer(placed) {
         },
     };
 }
-addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left, _, options) {
+addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
     if (readSignature(reader) !== 'soLD')
         throw new Error("Invalid SoLd type");
     var version = readInt32(reader);
@@ -1838,7 +1851,7 @@ addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left, _, opt
         };
     }
     if (desc.filterFX)
-        target.placedLayer.filter = parseFilterFX(desc.filterFX, options);
+        target.placedLayer.filter = parseFilterFX(desc.filterFX, reader);
     // console.log('filter', require('util').inspect(target.placedLayer.filter, false, 99, true));
     skipBytes(reader, left()); // HACK
 }, function (writer, target) {
@@ -1909,12 +1922,12 @@ addHandler('fxrp', hasKey('referencePoint'), function (reader, target) {
     writeFloat64(writer, target.referencePoint.x);
     writeFloat64(writer, target.referencePoint.y);
 });
-addHandler('Lr16', function () { return false; }, function (reader, _target, _left, psd, options) {
-    readLayerInfo(reader, psd, options);
+addHandler('Lr16', function () { return false; }, function (reader, _target, _left, psd) {
+    readLayerInfo(reader, psd);
 }, function (_writer, _target) {
 });
-addHandler('Lr32', function () { return false; }, function (reader, _target, _left, psd, options) {
-    readLayerInfo(reader, psd, options);
+addHandler('Lr32', function () { return false; }, function (reader, _target, _left, psd) {
+    readLayerInfo(reader, psd);
 }, function (_writer, _target) {
 });
 addHandler('LMsk', hasKey('userMask'), function (reader, target) {
@@ -2112,7 +2125,7 @@ addHandler('Anno', function (target) { return target.annotations !== undefined;
         writer.view.setUint32(dataOffset - 4, writer.offset - dataOffset, false);
     }
 });
-addHandler('lnk2', function (target) { return !!target.linkedFiles && target.linkedFiles.length > 0; }, function (reader, target, left, _, options) {
+addHandler('lnk2', function (target) { return !!target.linkedFiles && target.linkedFiles.length > 0; }, function (reader, target, left) {
     var psd = target;
     psd.linkedFiles = psd.linkedFiles || [];
     while (left() > 8) {
@@ -2168,7 +2181,7 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
             file.assetLockedState = readUint8(reader);
         if (type === 'liFE' && version === 2)
             file.data = readBytes(reader, fileSize);
-        if (options.skipLinkedFilesData)
+        if (reader.skipLinkedFilesData)
             file.data = undefined;
         psd.linkedFiles.push(file);
         linkedFileDescriptor;
@@ -3083,7 +3096,7 @@ target) { return target.artboards !== undefined; }, function (reader, target, le
 export function hasMultiEffects(effects) {
     return Object.keys(effects).map(function (key) { return effects[key]; }).some(function (v) { return Array.isArray(v) && v.length > 1; });
 }
-addHandler('lfx2', function (target) { return target.effects !== undefined && !hasMultiEffects(target.effects); }, function (reader, target, left, _, options) {
+addHandler('lfx2', function (target) { return target.effects !== undefined && !hasMultiEffects(target.effects); }, function (reader, target, left) {
     var version = readUint32(reader);
     if (version !== 0)
         throw new Error("Invalid lfx2 version");
@@ -3091,7 +3104,7 @@ addHandler('lfx2', function (target) { return target.effects !== undefined && !h
     // 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 = parseEffects(desc, !!options.logMissingFeatures);
+    target.effects = parseEffects(desc, !!reader.logMissingFeatures);
     skipBytes(reader, left());
 }, function (writer, target, _, options) {
     var desc = serializeEffects(target.effects, !!options.logMissingFeatures, true);