ag-psd 21.0.2 → 22.0.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v22.0.0
+- Fixed parsing path `smooth` gradient interpolation method
+- Changed `PsdReader` type
+
 ## v21.0.0
 - Fixed parsing path `operation` field to handle empty value
 

package/dist/additionalInfo.d.ts

@@ -1,12 +1,12 @@
 import { LayerAdditionalInfo, BezierPath, Psd, WriteOptions, BooleanOperation, LayerEffectsInfo, LayerVectorMask } from './psd';
-import { PsdReader, ReadOptionsExt } from './psdReader';
+import { PsdReader } from './psdReader';
 import { PsdWriter } from './psdWriter';
 export interface ExtendedWriteOptions extends WriteOptions {
     layerIds: Set<number>;
     layerToId: Map<any, number>;
 }
 type HasMethod = (target: LayerAdditionalInfo) => boolean;
-type ReadMethod = (reader: PsdReader, target: LayerAdditionalInfo, left: () => number, psd: Psd, options: ReadOptionsExt) => void;
+type ReadMethod = (reader: PsdReader, target: LayerAdditionalInfo, left: () => number, psd: Psd) => void;
 type WriteMethod = (writer: PsdWriter, target: LayerAdditionalInfo, psd: Psd, options: ExtendedWriteOptions) => void;
 export interface InfoHandler {
     key: string;

package/dist/additionalInfo.js

@@ -388,14 +388,14 @@ addHandler('vogk', hasKey('vectorOrigination'), function (reader, target, left)
     (0, psdWriter_1.writeInt32)(writer, 1); // version
     (0, descriptor_1.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 = (0, psdReader_1.readUint32)(reader);
     if (version !== 0)
         throw new Error('Invalid lmfx version');
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     // console.log(require('util').inspect(info, false, 99, true));
     // discard if read in 'lrFX' or 'lfx2' section
-    target.effects = (0, descriptor_1.parseEffects)(desc, !!options.logMissingFeatures);
+    target.effects = (0, descriptor_1.parseEffects)(desc, !!reader.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
     var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, true);
@@ -410,7 +410,20 @@ addHandler('lrFX', hasKey('effects'), function (reader, target, left) {
     (0, effectsHelpers_1.writeEffects)(writer, target.effects);
 });
 addHandler('luni', hasKey('name'), function (reader, target, left) {
-    target.name = (0, psdReader_1.readUnicodeString)(reader);
+    if (left() > 4) {
+        var length_1 = (0, psdReader_1.readUint32)(reader);
+        if (left() >= (length_1 * 2)) {
+            target.name = (0, psdReader_1.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');
+    }
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target) {
     (0, psdWriter_1.writeUnicodeString)(writer, target.name);
@@ -501,7 +514,7 @@ addHandler('lclr', hasKey('layerColor'), function (reader, target) {
     (0, psdWriter_1.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 = (0, psdReader_1.readUint32)(reader);
     var _loop_1 = function (i) {
         (0, psdReader_1.checkSignature)(reader, '8BIM');
@@ -529,7 +542,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                     if (f.FXRf)
                         frame.referencePoint = (0, descriptor_1.horzVrtcToXY)(f.FXRf);
                     if (f.Lefx)
-                        frame.effects = (0, descriptor_1.parseEffects)(f.Lefx, !!options.logMissingFeatures);
+                        frame.effects = (0, descriptor_1.parseEffects)(f.Lefx, !!reader.logMissingFeatures);
                     if (f.blendOptions && f.blendOptions.Opct)
                         frame.opacity = (0, descriptor_1.parsePercent)(f.blendOptions.Opct);
                     target.animationFrames.push(frame);
@@ -560,7 +573,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                     audioLevel: desc.audioLevel,
                 };
                 if (desc.trackList) {
-                    timeline.tracks = (0, descriptor_1.parseTrackList)(desc.trackList, !!options.logMissingFeatures);
+                    timeline.tracks = (0, descriptor_1.parseTrackList)(desc.trackList, !!reader.logMissingFeatures);
                 }
                 target.timeline = timeline;
                 // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
@@ -586,7 +599,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);
             }
             (0, psdReader_1.skipBytes)(reader, left());
         });
@@ -1800,7 +1813,7 @@ function getWarpFromPlacedLayer(placed) {
         },
     };
 }
-addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left, _, options) {
+addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
     if ((0, psdReader_1.readSignature)(reader) !== 'soLD')
         throw new Error("Invalid SoLd type");
     var version = (0, psdReader_1.readInt32)(reader);
@@ -1843,7 +1856,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));
     (0, psdReader_1.skipBytes)(reader, left()); // HACK
 }, function (writer, target) {
@@ -1914,12 +1927,12 @@ addHandler('fxrp', hasKey('referencePoint'), function (reader, target) {
     (0, psdWriter_1.writeFloat64)(writer, target.referencePoint.x);
     (0, psdWriter_1.writeFloat64)(writer, target.referencePoint.y);
 });
-addHandler('Lr16', function () { return false; }, function (reader, _target, _left, psd, options) {
-    (0, psdReader_1.readLayerInfo)(reader, psd, options);
+addHandler('Lr16', function () { return false; }, function (reader, _target, _left, psd) {
+    (0, psdReader_1.readLayerInfo)(reader, psd);
 }, function (_writer, _target) {
 });
-addHandler('Lr32', function () { return false; }, function (reader, _target, _left, psd, options) {
-    (0, psdReader_1.readLayerInfo)(reader, psd, options);
+addHandler('Lr32', function () { return false; }, function (reader, _target, _left, psd) {
+    (0, psdReader_1.readLayerInfo)(reader, psd);
 }, function (_writer, _target) {
 });
 addHandler('LMsk', hasKey('userMask'), function (reader, target) {
@@ -2117,7 +2130,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) {
@@ -2173,7 +2186,7 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
             file.assetLockedState = (0, psdReader_1.readUint8)(reader);
         if (type === 'liFE' && version === 2)
             file.data = (0, psdReader_1.readBytes)(reader, fileSize);
-        if (options.skipLinkedFilesData)
+        if (reader.skipLinkedFilesData)
             file.data = undefined;
         psd.linkedFiles.push(file);
         linkedFileDescriptor;
@@ -3089,7 +3102,7 @@ function hasMultiEffects(effects) {
     return Object.keys(effects).map(function (key) { return effects[key]; }).some(function (v) { return Array.isArray(v) && v.length > 1; });
 }
 exports.hasMultiEffects = hasMultiEffects;
-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 = (0, psdReader_1.readUint32)(reader);
     if (version !== 0)
         throw new Error("Invalid lfx2 version");
@@ -3097,7 +3110,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 = (0, descriptor_1.parseEffects)(desc, !!options.logMissingFeatures);
+    target.effects = (0, descriptor_1.parseEffects)(desc, !!reader.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
     var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, true);