ag-psd 21.0.2 → 22.0.1

package/dist/bundle.js

@@ -689,14 +689,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);
@@ -711,7 +711,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);
@@ -802,7 +815,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');
@@ -830,7 +843,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);
@@ -861,7 +874,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));
@@ -887,7 +900,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());
         });
@@ -2101,7 +2114,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);
@@ -2144,7 +2157,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) {
@@ -2215,12 +2228,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) {
@@ -2418,7 +2431,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) {
@@ -2474,7 +2487,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;
@@ -3390,7 +3403,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");
@@ -3398,7 +3411,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);
@@ -5337,6 +5350,7 @@ exports.gradientInterpolationMethodType = (0, helpers_1.createEnum)('gradientInt
     perceptual: 'Perc',
     linear: 'Lnr',
     classic: 'Gcls',
+    smooth: 'Smoo',
 });
 exports.ClrS = (0, helpers_1.createEnum)('ClrS', 'rgb', {
     rgb: 'RGBC',
@@ -7000,7 +7014,7 @@ target) { return target.onionSkins !== undefined; }, function (reader, target) {
 });
 addHandler(1075, // Timeline Information
 function (// Timeline Information
-target) { return target.timelineInformation !== undefined; }, function (reader, target, _, options) {
+target) { return target.timelineInformation !== undefined; }, function (reader, target) {
     var _a, _b;
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     target.timelineInformation = {
@@ -7013,7 +7027,7 @@ target) { return target.timelineInformation !== undefined; }, function (reader,
         workOutTime: (0, descriptor_1.frac)(desc.workOutTime),
         repeats: desc.LCnt,
         hasMotion: desc.hasMotion,
-        globalTracks: (0, descriptor_1.parseTrackList)(desc.globalTrackList, !!options.logMissingFeatures),
+        globalTracks: (0, descriptor_1.parseTrackList)(desc.globalTrackList, !!reader.logMissingFeatures),
     };
     if ((_b = (_a = desc.audioClipGroupList) === null || _a === void 0 ? void 0 : _a.audioClipGroupList) === null || _b === void 0 ? void 0 : _b.length) {
         target.timelineInformation.audioClipGroups = desc.audioClipGroupList.audioClipGroupList.map(function (g) { return ({
@@ -7120,12 +7134,12 @@ target) { return target.sheetDisclosure !== undefined; }, function (reader, targ
 });
 addHandler(1054, // URL List
 function (// URL List
-target) { return target.urlsList !== undefined; }, function (reader, target, _, options) {
+target) { return target.urlsList !== undefined; }, function (reader, target) {
     var count = (0, psdReader_1.readUint32)(reader);
     target.urlsList = [];
     for (var i = 0; i < count; i++) {
         var long = (0, psdReader_1.readSignature)(reader);
-        if (long !== 'slic' && options.throwForMissingFeatures)
+        if (long !== 'slic' && reader.throwForMissingFeatures)
             throw new Error('Unknown long');
         var id = (0, psdReader_1.readUint32)(reader);
         var url = (0, psdReader_1.readUnicodeString)(reader);
@@ -7319,7 +7333,7 @@ target) { return target._ir1039 !== undefined; }, function (reader, target, left
     (0, psdWriter_1.writeBytes)(writer, target._ir1039);
 });
 addHandler(1044, function (target) { return target.idsSeedNumber !== undefined; }, function (reader, target) { return target.idsSeedNumber = (0, psdReader_1.readUint32)(reader); }, function (writer, target) { return (0, psdWriter_1.writeUint32)(writer, target.idsSeedNumber); });
-addHandler(1036, function (target) { return target.thumbnail !== undefined || target.thumbnailRaw !== undefined; }, function (reader, target, left, options) {
+addHandler(1036, function (target) { return target.thumbnail !== undefined || target.thumbnailRaw !== undefined; }, function (reader, target, left) {
     var format = (0, psdReader_1.readUint32)(reader); // 1 = kJpegRGB, 0 = kRawRGB
     var width = (0, psdReader_1.readUint32)(reader);
     var height = (0, psdReader_1.readUint32)(reader);
@@ -7329,13 +7343,13 @@ addHandler(1036, function (target) { return target.thumbnail !== undefined || ta
     var bitsPerPixel = (0, psdReader_1.readUint16)(reader); // 24
     var planes = (0, psdReader_1.readUint16)(reader); // 1
     if (format !== 1 || bitsPerPixel !== 24 || planes !== 1) {
-        options.logMissingFeatures && console.log("Invalid thumbnail data (format: ".concat(format, ", bitsPerPixel: ").concat(bitsPerPixel, ", planes: ").concat(planes, ")"));
+        reader.logMissingFeatures && reader.log("Invalid thumbnail data (format: ".concat(format, ", bitsPerPixel: ").concat(bitsPerPixel, ", planes: ").concat(planes, ")"));
         (0, psdReader_1.skipBytes)(reader, left());
         return;
     }
     var size = left();
     var data = (0, psdReader_1.readBytes)(reader, size);
-    if (options.useRawThumbnail) {
+    if (reader.useRawThumbnail) {
         target.thumbnailRaw = { width: width, height: height, data: data };
     }
     else if (data.byteLength) {
@@ -7345,22 +7359,22 @@ addHandler(1036, function (target) { return target.thumbnail !== undefined || ta
     var _a;
     var width = 0;
     var height = 0;
-    var data;
+    var data = new Uint8Array(0);
     if (target.thumbnailRaw) {
         width = target.thumbnailRaw.width;
         height = target.thumbnailRaw.height;
         data = target.thumbnailRaw.data;
     }
     else {
-        var dataUrl = (_a = target.thumbnail.toDataURL('image/jpeg', 1)) === null || _a === void 0 ? void 0 : _a.substring('data:image/jpeg;base64,'.length);
-        if (dataUrl) {
-            width = target.thumbnail.width;
-            height = target.thumbnail.height;
-            data = (0, base64_js_1.toByteArray)(dataUrl);
-        }
-        else {
-            data = new Uint8Array(0);
+        try {
+            var dataUrl = (_a = target.thumbnail.toDataURL('image/jpeg', 1)) === null || _a === void 0 ? void 0 : _a.substring('data:image/jpeg;base64,'.length);
+            if (dataUrl) {
+                data = (0, base64_js_1.toByteArray)(dataUrl); // this sometimes fails for some reason, maybe some browser bugs
+                width = target.thumbnail.width;
+                height = target.thumbnail.height;
+            }
         }
+        catch (_b) { }
     }
     var bitsPerPixel = 24;
     var widthBytes = Math.floor((width * bitsPerPixel + 31) / 32) * 4;
@@ -7434,8 +7448,7 @@ var FrmD = (0, helpers_1.createEnum)('FrmD', '', {
 });
 addHandler(4000, // Plug-In resource(s)
 function (// Plug-In resource(s)
-target) { return target.animations !== undefined; }, function (reader, target, left, _a) {
-    var logMissingFeatures = _a.logMissingFeatures, logDevFeatures = _a.logDevFeatures;
+target) { return target.animations !== undefined; }, function (reader, target, left) {
     var key = (0, psdReader_1.readSignature)(reader);
     if (key === 'mani') {
         (0, psdReader_1.checkSignature)(reader, 'IRFR');
@@ -7466,10 +7479,10 @@ target) { return target.animations !== undefined; }, function (reader, target, l
                     }
                     else if (key_1 === 'Roll') {
                         var bytes = (0, psdReader_1.readBytes)(reader, left());
-                        logDevFeatures && console.log('#4000 Roll', bytes);
+                        reader.logDevFeatures && reader.log('#4000 Roll', bytes);
                     }
                     else {
-                        logMissingFeatures && console.log('Unhandled subsection in #4000', key_1);
+                        reader.logMissingFeatures && reader.log('Unhandled subsection in #4000', key_1);
                     }
                 });
             };
@@ -7480,10 +7493,10 @@ target) { return target.animations !== undefined; }, function (reader, target, l
     }
     else if (key === 'mopt') {
         var bytes = (0, psdReader_1.readBytes)(reader, left());
-        logDevFeatures && console.log('#4000 mopt', bytes);
+        reader.logDevFeatures && reader.log('#4000 mopt', bytes);
     }
     else {
-        logMissingFeatures && console.log('Unhandled key in #4000:', key);
+        reader.logMissingFeatures && reader.log('Unhandled key in #4000:', key);
     }
 }, function (writer, target) {
     if (target.animations) {
@@ -7532,8 +7545,7 @@ target) { return target.animations !== undefined; }, function (reader, target, l
 // TODO: Unfinished
 helpers_1.MOCK_HANDLERS && addHandler(4001, // Plug-In resource(s)
 function (// Plug-In resource(s)
-target) { return target._ir4001 !== undefined; }, function (reader, target, left, _a) {
-    var logMissingFeatures = _a.logMissingFeatures, logDevFeatures = _a.logDevFeatures;
+target) { return target._ir4001 !== undefined; }, function (reader, target, left) {
     if (helpers_1.MOCK_HANDLERS) {
         LOG_MOCK_HANDLERS && console.log('image resource 4001', left());
         target._ir4001 = (0, psdReader_1.readBytes)(reader, left());
@@ -7546,14 +7558,14 @@ target) { return target._ir4001 !== undefined; }, function (reader, target, left
             throw new Error('Invalid mfri version');
         var length_1 = (0, psdReader_1.readUint32)(reader);
         var bytes = (0, psdReader_1.readBytes)(reader, length_1);
-        logDevFeatures && console.log('mfri', bytes);
+        reader.logDevFeatures && reader.log('mfri', bytes);
     }
     else if (key === 'mset') {
         var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-        logDevFeatures && console.log('mset', desc);
+        reader.logDevFeatures && reader.log('mset', desc);
     }
     else {
-        logMissingFeatures && console.log('Unhandled key in #4001', key);
+        reader.logMissingFeatures && reader.log('Unhandled key in #4001', key);
     }
 }, function (writer, target) {
     (0, psdWriter_1.writeBytes)(writer, target._ir4001);
@@ -7656,19 +7668,8 @@ var LayerCompCapturedInfo;
 
 },{}],11:[function(require,module,exports){
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readPattern = exports.readColor = exports.readSection = exports.readDataRLE = exports.readDataZip = exports.readAdditionalLayerInfo = exports.readGlobalLayerMaskInfo = exports.readLayerInfo = exports.readPsd = exports.checkSignature = exports.skipBytes = exports.readAsciiString = exports.readUnicodeStringWithLengthLE = exports.readUnicodeStringWithLength = exports.readUnicodeString = exports.readPascalString = exports.readSignature = exports.readBytes = exports.readFixedPointPath32 = exports.readFixedPoint32 = exports.readFloat64 = exports.readFloat32 = exports.readUint32 = exports.readInt32LE = exports.readInt32 = exports.readUint16LE = exports.readUint16 = exports.readInt16 = exports.peekUint8 = exports.readUint8 = exports.warnOrThrow = exports.createReader = exports.supportedColorModes = void 0;
+exports.readPattern = exports.readColor = exports.readSection = exports.readDataRLE = exports.readDataZip = exports.readAdditionalLayerInfo = exports.readGlobalLayerMaskInfo = exports.readLayerInfo = exports.readPsd = exports.checkSignature = exports.skipBytes = exports.readAsciiString = exports.readUnicodeStringWithLengthLE = exports.readUnicodeStringWithLength = exports.readUnicodeString = exports.readPascalString = exports.validSignatureAt = exports.readSignature = exports.readBytes = exports.readFixedPointPath32 = exports.readFixedPoint32 = exports.readFloat64 = exports.readFloat32 = exports.readUint32 = exports.readInt32LE = exports.readInt32 = exports.readUint16LE = exports.readUint16 = exports.readInt16 = exports.peekUint8 = exports.readUint8 = exports.warnOrThrow = exports.createReader = exports.supportedColorModes = void 0;
 var pako_1 = require("pako");
 var helpers_1 = require("./helpers");
 var additionalInfo_1 = require("./additionalInfo");
@@ -7684,14 +7685,14 @@ function setupGrayscale(data) {
 }
 function createReader(buffer, offset, length) {
     var view = new DataView(buffer, offset, length);
-    return { view: view, offset: 0, strict: false, debug: false };
+    return { view: view, offset: 0, strict: false, debug: false, large: false, globalAlpha: false, log: console.log };
 }
 exports.createReader = createReader;
 function warnOrThrow(reader, message) {
     if (reader.strict)
         throw new Error(message);
     if (reader.debug)
-        console.warn(message);
+        reader.log(message);
 }
 exports.warnOrThrow = warnOrThrow;
 function readUint8(reader) {
@@ -7776,6 +7777,14 @@ function readSignature(reader) {
     return readShortString(reader, 4);
 }
 exports.readSignature = readSignature;
+function validSignatureAt(reader, offset) {
+    var sig = String.fromCharCode(reader.view.getUint8(offset))
+        + String.fromCharCode(reader.view.getUint8(offset + 1))
+        + String.fromCharCode(reader.view.getUint8(offset + 2))
+        + String.fromCharCode(reader.view.getUint8(offset + 3));
+    return sig == '8BIM' || sig == '8B64';
+}
+exports.validSignatureAt = validSignatureAt;
 function readPascalString(reader, padTo) {
     var length = readUint8(reader);
     var text = length ? readShortString(reader, length) : '';
@@ -7867,7 +7876,9 @@ function readPsd(reader, readOptions) {
     if (exports.supportedColorModes.indexOf(colorMode) === -1)
         throw new Error("Color mode not supported: ".concat((_a = colorModes[colorMode]) !== null && _a !== void 0 ? _a : colorMode));
     var psd = { width: width, height: height, channels: channels, bitsPerChannel: bitsPerChannel, colorMode: colorMode };
-    var options = __assign(__assign({}, readOptions), { large: version === 2, globalAlpha: false });
+    Object.assign(reader, readOptions);
+    reader.large = version === 2;
+    reader.globalAlpha = false;
     var fixOffsets = [0, 1, -1, 2, -2, 3, -3, 4, -4];
     // color mode data
     readSection(reader, 1, function (left) {
@@ -7905,16 +7916,16 @@ function readPsd(reader, readOptions) {
             readPascalString(reader, 2); // name
             readSection(reader, 2, function (left) {
                 var handler = imageResources_1.resourceHandlersMap[id];
-                var skip = id === 1036 && !!options.skipThumbnail;
+                var skip = id === 1036 && !!reader.skipThumbnail;
                 if (!psd.imageResources) {
                     psd.imageResources = {};
                 }
                 if (handler && !skip) {
                     try {
-                        handler.read(reader, psd.imageResources, left, options);
+                        handler.read(reader, psd.imageResources, left);
                     }
                     catch (e) {
-                        if (options.throwForMissingFeatures)
+                        if (reader.throwForMissingFeatures)
                             throw e;
                         skipBytes(reader, left());
                     }
@@ -7932,9 +7943,9 @@ function readPsd(reader, readOptions) {
     // layer and mask info
     readSection(reader, 1, function (left) {
         readSection(reader, 2, function (left) {
-            readLayerInfo(reader, psd, options);
+            readLayerInfo(reader, psd);
             skipBytes(reader, left());
-        }, undefined, options.large);
+        }, undefined, reader.large);
         // SAI does not include this section
         if (left() > 0) {
             var globalLayerMaskInfo = readGlobalLayerMaskInfo(reader);
@@ -7953,18 +7964,18 @@ function readPsd(reader, readOptions) {
                 skipBytes(reader, 1);
             }
             if (left() >= 12) {
-                readAdditionalLayerInfo(reader, psd, psd, options);
+                readAdditionalLayerInfo(reader, psd, psd);
             }
             else {
                 // opt.logMissingFeatures && console.log('skipping leftover bytes', left());
                 skipBytes(reader, left());
             }
         }
-    }, undefined, options.large);
+    }, undefined, reader.large);
     var hasChildren = psd.children && psd.children.length;
-    var skipComposite = options.skipCompositeImageData && (options.skipLayerImageData || hasChildren);
+    var skipComposite = reader.skipCompositeImageData && (reader.skipLayerImageData || hasChildren);
     if (!skipComposite) {
-        readImageData(reader, psd, options);
+        readImageData(reader, psd);
     }
     // TODO: show converted color mode instead of original PSD file color mode
     //       but add option to preserve file color mode (need to return image data instead of canvas in that case)
@@ -7972,22 +7983,23 @@ function readPsd(reader, readOptions) {
     return psd;
 }
 exports.readPsd = readPsd;
-function readLayerInfo(reader, psd, options) {
+function readLayerInfo(reader, psd) {
+    var _a, _b;
     var layerCount = readInt16(reader);
     if (layerCount < 0) {
-        options.globalAlpha = true;
+        reader.globalAlpha = true;
         layerCount = -layerCount;
     }
     var layers = [];
     var layerChannels = [];
     for (var i = 0; i < layerCount; i++) {
-        var _a = readLayerRecord(reader, psd, options), layer = _a.layer, channels = _a.channels;
+        var _c = readLayerRecord(reader, psd), layer = _c.layer, channels = _c.channels;
         layers.push(layer);
         layerChannels.push(channels);
     }
-    if (!options.skipLayerImageData) {
+    if (!reader.skipLayerImageData) {
         for (var i = 0; i < layerCount; i++) {
-            readLayerChannelImageData(reader, psd, layers[i], layerChannels[i], options);
+            readLayerChannelImageData(reader, psd, layers[i], layerChannels[i]);
         }
     }
     if (!psd.children)
@@ -7999,6 +8011,9 @@ function readLayerInfo(reader, psd, options) {
         if (type === 1 /* SectionDividerType.OpenFolder */ || type === 2 /* SectionDividerType.ClosedFolder */) {
             l.opened = type === 1 /* SectionDividerType.OpenFolder */;
             l.children = [];
+            if ((_a = l.sectionDivider) === null || _a === void 0 ? void 0 : _a.key) {
+                l.blendMode = (_b = helpers_1.toBlendMode[l.sectionDivider.key]) !== null && _b !== void 0 ? _b : l.blendMode;
+            }
             stack[stack.length - 1].children.unshift(l);
             stack.push(l);
         }
@@ -8015,7 +8030,7 @@ function readLayerInfo(reader, psd, options) {
     }
 }
 exports.readLayerInfo = readLayerInfo;
-function readLayerRecord(reader, psd, options) {
+function readLayerRecord(reader, psd) {
     var layer = {};
     layer.top = readInt32(reader);
     layer.left = readInt32(reader);
@@ -8026,7 +8041,7 @@ function readLayerRecord(reader, psd, options) {
     for (var i = 0; i < channelCount; i++) {
         var id = readInt16(reader);
         var length_1 = readUint32(reader);
-        if (options.large) {
+        if (reader.large) {
             if (length_1 !== 0)
                 throw new Error('Sizes larger than 4GB are not supported');
             length_1 = readUint32(reader);
@@ -8051,18 +8066,20 @@ function readLayerRecord(reader, psd, options) {
     // 0x20 - effects/filters panel is expanded
     skipBytes(reader, 1);
     readSection(reader, 1, function (left) {
-        var mask = readLayerMaskData(reader, options);
+        var mask = readLayerMaskData(reader);
         if (mask)
             layer.mask = mask;
         /*const blendingRanges =*/ readLayerBlendingRanges(reader);
-        layer.name = readPascalString(reader, 4);
-        while (left() > 0) {
-            readAdditionalLayerInfo(reader, layer, psd, options);
-        }
+        layer.name = readPascalString(reader, 1); // should be padded to 4, but is not sometimes
+        // HACK: fix for sometimes layer.name string not being padded correctly, just skip until we get valid signature
+        while (left() > 4 && !validSignatureAt(reader, reader.offset))
+            reader.offset++;
+        while (left() > 4)
+            readAdditionalLayerInfo(reader, layer, psd);
     });
     return { layer: layer, channels: channels };
 }
-function readLayerMaskData(reader, options) {
+function readLayerMaskData(reader) {
     return readSection(reader, 1, function (left) {
         if (!left())
             return undefined;
@@ -8098,8 +8115,8 @@ function readLayerMaskData(reader, options) {
 
             // TEMP
             (mask as any)._real = { realFlags, realUserMaskBackground, top2, left2, bottom2, right2 };*/
-            if (options.logMissingFeatures) {
-                console.log('Unhandled extra real user mask params');
+            if (reader.logMissingFeatures) {
+                reader.log('Unhandled extra real user mask params');
             }
         }
         skipBytes(reader, left());
@@ -8119,7 +8136,7 @@ function readLayerBlendingRanges(reader) {
         return { compositeGrayBlendSource: compositeGrayBlendSource, compositeGraphBlendDestinationRange: compositeGraphBlendDestinationRange, ranges: ranges };
     });
 }
-function readLayerChannelImageData(reader, psd, layer, channels, options) {
+function readLayerChannelImageData(reader, psd, layer, channels) {
     var _a, _b, _c, _d;
     var layerWidth = (layer.right || 0) - (layer.left || 0);
     var layerHeight = (layer.bottom || 0) - (layer.top || 0);
@@ -8170,12 +8187,12 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
                 var maskData = createImageDataBitDepth(maskWidth, maskHeight, (_b = psd.bitsPerChannel) !== null && _b !== void 0 ? _b : 8);
                 (0, helpers_1.resetImageData)(maskData);
                 var start_1 = reader.offset;
-                readData(reader, channel.length, maskData, compression, maskWidth, maskHeight, (_c = psd.bitsPerChannel) !== null && _c !== void 0 ? _c : 8, 0, options.large, 4);
+                readData(reader, channel.length, maskData, compression, maskWidth, maskHeight, (_c = psd.bitsPerChannel) !== null && _c !== void 0 ? _c : 8, 0, reader.large, 4);
                 if (helpers_1.RAW_IMAGE_DATA) {
                     layer.maskDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start_1, reader.offset - start_1);
                 }
                 setupGrayscale(maskData);
-                if (options.useImageData) {
+                if (reader.useImageData) {
                     mask.imageData = maskData;
                 }
                 else {
@@ -8184,8 +8201,8 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
             }
         }
         else if (channel.id === -3 /* ChannelID.RealUserMask */) {
-            if (options.logMissingFeatures) {
-                console.log("RealUserMask not supported");
+            if (reader.logMissingFeatures) {
+                reader.log("RealUserMask not supported");
             }
             reader.offset = start + channel.length;
         }
@@ -8194,11 +8211,11 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
             var targetData = imageData;
             if (offset < 0) {
                 targetData = undefined;
-                if (options.throwForMissingFeatures) {
+                if (reader.throwForMissingFeatures) {
                     throw new Error("Channel not supported: ".concat(channel.id));
                 }
             }
-            readData(reader, channel.length, targetData, compression, layerWidth, layerHeight, (_d = psd.bitsPerChannel) !== null && _d !== void 0 ? _d : 8, offset, options.large, cmyk ? 5 : 4);
+            readData(reader, channel.length, targetData, compression, layerWidth, layerHeight, (_d = psd.bitsPerChannel) !== null && _d !== void 0 ? _d : 8, offset, reader.large, cmyk ? 5 : 4);
             if (helpers_1.RAW_IMAGE_DATA) {
                 layer.imageDataRaw[channel.id] = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start + 2, channel.length - 2);
             }
@@ -8214,7 +8231,7 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
             imageData = (0, helpers_1.createImageData)(cmykData.width, cmykData.height);
             cmykToRgb(cmykData, imageData, false);
         }
-        if (options.useImageData) {
+        if (reader.useImageData) {
             layer.imageData = imageData;
         }
         else {
@@ -8255,30 +8272,30 @@ function readGlobalLayerMaskInfo(reader) {
     });
 }
 exports.readGlobalLayerMaskInfo = readGlobalLayerMaskInfo;
-function readAdditionalLayerInfo(reader, target, psd, options) {
+function readAdditionalLayerInfo(reader, target, psd) {
     var sig = readSignature(reader);
     if (sig !== '8BIM' && sig !== '8B64')
         throw new Error("Invalid signature: '".concat(sig, "' at 0x").concat((reader.offset - 4).toString(16)));
     var key = readSignature(reader);
     // `largeAdditionalInfoKeys` fallback, because some keys don't have 8B64 signature even when they are 64bit
-    var u64 = sig === '8B64' || (options.large && helpers_1.largeAdditionalInfoKeys.indexOf(key) !== -1);
+    var u64 = sig === '8B64' || (reader.large && helpers_1.largeAdditionalInfoKeys.indexOf(key) !== -1);
     readSection(reader, 2, function (left) {
         var handler = additionalInfo_1.infoHandlersMap[key];
         if (handler) {
             try {
-                handler.read(reader, target, left, psd, options);
+                handler.read(reader, target, left, psd);
             }
             catch (e) {
-                if (options.throwForMissingFeatures)
+                if (reader.throwForMissingFeatures)
                     throw e;
             }
         }
         else {
-            options.logMissingFeatures && console.log("Unhandled additional info: ".concat(key));
+            reader.logMissingFeatures && reader.log("Unhandled additional info: ".concat(key));
             skipBytes(reader, left());
         }
         if (left()) {
-            options.logMissingFeatures && console.log("Unread ".concat(left(), " bytes left for additional info: ").concat(key));
+            reader.logMissingFeatures && reader.log("Unread ".concat(left(), " bytes left for additional info: ").concat(key));
             skipBytes(reader, left());
         }
     }, false, u64);
@@ -8298,7 +8315,7 @@ function createImageDataBitDepth(width, height, bitDepth) {
         throw new Error("Invalid bitDepth (".concat(bitDepth, ")"));
     }
 }
-function readImageData(reader, psd, options) {
+function readImageData(reader, psd) {
     var _a, _b;
     var compression = readUint16(reader);
     var bitsPerChannel = (_a = psd.bitsPerChannel) !== null && _a !== void 0 ? _a : 8;
@@ -8318,7 +8335,7 @@ function readImageData(reader, psd, options) {
             }
             else if (compression === 1 /* Compression.RleCompressed */) {
                 bytes = new Uint8Array(psd.width * psd.height);
-                readDataRLE(reader, { data: bytes, width: psd.width, height: psd.height }, psd.width, psd.height, 8, 1, [0], options.large);
+                readDataRLE(reader, { data: bytes, width: psd.width, height: psd.height }, psd.width, psd.height, 8, 1, [0], reader.large);
             }
             else {
                 throw new Error("Bitmap compression not supported: ".concat(compression));
@@ -8335,7 +8352,7 @@ function readImageData(reader, psd, options) {
                     channels.push(i);
                 }
             }
-            else if (options.globalAlpha) {
+            else if (reader.globalAlpha) {
                 channels.push(3);
             }
             if (compression === 0 /* Compression.RawData */) {
@@ -8345,7 +8362,7 @@ function readImageData(reader, psd, options) {
             }
             else if (compression === 1 /* Compression.RleCompressed */) {
                 var start = reader.offset;
-                readDataRLE(reader, imageData, psd.width, psd.height, bitsPerChannel, 4, channels, options.large);
+                readDataRLE(reader, imageData, psd.width, psd.height, bitsPerChannel, 4, channels, reader.large);
                 if (helpers_1.RAW_IMAGE_DATA)
                     psd.imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
             }
@@ -8360,7 +8377,7 @@ function readImageData(reader, psd, options) {
             if (psd.channels !== 4)
                 throw new Error("Invalid channel count");
             var channels = [0, 1, 2, 3];
-            if (options.globalAlpha)
+            if (reader.globalAlpha)
                 channels.push(4);
             if (compression === 0 /* Compression.RawData */) {
                 throw new Error("Not implemented");
@@ -8376,7 +8393,7 @@ function readImageData(reader, psd, options) {
                     data: new Uint8Array(imageData.width * imageData.height * 5),
                 };
                 var start = reader.offset;
-                readDataRLE(reader, cmykImageData, psd.width, psd.height, (_b = psd.bitsPerChannel) !== null && _b !== void 0 ? _b : 8, 5, channels, options.large);
+                readDataRLE(reader, cmykImageData, psd.width, psd.height, (_b = psd.bitsPerChannel) !== null && _b !== void 0 ? _b : 8, 5, channels, reader.large);
                 cmykToRgb(cmykImageData, imageData, true);
                 if (helpers_1.RAW_IMAGE_DATA)
                     psd.imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
@@ -8386,7 +8403,7 @@ function readImageData(reader, psd, options) {
         default: throw new Error("Color mode not supported: ".concat(psd.colorMode));
     }
     // remove weird white matte
-    if (options.globalAlpha) {
+    if (reader.globalAlpha) {
         if (psd.bitsPerChannel !== 8)
             throw new Error('bitsPerChannel Not supproted');
         var p = imageData.data;
@@ -8403,7 +8420,7 @@ function readImageData(reader, psd, options) {
             }
         }
     }
-    if (options.useImageData) {
+    if (reader.useImageData) {
         psd.imageData = imageData;
     }
     else {
@@ -8769,7 +8786,7 @@ function readPattern(reader) {
             // console.log(data);
             // throw new Error('Zip compression not supported for pattern');
             // throw new Error('Unsupported pattern compression');
-            console.error('Unsupported pattern compression');
+            reader.log('Unsupported pattern compression');
             name += ' (failed to decode)';
         }
         else {
@@ -9263,11 +9280,11 @@ function addChildren(layers, children) {
                 // referencePoint: { x: 0, y: 0 },
             });
             addChildren(layers, c.children);
-            layers.push(__assign({ sectionDivider: {
+            layers.push(__assign(__assign({}, c), { blendMode: c.blendMode === 'pass through' ? 'normal' : c.blendMode, sectionDivider: {
                     type: c.opened === false ? 2 /* SectionDividerType.ClosedFolder */ : 1 /* SectionDividerType.OpenFolder */,
                     key: helpers_1.fromBlendMode[c.blendMode] || 'pass',
                     subType: 0,
-                } }, c));
+                } }));
         }
         else {
             layers.push(__assign({}, c));