ag-psd 23.1.0 → 24.0.0

package/dist/bundle.js

@@ -732,7 +732,9 @@ addHandler('luni', hasKey('name'), function (reader, target, left) {
     // writeUint16(writer, 0); // padding (but not extending string length)
 });
 addHandler('lnsr', hasKey('nameSource'), function (reader, target) { return target.nameSource = (0, psdReader_1.readSignature)(reader); }, function (writer, target) { return (0, psdWriter_1.writeSignature)(writer, target.nameSource); });
-addHandler('lyid', hasKey('id'), function (reader, target) { return target.id = (0, psdReader_1.readUint32)(reader); }, function (writer, target, _psd, options) {
+addHandler('lyid', hasKey('id'), function (reader, target) {
+    target.id = (0, psdReader_1.readUint32)(reader);
+}, function (writer, target, _psd, options) {
     var id = target.id;
     while (options.layerIds.has(id))
         id += 100; // make sure we don't have duplicate layer ids
@@ -815,8 +817,9 @@ addHandler('lclr', hasKey('layerColor'), function (reader, target) {
     (0, psdWriter_1.writeUint16)(writer, index === -1 ? 0 : index);
     (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) {
+addHandler('shmd', // Metadata setting
+function (// Metadata setting
+target) { return target.timestamp !== undefined || target.animationFrames !== undefined || 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');
@@ -900,6 +903,12 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                         t.effectsReferencePoint = { x: item.FXRefPoint.Hrzn, y: item.FXRefPoint.Vrtc };
                 }
             }
+            else if (key === 'extn') {
+                var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                // console.log(require('util').inspect(desc, false, 99, true));
+                desc; // TODO: save this
+                reader.logMissingFeatures && reader.log('Unhandled "shmd" section key', key);
+            }
             else {
                 reader.logMissingFeatures && reader.log('Unhandled "shmd" section key', key);
             }
@@ -1617,6 +1626,33 @@ function parseFilterFXItem(f, options) {
                         } });
                 }
                 ;
+            case 'Crvs':
+                {
+                    return __assign(__assign({}, base), { type: 'curves', filter: {
+                            presetKind: descriptor_1.presetKindType.decode(f.Fltr.presetKind),
+                            adjustments: f.Fltr.Adjs.map(function (a) {
+                                var channels = a.Chnl.map(function (c) { return descriptor_1.Chnl.decode(c); });
+                                if (a['Crv ']) {
+                                    return {
+                                        channels: channels,
+                                        curve: a['Crv '].map(function (c) {
+                                            var point = { x: c.Hrzn, y: c.Vrtc };
+                                            if (c.Cnty)
+                                                point.curved = true;
+                                            return point;
+                                        }),
+                                    };
+                                }
+                                else if (a.Mpng) {
+                                    return { channels: channels, values: a.Mpng };
+                                }
+                                else {
+                                    throw new Error("Unknown curve adjustment");
+                                }
+                            }),
+                        } });
+                }
+                ;
             default:
                 if (options.throwForMissingFeatures) {
                     throw new Error("Unknown filter classId: ".concat(f.Fltr._classID));
@@ -2096,6 +2132,25 @@ function serializeFilterFXItem(f) {
                 warpedVertices: f.filter.warpedVertices.map(pointToHrznVrtc),
                 quads: f.filter.quads.map(function (indices) { return ({ indices: indices }); }),
             }, filterID: 442 });
+        case 'curves': return __assign(__assign({}, base), { Fltr: {
+                _name: 'Curves',
+                _classID: 'Crvs',
+                presetKind: descriptor_1.presetKindType.encode(f.filter.presetKind),
+                Adjs: f.filter.adjustments.map(function (a) { return 'curve' in a ? {
+                    _name: '',
+                    _classID: 'CrvA',
+                    Chnl: a.channels.map(function (c) { return descriptor_1.Chnl.encode(c); }),
+                    'Crv ': a.curve.map(function (c) { return (__assign({ _name: '', _classID: 'Pnt ', Hrzn: c.x, Vrtc: c.y }, (c.curved ? { Cnty: true } : {}))); }),
+                } : {
+                    _name: '',
+                    _classID: 'CrvA',
+                    Chnl: a.channels.map(function (c) { return descriptor_1.Chnl.encode(c); }),
+                    Mpng: a.values,
+                }; }),
+            }, filterID: 1131574899 });
+        // case 'hsb/hsl': return {
+        // TODO: ...
+        // };
         default: throw new Error("Unknow filter type: ".concat(f.type));
     }
 }
@@ -2207,7 +2262,14 @@ addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
             filterFXList: placed.filter.list.map(function (f) { return serializeFilterFXItem(f); }),
         };
     }
-    // console.log('write', require('util').inspect(desc.filterFX, false, 99, true)); ///
+    // TODO:
+    // desc.comp = -1;
+    // desc.compInfo = { _name: '', _classID: 'null', compID: -1, originalCompID: -1 } as any;
+    // desc.ClMg = {
+    // 	_name: '',
+    // 	_classID: 'ClMg',
+    // 	placedLayerOCIOConversion: 'placedLayerOCIOConversion.placedLayerOCIOConvertEmbedded'
+    // } as any;
     // if (JSON.stringify(t) !== JSON.stringify(desc)) {
     // 	console.log('read', require('util').inspect(t, false, 99, true));
     // 	console.log('write', require('util').inspect(desc, false, 99, true));
