ag-psd 19.0.1 → 20.0.0

package/dist/bundle.js

@@ -75,21 +75,21 @@ function readAbr(buffer, options) {
                         var w = (0, psdReader_1.readInt32)(reader) - x;
                         if (w <= 0 || h <= 0)
                             throw new Error('Invalid bounds');
-                        var depth = (0, psdReader_1.readInt16)(reader);
+                        var bithDepth = (0, psdReader_1.readInt16)(reader);
                         var compression = (0, psdReader_1.readUint8)(reader); // 0 - raw, 1 - RLE
                         var alpha = new Uint8Array(w * h);
-                        if (depth === 8) {
+                        if (bithDepth === 8) {
                             if (compression === 0) {
                                 alpha.set((0, psdReader_1.readBytes)(reader, alpha.byteLength));
                             }
                             else if (compression === 1) {
-                                (0, psdReader_1.readDataRLE)(reader, { width: w, height: h, data: alpha }, w, h, 1, [0], false);
+                                (0, psdReader_1.readDataRLE)(reader, { width: w, height: h, data: alpha }, w, h, bithDepth, 1, [0], false);
                             }
                             else {
                                 throw new Error('Invalid compression');
                             }
                         }
-                        else if (depth === 16) {
+                        else if (bithDepth === 16) {
                             if (compression === 0) {
                                 for (var i = 0; i < alpha.byteLength; i++) {
                                     alpha[i] = (0, psdReader_1.readUint16)(reader) >> 8; // convert to 8bit values
@@ -353,9 +353,11 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     if ((0, psdReader_1.readInt16)(reader) !== 50)
         throw new Error("Invalid TySh text version");
     var text = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log(require('util').inspect(text, false, 99, false), 'utf8');
     if ((0, psdReader_1.readInt16)(reader) !== 1)
         throw new Error("Invalid TySh warp version");
     var warp = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log(require('util').inspect(warp, false, 99, false), 'utf8');
     target.text = {
         transform: transform,
         left: (0, psdReader_1.readFloat32)(reader),
@@ -382,6 +384,7 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     if (text.EngineData) {
         var engineData = (0, engineData_1.parseEngineData)(text.EngineData);
         var textData = (0, text_1.decodeEngineData)(engineData);
+        // console.log(require('util').inspect(engineData, false, 99, false), 'utf8');
         // require('fs').writeFileSync(`layer-${target.name}.txt`, require('util').inspect(engineData, false, 99, false), 'utf8');
         // const before = parseEngineData(text.EngineData);
         // const after = encodeEngineData(engineData);
@@ -799,7 +802,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; }, function (reader, target, left, _, options) {
+    target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined; }, function (reader, target, left, _, options) {
     var count = (0, psdReader_1.readUint32)(reader);
     var _loop_1 = function (i) {
         (0, psdReader_1.checkSignature)(reader, '8BIM');
@@ -863,8 +866,28 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                 target.timeline = timeline;
                 // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
             }
+            else if (key === 'cmls') {
+                var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                // console.log('cmls', require('util').inspect(desc, false, 99, true));
+                target.comps = {
+                    settings: [],
+                };
+                if (desc.origFXRefPoint)
+                    target.comps.originalEffectsReferencePoint = { x: desc.origFXRefPoint.Hrzn, y: desc.origFXRefPoint.Vrtc };
+                for (var _i = 0, _a = desc.layerSettings; _i < _a.length; _i++) {
+                    var item = _a[_i];
+                    target.comps.settings.push({ compList: item.compList });
+                    var t = target.comps.settings[target.comps.settings.length - 1];
+                    if ('enab' in item)
+                        t.enabled = item.enab;
+                    if (item.Ofst)
+                        t.offset = { x: item.Ofst.Hrzn, y: item.Ofst.Vrtc };
+                    if (item.FXRefPoint)
+                        t.effectsReferencePoint = { x: item.FXRefPoint.Hrzn, y: item.FXRefPoint.Vrtc };
+                }
+            }
             else {
-                options.logDevFeatures && console.log('Unhandled "shmd" section key', key);
+                options.logMissingFeatures && console.log('Unhandled "shmd" section key', key);
             }
             (0, psdReader_1.skipBytes)(reader, left());
         });
@@ -874,7 +897,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
     }
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
-    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline;
+    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline, comps = target.comps;
     var count = 0;
     if (animationFrames)
         count++;
@@ -884,6 +907,8 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
         count++;
     if (timestamp !== undefined)
         count++;
+    if (comps)
+        count++;
     (0, psdWriter_1.writeUint32)(writer, count);
     if (animationFrames) {
         (0, psdWriter_1.writeSignature)(writer, '8BIM');
@@ -949,7 +974,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
             if (timeline.tracks) {
                 desc.trackList = (0, descriptor_1.serializeTrackList)(timeline.tracks);
             }
-            var id = options.layerToId.get(target) || target.id || 0;
+            var id = options.layerToId.get(target) || target.id;
             if (!id)
                 throw new Error('You need to provide layer.id value whan writing document with animations');
             desc.LyrI = id;
@@ -969,6 +994,37 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
             (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'metadata', desc);
         }, true);
     }
+    if (comps) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'cmls');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, function () {
+            var id = options.layerToId.get(target) || target.id;
+            if (!id)
+                throw new Error('You need to provide layer.id value whan writing document with layer comps');
+            var desc = {};
+            if (comps.originalEffectsReferencePoint) {
+                desc.origFXRefPoint = { Hrzn: comps.originalEffectsReferencePoint.x, Vrtc: comps.originalEffectsReferencePoint.y };
+            }
+            desc.LyrI = id;
+            desc.layerSettings = [];
+            for (var _i = 0, _a = comps.settings; _i < _a.length; _i++) {
+                var item = _a[_i];
+                var t = {};
+                if (item.enabled !== undefined)
+                    t.enab = item.enabled;
+                if (item.offset)
+                    t.Ofst = { Hrzn: item.offset.x, Vrtc: item.offset.y };
+                if (item.effectsReferencePoint)
+                    t.FXRefPoint = { Hrzn: item.effectsReferencePoint.x, Vrtc: item.effectsReferencePoint.y };
+                t.compList = item.compList;
+                desc.layerSettings.push(t);
+            }
+            // console.log('cmls', require('util').inspect(desc, false, 99, true));
+            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+        }, true);
+    }
 });
 addHandler('vstk', hasKey('vectorStroke'), function (reader, target, left) {
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
@@ -2145,6 +2201,38 @@ 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);
+}, function (_writer, _target) {
+});
+addHandler('LMsk', hasKey('userMask'), function (reader, target) {
+    target.userMask = {
+        colorSpace: (0, psdReader_1.readColor)(reader),
+        opacity: (0, psdReader_1.readUint16)(reader) / 0xff,
+    };
+    var flag = (0, psdReader_1.readUint8)(reader);
+    if (flag !== 128)
+        throw new Error('Invalid flag value');
+    (0, psdReader_1.skipBytes)(reader, 1);
+}, function (writer, target) {
+    var userMask = target.userMask;
+    (0, psdWriter_1.writeColor)(writer, userMask.colorSpace);
+    (0, psdWriter_1.writeUint16)(writer, (0, helpers_1.clamp)(userMask.opacity, 0, 1) * 0xff);
+    (0, psdWriter_1.writeUint8)(writer, 128);
+    (0, psdWriter_1.writeZeros)(writer, 1);
+});
+if (helpers_1.MOCK_HANDLERS) {
+    addHandler('vowv', // appears with Lr16 section ?
+    function (// appears with Lr16 section ?
+    _) { return false; }, function (reader, target, left) {
+        var value = (0, psdReader_1.readUint32)(reader); // 2 ????
+        reader;
+        target;
+        console.log('vowv', { value: value }, left());
+    }, function (_writer, _target) {
+        // TODO: write
+    });
+}
 if (helpers_1.MOCK_HANDLERS) {
     addHandler('Patt', function (target) { return target._Patt !== undefined; }, function (reader, target, left) {
         // console.log('additional info: Patt');
@@ -2437,15 +2525,16 @@ addHandlerAlias('lnkD', 'lnk2');
 addHandlerAlias('lnk3', 'lnk2');
 addHandlerAlias('lnkE', 'lnk2');
 addHandler('pths', hasKey('pathList'), function (reader, target) {
-    var descriptor = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.pathList = []; // TODO: read paths (find example with non-empty list)
-    descriptor;
-    // console.log('pths', descriptor); // TODO: remove this
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
+    // console.log(require('util').inspect(desc, false, 99, true));
+    // if (options.throwForMissingFeatures && desc?.pathList?.length) throw new Error('non-empty pathList in `pths`');
+    desc;
+    target.pathList = []; // TODO: read paths
 }, function (writer, _target) {
-    var descriptor = {
+    var desc = {
         pathList: [], // TODO: write paths
     };
-    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'pathsDataClass', descriptor);
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'pathsDataClass', desc);
 });
 addHandler('lyvr', hasKey('version'), function (reader, target) { return target.version = (0, psdReader_1.readUint32)(reader); }, function (writer, target) { return (0, psdWriter_1.writeUint32)(writer, target.version); });
 function adjustmentType(type) {
@@ -3550,6 +3639,8 @@ var fieldToExtType = {
     sdwM: makeType('Parameters', 'adaptCorrectTones'),
     hglM: makeType('Parameters', 'adaptCorrectTones'),
     customShape: makeType('', 'customShape'),
+    origFXRefPoint: nullType,
+    FXRefPoint: nullType,
 };
 var fieldToArrayExtType = {
     'Crv ': makeType('', 'CrPt'),
@@ -3580,13 +3671,15 @@ var fieldToArrayExtType = {
     puppetShapeList: makeType('', 'puppetShape'),
     channelDenoise: makeType('', 'channelDenoiseParams'),
     ShrP: makeType('', 'Pnt '),
+    layerSettings: nullType,
+    list: nullType,
 };
 var typeToField = {
     'TEXT': [
         'Txt ', 'printerName', 'Nm  ', 'Idnt', 'blackAndWhitePresetFileName', 'LUT3DFileName',
         'presetFileName', 'curvesPresetFileName', 'mixerPresetFileName', 'placed', 'description', 'reason',
         'artboardPresetName', 'json', 'clipID', 'relPath', 'fullPath', 'mediaDescriptor', 'Msge',
-        'altTag', 'url', 'cellText', 'preset', 'KnNm', 'FPth',
+        'altTag', 'url', 'cellText', 'preset', 'KnNm', 'FPth', 'comment',
     ],
     'tdta': [
         'EngineData', 'LUT3DFileData', 'indexArray', 'originalVertexArray', 'deformedVertexArray',
@@ -3604,7 +3697,7 @@ var typeToField = {
         'topOutset', 'leftOutset', 'bottomOutset', 'rightOutset', 'filterID', 'meshQuality',
         'meshExpansion', 'meshRigidity', 'VrsM', 'VrsN', 'NmbG', 'WLMn', 'WLMx', 'AmMn', 'AmMx', 'SclH', 'SclV',
         'Lvl ', 'TlNm', 'TlOf', 'FlRs', 'Thsh', 'ShrS', 'ShrE', 'FlRs', 'Vrnc', 'Strg', 'ExtS', 'ExtD',
-        'HrzS', 'VrtS', 'NmbR', 'EdgF', 'Ang1', 'Ang2', 'Ang3', 'Ang4',
+        'HrzS', 'VrtS', 'NmbR', 'EdgF', 'Ang1', 'Ang2', 'Ang3', 'Ang4', 'lastAppliedComp', 'capturedInfo',
     ],
     'enum': [
         'textGridding', 'Ornt', 'warpStyle', 'warpRotate', 'Inte', 'Bltn', 'ClrS', 'BlrQ',
@@ -3649,7 +3742,7 @@ var typeToField = {
         'sheetTimelineOptions', 'audioClipList', 'trackList', 'globalTrackList', 'keyList', 'audioClipList',
         'warpValues', 'selectedPin', 'Pts ', 'SbpL', 'pathComponents', 'pinOffsets', 'posFinalPins',
         'pinVertexIndices', 'PinP', 'PnRt', 'PnOv', 'PnDp', 'filterFXList', 'puppetShapeList', 'ShrP',
-        'channelDenoise', 'Mtrx',
+        'channelDenoise', 'Mtrx', 'layerSettings', 'list', 'compList',
     ],
     'ObAr': ['meshPoints', 'quiltSliceX', 'quiltSliceY'],
     'obj ': ['null', 'Chnl'],
@@ -3695,6 +3788,7 @@ var fieldToArrayType = {
     ShrP: 'Objc',
     channelDenoise: 'Objc',
     Mtrx: 'long',
+    compList: 'long',
 };
 var fieldToType = {};
 for (var _i = 0, _a = Object.keys(typeToField); _i < _a.length; _i++) {
@@ -3756,7 +3850,7 @@ function readAsciiStringOrClassId(reader) {
 }
 exports.readAsciiStringOrClassId = readAsciiStringOrClassId;
 function writeAsciiStringOrClassId(writer, value) {
-    if (value.length === 4 && value !== 'warp' && value !== 'time' && value !== 'hold') {
+    if (value.length === 4 && value !== 'warp' && value !== 'time' && value !== 'hold' && value !== 'list') {
         // write classId
         (0, psdWriter_1.writeInt32)(writer, 0);
         (0, psdWriter_1.writeSignature)(writer, value);
@@ -3913,9 +4007,9 @@ function readOSType(reader, type, includeClass) {
             var length_1 = (0, psdReader_1.readInt32)(reader);
             var items = [];
             for (var i = 0; i < length_1; i++) {
-                var type_1 = (0, psdReader_1.readSignature)(reader);
-                // console.log('  >', type);
-                items.push(readOSType(reader, type_1, includeClass));
+                var itemType = (0, psdReader_1.readSignature)(reader);
+                // console.log('  >', itemType);
+                items.push(readOSType(reader, itemType, includeClass));
             }
             return items;
         }
@@ -3938,9 +4032,9 @@ function readOSType(reader, type, includeClass) {
         case 'TEXT': // String
             return (0, psdReader_1.readUnicodeString)(reader);
         case 'enum': { // Enumerated
-            var type_2 = readAsciiStringOrClassId(reader);
+            var enumType = readAsciiStringOrClassId(reader);
             var value = readAsciiStringOrClassId(reader);
-            return "".concat(type_2, ".").concat(value);
+            return "".concat(enumType, ".").concat(value);
         }
         case 'long': // Integer
             return (0, psdReader_1.readInt32)(reader);
@@ -4019,10 +4113,10 @@ function writeOSType(writer, type, value, key, extType, root) {
                 throw new Error("Invalid list value: ".concat(JSON.stringify(value), ", key: ").concat(key));
             (0, psdWriter_1.writeInt32)(writer, value.length);
             for (var i = 0; i < value.length; i++) {
-                var type_3 = fieldToArrayType[key];
-                (0, psdWriter_1.writeSignature)(writer, type_3 || 'long');
-                writeOSType(writer, type_3 || 'long', value[i], "".concat(key, "[]"), fieldToArrayExtType[key], root);
-                if (logErrors && !type_3)
+                var type_1 = fieldToArrayType[key];
+                (0, psdWriter_1.writeSignature)(writer, type_1 || 'long');
+                writeOSType(writer, type_1 || 'long', value[i], "".concat(key, "[]"), fieldToArrayExtType[key], root);
+                if (logErrors && !type_1)
                     console.log("Missing descriptor array type for: '".concat(key, "' in"), value);
             }
             break;
@@ -4078,10 +4172,10 @@ function writeOSType(writer, type, value, key, extType, root) {
         case 'ObAr': { // Object array
             (0, psdWriter_1.writeInt32)(writer, 16); // version
             (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, ''); // name
-            var type_4 = ObArTypes[key];
-            if (!type_4)
+            var type_2 = ObArTypes[key];
+            if (!type_2)
                 throw new Error("Not implemented ObArType for: ".concat(key));
-            writeAsciiStringOrClassId(writer, type_4);
+            writeAsciiStringOrClassId(writer, type_2);
             (0, psdWriter_1.writeInt32)(writer, value.length);
             for (var i = 0; i < value.length; i++) {
                 writeAsciiStringOrClassId(writer, value[i].type); // Hrzn | Vrtc
@@ -6063,7 +6157,7 @@ exports.serializeEngineData = serializeEngineData;
 },{}],7:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeCanvas = exports.createImageData = exports.createCanvasFromData = exports.createCanvas = exports.writeDataZipWithoutPrediction = exports.writeDataRLE = exports.writeDataRaw = exports.decodeBitmap = exports.resetImageData = exports.hasAlpha = exports.clamp = exports.offsetForChannel = exports.Compression = exports.ChannelID = exports.MaskParams = exports.LayerMaskFlags = exports.ColorSpace = exports.createEnum = exports.revMap = exports.largeAdditionalInfoKeys = exports.layerColors = exports.toBlendMode = exports.fromBlendMode = exports.RAW_IMAGE_DATA = exports.MOCK_HANDLERS = void 0;
+exports.initializeCanvas = exports.createImageData = exports.createCanvasFromData = exports.createCanvas = exports.writeDataZipWithoutPrediction = exports.writeDataRLE = exports.writeDataRaw = exports.decodeBitmap = exports.imageDataToCanvas = exports.resetImageData = exports.hasAlpha = exports.clamp = exports.offsetForChannel = exports.Compression = exports.ChannelID = exports.MaskParams = exports.LayerMaskFlags = exports.ColorSpace = exports.createEnum = exports.revMap = exports.largeAdditionalInfoKeys = exports.layerColors = exports.toBlendMode = exports.fromBlendMode = exports.RAW_IMAGE_DATA = exports.MOCK_HANDLERS = void 0;
 var base64_js_1 = require("base64-js");
 var pako_1 = require("pako");
 exports.MOCK_HANDLERS = false;
@@ -6198,24 +6292,47 @@ function hasAlpha(data) {
 exports.hasAlpha = hasAlpha;
 function resetImageData(_a) {
     var data = _a.data;
-    var buffer = new Uint32Array(data.buffer);
-    var size = buffer.length | 0;
-    for (var p = 0; p < size; p = (p + 1) | 0) {
-        buffer[p] = 0xff000000;
+    var alpha = (data instanceof Uint32Array) ? (0xffffffff >>> 0) : ((data instanceof Uint16Array) ? 0xffff : 0xff);
+    for (var p = 0, size = data.length | 0; p < size; p = (p + 4) | 0) {
+        data[p + 0] = 0;
+        data[p + 1] = 0;
+        data[p + 2] = 0;
+        data[p + 3] = alpha;
     }
 }
 exports.resetImageData = resetImageData;
+function imageDataToCanvas(pixelData) {
+    var canvas = (0, exports.createCanvas)(pixelData.width, pixelData.height);
+    var imageData;
+    if (pixelData.data instanceof Uint8ClampedArray) {
+        imageData = pixelData;
+    }
+    else {
+        imageData = (0, exports.createImageData)(pixelData.width, pixelData.height);
+        var src = pixelData.data;
+        var dst = imageData.data;
+        var shift = (src instanceof Uint32Array) ? 24 : ((src instanceof Uint16Array) ? 8 : 0);
+        for (var i = 0, size = src.length; i < size; i++) {
+            dst[i] = src[i] >>> shift;
+        }
+    }
+    canvas.getContext('2d').putImageData(imageData, 0, 0);
+    return canvas;
+}
+exports.imageDataToCanvas = imageDataToCanvas;
 function decodeBitmap(input, output, width, height) {
+    if (input instanceof Uint32Array || input instanceof Uint16Array)
+        throw new Error('Invalid bit depth');
     for (var y = 0, p = 0, o = 0; y < height; y++) {
         for (var x = 0; x < width;) {
             var b = input[o++];
-            for (var i = 0; i < 8 && x < width; i++, x++) {
+            for (var i = 0; i < 8 && x < width; i++, x++, p += 4) {
                 var v = b & 0x80 ? 0 : 255;
                 b = b << 1;
-                output[p++] = v;
-                output[p++] = v;
-                output[p++] = v;
-                output[p++] = 255;
+                output[p + 0] = v;
+                output[p + 1] = v;
+                output[p + 2] = v;
+                output[p + 3] = 255;
             }
         }
     }
@@ -6767,6 +6884,43 @@ addHandler(1032, function (target) { return target.gridAndGuidesInformation !==
         (0, psdWriter_1.writeUint8)(writer, g.direction === 'horizontal' ? 1 : 0);
     }
 });
+addHandler(1065, // Layer Comps
+function (// Layer Comps
+target) { return target.layerComps !== undefined; }, function (reader, target) {
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
+    // console.log('CompList', require('util').inspect(desc, false, 99, true));
+    target.layerComps = { list: [] };
+    for (var _i = 0, _a = desc.list; _i < _a.length; _i++) {
+        var item = _a[_i];
+        target.layerComps.list.push({
+            id: item.compID,
+            name: item['Nm  '],
+            capturedInfo: item.capturedInfo,
+        });
+        if ('comment' in item)
+            target.layerComps.list[target.layerComps.list.length - 1].comment = item.comment;
+    }
+    if ('lastAppliedComp' in desc)
+        target.layerComps.lastApplied = desc.lastAppliedComp;
+}, function (writer, target) {
+    var layerComps = target.layerComps;
+    var desc = { list: [] };
+    for (var _i = 0, _a = layerComps.list; _i < _a.length; _i++) {
+        var item = _a[_i];
+        var t = {};
+        t._classID = 'Comp';
+        t['Nm  '] = item.name;
+        if ('comment' in item)
+            t.comment = item.comment;
+        t.compID = item.id;
+        t.capturedInfo = item.capturedInfo;
+        desc.list.push(t);
+    }
+    if ('lastApplied' in layerComps)
+        desc.lastAppliedComp = layerComps.lastApplied;
+    // console.log('CompList', require('util').inspect(desc, false, 99, true));
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'CompList', desc);
+});
 helpers_1.MOCK_HANDLERS && addHandler(1092, // ???
 function (// ???
 target) { return target._ir1092 !== undefined; }, function (reader, target, left) {
@@ -7461,7 +7615,7 @@ exports.writePsdBuffer = writePsdBuffer;
 },{"./abr":1,"./csh":3,"./helpers":7,"./psd":10,"./psdReader":11,"./psdWriter":12,"base64-js":15,"buffer":16}],10:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SectionDividerType = exports.ColorMode = void 0;
+exports.LayerCompCapturedInfo = exports.SectionDividerType = exports.ColorMode = void 0;
 var ColorMode;
 (function (ColorMode) {
     ColorMode[ColorMode["Bitmap"] = 0] = "Bitmap";
@@ -7480,6 +7634,13 @@ var SectionDividerType;
     SectionDividerType[SectionDividerType["ClosedFolder"] = 2] = "ClosedFolder";
     SectionDividerType[SectionDividerType["BoundingSectionDivider"] = 3] = "BoundingSectionDivider";
 })(SectionDividerType = exports.SectionDividerType || (exports.SectionDividerType = {}));
+var LayerCompCapturedInfo;
+(function (LayerCompCapturedInfo) {
+    LayerCompCapturedInfo[LayerCompCapturedInfo["None"] = 0] = "None";
+    LayerCompCapturedInfo[LayerCompCapturedInfo["Visibility"] = 1] = "Visibility";
+    LayerCompCapturedInfo[LayerCompCapturedInfo["Position"] = 2] = "Position";
+    LayerCompCapturedInfo[LayerCompCapturedInfo["Appearance"] = 4] = "Appearance";
+})(LayerCompCapturedInfo = exports.LayerCompCapturedInfo || (exports.LayerCompCapturedInfo = {}));
 
 },{}],11:[function(require,module,exports){
 "use strict";
@@ -7495,7 +7656,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readPattern = exports.readColor = exports.readSection = exports.readDataRLE = exports.readDataZipWithoutPrediction = 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.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");
@@ -7670,9 +7831,9 @@ function readShortString(reader, length) {
 function isValidSignature(sig) {
     return sig === '8BIM' || sig === 'MeSa' || sig === 'AgHg' || sig === 'PHUT' || sig === 'DCSR';
 }
-function readPsd(reader, options) {
+function readPsd(reader, readOptions) {
     var _a;
-    if (options === void 0) { options = {}; }
+    if (readOptions === void 0) { readOptions = {}; }
     // header
     checkSignature(reader, '8BPS');
     var version = readUint16(reader);
@@ -7686,19 +7847,19 @@ function readPsd(reader, options) {
     var colorMode = readUint16(reader);
     var maxSize = version === 1 ? 30000 : 300000;
     if (width > maxSize || height > maxSize)
-        throw new Error("Invalid size");
+        throw new Error("Invalid size: ".concat(width, "x").concat(height));
     if (channels > 16)
-        throw new Error("Invalid channel count");
-    if (bitsPerChannel > 32)
-        throw new Error("Invalid bitsPerChannel count");
+        throw new Error("Invalid channel count: ".concat(channels));
+    if (![1, 8, 16, 32].includes(bitsPerChannel))
+        throw new Error("Invalid bitsPerChannel: ".concat(bitsPerChannel));
     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 opt = __assign(__assign({}, options), { large: version === 2 });
+    var options = __assign(__assign({}, readOptions), { large: version === 2, globalAlpha: false });
     var fixOffsets = [0, 1, -1, 2, -2, 3, -3, 4, -4];
     // color mode data
     readSection(reader, 1, function (left) {
-        if (opt.throwForMissingFeatures)
+        if (options.throwForMissingFeatures)
             throw new Error('Color mode data not supported');
         skipBytes(reader, left());
     });
@@ -7725,22 +7886,22 @@ function readPsd(reader, options) {
             readPascalString(reader, 2); // name
             readSection(reader, 2, function (left) {
                 var handler = imageResources_1.resourceHandlersMap[id];
-                var skip = id === 1036 && !!opt.skipThumbnail;
+                var skip = id === 1036 && !!options.skipThumbnail;
                 if (!psd.imageResources) {
                     psd.imageResources = {};
                 }
                 if (handler && !skip) {
                     try {
-                        handler.read(reader, psd.imageResources, left, opt);
+                        handler.read(reader, psd.imageResources, left, options);
                     }
                     catch (e) {
-                        if (opt.throwForMissingFeatures)
+                        if (options.throwForMissingFeatures)
                             throw e;
                         skipBytes(reader, left());
                     }
                 }
                 else {
-                    // options.logMissingFeatures && console.log(`Unhandled image resource: ${id}`);
+                    // options.logMissingFeatures && console.log(`Unhandled image resource: ${id} (${left()})`);
                     skipBytes(reader, left());
                 }
             });
@@ -7750,9 +7911,11 @@ function readPsd(reader, options) {
         }
     });
     // layer and mask info
-    var globalAlpha = false;
     readSection(reader, 1, function (left) {
-        globalAlpha = readLayerInfo(reader, psd, opt);
+        readSection(reader, 2, function (left) {
+            readLayerInfo(reader, psd, options);
+            skipBytes(reader, left());
+        }, undefined, options.large);
         // SAI does not include this section
         if (left() > 0) {
             var globalLayerMaskInfo = readGlobalLayerMaskInfo(reader);
@@ -7771,18 +7934,18 @@ function readPsd(reader, options) {
                 skipBytes(reader, 1);
             }
             if (left() >= 12) {
-                readAdditionalLayerInfo(reader, psd, psd, opt);
+                readAdditionalLayerInfo(reader, psd, psd, options);
             }
             else {
                 // opt.logMissingFeatures && console.log('skipping leftover bytes', left());
                 skipBytes(reader, left());
             }
         }
-    }, undefined, opt.large);
+    }, undefined, options.large);
     var hasChildren = psd.children && psd.children.length;
-    var skipComposite = opt.skipCompositeImageData && (opt.skipLayerImageData || hasChildren);
+    var skipComposite = options.skipCompositeImageData && (options.skipLayerImageData || hasChildren);
     if (!skipComposite) {
-        readImageData(reader, psd, globalAlpha, opt);
+        readImageData(reader, psd, options);
     }
     // 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)
@@ -7791,52 +7954,48 @@ function readPsd(reader, options) {
 }
 exports.readPsd = readPsd;
 function readLayerInfo(reader, psd, options) {
-    var globalAlpha = false;
-    readSection(reader, 2, function (left) {
-        var layerCount = readInt16(reader);
-        if (layerCount < 0) {
-            globalAlpha = true;
-            layerCount = -layerCount;
-        }
-        var layers = [];
-        var layerChannels = [];
+    var layerCount = readInt16(reader);
+    if (layerCount < 0) {
+        options.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;
+        layers.push(layer);
+        layerChannels.push(channels);
+    }
+    if (!options.skipLayerImageData) {
         for (var i = 0; i < layerCount; i++) {
-            var _a = readLayerRecord(reader, psd, options), layer = _a.layer, channels = _a.channels;
-            layers.push(layer);
-            layerChannels.push(channels);
+            readLayerChannelImageData(reader, psd, layers[i], layerChannels[i], options);
         }
-        if (!options.skipLayerImageData) {
-            for (var i = 0; i < layerCount; i++) {
-                readLayerChannelImageData(reader, psd, layers[i], layerChannels[i], options);
-            }
+    }
+    if (!psd.children)
+        psd.children = [];
+    var stack = [psd];
+    for (var i = layers.length - 1; i >= 0; i--) {
+        var l = layers[i];
+        var type = l.sectionDivider ? l.sectionDivider.type : 0 /* SectionDividerType.Other */;
+        if (type === 1 /* SectionDividerType.OpenFolder */ || type === 2 /* SectionDividerType.ClosedFolder */) {
+            l.opened = type === 1 /* SectionDividerType.OpenFolder */;
+            l.children = [];
+            stack[stack.length - 1].children.unshift(l);
+            stack.push(l);
         }
-        skipBytes(reader, left());
-        if (!psd.children)
-            psd.children = [];
-        var stack = [psd];
-        for (var i = layers.length - 1; i >= 0; i--) {
-            var l = layers[i];
-            var type = l.sectionDivider ? l.sectionDivider.type : 0 /* SectionDividerType.Other */;
-            if (type === 1 /* SectionDividerType.OpenFolder */ || type === 2 /* SectionDividerType.ClosedFolder */) {
-                l.opened = type === 1 /* SectionDividerType.OpenFolder */;
-                l.children = [];
-                stack[stack.length - 1].children.unshift(l);
-                stack.push(l);
-            }
-            else if (type === 3 /* SectionDividerType.BoundingSectionDivider */) {
-                stack.pop();
-                // this was workaround because I didn't know what `lsdk` section was, now it's probably not needed anymore
-                // } else if (l.name === '</Layer group>' && !l.sectionDivider && !l.top && !l.left && !l.bottom && !l.right) {
-                // 	// sometimes layer group terminator doesn't have sectionDivider, so we just guess here (PS bug ?)
-                // 	stack.pop();
-            }
-            else {
-                stack[stack.length - 1].children.unshift(l);
-            }
+        else if (type === 3 /* SectionDividerType.BoundingSectionDivider */) {
+            stack.pop();
+            // this was workaround because I didn't know what `lsdk` section was, now it's probably not needed anymore
+            // } else if (l.name === '</Layer group>' && !l.sectionDivider && !l.top && !l.left && !l.bottom && !l.right) {
+            // 	// sometimes layer group terminator doesn't have sectionDivider, so we just guess here (PS bug ?)
+            // 	stack.pop();
         }
-    }, undefined, options.large);
-    return globalAlpha;
+        else {
+            stack[stack.length - 1].children.unshift(l);
+        }
+    }
 }
+exports.readLayerInfo = readLayerInfo;
 function readLayerRecord(reader, psd, options) {
     var layer = {};
     layer.top = readInt32(reader);
@@ -7937,18 +8096,21 @@ function readLayerBlendingRanges(reader) {
     });
 }
 function readLayerChannelImageData(reader, psd, layer, channels, options) {
+    var _a, _b, _c, _d;
     var layerWidth = (layer.right || 0) - (layer.left || 0);
     var layerHeight = (layer.bottom || 0) - (layer.top || 0);
     var cmyk = psd.colorMode === 4 /* ColorMode.CMYK */;
     var imageData;
     if (layerWidth && layerHeight) {
         if (cmyk) {
+            if (psd.bitsPerChannel !== 8)
+                throw new Error('bitsPerChannel Not supproted');
             imageData = { width: layerWidth, height: layerHeight, data: new Uint8ClampedArray(layerWidth * layerHeight * 5) };
             for (var p = 4; p < imageData.data.byteLength; p += 5)
                 imageData.data[p] = 255;
         }
         else {
-            imageData = (0, helpers_1.createImageData)(layerWidth, layerHeight);
+            imageData = createImageDataBitDepth(layerWidth, layerHeight, (_a = psd.bitsPerChannel) !== null && _a !== void 0 ? _a : 8);
             (0, helpers_1.resetImageData)(imageData);
         }
     }
@@ -7981,10 +8143,10 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
             var maskWidth = (mask.right || 0) - (mask.left || 0);
             var maskHeight = (mask.bottom || 0) - (mask.top || 0);
             if (maskWidth && maskHeight) {
-                var maskData = (0, helpers_1.createImageData)(maskWidth, maskHeight);
+                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, 0, options.large, 4);
+                readData(reader, channel.length, maskData, compression, maskWidth, maskHeight, (_c = psd.bitsPerChannel) !== null && _c !== void 0 ? _c : 8, 0, options.large, 4);
                 if (helpers_1.RAW_IMAGE_DATA) {
                     layer.maskDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start_1, reader.offset - start_1);
                 }
@@ -7993,8 +8155,7 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
                     mask.imageData = maskData;
                 }
                 else {
-                    mask.canvas = (0, helpers_1.createCanvas)(maskWidth, maskHeight);
-                    mask.canvas.getContext('2d').putImageData(maskData, 0, 0);
+                    mask.canvas = (0, helpers_1.imageDataToCanvas)(maskData);
                 }
             }
         }
@@ -8007,7 +8168,7 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
                     throw new Error("Channel not supported: ".concat(channel.id));
                 }
             }
-            readData(reader, channel.length, targetData, compression, layerWidth, layerHeight, offset, options.large, cmyk ? 5 : 4);
+            readData(reader, channel.length, targetData, compression, layerWidth, layerHeight, (_d = psd.bitsPerChannel) !== null && _d !== void 0 ? _d : 8, offset, options.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);
             }
@@ -8027,23 +8188,22 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
             layer.imageData = imageData;
         }
         else {
-            layer.canvas = (0, helpers_1.createCanvas)(layerWidth, layerHeight);
-            layer.canvas.getContext('2d').putImageData(imageData, 0, 0);
+            layer.canvas = (0, helpers_1.imageDataToCanvas)(imageData);
         }
     }
 }
-function readData(reader, length, data, compression, width, height, offset, large, step) {
+function readData(reader, length, data, compression, width, height, bitDepth, offset, large, step) {
     if (compression === 0 /* Compression.RawData */) {
-        readDataRaw(reader, data, width, height, step, offset);
+        readDataRaw(reader, data, width, height, bitDepth, step, offset);
     }
     else if (compression === 1 /* Compression.RleCompressed */) {
-        readDataRLE(reader, data, width, height, step, [offset], large);
+        readDataRLE(reader, data, width, height, bitDepth, step, [offset], large);
     }
     else if (compression === 2 /* Compression.ZipWithoutPrediction */) {
-        readDataZipWithoutPrediction(reader, length, data, width, height, step, offset);
+        readDataZip(reader, length, data, width, height, bitDepth, step, offset, false);
     }
     else if (compression === 3 /* Compression.ZipWithPrediction */) {
-        throw new Error("Compression type not supported: ".concat(compression));
+        readDataZip(reader, length, data, width, height, bitDepth, step, offset, true);
     }
     else {
         throw new Error("Invalid Compression type: ".concat(compression));
@@ -8064,6 +8224,7 @@ function readGlobalLayerMaskInfo(reader) {
         return { overlayColorSpace: overlayColorSpace, colorSpace1: colorSpace1, colorSpace2: colorSpace2, colorSpace3: colorSpace3, colorSpace4: colorSpace4, opacity: opacity, kind: kind };
     });
 }
+exports.readGlobalLayerMaskInfo = readGlobalLayerMaskInfo;
 function readAdditionalLayerInfo(reader, target, psd, options) {
     var sig = readSignature(reader);
     if (sig !== '8BIM' && sig !== '8B64')
@@ -8092,13 +8253,30 @@ function readAdditionalLayerInfo(reader, target, psd, options) {
         }
     }, false, u64);
 }
-function readImageData(reader, psd, globalAlpha, options) {
+exports.readAdditionalLayerInfo = readAdditionalLayerInfo;
+function createImageDataBitDepth(width, height, bitDepth) {
+    if (bitDepth === 1 || bitDepth === 8) {
+        return (0, helpers_1.createImageData)(width, height);
+    }
+    else if (bitDepth === 16) {
+        return { width: width, height: height, data: new Uint16Array(width * height * 4) };
+    }
+    else if (bitDepth === 32) {
+        return { width: width, height: height, data: new Uint32Array(width * height * 4) };
+    }
+    else {
+        throw new Error("Invalid bitDepth (".concat(bitDepth, ")"));
+    }
+}
+function readImageData(reader, psd, options) {
+    var _a, _b;
     var compression = readUint16(reader);
+    var bitsPerChannel = (_a = psd.bitsPerChannel) !== null && _a !== void 0 ? _a : 8;
     if (exports.supportedColorModes.indexOf(psd.colorMode) === -1)
         throw new Error("Color mode not supported: ".concat(psd.colorMode));
     if (compression !== 0 /* Compression.RawData */ && compression !== 1 /* Compression.RleCompressed */)
         throw new Error("Compression type not supported: ".concat(compression));
-    var imageData = (0, helpers_1.createImageData)(psd.width, psd.height);
+    var imageData = createImageDataBitDepth(psd.width, psd.height, bitsPerChannel);
     (0, helpers_1.resetImageData)(imageData);
     switch (psd.colorMode) {
         case 0 /* ColorMode.Bitmap */: {
@@ -8108,7 +8286,7 @@ function readImageData(reader, psd, globalAlpha, 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, 1, [0], options.large);
+                readDataRLE(reader, { data: bytes, width: psd.width, height: psd.height }, psd.width, psd.height, bitsPerChannel, 1, [0], options.large);
             }
             else {
                 throw new Error("Bitmap compression not supported: ".concat(compression));
@@ -8125,17 +8303,17 @@ function readImageData(reader, psd, globalAlpha, options) {
                     channels.push(i);
                 }
             }
-            else if (globalAlpha) {
+            else if (options.globalAlpha) {
                 channels.push(3);
             }
             if (compression === 0 /* Compression.RawData */) {
                 for (var i = 0; i < channels.length; i++) {
-                    readDataRaw(reader, imageData, psd.width, psd.height, 4, channels[i]);
+                    readDataRaw(reader, imageData, psd.width, psd.height, bitsPerChannel, 4, channels[i]);
                 }
             }
             else if (compression === 1 /* Compression.RleCompressed */) {
                 var start = reader.offset;
-                readDataRLE(reader, imageData, psd.width, psd.height, 4, channels, options.large);
+                readDataRLE(reader, imageData, psd.width, psd.height, bitsPerChannel, 4, channels, options.large);
                 if (helpers_1.RAW_IMAGE_DATA)
                     psd.imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
             }
@@ -8145,10 +8323,12 @@ function readImageData(reader, psd, globalAlpha, options) {
             break;
         }
         case 4 /* ColorMode.CMYK */: {
+            if (psd.bitsPerChannel !== 8)
+                throw new Error('bitsPerChannel Not supproted');
             if (psd.channels !== 4)
                 throw new Error("Invalid channel count");
             var channels = [0, 1, 2, 3];
-            if (globalAlpha)
+            if (options.globalAlpha)
                 channels.push(4);
             if (compression === 0 /* Compression.RawData */) {
                 throw new Error("Not implemented");
@@ -8164,7 +8344,7 @@ function readImageData(reader, psd, globalAlpha, options) {
                     data: new Uint8Array(imageData.width * imageData.height * 5),
                 };
                 var start = reader.offset;
-                readDataRLE(reader, cmykImageData, psd.width, psd.height, 5, channels, options.large);
+                readDataRLE(reader, cmykImageData, psd.width, psd.height, (_b = psd.bitsPerChannel) !== null && _b !== void 0 ? _b : 8, 5, channels, options.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);
@@ -8174,7 +8354,9 @@ function readImageData(reader, psd, globalAlpha, options) {
         default: throw new Error("Color mode not supported: ".concat(psd.colorMode));
     }
     // remove weird white matte
-    if (globalAlpha) {
+    if (options.globalAlpha) {
+        if (psd.bitsPerChannel !== 8)
+            throw new Error('bitsPerChannel Not supproted');
         var p = imageData.data;
         var size = imageData.width * imageData.height * 4;
         for (var i = 0; i < size; i += 4) {
@@ -8193,8 +8375,7 @@ function readImageData(reader, psd, globalAlpha, options) {
         psd.imageData = imageData;
     }
     else {
-        psd.canvas = (0, helpers_1.createCanvas)(psd.width, psd.height);
-        psd.canvas.getContext('2d').putImageData(imageData, 0, 0);
+        psd.canvas = (0, helpers_1.imageDataToCanvas)(imageData);
     }
 }
 function cmykToRgb(cmyk, rgb, reverseAlpha) {
@@ -8222,29 +8403,89 @@ function cmykToRgb(cmyk, rgb, reverseAlpha) {
     // 	dstData[dst + 3] = reverseAlpha ? 255 - srcData[src + 4] : srcData[src + 4];
     // }
 }
-function readDataRaw(reader, pixelData, width, height, step, offset) {
-    var size = width * height;
-    var buffer = readBytes(reader, size);
+function verifyCompatible(a, b) {
+    if ((a.byteLength / a.length) !== (b.byteLength / b.length)) {
+        throw new Error('Invalid array types');
+    }
+}
+function bytesToArray(bytes, bitDepth) {
+    if (bitDepth === 8) {
+        return bytes;
+    }
+    else if (bitDepth === 16) {
+        if (bytes.byteOffset % 2) {
+            var result = new Uint16Array(bytes.byteLength / 2);
+            new Uint8Array(result.buffer, result.byteOffset, result.byteLength).set(bytes);
+            return result;
+        }
+        else {
+            return new Uint16Array(bytes.buffer, bytes.byteOffset, bytes.byteLength / 2);
+        }
+    }
+    else if (bitDepth === 32) {
+        if (bytes.byteOffset % 4) {
+            var result = new Uint32Array(bytes.byteLength / 4);
+            new Uint8Array(result.buffer, result.byteOffset, result.byteLength).set(bytes);
+            return result;
+        }
+        else {
+            return new Uint32Array(bytes.buffer, bytes.byteOffset, bytes.byteLength / 4);
+        }
+    }
+    else {
+        throw new Error("Invalid bitDepth (".concat(bitDepth, ")"));
+    }
+}
+function copyChannelToPixelData(pixelData, channel, offset, step) {
+    verifyCompatible(pixelData.data, channel);
+    var size = pixelData.width * pixelData.height;
+    var data = pixelData.data;
+    for (var i = 0, p = offset | 0; i < size; i++, p = (p + step) | 0) {
+        data[p] = channel[i];
+    }
+}
+function readDataRaw(reader, pixelData, width, height, bitDepth, step, offset) {
+    var buffer = readBytes(reader, width * height * Math.floor(bitDepth / 8));
+    var array = bytesToArray(buffer, bitDepth);
     if (pixelData && offset < step) {
-        var data = pixelData.data;
-        for (var i = 0, p = offset | 0; i < size; i++, p = (p + step) | 0) {
-            data[p] = buffer[i];
+        copyChannelToPixelData(pixelData, array, offset, step);
+    }
+}
+function decodePredicted(data, width, height, mod) {
+    for (var y = 0; y < height; y++) {
+        var offset = y * width;
+        for (var x = 1, o = offset + 1; x < width; x++, o++) {
+            data[o] = (data[o - 1] + data[o]) % mod;
         }
     }
 }
-function readDataZipWithoutPrediction(reader, length, pixelData, width, height, step, offset) {
+function readDataZip(reader, length, pixelData, width, height, bitDepth, step, offset, prediction) {
     var compressed = readBytes(reader, length);
     var decompressed = (0, pako_1.inflate)(compressed);
-    var size = width * height;
     if (pixelData && offset < step) {
-        var data = pixelData.data;
-        for (var i = 0, p = offset | 0; i < size; i++, p = (p + step) | 0) {
-            data[p] = decompressed[i];
+        var array = bytesToArray(decompressed, bitDepth);
+        if (bitDepth === 8) {
+            if (prediction)
+                decodePredicted(decompressed, width, height, 0x100);
+            copyChannelToPixelData(pixelData, decompressed, offset, step);
+        }
+        else if (bitDepth === 16) {
+            if (prediction)
+                decodePredicted(array, width, height, 0x10000);
+            copyChannelToPixelData(pixelData, array, offset, step);
+        }
+        else if (bitDepth === 32) {
+            if (prediction)
+                decodePredicted(decompressed, width, height, 0x100);
+            copyChannelToPixelData(pixelData, array, offset, step);
+        }
+        else {
+            throw new Error('Invalid bitDepth');
         }
     }
 }
-exports.readDataZipWithoutPrediction = readDataZipWithoutPrediction;
-function readDataRLE(reader, pixelData, _width, height, step, offsets, large) {
+exports.readDataZip = readDataZip;
+function readDataRLE(reader, pixelData, _width, height, bitDepth, step, offsets, large) {
     var data = pixelData && pixelData.data;
     var lengths;
     if (large) {
@@ -8263,6 +8504,8 @@ function readDataRLE(reader, pixelData, _width, height, step, offsets, large) {
             }
         }
     }
+    if (bitDepth !== 1 && bitDepth !== 8)
+        throw new Error("Invalid bit depth (".concat(bitDepth, ")"));
     var extraLimit = (step - 1) | 0; // 3 for rgb, 4 for cmyk
     for (var c = 0, li = 0; c < offsets.length; c++) {
         var offset = offsets[c] | 0;
@@ -8672,12 +8915,31 @@ function writeSection(writer, round, func, writeTotalLength, large) {
     writer.view.setUint32(offset, length, false);
 }
 exports.writeSection = writeSection;
+function verifyBitCount(target) {
+    var _a;
+    (_a = target.children) === null || _a === void 0 ? void 0 : _a.forEach(verifyBitCount);
+    var data = target.imageData;
+    if (data && (data.data instanceof Uint32Array || data.data instanceof Uint16Array)) {
+        throw new Error('imageData has incorrect bitDepth');
+    }
+    if ('mask' in target && target.mask) {
+        var data_1 = target.mask.imageData;
+        if (data_1 && (data_1.data instanceof Uint32Array || data_1.data instanceof Uint16Array)) {
+            throw new Error('mask imageData has incorrect bitDepth');
+        }
+    }
+}
 function writePsd(writer, psd, options) {
+    var _a;
     if (options === void 0) { options = {}; }
     if (!(+psd.width > 0 && +psd.height > 0))
         throw new Error('Invalid document size');
     if ((psd.width > 30000 || psd.height > 30000) && !options.psb)
         throw new Error('Document size is too large (max is 30000x30000, use PSB format instead)');
+    var bitsPerChannel = (_a = psd.bitsPerChannel) !== null && _a !== void 0 ? _a : 8;
+    if (bitsPerChannel !== 8)
+        throw new Error('bitsPerChannel other than 8 are not supported for writing');
+    verifyBitCount(psd);
     var imageResources = psd.imageResources || {};
     var opt = __assign(__assign({}, options), { layerIds: new Set(), layerToId: new Map() });
     if (opt.generateThumbnail) {
@@ -8699,7 +8961,7 @@ function writePsd(writer, psd, options) {
     writeUint16(writer, globalAlpha ? 4 : 3); // channels
     writeUint32(writer, psd.height);
     writeUint32(writer, psd.width);
-    writeUint16(writer, 8); // bits per channel
+    writeUint16(writer, bitsPerChannel); // bits per channel
     writeUint16(writer, 3 /* ColorMode.RGB */); // we only support saving RGB right now
     // color mode data
     writeSection(writer, 1, function () {
@@ -8996,9 +9258,7 @@ function createThumbnail(psd) {
     var context = canvas.getContext('2d');
     context.scale(scale, scale);
     if (psd.imageData) {
-        var temp = (0, helpers_1.createCanvas)(psd.imageData.width, psd.imageData.height);
-        temp.getContext('2d').putImageData(psd.imageData, 0, 0);
-        context.drawImage(temp, 0, 0);
+        context.drawImage((0, helpers_1.imageDataToCanvas)(psd.imageData), 0, 0);
     }
     else if (psd.canvas) {
         context.drawImage(psd.canvas, 0, 0);
@@ -9053,6 +9313,9 @@ function getLayerDimentions(_a) {
     return imageData || canvas || { width: 0, height: 0 };
 }
 function cropImageData(data, left, top, width, height) {
+    if (data.data instanceof Uint32Array || data.data instanceof Uint16Array) {
+        throw new Error('imageData has incorrect bit depth');
+    }
     var croppedData = (0, helpers_1.createImageData)(width, height);
     var srcData = data.data;
     var dstData = croppedData.data;