@@ -2325,22 +2387,36 @@ addHandler(
     },
 );
 */
-/*
-interface GenIDesc {
-    isUsingGenTech: number;
+if (helpers_1.MOCK_HANDLERS) {
+    addHandler('CAI ', function (target) { return target._CAI_ !== undefined; }, function (reader, target, left) {
+        target._CAI_ = (0, psdReader_1.readBytes)(reader, left());
+    }, function (writer, target) {
+        (0, psdWriter_1.writeBytes)(writer, target._CAI_);
+    });
+}
+if (helpers_1.MOCK_HANDLERS) {
+    addHandler('OCIO', // generative tech?
+    function (// generative tech?
+    target) { return target._OCIO !== undefined; }, function (reader, target, left) {
+        target._OCIO = (0, psdReader_1.readBytes)(reader, left());
+    }, function (writer, target) {
+        (0, psdWriter_1.writeBytes)(writer, target._OCIO);
+    });
+}
+// interface GenIDesc {
+// 	isUsingGenTech: number;
+// }
+if (helpers_1.MOCK_HANDLERS) {
+    addHandler('GenI', // generative tech
+    function (// generative tech
+    target) { return target._GenI !== undefined; }, function (reader, target, left) {
+        target._GenI = (0, psdReader_1.readBytes)(reader, left());
+        // const desc = readVersionAndDescriptor(reader) as GenIDesc;
+        // console.log('GenI', require('util').inspect(desc, false, 99, true));
+    }, function (writer, target) {
+        (0, psdWriter_1.writeBytes)(writer, target._GenI);
+    });
 }
-
-addHandler(
-    'GenI', // generative tech
-    () => false,
-    (reader, _target, left) => {
-        const desc = readVersionAndDescriptor(reader) as GenIDesc;
-        console.log('GenI', require('util').inspect(desc, false, 99, true));
-    },
-    (_writer, _target) => {
-    },
-);
-*/
 function readRect(reader) {
     var top = (0, psdReader_1.readInt32)(reader);
     var left = (0, psdReader_1.readInt32)(reader);
@@ -3332,12 +3408,12 @@ addHandler('FEid', hasKey('filterEffectsMasks'), function (reader, target, leftB
     var version = (0, psdReader_1.readInt32)(reader);
     if (version < 1 || version > 3)
         throw new Error("Invalid filterEffects version ".concat(version));
-    if ((0, psdReader_1.readUint32)(reader))
-        throw new Error('filterEffects: 64 bit length is not supported');
-    var length = (0, psdReader_1.readUint32)(reader);
-    var end = reader.offset + length;
     target.filterEffectsMasks = [];
-    while (reader.offset < end) {
+    while (leftBytes() > 8) {
+        if ((0, psdReader_1.readUint32)(reader))
+            throw new Error('filterEffects: 64 bit length is not supported');
+        var length_2 = (0, psdReader_1.readUint32)(reader);
+        var end = reader.offset + length_2;
         var id = (0, psdReader_1.readPascalString)(reader, 1);
         var effectVersion = (0, psdReader_1.readInt32)(reader);
         if (effectVersion !== 1)
@@ -3354,12 +3430,14 @@ addHandler('FEid', hasKey('filterEffectsMasks'), function (reader, target, leftB
         var maxChannels = (0, psdReader_1.readInt32)(reader);
         var channels = [];
         // 0 -> R, 1 -> G, 2 -> B, 25 -> A
-        for (var i = 0; i < (maxChannels + 2); i++) {
+        for (var i = 0; i < (maxChannels + 2); i++) { // channels + user mask + sheet mask
             var exists = (0, psdReader_1.readInt32)(reader);
             if (exists) {
                 if ((0, psdReader_1.readUint32)(reader))
                     throw new Error('filterEffect: 64 bit length is not supported');
                 var channelLength = (0, psdReader_1.readUint32)(reader);
+                if (!channelLength)
+                    throw new Error('filterEffect: Empty channel');
                 var compressionMode = (0, psdReader_1.readUint16)(reader);
                 var data = (0, psdReader_1.readBytes)(reader, channelLength - 2);
                 channels.push({ compressionMode: compressionMode, data: data });
@@ -3369,22 +3447,35 @@ addHandler('FEid', hasKey('filterEffectsMasks'), function (reader, target, leftB
             }
         }
         target.filterEffectsMasks.push({ id: id, top: top_2, left: left, bottom: bottom, right: right, depth: depth, channels: channels });
-        if (leftBytes() && (0, psdReader_1.readUint8)(reader)) {
+        if (reader.offset < end && (0, psdReader_1.readUint8)(reader)) {
+            var top_3 = (0, psdReader_1.readInt32)(reader);
+            var left_1 = (0, psdReader_1.readInt32)(reader);
+            var bottom_1 = (0, psdReader_1.readInt32)(reader);
+            var right_1 = (0, psdReader_1.readInt32)(reader);
+            if ((0, psdReader_1.readUint32)(reader))
+                throw new Error('filterEffect: 64 bit length is not supported');
+            var extraLength = (0, psdReader_1.readUint32)(reader);
             var compressionMode = (0, psdReader_1.readUint16)(reader);
-            var data = (0, psdReader_1.readBytes)(reader, leftBytes());
-            target.filterEffectsMasks[target.filterEffectsMasks.length - 1].extra = { compressionMode: compressionMode, data: data };
+            var data = (0, psdReader_1.readBytes)(reader, extraLength - 2);
+            target.filterEffectsMasks[target.filterEffectsMasks.length - 1].extra = { top: top_3, left: left_1, bottom: bottom_1, right: right_1, compressionMode: compressionMode, data: data };
+        }
+        reader.offset = end;
+        var len = length_2;
+        while (len % 4) {
+            reader.offset++;
+            len++;
         }
     }
 }, function (writer, target) {
     var _a;
-    (0, psdWriter_1.writeInt32)(writer, 3);
-    (0, psdWriter_1.writeUint32)(writer, 0);
-    (0, psdWriter_1.writeUint32)(writer, 0);
-    var lengthOffset = writer.offset;
+    (0, psdWriter_1.writeInt32)(writer, 3); // version
     for (var _i = 0, _b = target.filterEffectsMasks; _i < _b.length; _i++) {
         var mask = _b[_i];
+        (0, psdWriter_1.writeUint32)(writer, 0);
+        (0, psdWriter_1.writeUint32)(writer, 0);
+        var lengthOffset = writer.offset;
         (0, psdWriter_1.writePascalString)(writer, mask.id, 1);
-        (0, psdWriter_1.writeInt32)(writer, 1);
+        (0, psdWriter_1.writeInt32)(writer, 1); // version
         (0, psdWriter_1.writeUint32)(writer, 0);
         (0, psdWriter_1.writeUint32)(writer, 0);
         var length2Offset = writer.offset;
@@ -3406,14 +3497,25 @@ addHandler('FEid', hasKey('filterEffectsMasks'), function (reader, target, leftB
             }
         }
         writer.view.setUint32(length2Offset - 4, writer.offset - length2Offset, false);
+        var extra = (_a = target.filterEffectsMasks[target.filterEffectsMasks.length - 1]) === null || _a === void 0 ? void 0 : _a.extra;
+        if (extra) {
+            (0, psdWriter_1.writeUint8)(writer, 1);
+            (0, psdWriter_1.writeInt32)(writer, extra.top);
+            (0, psdWriter_1.writeInt32)(writer, extra.left);
+            (0, psdWriter_1.writeInt32)(writer, extra.bottom);
+            (0, psdWriter_1.writeInt32)(writer, extra.right);
+            (0, psdWriter_1.writeUint32)(writer, 0);
+            (0, psdWriter_1.writeUint32)(writer, extra.data.byteLength + 2);
+            (0, psdWriter_1.writeUint16)(writer, extra.compressionMode);
+            (0, psdWriter_1.writeBytes)(writer, extra.data);
+        }
+        var length_3 = writer.offset - lengthOffset;
+        writer.view.setUint32(lengthOffset - 4, length_3, false);
+        while (length_3 % 4) {
+            (0, psdWriter_1.writeZeros)(writer, 1);
+            length_3++;
+        }
     }
-    var extra = (_a = target.filterEffectsMasks[target.filterEffectsMasks.length - 1]) === null || _a === void 0 ? void 0 : _a.extra;
-    if (extra) {
-        (0, psdWriter_1.writeUint8)(writer, 1);
-        (0, psdWriter_1.writeUint16)(writer, extra.compressionMode);
-        (0, psdWriter_1.writeBytes)(writer, extra.data);
-    }
-    writer.view.setUint32(lengthOffset - 4, writer.offset - lengthOffset, false);
 });
 addHandlerAlias('FXid', 'FEid');
 addHandler('FMsk', hasKey('filterMask'), function (reader, target) {
@@ -3489,10 +3591,16 @@ addHandler('cinf', hasKey('compositorUsed'), function (reader, target, left) {
         reason: desc.reason,
         engine: enumValue(desc.Engn),
     };
+    if (desc.Vrsn)
+        target.compositorUsed.version = desc.Vrsn;
+    if (desc.psVersion)
+        target.compositorUsed.photoshopVersion = desc.psVersion;
     if (desc.enableCompCore)
         target.compositorUsed.enableCompCore = enumValue(desc.enableCompCore);
     if (desc.enableCompCoreGPU)
         target.compositorUsed.enableCompCoreGPU = enumValue(desc.enableCompCoreGPU);
+    if (desc.enableCompCoreThreads)
+        target.compositorUsed.enableCompCoreThreads = enumValue(desc.enableCompCoreThreads);
     if (desc.compCoreSupport)
         target.compositorUsed.compCoreSupport = enumValue(desc.compCoreSupport);
     if (desc.compCoreGPUSupport)
@@ -3501,17 +3609,19 @@ addHandler('cinf', hasKey('compositorUsed'), function (reader, target, left) {
 }, function (writer, target) {
     var cinf = target.compositorUsed;
     var desc = {
-        Vrsn: { major: 1, minor: 0, fix: 0 },
-        // psVersion: { major: 22, minor: 3, fix: 1 }, // TESTING
-        description: cinf.description,
-        reason: cinf.reason,
-        Engn: "Engn.".concat(cinf.engine),
+        Vrsn: cinf.version || { major: 1, minor: 0, fix: 0 },
     };
+    if (cinf.photoshopVersion)
+        desc.psVersion = cinf.photoshopVersion;
+    desc.description = cinf.description;
+    desc.reason = cinf.reason;
+    desc.Engn = "Engn.".concat(cinf.engine);
     if (cinf.enableCompCore)
         desc.enableCompCore = "enable.".concat(cinf.enableCompCore);
     if (cinf.enableCompCoreGPU)
         desc.enableCompCoreGPU = "enable.".concat(cinf.enableCompCoreGPU);
-    // desc.enableCompCoreThreads = `enable.feature`; // TESTING
+    if (cinf.enableCompCoreThreads)
+        desc.enableCompCoreThreads = "enable.".concat(cinf.enableCompCoreThreads);
     if (cinf.compCoreSupport)
         desc.compCoreSupport = "reason.".concat(cinf.compCoreSupport);
     if (cinf.compCoreGPUSupport)
@@ -3619,7 +3729,7 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ESliceOrigin = exports.ESliceVertAlign = exports.ESliceHorzAlign = exports.ESliceType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.stdTrackID = exports.animInterpStyleEnum = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.frac = exports.unitsValue = exports.unitsPercentF = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.serializeColor = exports.parseColor = exports.serializeVectorContent = exports.parseVectorContent = exports.serializeTrackList = exports.parseTrackList = exports.parseEffects = exports.serializeEffects = exports.boundsToDescBounds = exports.descBoundsToBounds = exports.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
-exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = exports.ESliceBGColorType = void 0;
+exports.presetKindType = exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = exports.ESliceBGColorType = void 0;
 var helpers_1 = require("./helpers");
 var psdReader_1 = require("./psdReader");
 var psdWriter_1 = require("./psdWriter");
@@ -3733,6 +3843,7 @@ var fieldToExtType = {
     customShape: makeType('', 'customShape'),
     origFXRefPoint: nullType,
     FXRefPoint: nullType,
+    ClMg: makeType('', 'ClMg'),
 };
 var fieldToArrayExtType = {
     'Crv ': makeType('', 'CrPt'),
@@ -3765,6 +3876,7 @@ var fieldToArrayExtType = {
     ShrP: makeType('', 'Pnt '),
     layerSettings: nullType,
     list: nullType,
+    Adjs: makeType('', 'CrvA'),
 };
 var typeToField = {
     'TEXT': [
@@ -3779,7 +3891,7 @@ var typeToField = {
     ],
     'long': [
         'TextIndex', 'RndS', 'Mdpn', 'Smth', 'Lctn', 'strokeStyleVersion', 'LaID', 'Vrsn', 'Cnt ',
-        'Brgh', 'Cntr', 'means', 'vibrance', 'Strt', 'bwPresetKind', 'presetKind', 'comp', 'compID', 'originalCompID',
+        'Brgh', 'Cntr', 'means', 'vibrance', 'Strt', 'bwPresetKind', 'comp', 'compID', 'originalCompID',
         'curvesPresetKind', 'mixerPresetKind', 'uOrder', 'vOrder', 'PgNm', 'totalPages', 'Crop',
         'numerator', 'denominator', 'frameCount', 'Annt', 'keyOriginType', 'unitValueQuadVersion',
         'keyOriginIndex', 'major', 'minor', 'fix', 'docDefaultNewArtboardBackgroundType', 'artboardBackgroundType',
@@ -3799,7 +3911,7 @@ var typeToField = {
         'tableOrder', 'enableCompCore', 'enableCompCoreGPU', 'compCoreSupport', 'compCoreGPUSupport', 'Engn',
         'enableCompCoreThreads', 'gs99', 'FrDs', 'trackID', 'animInterpStyle', 'horzAlign',
         'vertAlign', 'bgColorType', 'shapeOperation', 'UndA', 'Wvtp', 'Drct', 'WndM', 'Edg ', 'FlCl', 'IntE',
-        'IntC', 'Cnvr', 'Fl  ', 'Dstr', 'MztT', 'Lns ', 'ExtT', 'DspM', 'ExtR', 'ZZTy', 'SphM', 'SmBQ',
+        'IntC', 'Cnvr', 'Fl  ', 'Dstr', 'MztT', 'Lns ', 'ExtT', 'DspM', 'ExtR', 'ZZTy', 'SphM', 'SmBQ', 'placedLayerOCIOConversion',
     ],
     'bool': [
         'PstS', 'printSixteenBit', 'masterFXSwitch', 'enab', 'uglg', 'antialiasGloss',
@@ -3812,7 +3924,7 @@ var typeToField = {
         'materialsDisclosed', 'hasMotion', 'muted', 'Effc', 'selected', 'autoScope', 'fillCanvas',
         'cellTextIsHTML', 'Smoo', 'Clsp', 'validAtPosition', 'rigidType', 'hasoptions', 'filterMaskEnable',
         'filterMaskLinked', 'filterMaskExtendWithWhite', 'removeJPEGArtifact', 'Mnch', 'ExtF', 'ExtM',
-        'moreAccurate', 'GpuY', 'LIWy',
+        'moreAccurate', 'GpuY', 'LIWy', 'Cnty',
     ],
     'doub': [
         'warpValue', 'warpPerspective', 'warpPerspectiveOther', 'Intr', 'Wdth', 'Hght',
@@ -3834,7 +3946,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', 'layerSettings', 'list', 'compList',
+        'channelDenoise', 'Mtrx', 'layerSettings', 'list', 'compList', 'Adjs',
     ],
     'ObAr': ['meshPoints', 'quiltSliceX', 'quiltSliceY'],
     'obj ': ['null', 'Chnl'],
@@ -3881,6 +3993,7 @@ var fieldToArrayType = {
     channelDenoise: 'Objc',
     Mtrx: 'long',
     compList: 'long',
+    Chnl: 'enum',
 };
 var fieldToType = {};
 for (var _i = 0, _a = Object.keys(typeToField); _i < _a.length; _i++) {
@@ -3900,6 +4013,9 @@ for (var _f = 0, _g = Object.keys(fieldToArrayExtType); _f < _g.length; _f++) {
     fieldToArrayType[field] = 'Objc';
 }
 function getTypeByKey(key, value, root, parent) {
+    if (key === 'presetKind') {
+        return typeof value === 'string' ? 'enum' : 'long';
+    }
     if (key === 'null' && root === 'slices') {
         return 'TEXT';
     }
@@ -3915,7 +4031,7 @@ function getTypeByKey(key, value, root, parent) {
     else if (key === 'AntA') {
         return typeof value === 'string' ? 'enum' : 'bool';
     }
-    else if ((key === 'Hrzn' || key === 'Vrtc') && parent.Type === 'keyType.Pstn') {
+    else if ((key === 'Hrzn' || key === 'Vrtc') && (parent.Type === 'keyType.Pstn' || parent._classID === 'Ofst')) {
         return 'long';
     }
     else if (key === 'Hrzn' || key === 'Vrtc' || key === 'Top ' || key === 'Left' || key === 'Btom' || key === 'Rght') {
@@ -4008,6 +4124,9 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
         else if (/^PF[a-z][a-z]$/.test(key)) {
             type = 'doub';
         }
+        else if ((key === 'Rds ' || key === 'Thsh') && typeof value[key] === 'number' && value._classID === 'SmrB') {
+            type = 'doub';
+        }
         else if (key === 'ClSz' || key === 'Rds ' || key === 'Amnt') {
             type = typeof value[key] === 'number' ? 'long' : 'UntF';
         }
@@ -4017,6 +4136,12 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
         else if (key === 'blur' && typeof value[key] === 'string') {
             type = 'enum';
         }
+        else if (key === 'Hght' && typeof value[key] === 'number' && value._classID === 'Embs') {
+            type = 'long';
+        }
+        else if (key === 'Angl' && typeof value[key] === 'number' && (value._classID === 'Embs' || value._classID === 'smartSharpen' || value._classID === 'Twrl' || value._classID === 'MtnB')) {
+            type = 'long';
+        }
         else if (key === 'Angl' && typeof value[key] === 'number') {
             type = 'doub'; // ???
         }
@@ -4344,7 +4469,7 @@ function writeReferenceStructure(writer, _key, items) {
         var value = items[i];
         var type = 'unknown';
         if (typeof value === 'string') {
-            if (/^[a-z]+\.[a-z]+$/i.test(value)) {
+            if (/^[a-z ]+\.[a-z ]+$/i.test(value)) {
                 type = 'Enmr';
             }
             else {
@@ -5600,6 +5725,10 @@ exports.prjM = (0, helpers_1.createEnum)('prjM', 'fisheye', {
     'auto': 'auto',
     'full spherical': 'fusP',
 });
+exports.presetKindType = (0, helpers_1.createEnum)('presetKindType', 'presetKindCustom', {
+    custom: 'presetKindCustom',
+    default: 'presetKindDefault',
+});
 
 },{"./helpers":7,"./psdReader":11,"./psdWriter":12}],5:[function(require,module,exports){
 "use strict";
@@ -7730,12 +7859,12 @@ var LayerCompCapturedInfo;
 },{}],11:[function(require,module,exports){
 "use strict";
 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.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;
+exports.readPattern = exports.readColor = exports.readSection = exports.readDataRLE = exports.readDataZip = exports.createImageDataBitDepth = exports.readAdditionalLayerInfo = exports.readGlobalLayerMaskInfo = exports.readData = 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");
 var imageResources_1 = require("./imageResources");
-exports.supportedColorModes = [0 /* ColorMode.Bitmap */, 1 /* ColorMode.Grayscale */, 3 /* ColorMode.RGB */];
+exports.supportedColorModes = [0 /* ColorMode.Bitmap */, 1 /* ColorMode.Grayscale */, 3 /* ColorMode.RGB */, 2 /* ColorMode.Indexed */];
 var colorModes = ['bitmap', 'grayscale', 'indexed', 'RGB', 'CMYK', 'multichannel', 'duotone', 'lab'];
 function setupGrayscale(data) {
     var size = data.width * data.height * 4;
@@ -7849,7 +7978,7 @@ exports.validSignatureAt = validSignatureAt;
 function readPascalString(reader, padTo) {
     var length = readUint8(reader);
     var text = length ? readShortString(reader, length) : '';
-    while (++length % padTo) {
+    while (++length % padTo) { // starts with length + 1 so we count the size byte too
         reader.offset++;
     }
     return text;
@@ -7945,13 +8074,22 @@ function readPsd(reader, readOptions) {
     readSection(reader, 1, function (left) {
         if (!left())
             return;
-        // const numbers: number[] = [];
-        // console.log('color mode', left());
-        // while (left() > 0) {
-        // 	numbers.push(readUint32(reader));
-        // }
-        // console.log('color mode', numbers);
-        // if (options.throwForMissingFeatures) throw new Error('Color mode data not supported');
+        if (colorMode === 2 /* ColorMode.Indexed */) {
+            // should have 256 colors here saved as 8bit channels RGB
+            if (left() != 768)
+                throw new Error('Invalid color palette size');
+            psd.palette = [];
+            for (var i = 0; i < 256; i++)
+                psd.palette.push({ r: readUint8(reader), g: 0, b: 0 });
+            for (var i = 0; i < 256; i++)
+                psd.palette[i].g = readUint8(reader);
+            for (var i = 0; i < 256; i++)
+                psd.palette[i].b = readUint8(reader);
+        }
+        else {
+            // TODO: unknown format for duotone, also seems to have some data here for 32bit colors
+            // if (options.throwForMissingFeatures) throw new Error('Color mode data not supported');
+        }
         skipBytes(reader, left());
     });
     // image resources
@@ -8135,8 +8273,9 @@ function readLayerRecord(reader, psd) {
         // 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)
+        while (left() >= 12)
             readAdditionalLayerInfo(reader, layer, psd);
+        skipBytes(reader, left());
     });
     return { layer: layer, channels: channels };
 }
@@ -8216,8 +8355,10 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
             (0, helpers_1.resetImageData)(imageData);
         }
     }
-    if (helpers_1.RAW_IMAGE_DATA)
+    if (helpers_1.RAW_IMAGE_DATA) {
         layer.imageDataRaw = [];
+        layer.imageDataRawCompression = [];
+    }
     for (var _i = 0, channels_1 = channels; _i < channels_1.length; _i++) {
         var channel = channels_1[_i];
         if (channel.length === 0)
@@ -8250,6 +8391,7 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
                 var start_1 = reader.offset;
                 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.maskDataRawCompression = compression;
                     layer.maskDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start_1, reader.offset - start_1);
                 }
                 setupGrayscale(maskData);
@@ -8278,6 +8420,7 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
             }
             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.imageDataRawCompression[channel.id] = compression;
                 layer.imageDataRaw[channel.id] = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start + 2, channel.length - 2);
             }
             reader.offset = start + channel.length;
@@ -8317,6 +8460,7 @@ function readData(reader, length, data, compression, width, height, bitDepth, of
         throw new Error("Invalid Compression type: ".concat(compression));
     }
 }
+exports.readData = readData;
 function readGlobalLayerMaskInfo(reader) {
     return readSection(reader, 1, function (left) {
         if (!left())
@@ -8362,22 +8506,29 @@ function readAdditionalLayerInfo(reader, target, psd) {
     }, false, u64);
 }
 exports.readAdditionalLayerInfo = readAdditionalLayerInfo;
-function createImageDataBitDepth(width, height, bitDepth) {
+function createImageDataBitDepth(width, height, bitDepth, channels) {
+    if (channels === void 0) { channels = 4; }
     if (bitDepth === 1 || bitDepth === 8) {
-        return (0, helpers_1.createImageData)(width, height);
+        if (channels === 4) {
+            return (0, helpers_1.createImageData)(width, height);
+        }
+        else {
+            return { width: width, height: height, data: new Uint8ClampedArray(width * height * channels) };
+        }
     }
     else if (bitDepth === 16) {
-        return { width: width, height: height, data: new Uint16Array(width * height * 4) };
+        return { width: width, height: height, data: new Uint16Array(width * height * channels) };
     }
     else if (bitDepth === 32) {
-        return { width: width, height: height, data: new Float32Array(width * height * 4) };
+        return { width: width, height: height, data: new Float32Array(width * height * channels) };
     }
     else {
         throw new Error("Invalid bitDepth (".concat(bitDepth, ")"));
     }
 }
+exports.createImageDataBitDepth = createImageDataBitDepth;
 function readImageData(reader, psd) {
-    var _a, _b;
+    var _a;
     var compression = readUint16(reader);
     var bitsPerChannel = (_a = psd.bitsPerChannel) !== null && _a !== void 0 ? _a : 8;
     if (exports.supportedColorModes.indexOf(psd.colorMode) === -1)
@@ -8432,8 +8583,32 @@ function readImageData(reader, psd) {
             }
             break;
         }
+        case 2 /* ColorMode.Indexed */: {
+            if (bitsPerChannel !== 8)
+                throw new Error('bitsPerChannel Not supproted');
+            if (psd.channels !== 1)
+                throw new Error('Invalid channel count');
+            if (!psd.palette)
+                throw new Error('Missing color palette');
+            if (compression === 0 /* Compression.RawData */) {
+                throw new Error("Not implemented");
+            }
+            else if (compression === 1 /* Compression.RleCompressed */) {
+                var indexedImageData = {
+                    width: imageData.width,
+                    height: imageData.height,
+                    data: new Uint8Array(imageData.width * imageData.height),
+                };
+                readDataRLE(reader, indexedImageData, psd.width, psd.height, bitsPerChannel, 1, [0], reader.large);
+                indexedToRgb(indexedImageData, imageData, psd.palette);
+            }
+            else {
+                throw new Error("Not implemented");
+            }
+            break;
+        }
         case 4 /* ColorMode.CMYK */: {
-            if (psd.bitsPerChannel !== 8)
+            if (bitsPerChannel !== 8)
                 throw new Error('bitsPerChannel Not supproted');
             if (psd.channels !== 4)
                 throw new Error("Invalid channel count");
@@ -8454,11 +8629,14 @@ function readImageData(reader, psd) {
                     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, reader.large);
+                readDataRLE(reader, cmykImageData, psd.width, psd.height, bitsPerChannel, 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);
             }
+            else {
+                throw new Error("Not implemented");
+            }
             break;
         }
         default: throw new Error("Color mode not supported: ".concat(psd.colorMode));
@@ -8513,6 +8691,18 @@ function cmykToRgb(cmyk, rgb, reverseAlpha) {
     // 	dstData[dst + 3] = reverseAlpha ? 255 - srcData[src + 4] : srcData[src + 4];
     // }
 }
+function indexedToRgb(indexed, rgb, palette) {
+    var size = indexed.width * indexed.height;
+    var srcData = indexed.data;
+    var dstData = rgb.data;
+    for (var src = 0, dst = 0; src < size; src++, dst += 4) {
+        var c = palette[srcData[src]];
+        dstData[dst + 0] = c.r;
+        dstData[dst + 1] = c.g;
+        dstData[dst + 2] = c.b;
+        dstData[dst + 3] = 255;
+    }
+}
 function verifyCompatible(a, b) {
     if ((a.byteLength / a.length) !== (b.byteLength / b.length)) {
         throw new Error('Invalid array types');
@@ -8617,7 +8807,7 @@ function readDataZip(reader, length, pixelData, width, height, bitDepth, step, o
     }
 }
 exports.readDataZip = readDataZip;
-function readDataRLE(reader, pixelData, _width, height, bitDepth, step, offsets, large) {
+function readDataRLE(reader, pixelData, width, height, bitDepth, step, offsets, large) {
     var data = pixelData && pixelData.data;
     var lengths;
     if (large) {
@@ -8651,18 +8841,18 @@ function readDataRLE(reader, pixelData, _width, height, bitDepth, step, offsets,
             for (var y = 0, p = offset | 0; y < height; y++, li++) {
                 var length_2 = lengths[li];
                 var buffer = readBytes(reader, length_2);
-                for (var i = 0; i < length_2; i++) {
+                for (var i = 0, x = 0; i < length_2; i++) {
                     var header = buffer[i];
                     if (header > 128) {
                         var value = buffer[++i];
                         header = (256 - header) | 0;
-                        for (var j = 0; j <= header; j = (j + 1) | 0) {
+                        for (var j = 0; j <= header && x < width; j = (j + 1) | 0, x = (x + 1) | 0) {
                             data[p] = value;
                             p = (p + step) | 0;
                         }
                     }
                     else if (header < 128) {
-                        for (var j = 0; j <= header; j = (j + 1) | 0) {
+                        for (var j = 0; j <= header && x < width; j = (j + 1) | 0, x = (x + 1) | 0) {
                             data[p] = buffer[++i];
                             p = (p + step) | 0;
                         }
@@ -8883,7 +9073,7 @@ function createWriter(size) {
     var buffer = new ArrayBuffer(size);
     var view = new DataView(buffer);
     var offset = 0;
-    return { buffer: buffer, view: view, offset: offset };
+    return { buffer: buffer, view: view, offset: offset, tempBuffer: undefined };
 }
 exports.createWriter = createWriter;
 function getWriterBuffer(writer) {
@@ -9037,10 +9227,14 @@ function writeSection(writer, round, func, writeTotalLength, large) {
     func();
     var length = writer.offset - offset - 4;
     var len = length;
-    while ((writer.offset % round) !== 0) {
+    while ((len % round) !== 0) {
         writeUint8(writer, 0);
         len++;
     }
+    // while ((writer.offset % round) !== 0) {
+    // 	writeUint8(writer, 0);
+    // 	len++;
+    // }
     if (writeTotalLength) {
         length = len;
     }
@@ -9085,7 +9279,7 @@ function writePsd(writer, psd, options) {
         throw new Error('Document canvas must have the same size as document');
     var globalAlpha = !!imageData && (0, helpers_1.hasAlpha)(imageData);
     var maxBufferSize = Math.max(getLargestLayerSize(psd.children), 4 * 2 * psd.width * psd.height + 2 * psd.height);
-    var tempBuffer = new Uint8Array(maxBufferSize);
+    writer.tempBuffer = new Uint8Array(maxBufferSize);
     // header
     writeSignature(writer, '8BPS');
     writeUint16(writer, options.psb ? 2 : 1); // version
@@ -9097,7 +9291,16 @@ function writePsd(writer, psd, options) {
     writeUint16(writer, 3 /* ColorMode.RGB */); // we only support saving RGB right now
     // color mode data
     writeSection(writer, 1, function () {
-        // TODO: implement
+        var _a, _b, _c;
+        if (psd.palette) {
+            for (var i = 0; i < 256; i++)
+                writeUint8(writer, ((_a = psd.palette[i]) === null || _a === void 0 ? void 0 : _a.r) || 0);
+            for (var i = 0; i < 256; i++)
+                writeUint8(writer, ((_b = psd.palette[i]) === null || _b === void 0 ? void 0 : _b.g) || 0);
+            for (var i = 0; i < 256; i++)
+                writeUint8(writer, ((_c = psd.palette[i]) === null || _c === void 0 ? void 0 : _c.b) || 0);
+        }
+        // TODO: other data?
     });
     // image resources
     writeSection(writer, 1, function () {
@@ -9121,7 +9324,7 @@ function writePsd(writer, psd, options) {
     });
     // layer and mask info
     writeSection(writer, 2, function () {
-        writeLayerInfo(tempBuffer, writer, psd, globalAlpha, opt);
+        writeLayerInfo(writer, psd, globalAlpha, opt);
         writeGlobalLayerMaskInfo(writer, psd.globalLayerMaskInfo);
         writeAdditionalLayerInfo(writer, psd, psd, opt);
     }, undefined, !!opt.psb);
@@ -9153,11 +9356,11 @@ function writePsd(writer, psd, options) {
                 }
             }
         }
-        writeBytes(writer, (0, helpers_1.writeDataRLE)(tempBuffer, data, channels, !!options.psb));
+        writeBytes(writer, (0, helpers_1.writeDataRLE)(writer.tempBuffer, data, channels, !!options.psb));
     }
 }
 exports.writePsd = writePsd;
-function writeLayerInfo(tempBuffer, writer, psd, globalAlpha, options) {
+function writeLayerInfo(writer, psd, globalAlpha, options) {
     writeSection(writer, 4, function () {
         var _a;
         var layers = [];
@@ -9165,7 +9368,7 @@ function writeLayerInfo(tempBuffer, writer, psd, globalAlpha, options) {
         if (!layers.length)
             layers.push({});
         writeInt16(writer, globalAlpha ? -layers.length : layers.length);
-        var layersData = layers.map(function (l, i) { return getChannels(tempBuffer, l, i === 0, options); });
+        var layersData = layers.map(function (l, i) { return getChannels(writer.tempBuffer, l, i === 0, options); });
         var _loop_3 = function (layerData) {
             var layer = layerData.layer, top_1 = layerData.top, left = layerData.left, bottom = layerData.bottom, right = layerData.right, channels = layerData.channels;
             writeInt32(writer, top_1);
@@ -9301,10 +9504,10 @@ function writeAdditionalLayerInfo(writer, target, psd, options) {
             key = 'vsms';
         if (handler.has(target)) {
             var large = options.psb && helpers_1.largeAdditionalInfoKeys.indexOf(key) !== -1;
-            var writeTotalLength = key !== 'Txt2' && key !== 'cinf' && key !== 'extn';
+            var writeTotalLength = key !== 'Txt2' && key !== 'cinf' && key !== 'extn' && key !== 'CAI ' && key !== 'OCIO';
             var fourBytes = key === 'Txt2' || key === 'luni' || key === 'vmsk' || key === 'artb' || key === 'artd' ||
                 key === 'vogk' || key === 'SoLd' || key === 'lnk2' || key === 'vscg' || key === 'vsms' || key === 'GdFl' ||
-                key === 'lmfx' || key === 'lrFX' || key === 'cinf' || key === 'PlLd' || key === 'Anno';
+                key === 'lmfx' || key === 'lrFX' || key === 'cinf' || key === 'PlLd' || key === 'Anno' || key === 'CAI ' || key === 'OCIO' || key === 'GenI' || key === 'FEid';
             writeSignature(writer, large ? '8B64' : '8BIM');
             writeSignature(writer, key);
             writeSection(writer, fourBytes ? 4 : 2, function () {
@@ -9320,6 +9523,8 @@ function writeAdditionalLayerInfo(writer, target, psd, options) {
 function addChildren(layers, children) {
     if (!children)
         return;
+    // const layerIds = [];
+    // const timestamps = []
     for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
         var c = children_1[_i];
         if (c.children && c.canvas)
@@ -9332,6 +9537,19 @@ function addChildren(layers, children) {
                 sectionDivider: {
                     type: 3 /* SectionDividerType.BoundingSectionDivider */,
                 },
+                // nameSource: 'lset',
+                // id: layerIds.shift(),
+                // protected: {
+                // 	transparency: false,
+                // 	composite: false,
+                // 	position: false,
+                // },
+                // layerColor: 'none',
+                // timestamp: timestamps.shift(),
+                // referencePoint: {
+                // 	x: 0,
+                // 	y: 0,
+                // },
             });
             addChildren(layers, c.children);
             layers.push(__assign(__assign({}, c), { blendMode: c.blendMode === 'pass through' ? 'normal' : c.blendMode, sectionDivider: {
@@ -9414,7 +9632,7 @@ function getChannels(tempBuffer, layer, background, options) {
             if (helpers_1.RAW_IMAGE_DATA && layer.maskDataRaw) {
                 // console.log('written raw layer image data');
                 buffer = layer.maskDataRaw;
-                compression = 1 /* Compression.RleCompressed */;
+                compression = layer.maskDataRawCompression;
             }
             else if (options.compress) {
                 buffer = (0, helpers_1.writeDataZipWithoutPrediction)(imageData, [0]);
@@ -9506,7 +9724,7 @@ function getLayerChannels(tempBuffer, layer, background, options) {
         if (helpers_1.RAW_IMAGE_DATA && layer.imageDataRaw) {
             // console.log('written raw layer image data');
             buffer = layer.imageDataRaw[channelId];
-            compression = 1 /* Compression.RleCompressed */;
+            compression = layer.imageDataRawCompression[channelId];
         }
         else if (options.compress) {
             buffer = (0, helpers_1.writeDataZipWithoutPrediction)(data, [offset]);