ag-psd 14.5.3 → 15.0.1

package/dist/bundle.js

@@ -387,35 +387,35 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
 addHandler('SoCo', function (target) { return target.vectorFill !== undefined && target.vectorStroke === undefined &&
     target.vectorFill.type === 'color'; }, function (reader, target) {
     var descriptor = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.vectorFill = parseVectorContent(descriptor);
+    target.vectorFill = (0, descriptor_1.parseVectorContent)(descriptor);
 }, function (writer, target) {
-    var descriptor = serializeVectorContent(target.vectorFill).descriptor;
+    var descriptor = (0, descriptor_1.serializeVectorContent)(target.vectorFill).descriptor;
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', descriptor);
 });
 addHandler('GdFl', function (target) { return target.vectorFill !== undefined && target.vectorStroke === undefined &&
     (target.vectorFill.type === 'solid' || target.vectorFill.type === 'noise'); }, function (reader, target, left) {
     var descriptor = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.vectorFill = parseVectorContent(descriptor);
+    target.vectorFill = (0, descriptor_1.parseVectorContent)(descriptor);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target) {
-    var descriptor = serializeVectorContent(target.vectorFill).descriptor;
+    var descriptor = (0, descriptor_1.serializeVectorContent)(target.vectorFill).descriptor;
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', descriptor);
 });
 addHandler('PtFl', function (target) { return target.vectorFill !== undefined && target.vectorStroke === undefined &&
     target.vectorFill.type === 'pattern'; }, function (reader, target) {
     var descriptor = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.vectorFill = parseVectorContent(descriptor);
+    target.vectorFill = (0, descriptor_1.parseVectorContent)(descriptor);
 }, function (writer, target) {
-    var descriptor = serializeVectorContent(target.vectorFill).descriptor;
+    var descriptor = (0, descriptor_1.serializeVectorContent)(target.vectorFill).descriptor;
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', descriptor);
 });
 addHandler('vscg', function (target) { return target.vectorFill !== undefined && target.vectorStroke !== undefined; }, function (reader, target, left) {
     (0, psdReader_1.readSignature)(reader); // key
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.vectorFill = parseVectorContent(desc);
+    target.vectorFill = (0, descriptor_1.parseVectorContent)(desc);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target) {
-    var _a = serializeVectorContent(target.vectorFill), descriptor = _a.descriptor, key = _a.key;
+    var _a = (0, descriptor_1.serializeVectorContent)(target.vectorFill), descriptor = _a.descriptor, key = _a.key;
     (0, psdWriter_1.writeSignature)(writer, key);
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', descriptor);
 });
@@ -660,10 +660,10 @@ addHandler('lmfx', function (target) { return target.effects !== undefined && ha
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     // console.log(require('util').inspect(info, false, 99, true));
     // discard if read in 'lrFX' or 'lfx2' section
-    target.effects = parseEffects(desc, !!options.logMissingFeatures);
+    target.effects = (0, descriptor_1.parseEffects)(desc, !!options.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
-    var desc = serializeEffects(target.effects, !!options.logMissingFeatures, true);
+    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, true);
     (0, psdWriter_1.writeUint32)(writer, 0); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
@@ -684,10 +684,11 @@ addHandler('luni', hasKey('name'), function (reader, target, left) {
 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) {
     var id = target.id;
-    while (options.layerIds.indexOf(id) !== -1)
+    while (options.layerIds.has(id))
         id += 100; // make sure we don't have duplicate layer ids
     (0, psdWriter_1.writeUint32)(writer, id);
-    options.layerIds.push(id);
+    options.layerIds.add(id);
+    options.layerToId.set(target, id);
 });
 addHandler('lsct', hasKey('sectionDivider'), function (reader, target, left) {
     target.sectionDivider = { type: (0, psdReader_1.readUint32)(reader) };
@@ -764,7 +765,8 @@ addHandler('lclr', hasKey('layerColor'), function (reader, target) {
     (0, psdWriter_1.writeUint16)(writer, index === -1 ? 0 : index);
     (0, psdWriter_1.writeZeros)(writer, 6);
 });
-addHandler('shmd', hasKey('timestamp'), function (reader, target, left, _, options) {
+addHandler('shmd', function (target) { return target.timestamp !== undefined || target.animationFrames !== undefined ||
+    target.animationFrameFlags !== undefined || target.timeline !== undefined; }, function (reader, target, left, _, options) {
     var count = (0, psdReader_1.readUint32)(reader);
     var _loop_1 = function (i) {
         (0, psdReader_1.checkSignature)(reader, '8BIM');
@@ -774,28 +776,62 @@ addHandler('shmd', hasKey('timestamp'), function (reader, target, left, _, optio
         (0, psdReader_1.readSection)(reader, 1, function (left) {
             if (key === 'cust') {
                 var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                // console.log('cust', target.name, require('util').inspect(desc, false, 99, true));
                 if (desc.layerTime !== undefined)
                     target.timestamp = desc.layerTime;
             }
             else if (key === 'mlst') {
                 var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-                options.logDevFeatures && console.log('mlst', desc);
-                // options.logDevFeatures && console.log('mlst', require('util').inspect(desc, false, 99, true));
+                // console.log('mlst', target.name, require('util').inspect(desc, false, 99, true));
+                target.animationFrames = [];
+                for (var i_1 = 0; i_1 < desc.LaSt.length; i_1++) {
+                    var f = desc.LaSt[i_1];
+                    var frame = { frames: f.FrLs };
+                    if (f.enab !== undefined)
+                        frame.enable = f.enab;
+                    if (f.Ofst)
+                        frame.offset = (0, descriptor_1.horzVrtcToXY)(f.Ofst);
+                    if (f.FXRf)
+                        frame.referencePoint = (0, descriptor_1.horzVrtcToXY)(f.FXRf);
+                    if (f.Lefx)
+                        frame.effects = (0, descriptor_1.parseEffects)(f.Lefx, !!options.logMissingFeatures);
+                    if (f.blendOptions && f.blendOptions.Opct)
+                        frame.opacity = (0, descriptor_1.parsePercent)(f.blendOptions.Opct);
+                    target.animationFrames.push(frame);
+                }
             }
             else if (key === 'mdyn') {
                 // frame flags
-                var unknown = (0, psdReader_1.readUint16)(reader);
+                (0, psdReader_1.readUint16)(reader); // unknown
                 var propagate = (0, psdReader_1.readUint8)(reader);
                 var flags = (0, psdReader_1.readUint8)(reader);
-                var unifyLayerPosition = (flags & 1) !== 0;
-                var unifyLayerStyle = (flags & 2) !== 0;
-                var unifyLayerVisibility = (flags & 4) !== 0;
-                options.logDevFeatures && console.log('mdyn', 'unknown:', unknown, 'propagate:', propagate, 'flags:', flags, { unifyLayerPosition: unifyLayerPosition, unifyLayerStyle: unifyLayerStyle, unifyLayerVisibility: unifyLayerVisibility });
-                // const desc = readVersionAndDescriptor(reader) as FrameListDescriptor;
-                // console.log('mdyn', require('util').inspect(desc, false, 99, true));
+                target.animationFrameFlags = {
+                    propagateFrameOne: !propagate,
+                    unifyLayerPosition: (flags & 1) !== 0,
+                    unifyLayerStyle: (flags & 2) !== 0,
+                    unifyLayerVisibility: (flags & 4) !== 0,
+                };
+            }
+            else if (key === 'tmln') {
+                var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                var timeScope = desc.timeScope;
+                // console.log('tmln', target.name, target.id, require('util').inspect(desc, false, 99, true));
+                var timeline = {
+                    start: timeScope.Strt,
+                    duration: timeScope.duration,
+                    inTime: timeScope.inTime,
+                    outTime: timeScope.outTime,
+                    autoScope: desc.autoScope,
+                    audioLevel: desc.audioLevel,
+                };
+                if (desc.trackList) {
+                    timeline.tracks = (0, descriptor_1.parseTrackList)(desc.trackList, !!options.logMissingFeatures);
+                }
+                target.timeline = timeline;
+                // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
             }
             else {
-                options.logDevFeatures && console.log('Unhandled metadata', key);
+                options.logDevFeatures && console.log('Unhandled "shmd" section key', key);
             }
             (0, psdReader_1.skipBytes)(reader, left());
         });
@@ -804,16 +840,102 @@ addHandler('shmd', hasKey('timestamp'), function (reader, target, left, _, optio
         _loop_1(i);
     }
     (0, psdReader_1.skipBytes)(reader, left());
-}, function (writer, target) {
-    var desc = {
-        layerTime: target.timestamp,
-    };
-    (0, psdWriter_1.writeUint32)(writer, 1); // count
-    (0, psdWriter_1.writeSignature)(writer, '8BIM');
-    (0, psdWriter_1.writeSignature)(writer, 'cust');
-    (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
-    (0, psdWriter_1.writeZeros)(writer, 3);
-    (0, psdWriter_1.writeSection)(writer, 2, function () { return (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'metadata', desc); }, true);
+}, function (writer, target, _, options) {
+    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline;
+    var count = 0;
+    if (animationFrames)
+        count++;
+    if (animationFrameFlags)
+        count++;
+    if (timeline)
+        count++;
+    if (timestamp !== undefined)
+        count++;
+    (0, psdWriter_1.writeUint32)(writer, count);
+    if (animationFrames) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'mlst');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, function () {
+            var _a;
+            var desc = {
+                LaID: (_a = target.id) !== null && _a !== void 0 ? _a : 0,
+                LaSt: [],
+            };
+            for (var i = 0; i < animationFrames.length; i++) {
+                var f = animationFrames[i];
+                var frame = {};
+                if (f.enable !== undefined)
+                    frame.enab = f.enable;
+                frame.FrLs = f.frames;
+                if (f.offset)
+                    frame.Ofst = (0, descriptor_1.xyToHorzVrtc)(f.offset);
+                if (f.referencePoint)
+                    frame.FXRf = (0, descriptor_1.xyToHorzVrtc)(f.referencePoint);
+                if (f.effects)
+                    frame.Lefx = (0, descriptor_1.serializeEffects)(f.effects, false, false);
+                if (f.opacity !== undefined)
+                    frame.blendOptions = { Opct: (0, descriptor_1.unitsPercent)(f.opacity) };
+                desc.LaSt.push(frame);
+            }
+            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+        }, true);
+    }
+    if (animationFrameFlags) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'mdyn');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, function () {
+            (0, psdWriter_1.writeUint16)(writer, 0); // unknown
+            (0, psdWriter_1.writeUint8)(writer, animationFrameFlags.propagateFrameOne ? 0x0 : 0xf);
+            (0, psdWriter_1.writeUint8)(writer, (animationFrameFlags.unifyLayerPosition ? 1 : 0) |
+                (animationFrameFlags.unifyLayerStyle ? 2 : 0) |
+                (animationFrameFlags.unifyLayerVisibility ? 4 : 0));
+        });
+    }
+    if (timeline) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'tmln');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, function () {
+            var desc = {
+                Vrsn: 1,
+                timeScope: {
+                    Vrsn: 1,
+                    Strt: timeline.start,
+                    duration: timeline.duration,
+                    inTime: timeline.inTime,
+                    outTime: timeline.outTime,
+                },
+                autoScope: timeline.autoScope,
+                audioLevel: timeline.audioLevel,
+            };
+            if (timeline.tracks) {
+                desc.trackList = (0, descriptor_1.serializeTrackList)(timeline.tracks);
+            }
+            var id = options.layerToId.get(target) || target.id || 0;
+            if (!id)
+                throw new Error('You need to provide layer.id value whan writing document with animations');
+            desc.LyrI = id;
+            // console.log('WRITE:tmln', target.name, target.id, require('util').inspect(desc, false, 99, true));
+            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'anim');
+        }, true);
+    }
+    if (timestamp !== undefined) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'cust');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, function () {
+            var desc = {
+                layerTime: timestamp,
+            };
+            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'metadata', desc);
+        }, true);
+    }
 });
 addHandler('vstk', hasKey('vectorStroke'), function (reader, target, left) {
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
@@ -832,7 +954,7 @@ addHandler('vstk', hasKey('vectorStroke'), function (reader, target, left) {
         lineDashSet: desc.strokeStyleLineDashSet.map(descriptor_1.parseUnits),
         blendMode: descriptor_1.BlnM.decode(desc.strokeStyleBlendMode),
         opacity: (0, descriptor_1.parsePercent)(desc.strokeStyleOpacity),
-        content: parseVectorContent(desc.strokeStyleContent),
+        content: (0, descriptor_1.parseVectorContent)(desc.strokeStyleContent),
         resolution: desc.strokeStyleResolution,
     };
     (0, psdReader_1.skipBytes)(reader, left());
@@ -854,7 +976,7 @@ addHandler('vstk', hasKey('vectorStroke'), function (reader, target, left) {
         strokeStyleLineDashSet: stroke.lineDashSet || [],
         strokeStyleBlendMode: descriptor_1.BlnM.encode(stroke.blendMode),
         strokeStyleOpacity: (0, descriptor_1.unitsPercent)((_b = stroke.opacity) !== null && _b !== void 0 ? _b : 1),
-        strokeStyleContent: serializeVectorContent(stroke.content || { type: 'color', color: { r: 0, g: 0, b: 0 } }).descriptor,
+        strokeStyleContent: (0, descriptor_1.serializeVectorContent)(stroke.content || { type: 'color', color: { r: 0, g: 0, b: 0 } }).descriptor,
         strokeStyleResolution: (_c = stroke.resolution) !== null && _c !== void 0 ? _c : 72,
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'strokeStyle', descriptor);
@@ -867,7 +989,7 @@ hasKey('artboard'), function (reader, target, left) {
         rect: { top: rect['Top '], left: rect.Left, bottom: rect.Btom, right: rect.Rght },
         guideIndices: desc.guideIndeces,
         presetName: desc.artboardPresetName,
-        color: parseColor(desc['Clr ']),
+        color: (0, descriptor_1.parseColor)(desc['Clr ']),
         backgroundType: desc.artboardBackgroundType,
     };
     (0, psdReader_1.skipBytes)(reader, left());
@@ -879,7 +1001,7 @@ hasKey('artboard'), function (reader, target, left) {
         artboardRect: { 'Top ': rect.top, Left: rect.left, Btom: rect.bottom, Rght: rect.right },
         guideIndeces: artboard.guideIndices || [],
         artboardPresetName: artboard.presetName || '',
-        'Clr ': serializeColor(artboard.color),
+        'Clr ': (0, descriptor_1.serializeColor)(artboard.color),
         artboardBackgroundType: (_a = artboard.backgroundType) !== null && _a !== void 0 ? _a : 1,
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'artboard', desc);
@@ -989,8 +1111,8 @@ addHandler('PlLd', hasKey('placedLayer'), function (reader, target, left) {
     if ((0, psdReader_1.readInt32)(reader) !== 3)
         throw new Error("Invalid PlLd version");
     var id = (0, psdReader_1.readPascalString)(reader, 1);
-    (0, psdReader_1.readInt32)(reader); // pageNumber
-    (0, psdReader_1.readInt32)(reader); // totalPages, TODO: check how this works ?
+    var pageNumber = (0, psdReader_1.readInt32)(reader);
+    var totalPages = (0, psdReader_1.readInt32)(reader); // TODO: check how this works ?
     (0, psdReader_1.readInt32)(reader); // anitAliasPolicy 16
     var placedLayerType = (0, psdReader_1.readInt32)(reader); // 0 = unknown, 1 = vector, 2 = raster, 3 = image stack
     if (!placedLayerTypes[placedLayerType])
@@ -1005,8 +1127,8 @@ addHandler('PlLd', hasKey('placedLayer'), function (reader, target, left) {
     target.placedLayer = target.placedLayer || {
         id: id,
         type: placedLayerTypes[placedLayerType],
-        // pageNumber,
-        // totalPages,
+        pageNumber: pageNumber,
+        totalPages: totalPages,
         transform: transform,
         warp: parseWarp(warp),
     };
@@ -1044,11 +1166,11 @@ addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
         id: desc.Idnt,
         placed: desc.placed,
         type: placedLayerTypes[desc.Type],
-        // pageNumber: info.PgNm,
-        // totalPages: info.totalPages,
-        // frameStep: info.frameStep,
-        // duration: info.duration,
-        // frameCount: info.frameCount,
+        pageNumber: desc.PgNm,
+        totalPages: desc.totalPages,
+        frameStep: desc.frameStep,
+        duration: desc.duration,
+        frameCount: desc.frameCount,
         transform: desc.Trnf,
         width: desc['Sz  '].Wdth,
         height: desc['Sz  '].Hght,
@@ -1070,13 +1192,7 @@ addHandler('SoLd', hasKey('placedLayer'), function (reader, target, left) {
     (0, psdWriter_1.writeSignature)(writer, 'soLD');
     (0, psdWriter_1.writeInt32)(writer, 4); // version
     var placed = target.placedLayer;
-    var desc = __assign(__assign({ Idnt: placed.id, placed: (_a = placed.placed) !== null && _a !== void 0 ? _a : placed.id, PgNm: 1, totalPages: 1 }, (placed.crop ? { Crop: placed.crop } : {})), { frameStep: {
-            numerator: 0,
-            denominator: 600
-        }, duration: {
-            numerator: 0,
-            denominator: 600
-        }, frameCount: 1, Annt: 16, Type: placedLayerTypes.indexOf(placed.type), Trnf: placed.transform, nonAffineTransform: (_b = placed.nonAffineTransform) !== null && _b !== void 0 ? _b : placed.transform, quiltWarp: {}, warp: encodeWarp(placed.warp || {}), 'Sz  ': {
+    var desc = __assign(__assign({ Idnt: placed.id, placed: (_a = placed.placed) !== null && _a !== void 0 ? _a : placed.id, PgNm: placed.pageNumber || 1, totalPages: placed.totalPages || 1 }, (placed.crop ? { Crop: placed.crop } : {})), { frameStep: placed.frameStep || { numerator: 0, denominator: 600 }, duration: placed.duration || { numerator: 0, denominator: 600 }, frameCount: placed.frameCount || 0, Annt: 16, Type: placedLayerTypes.indexOf(placed.type), Trnf: placed.transform, nonAffineTransform: (_b = placed.nonAffineTransform) !== null && _b !== void 0 ? _b : placed.transform, quiltWarp: {}, warp: encodeWarp(placed.warp || {}), 'Sz  ': {
             Wdth: placed.width || 0,
             Hght: placed.height || 0, // TODO: find size ?
         }, Rslt: placed.resolution ? (0, descriptor_1.unitsValue)(placed.resolution, 'resolution') : { units: 'Density', value: 72 } });
@@ -1647,7 +1763,7 @@ addHandler('blwh', adjustmentType('black & white'), function (reader, target, le
         presetFileName: desc.blackAndWhitePresetFileName,
     };
     if (desc.tintColor !== undefined)
-        target.adjustment.tintColor = parseColor(desc.tintColor);
+        target.adjustment.tintColor = (0, descriptor_1.parseColor)(desc.tintColor);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target) {
     var info = target.adjustment;
@@ -1659,7 +1775,7 @@ addHandler('blwh', adjustmentType('black & white'), function (reader, target, le
         'Bl  ': info.blues || 0,
         Mgnt: info.magentas || 0,
         useTint: !!info.useTint,
-        tintColor: serializeColor(info.tintColor),
+        tintColor: (0, descriptor_1.serializeColor)(info.tintColor),
         bwPresetKind: info.presetKind || 0,
         blackAndWhitePresetFileName: info.presetFileName || '',
     };
@@ -2093,7 +2209,7 @@ target) { return target.artboards !== undefined; }, function (reader, target, le
         autoNestEnabled: desc.autoNestEnabled,
         autoPositionEnabled: desc.autoPositionEnabled,
         shrinkwrapOnSaveEnabled: desc.shrinkwrapOnSaveEnabled,
-        docDefaultNewArtboardBackgroundColor: parseColor(desc.docDefaultNewArtboardBackgroundColor),
+        docDefaultNewArtboardBackgroundColor: (0, descriptor_1.parseColor)(desc.docDefaultNewArtboardBackgroundColor),
         docDefaultNewArtboardBackgroundType: desc.docDefaultNewArtboardBackgroundType,
     };
     (0, psdReader_1.skipBytes)(reader, left());
@@ -2108,155 +2224,11 @@ target) { return target.artboards !== undefined; }, function (reader, target, le
         autoNestEnabled: (_b = artb.autoNestEnabled) !== null && _b !== void 0 ? _b : true,
         autoPositionEnabled: (_c = artb.autoPositionEnabled) !== null && _c !== void 0 ? _c : true,
         shrinkwrapOnSaveEnabled: (_d = artb.shrinkwrapOnSaveEnabled) !== null && _d !== void 0 ? _d : true,
-        docDefaultNewArtboardBackgroundColor: serializeColor(artb.docDefaultNewArtboardBackgroundColor),
+        docDefaultNewArtboardBackgroundColor: (0, descriptor_1.serializeColor)(artb.docDefaultNewArtboardBackgroundColor),
         docDefaultNewArtboardBackgroundType: (_e = artb.docDefaultNewArtboardBackgroundType) !== null && _e !== void 0 ? _e : 1,
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'artd');
 });
-function parseFxObject(fx) {
-    var stroke = {
-        enabled: !!fx.enab,
-        position: descriptor_1.FStl.decode(fx.Styl),
-        fillType: descriptor_1.FrFl.decode(fx.PntT),
-        blendMode: descriptor_1.BlnM.decode(fx['Md  ']),
-        opacity: (0, descriptor_1.parsePercent)(fx.Opct),
-        size: (0, descriptor_1.parseUnits)(fx['Sz  ']),
-    };
-    if (fx.present !== undefined)
-        stroke.present = fx.present;
-    if (fx.showInDialog !== undefined)
-        stroke.showInDialog = fx.showInDialog;
-    if (fx.overprint !== undefined)
-        stroke.overprint = fx.overprint;
-    if (fx['Clr '])
-        stroke.color = parseColor(fx['Clr ']);
-    if (fx.Grad)
-        stroke.gradient = parseGradientContent(fx);
-    if (fx.Ptrn)
-        stroke.pattern = parsePatternContent(fx);
-    return stroke;
-}
-function serializeFxObject(stroke) {
-    var FrFX = {};
-    FrFX.enab = !!stroke.enabled;
-    if (stroke.present !== undefined)
-        FrFX.present = !!stroke.present;
-    if (stroke.showInDialog !== undefined)
-        FrFX.showInDialog = !!stroke.showInDialog;
-    FrFX.Styl = descriptor_1.FStl.encode(stroke.position);
-    FrFX.PntT = descriptor_1.FrFl.encode(stroke.fillType);
-    FrFX['Md  '] = descriptor_1.BlnM.encode(stroke.blendMode);
-    FrFX.Opct = (0, descriptor_1.unitsPercent)(stroke.opacity);
-    FrFX['Sz  '] = (0, descriptor_1.unitsValue)(stroke.size, 'size');
-    if (stroke.color)
-        FrFX['Clr '] = serializeColor(stroke.color);
-    if (stroke.gradient)
-        FrFX = __assign(__assign({}, FrFX), serializeGradientContent(stroke.gradient));
-    if (stroke.pattern)
-        FrFX = __assign(__assign({}, FrFX), serializePatternContent(stroke.pattern));
-    if (stroke.overprint !== undefined)
-        FrFX.overprint = !!stroke.overprint;
-    return FrFX;
-}
-function parseEffects(info, log) {
-    var effects = {};
-    if (!info.masterFXSwitch)
-        effects.disabled = true;
-    if (info['Scl '])
-        effects.scale = (0, descriptor_1.parsePercent)(info['Scl ']);
-    if (info.DrSh)
-        effects.dropShadow = [parseEffectObject(info.DrSh, log)];
-    if (info.dropShadowMulti)
-        effects.dropShadow = info.dropShadowMulti.map(function (i) { return parseEffectObject(i, log); });
-    if (info.IrSh)
-        effects.innerShadow = [parseEffectObject(info.IrSh, log)];
-    if (info.innerShadowMulti)
-        effects.innerShadow = info.innerShadowMulti.map(function (i) { return parseEffectObject(i, log); });
-    if (info.OrGl)
-        effects.outerGlow = parseEffectObject(info.OrGl, log);
-    if (info.IrGl)
-        effects.innerGlow = parseEffectObject(info.IrGl, log);
-    if (info.ebbl)
-        effects.bevel = parseEffectObject(info.ebbl, log);
-    if (info.SoFi)
-        effects.solidFill = [parseEffectObject(info.SoFi, log)];
-    if (info.solidFillMulti)
-        effects.solidFill = info.solidFillMulti.map(function (i) { return parseEffectObject(i, log); });
-    if (info.patternFill)
-        effects.patternOverlay = parseEffectObject(info.patternFill, log);
-    if (info.GrFl)
-        effects.gradientOverlay = [parseEffectObject(info.GrFl, log)];
-    if (info.gradientFillMulti)
-        effects.gradientOverlay = info.gradientFillMulti.map(function (i) { return parseEffectObject(i, log); });
-    if (info.ChFX)
-        effects.satin = parseEffectObject(info.ChFX, log);
-    if (info.FrFX)
-        effects.stroke = [parseFxObject(info.FrFX)];
-    if (info.frameFXMulti)
-        effects.stroke = info.frameFXMulti.map(function (i) { return parseFxObject(i); });
-    return effects;
-}
-function serializeEffects(e, log, multi) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    var info = multi ? {
-        'Scl ': (0, descriptor_1.unitsPercent)((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
-        masterFXSwitch: !e.disabled,
-    } : {
-        masterFXSwitch: !e.disabled,
-        'Scl ': (0, descriptor_1.unitsPercent)((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
-    };
-    var arrayKeys = ['dropShadow', 'innerShadow', 'solidFill', 'gradientOverlay', 'stroke'];
-    for (var _i = 0, arrayKeys_1 = arrayKeys; _i < arrayKeys_1.length; _i++) {
-        var key = arrayKeys_1[_i];
-        if (e[key] && !Array.isArray(e[key]))
-            throw new Error("".concat(key, " should be an array"));
-    }
-    if (((_c = e.dropShadow) === null || _c === void 0 ? void 0 : _c[0]) && !multi)
-        info.DrSh = serializeEffectObject(e.dropShadow[0], 'dropShadow', log);
-    if (((_d = e.dropShadow) === null || _d === void 0 ? void 0 : _d[0]) && multi)
-        info.dropShadowMulti = e.dropShadow.map(function (i) { return serializeEffectObject(i, 'dropShadow', log); });
-    if (((_e = e.innerShadow) === null || _e === void 0 ? void 0 : _e[0]) && !multi)
-        info.IrSh = serializeEffectObject(e.innerShadow[0], 'innerShadow', log);
-    if (((_f = e.innerShadow) === null || _f === void 0 ? void 0 : _f[0]) && multi)
-        info.innerShadowMulti = e.innerShadow.map(function (i) { return serializeEffectObject(i, 'innerShadow', log); });
-    if (e.outerGlow)
-        info.OrGl = serializeEffectObject(e.outerGlow, 'outerGlow', log);
-    if (((_g = e.solidFill) === null || _g === void 0 ? void 0 : _g[0]) && multi)
-        info.solidFillMulti = e.solidFill.map(function (i) { return serializeEffectObject(i, 'solidFill', log); });
-    if (((_h = e.gradientOverlay) === null || _h === void 0 ? void 0 : _h[0]) && multi)
-        info.gradientFillMulti = e.gradientOverlay.map(function (i) { return serializeEffectObject(i, 'gradientOverlay', log); });
-    if (((_j = e.stroke) === null || _j === void 0 ? void 0 : _j[0]) && multi)
-        info.frameFXMulti = e.stroke.map(function (i) { return serializeFxObject(i); });
-    if (e.innerGlow)
-        info.IrGl = serializeEffectObject(e.innerGlow, 'innerGlow', log);
-    if (e.bevel)
-        info.ebbl = serializeEffectObject(e.bevel, 'bevel', log);
-    if (((_k = e.solidFill) === null || _k === void 0 ? void 0 : _k[0]) && !multi)
-        info.SoFi = serializeEffectObject(e.solidFill[0], 'solidFill', log);
-    if (e.patternOverlay)
-        info.patternFill = serializeEffectObject(e.patternOverlay, 'patternOverlay', log);
-    if (((_l = e.gradientOverlay) === null || _l === void 0 ? void 0 : _l[0]) && !multi)
-        info.GrFl = serializeEffectObject(e.gradientOverlay[0], 'gradientOverlay', log);
-    if (e.satin)
-        info.ChFX = serializeEffectObject(e.satin, 'satin', log);
-    if (((_m = e.stroke) === null || _m === void 0 ? void 0 : _m[0]) && !multi)
-        info.FrFX = serializeFxObject((_o = e.stroke) === null || _o === void 0 ? void 0 : _o[0]);
-    if (multi) {
-        info.numModifyingFX = 0;
-        for (var _p = 0, _q = Object.keys(e); _p < _q.length; _p++) {
-            var key = _q[_p];
-            var value = e[key];
-            if (Array.isArray(value)) {
-                for (var _r = 0, value_1 = value; _r < value_1.length; _r++) {
-                    var effect = value_1[_r];
-                    if (effect.enabled)
-                        info.numModifyingFX++;
-                }
-            }
-        }
-    }
-    return info;
-}
 function hasMultiEffects(effects) {
     return Object.keys(effects).map(function (key) { return effects[key]; }).some(function (v) { return Array.isArray(v) && v.length > 1; });
 }
@@ -2269,10 +2241,10 @@ addHandler('lfx2', function (target) { return target.effects !== undefined && !h
     // console.log(require('util').inspect(desc, false, 99, true));
     // TODO: don't discard if we got it from lmfx
     // discard if read in 'lrFX' section
-    target.effects = parseEffects(desc, !!options.logMissingFeatures);
+    target.effects = (0, descriptor_1.parseEffects)(desc, !!options.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
-    var desc = serializeEffects(target.effects, !!options.logMissingFeatures, false);
+    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, false);
     // console.log(require('util').inspect(desc, false, 99, true));
     (0, psdWriter_1.writeUint32)(writer, 0); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
@@ -2324,6 +2296,17 @@ addHandler('iOpa', hasKey('fillOpacity'), function (reader, target) {
     (0, psdWriter_1.writeUint8)(writer, target.fillOpacity * 0xff);
     (0, psdWriter_1.writeZeros)(writer, 3);
 });
+addHandler('brst', hasKey('channelBlendingRestrictions'), function (reader, target, left) {
+    target.channelBlendingRestrictions = [];
+    while (left() > 4) {
+        target.channelBlendingRestrictions.push((0, psdReader_1.readInt32)(reader));
+    }
+}, function (writer, target) {
+    for (var _i = 0, _a = target.channelBlendingRestrictions; _i < _a.length; _i++) {
+        var channel = _a[_i];
+        (0, psdWriter_1.writeInt32)(writer, channel);
+    }
+});
 addHandler('tsly', hasKey('transparencyShapesLayer'), function (reader, target) {
     target.transparencyShapesLayer = !!(0, psdReader_1.readUint8)(reader);
     (0, psdReader_1.skipBytes)(reader, 3);
@@ -2331,481 +2314,1236 @@ addHandler('tsly', hasKey('transparencyShapesLayer'), function (reader, target)
     (0, psdWriter_1.writeUint8)(writer, target.transparencyShapesLayer ? 1 : 0);
     (0, psdWriter_1.writeZeros)(writer, 3);
 });
-// descriptor helpers
-function parseGradient(grad) {
-    if (grad.GrdF === 'GrdF.CstS') {
-        var samples_1 = grad.Intr || 4096;
-        return {
-            type: 'solid',
-            name: grad['Nm  '],
-            smoothness: grad.Intr / 4096,
-            colorStops: grad.Clrs.map(function (s) { return ({
-                color: parseColor(s['Clr ']),
-                location: s.Lctn / samples_1,
-                midpoint: s.Mdpn / 100,
-            }); }),
-            opacityStops: grad.Trns.map(function (s) { return ({
-                opacity: (0, descriptor_1.parsePercent)(s.Opct),
-                location: s.Lctn / samples_1,
-                midpoint: s.Mdpn / 100,
-            }); }),
-        };
-    }
-    else {
-        return {
-            type: 'noise',
-            name: grad['Nm  '],
-            roughness: grad.Smth / 4096,
-            colorModel: descriptor_1.ClrS.decode(grad.ClrS),
-            randomSeed: grad.RndS,
-            restrictColors: !!grad.VctC,
-            addTransparency: !!grad.ShTr,
-            min: grad['Mnm '].map(function (x) { return x / 100; }),
-            max: grad['Mxm '].map(function (x) { return x / 100; }),
-        };
+
+
+},{"./descriptor":4,"./effectsHelpers":5,"./engineData":6,"./helpers":7,"./psdReader":11,"./psdWriter":12,"./text":13,"base64-js":15}],3:[function(require,module,exports){
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readCsh = void 0;
+var additionalInfo_1 = require("./additionalInfo");
+var psdReader_1 = require("./psdReader");
+function readCsh(buffer) {
+    var reader = (0, psdReader_1.createReader)(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+    var csh = { shapes: [] };
+    (0, psdReader_1.checkSignature)(reader, 'cush');
+    if ((0, psdReader_1.readUint32)(reader) !== 2)
+        throw new Error('Invalid version');
+    var count = (0, psdReader_1.readUint32)(reader);
+    for (var i = 0; i < count; i++) {
+        var name_1 = (0, psdReader_1.readUnicodeString)(reader);
+        while (reader.offset % 4)
+            reader.offset++; // pad to 4byte bounds
+        if ((0, psdReader_1.readUint32)(reader) !== 1)
+            throw new Error('Invalid shape version');
+        var size = (0, psdReader_1.readUint32)(reader);
+        var end = reader.offset + size;
+        var id = (0, psdReader_1.readPascalString)(reader, 1);
+        // this might not be correct ???
+        var y1 = (0, psdReader_1.readUint32)(reader);
+        var x1 = (0, psdReader_1.readUint32)(reader);
+        var y2 = (0, psdReader_1.readUint32)(reader);
+        var x2 = (0, psdReader_1.readUint32)(reader);
+        var width = x2 - x1;
+        var height = y2 - y1;
+        var mask = { paths: [] };
+        (0, additionalInfo_1.readVectorMask)(reader, mask, width, height, end - reader.offset);
+        csh.shapes.push(__assign({ name: name_1, id: id, width: width, height: height }, mask));
+        reader.offset = end;
     }
+    return csh;
 }
-function serializeGradient(grad) {
-    var _a, _b;
-    if (grad.type === 'solid') {
-        var samples_2 = Math.round(((_a = grad.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);
-        return {
-            'Nm  ': grad.name || '',
-            GrdF: 'GrdF.CstS',
-            Intr: samples_2,
-            Clrs: grad.colorStops.map(function (s) {
-                var _a;
-                return ({
-                    'Clr ': serializeColor(s.color),
-                    Type: 'Clry.UsrS',
-                    Lctn: Math.round(s.location * samples_2),
-                    Mdpn: Math.round(((_a = s.midpoint) !== null && _a !== void 0 ? _a : 0.5) * 100),
-                });
-            }),
-            Trns: grad.opacityStops.map(function (s) {
-                var _a;
-                return ({
-                    Opct: (0, descriptor_1.unitsPercent)(s.opacity),
-                    Lctn: Math.round(s.location * samples_2),
-                    Mdpn: Math.round(((_a = s.midpoint) !== null && _a !== void 0 ? _a : 0.5) * 100),
-                });
-            }),
-        };
-    }
-    else {
-        return {
-            GrdF: 'GrdF.ClNs',
-            'Nm  ': grad.name || '',
-            ShTr: !!grad.addTransparency,
-            VctC: !!grad.restrictColors,
-            ClrS: descriptor_1.ClrS.encode(grad.colorModel),
-            RndS: grad.randomSeed || 0,
-            Smth: Math.round(((_b = grad.roughness) !== null && _b !== void 0 ? _b : 1) * 4096),
-            'Mnm ': (grad.min || [0, 0, 0, 0]).map(function (x) { return x * 100; }),
-            'Mxm ': (grad.max || [1, 1, 1, 1]).map(function (x) { return x * 100; }),
-        };
-    }
+exports.readCsh = readCsh;
+
+
+},{"./additionalInfo":2,"./psdReader":11}],4:[function(require,module,exports){
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = 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.unitsValue = 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.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
+var helpers_1 = require("./helpers");
+var psdReader_1 = require("./psdReader");
+var psdWriter_1 = require("./psdWriter");
+function revMap(map) {
+    var result = {};
+    Object.keys(map).forEach(function (key) { return result[map[key]] = key; });
+    return result;
 }
-function parseGradientContent(descriptor) {
-    var result = parseGradient(descriptor.Grad);
-    result.style = descriptor_1.GrdT.decode(descriptor.Type);
-    if (descriptor.Dthr !== undefined)
-        result.dither = descriptor.Dthr;
-    if (descriptor.Rvrs !== undefined)
-        result.reverse = descriptor.Rvrs;
-    if (descriptor.Angl !== undefined)
-        result.angle = (0, descriptor_1.parseAngle)(descriptor.Angl);
-    if (descriptor['Scl '] !== undefined)
-        result.scale = (0, descriptor_1.parsePercent)(descriptor['Scl ']);
-    if (descriptor.Algn !== undefined)
-        result.align = descriptor.Algn;
-    if (descriptor.Ofst !== undefined) {
-        result.offset = {
-            x: (0, descriptor_1.parsePercent)(descriptor.Ofst.Hrzn),
-            y: (0, descriptor_1.parsePercent)(descriptor.Ofst.Vrtc)
-        };
+var unitsMap = {
+    '#Ang': 'Angle',
+    '#Rsl': 'Density',
+    '#Rlt': 'Distance',
+    '#Nne': 'None',
+    '#Prc': 'Percent',
+    '#Pxl': 'Pixels',
+    '#Mlm': 'Millimeters',
+    '#Pnt': 'Points',
+    'RrPi': 'Picas',
+    'RrIn': 'Inches',
+    'RrCm': 'Centimeters',
+};
+var unitsMapRev = revMap(unitsMap);
+var logErrors = false;
+function setLogErrors(value) {
+    logErrors = value;
+}
+exports.setLogErrors = setLogErrors;
+function makeType(name, classID) {
+    return { name: name, classID: classID };
+}
+var nullType = makeType('', 'null');
+var fieldToExtType = {
+    strokeStyleContent: makeType('', 'solidColorLayer'),
+    // printProofSetup: makeType('校样设置', 'proofSetup'), // TESTING
+    printProofSetup: makeType('Proof Setup', 'proofSetup'),
+    patternFill: makeType('', 'patternFill'),
+    Grad: makeType('Gradient', 'Grdn'),
+    ebbl: makeType('', 'ebbl'),
+    SoFi: makeType('', 'SoFi'),
+    GrFl: makeType('', 'GrFl'),
+    sdwC: makeType('', 'RGBC'),
+    hglC: makeType('', 'RGBC'),
+    'Clr ': makeType('', 'RGBC'),
+    'tintColor': makeType('', 'RGBC'),
+    Ofst: makeType('', 'Pnt '),
+    ChFX: makeType('', 'ChFX'),
+    MpgS: makeType('', 'ShpC'),
+    DrSh: makeType('', 'DrSh'),
+    IrSh: makeType('', 'IrSh'),
+    OrGl: makeType('', 'OrGl'),
+    IrGl: makeType('', 'IrGl'),
+    TrnS: makeType('', 'ShpC'),
+    Ptrn: makeType('', 'Ptrn'),
+    FrFX: makeType('', 'FrFX'),
+    phase: makeType('', 'Pnt '),
+    frameStep: nullType,
+    duration: nullType,
+    workInTime: nullType,
+    workOutTime: nullType,
+    audioClipGroupList: nullType,
+    bounds: makeType('', 'Rctn'),
+    customEnvelopeWarp: makeType('', 'customEnvelopeWarp'),
+    warp: makeType('', 'warp'),
+    'Sz  ': makeType('', 'Pnt '),
+    origin: makeType('', 'Pnt '),
+    autoExpandOffset: makeType('', 'Pnt '),
+    keyOriginShapeBBox: makeType('', 'unitRect'),
+    Vrsn: nullType,
+    psVersion: nullType,
+    docDefaultNewArtboardBackgroundColor: makeType('', 'RGBC'),
+    artboardRect: makeType('', 'classFloatRect'),
+    keyOriginRRectRadii: makeType('', 'radii'),
+    keyOriginBoxCorners: nullType,
+    rectangleCornerA: makeType('', 'Pnt '),
+    rectangleCornerB: makeType('', 'Pnt '),
+    rectangleCornerC: makeType('', 'Pnt '),
+    rectangleCornerD: makeType('', 'Pnt '),
+    compInfo: nullType,
+    Trnf: makeType('Transform', 'Trnf'),
+    quiltWarp: makeType('', 'quiltWarp'),
+    generatorSettings: nullType,
+    crema: nullType,
+    FrIn: nullType,
+    blendOptions: nullType,
+    FXRf: nullType,
+    Lefx: nullType,
+    time: nullType,
+    animKey: nullType,
+    timeScope: nullType,
+    inTime: nullType,
+    outTime: nullType,
+    sheetStyle: nullType,
+    translation: nullType,
+    Skew: nullType,
+    'Lnk ': makeType('', 'ExternalFileLink'),
+    frameReader: makeType('', 'FrameReader'),
+    effectParams: makeType('', 'motionTrackEffectParams'),
+};
+var fieldToArrayExtType = {
+    'Crv ': makeType('', 'CrPt'),
+    Clrs: makeType('', 'Clrt'),
+    Trns: makeType('', 'TrnS'),
+    keyDescriptorList: nullType,
+    solidFillMulti: makeType('', 'SoFi'),
+    gradientFillMulti: makeType('', 'GrFl'),
+    dropShadowMulti: makeType('', 'DrSh'),
+    innerShadowMulti: makeType('', 'IrSh'),
+    frameFXMulti: makeType('', 'FrFX'),
+    FrIn: nullType,
+    FSts: nullType,
+    LaSt: nullType,
+    sheetTimelineOptions: nullType,
+    trackList: makeType('', 'animationTrack'),
+    globalTrackList: makeType('', 'animationTrack'),
+    keyList: nullType,
+    audioClipGroupList: nullType,
+    audioClipList: nullType,
+};
+var typeToField = {
+    'TEXT': [
+        'Txt ', 'printerName', 'Nm  ', 'Idnt', 'blackAndWhitePresetFileName', 'LUT3DFileName',
+        'presetFileName', 'curvesPresetFileName', 'mixerPresetFileName', 'placed', 'description', 'reason',
+        'artboardPresetName', 'json', 'groupID', 'clipID', 'relPath', 'fullPath', 'mediaDescriptor',
+    ],
+    'tdta': ['EngineData', 'LUT3DFileData'],
+    'long': [
+        'TextIndex', 'RndS', 'Mdpn', 'Smth', 'Lctn', 'strokeStyleVersion', 'LaID', 'Vrsn', 'Cnt ',
+        'Brgh', 'Cntr', 'means', 'vibrance', 'Strt', 'bwPresetKind', 'presetKind', 'comp', 'compID', 'originalCompID',
+        'curvesPresetKind', 'mixerPresetKind', 'uOrder', 'vOrder', 'PgNm', 'totalPages', 'Crop',
+        'numerator', 'denominator', 'frameCount', 'Annt', 'keyOriginType', 'unitValueQuadVersion',
+        'keyOriginIndex', 'major', 'minor', 'fix', 'docDefaultNewArtboardBackgroundType', 'artboardBackgroundType',
+        'numModifyingFX', 'deformNumRows', 'deformNumCols', 'FrID', 'FrDl', 'FsID', 'LCnt', 'AFrm', 'AFSt',
+        'numBefore', 'numAfter', 'Spcn', 'minOpacity', 'maxOpacity', 'BlnM', 'sheetID', 'gblA', 'globalAltitude',
+        'descVersion', 'frameReaderType', 'LyrI', 'zoomOrigin',
+    ],
+    'enum': [
+        'textGridding', 'Ornt', 'warpStyle', 'warpRotate', 'Inte', 'Bltn', 'ClrS',
+        'sdwM', 'hglM', 'bvlT', 'bvlS', 'bvlD', 'Md  ', 'glwS', 'GrdF', 'GlwT',
+        'strokeStyleLineCapType', 'strokeStyleLineJoinType', 'strokeStyleLineAlignment',
+        'strokeStyleBlendMode', 'PntT', 'Styl', 'lookupType', 'LUTFormat', 'dataOrder',
+        'tableOrder', 'enableCompCore', 'enableCompCoreGPU', 'compCoreSupport', 'compCoreGPUSupport', 'Engn',
+        'enableCompCoreThreads', 'gs99', 'FrDs', 'trackID', 'animInterpStyle',
+    ],
+    'bool': [
+        'PstS', 'printSixteenBit', 'masterFXSwitch', 'enab', 'uglg', 'antialiasGloss',
+        'useShape', 'useTexture', 'uglg', 'antialiasGloss', 'useShape',
+        'useTexture', 'Algn', 'Rvrs', 'Dthr', 'Invr', 'VctC', 'ShTr', 'layerConceals',
+        'strokeEnabled', 'fillEnabled', 'strokeStyleScaleLock', 'strokeStyleStrokeAdjust',
+        'hardProof', 'MpBl', 'paperWhite', 'useLegacy', 'Auto', 'Lab ', 'useTint', 'keyShapeInvalidated',
+        'autoExpandEnabled', 'autoNestEnabled', 'autoPositionEnabled', 'shrinkwrapOnSaveEnabled',
+        'present', 'showInDialog', 'overprint', 'sheetDisclosed', 'lightsDisclosed', 'meshesDisclosed',
+        'materialsDisclosed', 'hasMotion', 'muted', 'Effc', 'selected', 'autoScope', 'fillCanvas',
+    ],
+    'doub': [
+        'warpValue', 'warpPerspective', 'warpPerspectiveOther', 'Intr', 'Wdth', 'Hght',
+        'strokeStyleMiterLimit', 'strokeStyleResolution', 'layerTime', 'keyOriginResolution',
+        'xx', 'xy', 'yx', 'yy', 'tx', 'ty', 'FrGA', 'frameRate', 'audioLevel', 'rotation',
+    ],
+    'UntF': [
+        'Scl ', 'sdwO', 'hglO', 'lagl', 'Lald', 'srgR', 'blur', 'Sftn', 'Opct', 'Dstn', 'Angl',
+        'Ckmt', 'Nose', 'Inpr', 'ShdN', 'strokeStyleLineWidth', 'strokeStyleLineDashOffset',
+        'strokeStyleOpacity', 'H   ', 'Top ', 'Left', 'Btom', 'Rght', 'Rslt',
+        'topRight', 'topLeft', 'bottomLeft', 'bottomRight',
+    ],
+    'VlLs': [
+        'Crv ', 'Clrs', 'Mnm ', 'Mxm ', 'Trns', 'pathList', 'strokeStyleLineDashSet', 'FrLs',
+        'LaSt', 'Trnf', 'nonAffineTransform', 'keyDescriptorList', 'guideIndeces', 'gradientFillMulti',
+        'solidFillMulti', 'frameFXMulti', 'innerShadowMulti', 'dropShadowMulti', 'FrIn', 'FSts', 'FsFr',
+        'sheetTimelineOptions', 'audioClipList', 'trackList', 'globalTrackList', 'keyList', 'audioClipList',
+    ],
+    'ObAr': ['meshPoints', 'quiltSliceX', 'quiltSliceY'],
+    'obj ': ['null'],
+};
+var channels = [
+    'Rd  ', 'Grn ', 'Bl  ', 'Yllw', 'Ylw ', 'Cyn ', 'Mgnt', 'Blck', 'Gry ', 'Lmnc', 'A   ', 'B   ',
+];
+var fieldToArrayType = {
+    'Mnm ': 'long',
+    'Mxm ': 'long',
+    'FrLs': 'long',
+    'strokeStyleLineDashSet': 'UntF',
+    'Trnf': 'doub',
+    'nonAffineTransform': 'doub',
+    'keyDescriptorList': 'Objc',
+    'gradientFillMulti': 'Objc',
+    'solidFillMulti': 'Objc',
+    'frameFXMulti': 'Objc',
+    'innerShadowMulti': 'Objc',
+    'dropShadowMulti': 'Objc',
+    'LaSt': 'Objc',
+    'FrIn': 'Objc',
+    'FSts': 'Objc',
+    'FsFr': 'long',
+    'blendOptions': 'Objc',
+    'sheetTimelineOptions': 'Objc',
+    'keyList': 'Objc',
+};
+var fieldToType = {};
+for (var _i = 0, _a = Object.keys(typeToField); _i < _a.length; _i++) {
+    var type = _a[_i];
+    for (var _b = 0, _c = typeToField[type]; _b < _c.length; _b++) {
+        var field = _c[_b];
+        fieldToType[field] = type;
     }
-    return result;
 }
-function parsePatternContent(descriptor) {
-    var result = {
-        name: descriptor.Ptrn['Nm  '],
-        id: descriptor.Ptrn.Idnt,
-    };
-    if (descriptor.Lnkd !== undefined)
-        result.linked = descriptor.Lnkd;
-    if (descriptor.phase !== undefined)
-        result.phase = { x: descriptor.phase.Hrzn, y: descriptor.phase.Vrtc };
-    return result;
+for (var _d = 0, _e = Object.keys(fieldToExtType); _d < _e.length; _d++) {
+    var field = _e[_d];
+    if (!fieldToType[field])
+        fieldToType[field] = 'Objc';
 }
-function parseVectorContent(descriptor) {
-    if ('Grad' in descriptor) {
-        return parseGradientContent(descriptor);
+for (var _f = 0, _g = Object.keys(fieldToArrayExtType); _f < _g.length; _f++) {
+    var field = _g[_f];
+    fieldToArrayType[field] = 'Objc';
+}
+function getTypeByKey(key, value, root, parent) {
+    if (key === 'Sz  ') {
+        return ('Wdth' in value) ? 'Objc' : (('units' in value) ? 'UntF' : 'doub');
     }
-    else if ('Ptrn' in descriptor) {
-        return __assign({ type: 'pattern' }, parsePatternContent(descriptor));
+    else if (key === 'Type') {
+        return typeof value === 'string' ? 'enum' : 'long';
     }
-    else if ('Clr ' in descriptor) {
-        return { type: 'color', color: parseColor(descriptor['Clr ']) };
+    else if (key === 'AntA') {
+        return typeof value === 'string' ? 'enum' : 'bool';
+    }
+    else if ((key === 'Hrzn' || key === 'Vrtc') && parent.Type === 'keyType.Pstn') {
+        return 'long';
+    }
+    else if (key === 'Hrzn' || key === 'Vrtc' || key === 'Top ' || key === 'Left' || key === 'Btom' || key === 'Rght') {
+        return typeof value === 'number' ? 'doub' : 'UntF';
+    }
+    else if (key === 'Vrsn') {
+        return typeof value === 'number' ? 'long' : 'Objc';
+    }
+    else if (key === 'Rd  ' || key === 'Grn ' || key === 'Bl  ') {
+        return root === 'artd' ? 'long' : 'doub';
+    }
+    else if (key === 'Trnf') {
+        return Array.isArray(value) ? 'VlLs' : 'Objc';
     }
     else {
-        throw new Error('Invalid vector content');
+        return fieldToType[key];
     }
 }
-function serializeGradientContent(content) {
-    var result = {};
-    if (content.dither !== undefined)
-        result.Dthr = content.dither;
-    if (content.reverse !== undefined)
-        result.Rvrs = content.reverse;
-    if (content.angle !== undefined)
-        result.Angl = (0, descriptor_1.unitsAngle)(content.angle);
-    result.Type = descriptor_1.GrdT.encode(content.style);
-    if (content.align !== undefined)
-        result.Algn = content.align;
-    if (content.scale !== undefined)
-        result['Scl '] = (0, descriptor_1.unitsPercent)(content.scale);
-    if (content.offset) {
-        result.Ofst = {
-            Hrzn: (0, descriptor_1.unitsPercent)(content.offset.x),
-            Vrtc: (0, descriptor_1.unitsPercent)(content.offset.y),
-        };
-    }
-    result.Grad = serializeGradient(content);
-    return result;
-}
-function serializePatternContent(content) {
-    var result = {
-        Ptrn: {
-            'Nm  ': content.name || '',
-            Idnt: content.id || '',
-        }
-    };
-    if (content.linked !== undefined)
-        result.Lnkd = !!content.linked;
-    if (content.phase !== undefined)
-        result.phase = { Hrzn: content.phase.x, Vrtc: content.phase.y };
-    return result;
+function readAsciiStringOrClassId(reader) {
+    var length = (0, psdReader_1.readInt32)(reader);
+    return (0, psdReader_1.readAsciiString)(reader, length || 4);
 }
-function serializeVectorContent(content) {
-    if (content.type === 'color') {
-        return { key: 'SoCo', descriptor: { 'Clr ': serializeColor(content.color) } };
-    }
-    else if (content.type === 'pattern') {
-        return { key: 'PtFl', descriptor: serializePatternContent(content) };
+exports.readAsciiStringOrClassId = readAsciiStringOrClassId;
+function writeAsciiStringOrClassId(writer, value) {
+    if (value.length === 4 && value !== 'warp' && value !== 'time' && value !== 'hold') {
+        // write classId
+        (0, psdWriter_1.writeInt32)(writer, 0);
+        (0, psdWriter_1.writeSignature)(writer, value);
     }
     else {
-        return { key: 'GdFl', descriptor: serializeGradientContent(content) };
+        // write ascii string
+        (0, psdWriter_1.writeInt32)(writer, value.length);
+        for (var i = 0; i < value.length; i++) {
+            (0, psdWriter_1.writeUint8)(writer, value.charCodeAt(i));
+        }
     }
 }
-function parseColor(color) {
-    if ('H   ' in color) {
-        return { h: (0, descriptor_1.parsePercentOrAngle)(color['H   ']), s: color.Strt, b: color.Brgh };
-    }
-    else if ('Rd  ' in color) {
-        return { r: color['Rd  '], g: color['Grn '], b: color['Bl  '] };
-    }
-    else if ('Cyn ' in color) {
-        return { c: color['Cyn '], m: color.Mgnt, y: color['Ylw '], k: color.Blck };
-    }
-    else if ('Gry ' in color) {
-        return { k: color['Gry '] };
-    }
-    else if ('Lmnc' in color) {
-        return { l: color.Lmnc, a: color['A   '], b: color['B   '] };
-    }
-    else {
-        throw new Error('Unsupported color descriptor');
+function readDescriptorStructure(reader) {
+    var object = {};
+    // object.__struct =
+    readClassStructure(reader);
+    var itemsCount = (0, psdReader_1.readUint32)(reader);
+    // console.log('//', object.__struct);
+    for (var i = 0; i < itemsCount; i++) {
+        var key = readAsciiStringOrClassId(reader);
+        var type = (0, psdReader_1.readSignature)(reader);
+        // console.log(`> '${key}' '${type}'`);
+        var data = readOSType(reader, type);
+        // if (!getTypeByKey(key, data)) console.log(`> '${key}' '${type}'`, data);
+        object[key] = data;
     }
+    return object;
 }
-function serializeColor(color) {
-    if (!color) {
-        return { 'Rd  ': 0, 'Grn ': 0, 'Bl  ': 0 };
-    }
-    else if ('r' in color) {
-        return { 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
-    }
-    else if ('h' in color) {
-        return { 'H   ': (0, descriptor_1.unitsAngle)(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };
-    }
-    else if ('c' in color) {
-        return { 'Cyn ': color.c || 0, Mgnt: color.m || 0, 'Ylw ': color.y || 0, Blck: color.k || 0 };
-    }
-    else if ('l' in color) {
-        return { Lmnc: color.l || 0, 'A   ': color.a || 0, 'B   ': color.b || 0 };
-    }
-    else if ('k' in color) {
-        return { 'Gry ': color.k };
+exports.readDescriptorStructure = readDescriptorStructure;
+function writeDescriptorStructure(writer, name, classId, value, root) {
+    if (logErrors && !classId)
+        console.log('Missing classId for: ', name, classId, value);
+    // write class structure
+    (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name);
+    writeAsciiStringOrClassId(writer, classId);
+    var keys = Object.keys(value);
+    (0, psdWriter_1.writeUint32)(writer, keys.length);
+    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+        var key = keys_1[_i];
+        var type = getTypeByKey(key, value[key], root, value);
+        var extType = fieldToExtType[key];
+        if (key === 'Scl ' && 'Hrzn' in value[key]) {
+            type = 'Objc';
+            extType = nullType;
+        }
+        else if (key === 'audioClipGroupList' && keys.length === 1) {
+            type = 'VlLs';
+        }
+        else if ((key === 'Strt' || key === 'Brgh') && 'H   ' in value) {
+            type = 'doub';
+        }
+        else if (key === 'Strt') {
+            type = 'Objc';
+            extType = nullType;
+        }
+        else if (channels.indexOf(key) !== -1) {
+            type = (classId === 'RGBC' && root !== 'artd') ? 'doub' : 'long';
+        }
+        else if (key === 'profile') {
+            type = classId === 'printOutput' ? 'TEXT' : 'tdta';
+        }
+        else if (key === 'strokeStyleContent') {
+            if (value[key]['Clr ']) {
+                extType = makeType('', 'solidColorLayer');
+            }
+            else if (value[key].Grad) {
+                extType = makeType('', 'gradientLayer');
+            }
+            else if (value[key].Ptrn) {
+                extType = makeType('', 'patternLayer');
+            }
+            else {
+                logErrors && console.log('Invalid strokeStyleContent value', value[key]);
+            }
+        }
+        else if (key === 'bounds' && root === 'quiltWarp') {
+            extType = makeType('', 'classFloatRect');
+        }
+        if (extType && extType.classID === 'RGBC') {
+            if ('H   ' in value[key])
+                extType = { classID: 'HSBC', name: '' };
+            // TODO: other color spaces
+        }
+        writeAsciiStringOrClassId(writer, key);
+        (0, psdWriter_1.writeSignature)(writer, type || 'long');
+        writeOSType(writer, type || 'long', value[key], key, extType, root);
+        if (logErrors && !type)
+            console.log("Missing descriptor field type for: '".concat(key, "' in"), value);
     }
-    else {
-        throw new Error('Invalid color value');
+}
+exports.writeDescriptorStructure = writeDescriptorStructure;
+function readOSType(reader, type) {
+    switch (type) {
+        case 'obj ': // Reference
+            return readReferenceStructure(reader);
+        case 'Objc': // Descriptor
+        case 'GlbO': // GlobalObject same as Descriptor
+            return readDescriptorStructure(reader);
+        case 'VlLs': { // List
+            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));
+            }
+            return items;
+        }
+        case 'doub': // Double
+            return (0, psdReader_1.readFloat64)(reader);
+        case 'UntF': { // Unit double
+            var units = (0, psdReader_1.readSignature)(reader);
+            var value = (0, psdReader_1.readFloat64)(reader);
+            if (!unitsMap[units])
+                throw new Error("Invalid units: ".concat(units));
+            return { units: unitsMap[units], value: value };
+        }
+        case 'UnFl': { // Unit float
+            var units = (0, psdReader_1.readSignature)(reader);
+            var value = (0, psdReader_1.readFloat32)(reader);
+            if (!unitsMap[units])
+                throw new Error("Invalid units: ".concat(units));
+            return { units: unitsMap[units], value: value };
+        }
+        case 'TEXT': // String
+            return (0, psdReader_1.readUnicodeString)(reader);
+        case 'enum': { // Enumerated
+            var type_2 = readAsciiStringOrClassId(reader);
+            var value = readAsciiStringOrClassId(reader);
+            return "".concat(type_2, ".").concat(value);
+        }
+        case 'long': // Integer
+            return (0, psdReader_1.readInt32)(reader);
+        case 'comp': { // Large Integer
+            var low = (0, psdReader_1.readUint32)(reader);
+            var high = (0, psdReader_1.readUint32)(reader);
+            return { low: low, high: high };
+        }
+        case 'bool': // Boolean
+            return !!(0, psdReader_1.readUint8)(reader);
+        case 'type': // Class
+        case 'GlbC': // Class
+            return readClassStructure(reader);
+        case 'alis': { // Alias
+            var length_2 = (0, psdReader_1.readInt32)(reader);
+            return (0, psdReader_1.readAsciiString)(reader, length_2);
+        }
+        case 'tdta': { // Raw Data
+            var length_3 = (0, psdReader_1.readInt32)(reader);
+            return (0, psdReader_1.readBytes)(reader, length_3);
+        }
+        case 'ObAr': { // Object array
+            (0, psdReader_1.readInt32)(reader); // version: 16
+            (0, psdReader_1.readUnicodeString)(reader); // name: ''
+            readAsciiStringOrClassId(reader); // 'rationalPoint'
+            var length_4 = (0, psdReader_1.readInt32)(reader);
+            var items = [];
+            for (var i = 0; i < length_4; i++) {
+                var type1 = readAsciiStringOrClassId(reader); // type Hrzn | Vrtc
+                (0, psdReader_1.readSignature)(reader); // UnFl
+                (0, psdReader_1.readSignature)(reader); // units ? '#Pxl'
+                var valuesCount = (0, psdReader_1.readInt32)(reader);
+                var values = [];
+                for (var j = 0; j < valuesCount; j++) {
+                    values.push((0, psdReader_1.readFloat64)(reader));
+                }
+                items.push({ type: type1, values: values });
+            }
+            return items;
+        }
+        case 'Pth ': { // File path
+            /*const length =*/ (0, psdReader_1.readInt32)(reader);
+            var sig = (0, psdReader_1.readSignature)(reader);
+            /*const pathSize =*/ (0, psdReader_1.readInt32LE)(reader);
+            var charsCount = (0, psdReader_1.readInt32LE)(reader);
+            var path = (0, psdReader_1.readUnicodeStringWithLength)(reader, charsCount);
+            return { sig: sig, path: path };
+        }
+        default:
+            throw new Error("Invalid TySh descriptor OSType: ".concat(type, " at ").concat(reader.offset.toString(16)));
     }
 }
-function parseEffectObject(obj, reportErrors) {
-    var result = {};
-    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
-        var key = _a[_i];
-        var val = obj[key];
-        switch (key) {
-            case 'enab':
-                result.enabled = !!val;
-                break;
-            case 'uglg':
-                result.useGlobalLight = !!val;
-                break;
-            case 'AntA':
-                result.antialiased = !!val;
-                break;
-            case 'Algn':
-                result.align = !!val;
-                break;
-            case 'Dthr':
-                result.dither = !!val;
-                break;
-            case 'Invr':
-                result.invert = !!val;
-                break;
-            case 'Rvrs':
-                result.reverse = !!val;
-                break;
-            case 'Clr ':
-                result.color = parseColor(val);
-                break;
-            case 'hglC':
-                result.highlightColor = parseColor(val);
-                break;
-            case 'sdwC':
-                result.shadowColor = parseColor(val);
-                break;
-            case 'Styl':
-                result.position = descriptor_1.FStl.decode(val);
-                break;
-            case 'Md  ':
-                result.blendMode = descriptor_1.BlnM.decode(val);
-                break;
-            case 'hglM':
-                result.highlightBlendMode = descriptor_1.BlnM.decode(val);
-                break;
-            case 'sdwM':
-                result.shadowBlendMode = descriptor_1.BlnM.decode(val);
-                break;
-            case 'bvlS':
-                result.style = descriptor_1.BESl.decode(val);
-                break;
-            case 'bvlD':
-                result.direction = descriptor_1.BESs.decode(val);
-                break;
-            case 'bvlT':
-                result.technique = descriptor_1.bvlT.decode(val);
-                break;
-            case 'GlwT':
-                result.technique = descriptor_1.BETE.decode(val);
-                break;
-            case 'glwS':
-                result.source = descriptor_1.IGSr.decode(val);
-                break;
-            case 'Type':
-                result.type = descriptor_1.GrdT.decode(val);
-                break;
-            case 'gs99':
-                result.interpolationMethod = descriptor_1.gradientInterpolationMethodType.decode(val);
-                break;
-            case 'Opct':
-                result.opacity = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'hglO':
-                result.highlightOpacity = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'sdwO':
-                result.shadowOpacity = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'lagl':
-                result.angle = (0, descriptor_1.parseAngle)(val);
-                break;
-            case 'Angl':
-                result.angle = (0, descriptor_1.parseAngle)(val);
-                break;
-            case 'Lald':
-                result.altitude = (0, descriptor_1.parseAngle)(val);
-                break;
-            case 'Sftn':
-                result.soften = (0, descriptor_1.parseUnits)(val);
-                break;
-            case 'srgR':
-                result.strength = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'blur':
-                result.size = (0, descriptor_1.parseUnits)(val);
-                break;
-            case 'Nose':
-                result.noise = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'Inpr':
-                result.range = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'Ckmt':
-                result.choke = (0, descriptor_1.parseUnits)(val);
-                break;
-            case 'ShdN':
-                result.jitter = (0, descriptor_1.parsePercent)(val);
-                break;
-            case 'Dstn':
-                result.distance = (0, descriptor_1.parseUnits)(val);
-                break;
-            case 'Scl ':
-                result.scale = (0, descriptor_1.parsePercent)(val);
+var ObArTypes = {
+    meshPoints: 'rationalPoint',
+    quiltSliceX: 'UntF',
+    quiltSliceY: 'UntF',
+};
+function writeOSType(writer, type, value, key, extType, root) {
+    switch (type) {
+        case 'obj ': // Reference
+            writeReferenceStructure(writer, key, value);
+            break;
+        case 'Objc': // Descriptor
+        case 'GlbO': // GlobalObject same as Descriptor
+            if (!extType)
+                throw new Error("Missing ext type for: '".concat(key, "' (").concat(JSON.stringify(value), ")"));
+            writeDescriptorStructure(writer, extType.name, extType.classID, value, root);
+            break;
+        case 'VlLs': // List
+            (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], '', fieldToArrayExtType[key], root);
+                if (logErrors && !type_3)
+                    console.log("Missing descriptor array type for: '".concat(key, "' in"), value);
+            }
+            break;
+        case 'doub': // Double
+            (0, psdWriter_1.writeFloat64)(writer, value);
+            break;
+        case 'UntF': // Unit double
+            if (!unitsMapRev[value.units])
+                throw new Error("Invalid units: ".concat(value.units, " in ").concat(key));
+            (0, psdWriter_1.writeSignature)(writer, unitsMapRev[value.units]);
+            (0, psdWriter_1.writeFloat64)(writer, value.value);
+            break;
+        case 'UnFl': // Unit float
+            if (!unitsMapRev[value.units])
+                throw new Error("Invalid units: ".concat(value.units, " in ").concat(key));
+            (0, psdWriter_1.writeSignature)(writer, unitsMapRev[value.units]);
+            (0, psdWriter_1.writeFloat32)(writer, value.value);
+            break;
+        case 'TEXT': // String
+            (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, value);
+            break;
+        case 'enum': { // Enumerated
+            var _a = value.split('.'), _type = _a[0], val = _a[1];
+            writeAsciiStringOrClassId(writer, _type);
+            writeAsciiStringOrClassId(writer, val);
+            break;
+        }
+        case 'long': // Integer
+            (0, psdWriter_1.writeInt32)(writer, value);
+            break;
+        // case 'comp': // Large Integer
+        // 	writeLargeInteger(reader);
+        case 'bool': // Boolean
+            (0, psdWriter_1.writeUint8)(writer, value ? 1 : 0);
+            break;
+        // case 'type': // Class
+        // case 'GlbC': // Class
+        // 	writeClassStructure(reader);
+        // case 'alis': // Alias
+        // 	writeAliasStructure(reader);
+        case 'tdta': // Raw Data
+            (0, psdWriter_1.writeInt32)(writer, value.byteLength);
+            (0, psdWriter_1.writeBytes)(writer, value);
+            break;
+        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)
+                throw new Error("Not implemented ObArType for: ".concat(key));
+            writeAsciiStringOrClassId(writer, type_4);
+            (0, psdWriter_1.writeInt32)(writer, value.length);
+            for (var i = 0; i < value.length; i++) {
+                writeAsciiStringOrClassId(writer, value[i].type); // Hrzn | Vrtc
+                (0, psdWriter_1.writeSignature)(writer, 'UnFl');
+                (0, psdWriter_1.writeSignature)(writer, '#Pxl');
+                (0, psdWriter_1.writeInt32)(writer, value[i].values.length);
+                for (var j = 0; j < value[i].values.length; j++) {
+                    (0, psdWriter_1.writeFloat64)(writer, value[i].values[j]);
+                }
+            }
+            break;
+        }
+        // case 'Pth ': // File path
+        // 	writeFilePath(reader);
+        default:
+            throw new Error("Not implemented descriptor OSType: ".concat(type));
+    }
+}
+function readReferenceStructure(reader) {
+    var itemsCount = (0, psdReader_1.readInt32)(reader);
+    var items = [];
+    for (var i = 0; i < itemsCount; i++) {
+        var type = (0, psdReader_1.readSignature)(reader);
+        switch (type) {
+            case 'prop': { // Property
+                readClassStructure(reader);
+                var keyID = readAsciiStringOrClassId(reader);
+                items.push(keyID);
                 break;
-            case 'Ptrn':
-                result.pattern = { name: val['Nm  '], id: val.Idnt };
+            }
+            case 'Clss': // Class
+                items.push(readClassStructure(reader));
                 break;
-            case 'phase':
-                result.phase = { x: val.Hrzn, y: val.Vrtc };
+            case 'Enmr': { // Enumerated Reference
+                readClassStructure(reader);
+                var typeID = readAsciiStringOrClassId(reader);
+                var value = readAsciiStringOrClassId(reader);
+                items.push("".concat(typeID, ".").concat(value));
                 break;
-            case 'Ofst':
-                result.offset = { x: (0, descriptor_1.parsePercent)(val.Hrzn), y: (0, descriptor_1.parsePercent)(val.Vrtc) };
+            }
+            case 'rele': { // Offset
+                // const { name, classID } =
+                readClassStructure(reader);
+                items.push((0, psdReader_1.readUint32)(reader));
                 break;
-            case 'MpgS':
-            case 'TrnS':
-                result.contour = {
-                    name: val['Nm  '],
-                    curve: val['Crv '].map(function (p) { return ({ x: p.Hrzn, y: p.Vrtc }); }),
-                };
+            }
+            case 'Idnt': // Identifier
+                items.push((0, psdReader_1.readInt32)(reader));
                 break;
-            case 'Grad':
-                result.gradient = parseGradient(val);
+            case 'indx': // Index
+                items.push((0, psdReader_1.readInt32)(reader));
                 break;
-            case 'useTexture':
-            case 'useShape':
-            case 'layerConceals':
-            case 'present':
-            case 'showInDialog':
-            case 'antialiasGloss':
-                result[key] = val;
+            case 'name': { // Name
+                readClassStructure(reader);
+                items.push((0, psdReader_1.readUnicodeString)(reader));
                 break;
+            }
             default:
-                reportErrors && console.log("Invalid effect key: '".concat(key, "', value:"), val);
+                throw new Error("Invalid descriptor reference type: ".concat(type));
         }
     }
-    return result;
+    return items;
 }
-function serializeEffectObject(obj, objName, reportErrors) {
-    var result = {};
-    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
-        var objKey = _a[_i];
-        var key = objKey;
-        var val = obj[key];
-        switch (key) {
-            case 'enabled':
-                result.enab = !!val;
-                break;
-            case 'useGlobalLight':
-                result.uglg = !!val;
+function writeReferenceStructure(writer, _key, items) {
+    (0, psdWriter_1.writeInt32)(writer, items.length);
+    for (var i = 0; i < items.length; i++) {
+        var value = items[i];
+        var type = 'unknown';
+        if (typeof value === 'string') {
+            if (/^[a-z]+\.[a-z]+$/i.test(value)) {
+                type = 'Enmr';
+            }
+            else {
+                type = 'name';
+            }
+        }
+        (0, psdWriter_1.writeSignature)(writer, type);
+        switch (type) {
+            // case 'prop': // Property
+            // case 'Clss': // Class
+            case 'Enmr': { // Enumerated Reference
+                var _a = value.split('.'), typeID = _a[0], enumValue = _a[1];
+                writeClassStructure(writer, '\0', typeID);
+                writeAsciiStringOrClassId(writer, typeID);
+                writeAsciiStringOrClassId(writer, enumValue);
                 break;
-            case 'antialiased':
-                result.AntA = !!val;
+            }
+            // case 'rele': // Offset
+            // case 'Idnt': // Identifier
+            // case 'indx': // Index
+            case 'name': { // Name
+                writeClassStructure(writer, '\0', 'Lyr ');
+                (0, psdWriter_1.writeUnicodeString)(writer, value + '\0');
                 break;
-            case 'align':
-                result.Algn = !!val;
-                break;
-            case 'dither':
-                result.Dthr = !!val;
+            }
+            default:
+                throw new Error("Invalid descriptor reference type: ".concat(type));
+        }
+    }
+    return items;
+}
+function readClassStructure(reader) {
+    var name = (0, psdReader_1.readUnicodeString)(reader);
+    var classID = readAsciiStringOrClassId(reader);
+    // console.log({ name, classID });
+    return { name: name, classID: classID };
+}
+function writeClassStructure(writer, name, classID) {
+    (0, psdWriter_1.writeUnicodeString)(writer, name);
+    writeAsciiStringOrClassId(writer, classID);
+}
+function readVersionAndDescriptor(reader) {
+    var version = (0, psdReader_1.readUint32)(reader);
+    if (version !== 16)
+        throw new Error("Invalid descriptor version: ".concat(version));
+    var desc = readDescriptorStructure(reader);
+    // console.log(require('util').inspect(desc, false, 99, true));
+    return desc;
+}
+exports.readVersionAndDescriptor = readVersionAndDescriptor;
+function writeVersionAndDescriptor(writer, name, classID, descriptor, root) {
+    if (root === void 0) { root = ''; }
+    (0, psdWriter_1.writeUint32)(writer, 16); // version
+    writeDescriptorStructure(writer, name, classID, descriptor, root);
+}
+exports.writeVersionAndDescriptor = writeVersionAndDescriptor;
+function horzVrtcToXY(hv) {
+    return { x: hv.Hrzn, y: hv.Vrtc };
+}
+exports.horzVrtcToXY = horzVrtcToXY;
+function xyToHorzVrtc(xy) {
+    return { Hrzn: xy.x, Vrtc: xy.y };
+}
+exports.xyToHorzVrtc = xyToHorzVrtc;
+function parseFxObject(fx) {
+    var stroke = {
+        enabled: !!fx.enab,
+        position: exports.FStl.decode(fx.Styl),
+        fillType: exports.FrFl.decode(fx.PntT),
+        blendMode: exports.BlnM.decode(fx['Md  ']),
+        opacity: parsePercent(fx.Opct),
+        size: parseUnits(fx['Sz  ']),
+    };
+    if (fx.present !== undefined)
+        stroke.present = fx.present;
+    if (fx.showInDialog !== undefined)
+        stroke.showInDialog = fx.showInDialog;
+    if (fx.overprint !== undefined)
+        stroke.overprint = fx.overprint;
+    if (fx['Clr '])
+        stroke.color = parseColor(fx['Clr ']);
+    if (fx.Grad)
+        stroke.gradient = parseGradientContent(fx);
+    if (fx.Ptrn)
+        stroke.pattern = parsePatternContent(fx);
+    return stroke;
+}
+function serializeFxObject(stroke) {
+    var FrFX = {};
+    FrFX.enab = !!stroke.enabled;
+    if (stroke.present !== undefined)
+        FrFX.present = !!stroke.present;
+    if (stroke.showInDialog !== undefined)
+        FrFX.showInDialog = !!stroke.showInDialog;
+    FrFX.Styl = exports.FStl.encode(stroke.position);
+    FrFX.PntT = exports.FrFl.encode(stroke.fillType);
+    FrFX['Md  '] = exports.BlnM.encode(stroke.blendMode);
+    FrFX.Opct = unitsPercent(stroke.opacity);
+    FrFX['Sz  '] = unitsValue(stroke.size, 'size');
+    if (stroke.color)
+        FrFX['Clr '] = serializeColor(stroke.color);
+    if (stroke.gradient)
+        FrFX = __assign(__assign({}, FrFX), serializeGradientContent(stroke.gradient));
+    if (stroke.pattern)
+        FrFX = __assign(__assign({}, FrFX), serializePatternContent(stroke.pattern));
+    if (stroke.overprint !== undefined)
+        FrFX.overprint = !!stroke.overprint;
+    return FrFX;
+}
+function serializeEffects(e, log, multi) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var info = multi ? {
+        'Scl ': unitsPercent((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
+        masterFXSwitch: !e.disabled,
+    } : {
+        masterFXSwitch: !e.disabled,
+        'Scl ': unitsPercent((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
+    };
+    var arrayKeys = ['dropShadow', 'innerShadow', 'solidFill', 'gradientOverlay', 'stroke'];
+    for (var _i = 0, arrayKeys_1 = arrayKeys; _i < arrayKeys_1.length; _i++) {
+        var key = arrayKeys_1[_i];
+        if (e[key] && !Array.isArray(e[key]))
+            throw new Error("".concat(key, " should be an array"));
+    }
+    if (((_c = e.dropShadow) === null || _c === void 0 ? void 0 : _c[0]) && !multi)
+        info.DrSh = serializeEffectObject(e.dropShadow[0], 'dropShadow', log);
+    if (((_d = e.dropShadow) === null || _d === void 0 ? void 0 : _d[0]) && multi)
+        info.dropShadowMulti = e.dropShadow.map(function (i) { return serializeEffectObject(i, 'dropShadow', log); });
+    if (((_e = e.innerShadow) === null || _e === void 0 ? void 0 : _e[0]) && !multi)
+        info.IrSh = serializeEffectObject(e.innerShadow[0], 'innerShadow', log);
+    if (((_f = e.innerShadow) === null || _f === void 0 ? void 0 : _f[0]) && multi)
+        info.innerShadowMulti = e.innerShadow.map(function (i) { return serializeEffectObject(i, 'innerShadow', log); });
+    if (e.outerGlow)
+        info.OrGl = serializeEffectObject(e.outerGlow, 'outerGlow', log);
+    if (((_g = e.solidFill) === null || _g === void 0 ? void 0 : _g[0]) && multi)
+        info.solidFillMulti = e.solidFill.map(function (i) { return serializeEffectObject(i, 'solidFill', log); });
+    if (((_h = e.gradientOverlay) === null || _h === void 0 ? void 0 : _h[0]) && multi)
+        info.gradientFillMulti = e.gradientOverlay.map(function (i) { return serializeEffectObject(i, 'gradientOverlay', log); });
+    if (((_j = e.stroke) === null || _j === void 0 ? void 0 : _j[0]) && multi)
+        info.frameFXMulti = e.stroke.map(function (i) { return serializeFxObject(i); });
+    if (e.innerGlow)
+        info.IrGl = serializeEffectObject(e.innerGlow, 'innerGlow', log);
+    if (e.bevel)
+        info.ebbl = serializeEffectObject(e.bevel, 'bevel', log);
+    if (((_k = e.solidFill) === null || _k === void 0 ? void 0 : _k[0]) && !multi)
+        info.SoFi = serializeEffectObject(e.solidFill[0], 'solidFill', log);
+    if (e.patternOverlay)
+        info.patternFill = serializeEffectObject(e.patternOverlay, 'patternOverlay', log);
+    if (((_l = e.gradientOverlay) === null || _l === void 0 ? void 0 : _l[0]) && !multi)
+        info.GrFl = serializeEffectObject(e.gradientOverlay[0], 'gradientOverlay', log);
+    if (e.satin)
+        info.ChFX = serializeEffectObject(e.satin, 'satin', log);
+    if (((_m = e.stroke) === null || _m === void 0 ? void 0 : _m[0]) && !multi)
+        info.FrFX = serializeFxObject((_o = e.stroke) === null || _o === void 0 ? void 0 : _o[0]);
+    if (multi) {
+        info.numModifyingFX = 0;
+        for (var _p = 0, _q = Object.keys(e); _p < _q.length; _p++) {
+            var key = _q[_p];
+            var value = e[key];
+            if (Array.isArray(value)) {
+                for (var _r = 0, value_1 = value; _r < value_1.length; _r++) {
+                    var effect = value_1[_r];
+                    if (effect.enabled)
+                        info.numModifyingFX++;
+                }
+            }
+        }
+    }
+    return info;
+}
+exports.serializeEffects = serializeEffects;
+function parseEffects(info, log) {
+    var effects = {};
+    if (!info.masterFXSwitch)
+        effects.disabled = true;
+    if (info['Scl '])
+        effects.scale = parsePercent(info['Scl ']);
+    if (info.DrSh)
+        effects.dropShadow = [parseEffectObject(info.DrSh, log)];
+    if (info.dropShadowMulti)
+        effects.dropShadow = info.dropShadowMulti.map(function (i) { return parseEffectObject(i, log); });
+    if (info.IrSh)
+        effects.innerShadow = [parseEffectObject(info.IrSh, log)];
+    if (info.innerShadowMulti)
+        effects.innerShadow = info.innerShadowMulti.map(function (i) { return parseEffectObject(i, log); });
+    if (info.OrGl)
+        effects.outerGlow = parseEffectObject(info.OrGl, log);
+    if (info.IrGl)
+        effects.innerGlow = parseEffectObject(info.IrGl, log);
+    if (info.ebbl)
+        effects.bevel = parseEffectObject(info.ebbl, log);
+    if (info.SoFi)
+        effects.solidFill = [parseEffectObject(info.SoFi, log)];
+    if (info.solidFillMulti)
+        effects.solidFill = info.solidFillMulti.map(function (i) { return parseEffectObject(i, log); });
+    if (info.patternFill)
+        effects.patternOverlay = parseEffectObject(info.patternFill, log);
+    if (info.GrFl)
+        effects.gradientOverlay = [parseEffectObject(info.GrFl, log)];
+    if (info.gradientFillMulti)
+        effects.gradientOverlay = info.gradientFillMulti.map(function (i) { return parseEffectObject(i, log); });
+    if (info.ChFX)
+        effects.satin = parseEffectObject(info.ChFX, log);
+    if (info.FrFX)
+        effects.stroke = [parseFxObject(info.FrFX)];
+    if (info.frameFXMulti)
+        effects.stroke = info.frameFXMulti.map(function (i) { return parseFxObject(i); });
+    return effects;
+}
+exports.parseEffects = parseEffects;
+function parseKeyList(keyList, logMissingFeatures) {
+    var keys = [];
+    for (var j = 0; j < keyList.length; j++) {
+        var key = keyList[j];
+        var time = key.time, selected = key.selected, animKey = key.animKey;
+        var interpolation = exports.animInterpStyleEnum.decode(key.animInterpStyle);
+        switch (animKey.Type) {
+            case 'keyType.Opct':
+                keys.push({ interpolation: interpolation, time: time, selected: selected, type: 'opacity', value: parsePercent(animKey.Opct) });
                 break;
-            case 'invert':
-                result.Invr = !!val;
+            case 'keyType.Pstn':
+                keys.push({ interpolation: interpolation, time: time, selected: selected, type: 'position', x: animKey.Hrzn, y: animKey.Vrtc });
                 break;
-            case 'reverse':
-                result.Rvrs = !!val;
+            case 'keyType.Trnf':
+                keys.push({
+                    interpolation: interpolation,
+                    time: time,
+                    selected: selected,
+                    type: 'transform',
+                    scale: horzVrtcToXY(animKey['Scl ']), skew: horzVrtcToXY(animKey.Skew), rotation: animKey.rotation, translation: horzVrtcToXY(animKey.translation)
+                });
                 break;
-            case 'color':
-                result['Clr '] = serializeColor(val);
+            case 'keyType.sheetStyle': {
+                var key_1 = { interpolation: interpolation, time: time, selected: selected, type: 'style' };
+                if (animKey.sheetStyle.Lefx)
+                    key_1.style = parseEffects(animKey.sheetStyle.Lefx, logMissingFeatures);
+                keys.push(key_1);
                 break;
-            case 'highlightColor':
-                result.hglC = serializeColor(val);
+            }
+            case 'keyType.globalLighting': {
+                keys.push({
+                    interpolation: interpolation,
+                    time: time,
+                    selected: selected,
+                    type: 'globalLighting',
+                    globalAngle: animKey.gblA, globalAltitude: animKey.globalAltitude
+                });
                 break;
-            case 'shadowColor':
-                result.sdwC = serializeColor(val);
+            }
+            default: throw new Error("Unsupported keyType value");
+        }
+    }
+    return keys;
+}
+function serializeKeyList(keys) {
+    var keyList = [];
+    for (var j = 0; j < keys.length; j++) {
+        var key = keys[j];
+        var time = key.time, _a = key.selected, selected = _a === void 0 ? false : _a, interpolation = key.interpolation;
+        var animInterpStyle = exports.animInterpStyleEnum.encode(interpolation);
+        var animKey = void 0;
+        switch (key.type) {
+            case 'opacity':
+                animKey = { Type: 'keyType.Opct', Opct: unitsPercent(key.value) };
                 break;
             case 'position':
-                result.Styl = descriptor_1.FStl.encode(val);
-                break;
-            case 'blendMode':
-                result['Md  '] = descriptor_1.BlnM.encode(val);
-                break;
-            case 'highlightBlendMode':
-                result.hglM = descriptor_1.BlnM.encode(val);
+                animKey = { Type: 'keyType.Pstn', Hrzn: key.x, Vrtc: key.y };
                 break;
-            case 'shadowBlendMode':
-                result.sdwM = descriptor_1.BlnM.encode(val);
+            case 'transform':
+                animKey = { Type: 'keyType.Trnf', 'Scl ': xyToHorzVrtc(key.scale), Skew: xyToHorzVrtc(key.skew), rotation: key.rotation, translation: xyToHorzVrtc(key.translation) };
                 break;
             case 'style':
-                result.bvlS = descriptor_1.BESl.encode(val);
+                animKey = { Type: 'keyType.sheetStyle', sheetStyle: { Vrsn: 1, blendOptions: {} } };
+                if (key.style)
+                    animKey.sheetStyle = { Vrsn: 1, Lefx: serializeEffects(key.style, false, false), blendOptions: {} };
                 break;
-            case 'direction':
-                result.bvlD = descriptor_1.BESs.encode(val);
+            case 'globalLighting': {
+                animKey = { Type: 'keyType.globalLighting', gblA: key.globalAngle, globalAltitude: key.globalAltitude };
                 break;
-            case 'technique':
-                if (objName === 'bevel') {
-                    result.bvlT = descriptor_1.bvlT.encode(val);
-                }
-                else {
-                    result.GlwT = descriptor_1.BETE.encode(val);
-                }
+            }
+            default: throw new Error("Unsupported keyType value");
+        }
+        keyList.push({ Vrsn: 1, animInterpStyle: animInterpStyle, time: time, animKey: animKey, selected: selected });
+    }
+    return keyList;
+}
+function parseTrackList(trackList, logMissingFeatures) {
+    var tracks = [];
+    for (var i = 0; i < trackList.length; i++) {
+        var tr = trackList[i];
+        var track = {
+            type: exports.stdTrackID.decode(tr.trackID),
+            enabled: tr.enab,
+            keys: parseKeyList(tr.keyList, logMissingFeatures),
+        };
+        if (tr.effectParams) {
+            track.effectParams = {
+                fillCanvas: tr.effectParams.fillCanvas,
+                zoomOrigin: tr.effectParams.zoomOrigin,
+                keys: parseKeyList(tr.effectParams.keyList, logMissingFeatures),
+            };
+        }
+        tracks.push(track);
+    }
+    return tracks;
+}
+exports.parseTrackList = parseTrackList;
+function serializeTrackList(tracks) {
+    var trackList = [];
+    for (var i = 0; i < tracks.length; i++) {
+        var t = tracks[i];
+        trackList.push(__assign(__assign({ trackID: exports.stdTrackID.encode(t.type), Vrsn: 1, enab: !!t.enabled, Effc: !!t.effectParams }, (t.effectParams ? {
+            effectParams: {
+                keyList: serializeKeyList(t.keys),
+                fillCanvas: t.effectParams.fillCanvas,
+                zoomOrigin: t.effectParams.zoomOrigin,
+            }
+        } : {})), { keyList: serializeKeyList(t.keys) }));
+    }
+    return trackList;
+}
+exports.serializeTrackList = serializeTrackList;
+function parseEffectObject(obj, reportErrors) {
+    var result = {};
+    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
+        var key = _a[_i];
+        var val = obj[key];
+        switch (key) {
+            case 'enab':
+                result.enabled = !!val;
                 break;
-            case 'source':
-                result.glwS = descriptor_1.IGSr.encode(val);
+            case 'uglg':
+                result.useGlobalLight = !!val;
                 break;
-            case 'type':
-                result.Type = descriptor_1.GrdT.encode(val);
+            case 'AntA':
+                result.antialiased = !!val;
                 break;
-            case 'interpolationMethod':
-                result.gs99 = descriptor_1.gradientInterpolationMethodType.encode(val);
+            case 'Algn':
+                result.align = !!val;
                 break;
-            case 'opacity':
-                result.Opct = (0, descriptor_1.unitsPercent)(val);
+            case 'Dthr':
+                result.dither = !!val;
                 break;
-            case 'highlightOpacity':
-                result.hglO = (0, descriptor_1.unitsPercent)(val);
+            case 'Invr':
+                result.invert = !!val;
                 break;
-            case 'shadowOpacity':
-                result.sdwO = (0, descriptor_1.unitsPercent)(val);
+            case 'Rvrs':
+                result.reverse = !!val;
                 break;
-            case 'angle':
-                if (objName === 'gradientOverlay') {
-                    result.Angl = (0, descriptor_1.unitsAngle)(val);
-                }
-                else {
-                    result.lagl = (0, descriptor_1.unitsAngle)(val);
-                }
+            case 'Clr ':
+                result.color = parseColor(val);
                 break;
-            case 'altitude':
-                result.Lald = (0, descriptor_1.unitsAngle)(val);
+            case 'hglC':
+                result.highlightColor = parseColor(val);
                 break;
-            case 'soften':
-                result.Sftn = (0, descriptor_1.unitsValue)(val, key);
+            case 'sdwC':
+                result.shadowColor = parseColor(val);
                 break;
-            case 'strength':
-                result.srgR = (0, descriptor_1.unitsPercent)(val);
+            case 'Styl':
+                result.position = exports.FStl.decode(val);
                 break;
-            case 'size':
-                result.blur = (0, descriptor_1.unitsValue)(val, key);
+            case 'Md  ':
+                result.blendMode = exports.BlnM.decode(val);
                 break;
-            case 'noise':
-                result.Nose = (0, descriptor_1.unitsPercent)(val);
+            case 'hglM':
+                result.highlightBlendMode = exports.BlnM.decode(val);
+                break;
+            case 'sdwM':
+                result.shadowBlendMode = exports.BlnM.decode(val);
+                break;
+            case 'bvlS':
+                result.style = exports.BESl.decode(val);
+                break;
+            case 'bvlD':
+                result.direction = exports.BESs.decode(val);
+                break;
+            case 'bvlT':
+                result.technique = exports.bvlT.decode(val);
+                break;
+            case 'GlwT':
+                result.technique = exports.BETE.decode(val);
+                break;
+            case 'glwS':
+                result.source = exports.IGSr.decode(val);
+                break;
+            case 'Type':
+                result.type = exports.GrdT.decode(val);
+                break;
+            case 'gs99':
+                result.interpolationMethod = exports.gradientInterpolationMethodType.decode(val);
+                break;
+            case 'Opct':
+                result.opacity = parsePercent(val);
+                break;
+            case 'hglO':
+                result.highlightOpacity = parsePercent(val);
+                break;
+            case 'sdwO':
+                result.shadowOpacity = parsePercent(val);
+                break;
+            case 'lagl':
+                result.angle = parseAngle(val);
+                break;
+            case 'Angl':
+                result.angle = parseAngle(val);
+                break;
+            case 'Lald':
+                result.altitude = parseAngle(val);
+                break;
+            case 'Sftn':
+                result.soften = parseUnits(val);
+                break;
+            case 'srgR':
+                result.strength = parsePercent(val);
+                break;
+            case 'blur':
+                result.size = parseUnits(val);
+                break;
+            case 'Nose':
+                result.noise = parsePercent(val);
+                break;
+            case 'Inpr':
+                result.range = parsePercent(val);
+                break;
+            case 'Ckmt':
+                result.choke = parseUnits(val);
+                break;
+            case 'ShdN':
+                result.jitter = parsePercent(val);
+                break;
+            case 'Dstn':
+                result.distance = parseUnits(val);
+                break;
+            case 'Scl ':
+                result.scale = parsePercent(val);
+                break;
+            case 'Ptrn':
+                result.pattern = { name: val['Nm  '], id: val.Idnt };
+                break;
+            case 'phase':
+                result.phase = { x: val.Hrzn, y: val.Vrtc };
+                break;
+            case 'Ofst':
+                result.offset = { x: parsePercent(val.Hrzn), y: parsePercent(val.Vrtc) };
+                break;
+            case 'MpgS':
+            case 'TrnS':
+                result.contour = {
+                    name: val['Nm  '],
+                    curve: val['Crv '].map(function (p) { return ({ x: p.Hrzn, y: p.Vrtc }); }),
+                };
+                break;
+            case 'Grad':
+                result.gradient = parseGradient(val);
+                break;
+            case 'useTexture':
+            case 'useShape':
+            case 'layerConceals':
+            case 'present':
+            case 'showInDialog':
+            case 'antialiasGloss':
+                result[key] = val;
+                break;
+            default:
+                reportErrors && console.log("Invalid effect key: '".concat(key, "', value:"), val);
+        }
+    }
+    return result;
+}
+function serializeEffectObject(obj, objName, reportErrors) {
+    var result = {};
+    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
+        var objKey = _a[_i];
+        var key = objKey;
+        var val = obj[key];
+        switch (key) {
+            case 'enabled':
+                result.enab = !!val;
+                break;
+            case 'useGlobalLight':
+                result.uglg = !!val;
+                break;
+            case 'antialiased':
+                result.AntA = !!val;
+                break;
+            case 'align':
+                result.Algn = !!val;
+                break;
+            case 'dither':
+                result.Dthr = !!val;
+                break;
+            case 'invert':
+                result.Invr = !!val;
+                break;
+            case 'reverse':
+                result.Rvrs = !!val;
+                break;
+            case 'color':
+                result['Clr '] = serializeColor(val);
+                break;
+            case 'highlightColor':
+                result.hglC = serializeColor(val);
+                break;
+            case 'shadowColor':
+                result.sdwC = serializeColor(val);
+                break;
+            case 'position':
+                result.Styl = exports.FStl.encode(val);
+                break;
+            case 'blendMode':
+                result['Md  '] = exports.BlnM.encode(val);
+                break;
+            case 'highlightBlendMode':
+                result.hglM = exports.BlnM.encode(val);
+                break;
+            case 'shadowBlendMode':
+                result.sdwM = exports.BlnM.encode(val);
+                break;
+            case 'style':
+                result.bvlS = exports.BESl.encode(val);
+                break;
+            case 'direction':
+                result.bvlD = exports.BESs.encode(val);
+                break;
+            case 'technique':
+                if (objName === 'bevel') {
+                    result.bvlT = exports.bvlT.encode(val);
+                }
+                else {
+                    result.GlwT = exports.BETE.encode(val);
+                }
+                break;
+            case 'source':
+                result.glwS = exports.IGSr.encode(val);
+                break;
+            case 'type':
+                result.Type = exports.GrdT.encode(val);
+                break;
+            case 'interpolationMethod':
+                result.gs99 = exports.gradientInterpolationMethodType.encode(val);
+                break;
+            case 'opacity':
+                result.Opct = unitsPercent(val);
+                break;
+            case 'highlightOpacity':
+                result.hglO = unitsPercent(val);
+                break;
+            case 'shadowOpacity':
+                result.sdwO = unitsPercent(val);
+                break;
+            case 'angle':
+                if (objName === 'gradientOverlay') {
+                    result.Angl = unitsAngle(val);
+                }
+                else {
+                    result.lagl = unitsAngle(val);
+                }
+                break;
+            case 'altitude':
+                result.Lald = unitsAngle(val);
+                break;
+            case 'soften':
+                result.Sftn = unitsValue(val, key);
+                break;
+            case 'strength':
+                result.srgR = unitsPercent(val);
+                break;
+            case 'size':
+                result.blur = unitsValue(val, key);
+                break;
+            case 'noise':
+                result.Nose = unitsPercent(val);
                 break;
             case 'range':
-                result.Inpr = (0, descriptor_1.unitsPercent)(val);
+                result.Inpr = unitsPercent(val);
                 break;
             case 'choke':
-                result.Ckmt = (0, descriptor_1.unitsValue)(val, key);
+                result.Ckmt = unitsValue(val, key);
                 break;
             case 'jitter':
-                result.ShdN = (0, descriptor_1.unitsPercent)(val);
+                result.ShdN = unitsPercent(val);
                 break;
             case 'distance':
-                result.Dstn = (0, descriptor_1.unitsValue)(val, key);
+                result.Dstn = unitsValue(val, key);
                 break;
             case 'scale':
-                result['Scl '] = (0, descriptor_1.unitsPercent)(val);
+                result['Scl '] = unitsPercent(val);
                 break;
             case 'pattern':
                 result.Ptrn = { 'Nm  ': val.name, Idnt: val.id };
@@ -2814,7 +3552,7 @@ function serializeEffectObject(obj, objName, reportErrors) {
                 result.phase = { Hrzn: val.x, Vrtc: val.y };
                 break;
             case 'offset':
-                result.Ofst = { Hrzn: (0, descriptor_1.unitsPercent)(val.x), Vrtc: (0, descriptor_1.unitsPercent)(val.y) };
+                result.Ofst = { Hrzn: unitsPercent(val.x), Vrtc: unitsPercent(val.y) };
                 break;
             case 'contour': {
                 result[objName === 'satin' ? 'MpgS' : 'TrnS'] = {
@@ -2840,641 +3578,219 @@ function serializeEffectObject(obj, objName, reportErrors) {
     }
     return result;
 }
-
-
-},{"./descriptor":4,"./effectsHelpers":5,"./engineData":6,"./helpers":7,"./psdReader":11,"./psdWriter":12,"./text":13,"base64-js":15}],3:[function(require,module,exports){
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readCsh = void 0;
-var additionalInfo_1 = require("./additionalInfo");
-var psdReader_1 = require("./psdReader");
-function readCsh(buffer) {
-    var reader = (0, psdReader_1.createReader)(buffer.buffer, buffer.byteOffset, buffer.byteLength);
-    var csh = { shapes: [] };
-    (0, psdReader_1.checkSignature)(reader, 'cush');
-    if ((0, psdReader_1.readUint32)(reader) !== 2)
-        throw new Error('Invalid version');
-    var count = (0, psdReader_1.readUint32)(reader);
-    for (var i = 0; i < count; i++) {
-        var name_1 = (0, psdReader_1.readUnicodeString)(reader);
-        while (reader.offset % 4)
-            reader.offset++; // pad to 4byte bounds
-        if ((0, psdReader_1.readUint32)(reader) !== 1)
-            throw new Error('Invalid shape version');
-        var size = (0, psdReader_1.readUint32)(reader);
-        var end = reader.offset + size;
-        var id = (0, psdReader_1.readPascalString)(reader, 1);
-        // this might not be correct ???
-        var y1 = (0, psdReader_1.readUint32)(reader);
-        var x1 = (0, psdReader_1.readUint32)(reader);
-        var y2 = (0, psdReader_1.readUint32)(reader);
-        var x2 = (0, psdReader_1.readUint32)(reader);
-        var width = x2 - x1;
-        var height = y2 - y1;
-        var mask = { paths: [] };
-        (0, additionalInfo_1.readVectorMask)(reader, mask, width, height, end - reader.offset);
-        csh.shapes.push(__assign({ name: name_1, id: id, width: width, height: height }, mask));
-        reader.offset = end;
+function parseGradient(grad) {
+    if (grad.GrdF === 'GrdF.CstS') {
+        var samples_1 = grad.Intr || 4096;
+        return {
+            type: 'solid',
+            name: grad['Nm  '],
+            smoothness: grad.Intr / 4096,
+            colorStops: grad.Clrs.map(function (s) { return ({
+                color: parseColor(s['Clr ']),
+                location: s.Lctn / samples_1,
+                midpoint: s.Mdpn / 100,
+            }); }),
+            opacityStops: grad.Trns.map(function (s) { return ({
+                opacity: parsePercent(s.Opct),
+                location: s.Lctn / samples_1,
+                midpoint: s.Mdpn / 100,
+            }); }),
+        };
+    }
+    else {
+        return {
+            type: 'noise',
+            name: grad['Nm  '],
+            roughness: grad.Smth / 4096,
+            colorModel: exports.ClrS.decode(grad.ClrS),
+            randomSeed: grad.RndS,
+            restrictColors: !!grad.VctC,
+            addTransparency: !!grad.ShTr,
+            min: grad['Mnm '].map(function (x) { return x / 100; }),
+            max: grad['Mxm '].map(function (x) { return x / 100; }),
+        };
     }
-    return csh;
-}
-exports.readCsh = readCsh;
-
-
-},{"./additionalInfo":2,"./psdReader":11}],4:[function(require,module,exports){
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.unitsValue = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
-var helpers_1 = require("./helpers");
-var psdReader_1 = require("./psdReader");
-var psdWriter_1 = require("./psdWriter");
-function revMap(map) {
-    var result = {};
-    Object.keys(map).forEach(function (key) { return result[map[key]] = key; });
-    return result;
 }
-var unitsMap = {
-    '#Ang': 'Angle',
-    '#Rsl': 'Density',
-    '#Rlt': 'Distance',
-    '#Nne': 'None',
-    '#Prc': 'Percent',
-    '#Pxl': 'Pixels',
-    '#Mlm': 'Millimeters',
-    '#Pnt': 'Points',
-    'RrPi': 'Picas',
-    'RrIn': 'Inches',
-    'RrCm': 'Centimeters',
-};
-var unitsMapRev = revMap(unitsMap);
-var logErrors = false;
-function setLogErrors(value) {
-    logErrors = value;
-}
-exports.setLogErrors = setLogErrors;
-function makeType(name, classID) {
-    return { name: name, classID: classID };
-}
-var fieldToExtType = {
-    strokeStyleContent: makeType('', 'solidColorLayer'),
-    // printProofSetup: makeType('校样设置', 'proofSetup'), // TESTING
-    printProofSetup: makeType('Proof Setup', 'proofSetup'),
-    patternFill: makeType('', 'patternFill'),
-    Grad: makeType('Gradient', 'Grdn'),
-    ebbl: makeType('', 'ebbl'),
-    SoFi: makeType('', 'SoFi'),
-    GrFl: makeType('', 'GrFl'),
-    sdwC: makeType('', 'RGBC'),
-    hglC: makeType('', 'RGBC'),
-    'Clr ': makeType('', 'RGBC'),
-    'tintColor': makeType('', 'RGBC'),
-    Ofst: makeType('', 'Pnt '),
-    ChFX: makeType('', 'ChFX'),
-    MpgS: makeType('', 'ShpC'),
-    DrSh: makeType('', 'DrSh'),
-    IrSh: makeType('', 'IrSh'),
-    OrGl: makeType('', 'OrGl'),
-    IrGl: makeType('', 'IrGl'),
-    TrnS: makeType('', 'ShpC'),
-    Ptrn: makeType('', 'Ptrn'),
-    FrFX: makeType('', 'FrFX'),
-    phase: makeType('', 'Pnt '),
-    frameStep: makeType('', 'null'),
-    duration: makeType('', 'null'),
-    bounds: makeType('', 'Rctn'),
-    customEnvelopeWarp: makeType('', 'customEnvelopeWarp'),
-    warp: makeType('', 'warp'),
-    'Sz  ': makeType('', 'Pnt '),
-    origin: makeType('', 'Pnt '),
-    autoExpandOffset: makeType('', 'Pnt '),
-    keyOriginShapeBBox: makeType('', 'unitRect'),
-    Vrsn: makeType('', 'null'),
-    psVersion: makeType('', 'null'),
-    docDefaultNewArtboardBackgroundColor: makeType('', 'RGBC'),
-    artboardRect: makeType('', 'classFloatRect'),
-    keyOriginRRectRadii: makeType('', 'radii'),
-    keyOriginBoxCorners: makeType('', 'null'),
-    rectangleCornerA: makeType('', 'Pnt '),
-    rectangleCornerB: makeType('', 'Pnt '),
-    rectangleCornerC: makeType('', 'Pnt '),
-    rectangleCornerD: makeType('', 'Pnt '),
-    compInfo: makeType('', 'null'),
-    Trnf: makeType('Transform', 'Trnf'),
-    quiltWarp: makeType('', 'quiltWarp'),
-    generatorSettings: makeType('', 'null'),
-    crema: makeType('', 'null'),
-};
-var fieldToArrayExtType = {
-    'Crv ': makeType('', 'CrPt'),
-    Clrs: makeType('', 'Clrt'),
-    Trns: makeType('', 'TrnS'),
-    keyDescriptorList: makeType('', 'null'),
-    solidFillMulti: makeType('', 'SoFi'),
-    gradientFillMulti: makeType('', 'GrFl'),
-    dropShadowMulti: makeType('', 'DrSh'),
-    innerShadowMulti: makeType('', 'IrSh'),
-    frameFXMulti: makeType('', 'FrFX'),
-};
-var typeToField = {
-    'TEXT': [
-        'Txt ', 'printerName', 'Nm  ', 'Idnt', 'blackAndWhitePresetFileName', 'LUT3DFileName',
-        'presetFileName', 'curvesPresetFileName', 'mixerPresetFileName', 'placed', 'description', 'reason',
-        'artboardPresetName', 'json',
-    ],
-    'tdta': ['EngineData', 'LUT3DFileData'],
-    'long': [
-        'TextIndex', 'RndS', 'Mdpn', 'Smth', 'Lctn', 'strokeStyleVersion', 'LaID', 'Vrsn', 'Cnt ',
-        'Brgh', 'Cntr', 'means', 'vibrance', 'Strt', 'bwPresetKind', 'presetKind', 'comp', 'compID', 'originalCompID',
-        'curvesPresetKind', 'mixerPresetKind', 'uOrder', 'vOrder', 'PgNm', 'totalPages', 'Crop',
-        'numerator', 'denominator', 'frameCount', 'Annt', 'keyOriginType', 'unitValueQuadVersion',
-        'keyOriginIndex', 'major', 'minor', 'fix', 'docDefaultNewArtboardBackgroundType', 'artboardBackgroundType',
-        'numModifyingFX', 'deformNumRows', 'deformNumCols',
-    ],
-    'enum': [
-        'textGridding', 'Ornt', 'warpStyle', 'warpRotate', 'Inte', 'Bltn', 'ClrS',
-        'sdwM', 'hglM', 'bvlT', 'bvlS', 'bvlD', 'Md  ', 'glwS', 'GrdF', 'GlwT',
-        'strokeStyleLineCapType', 'strokeStyleLineJoinType', 'strokeStyleLineAlignment',
-        'strokeStyleBlendMode', 'PntT', 'Styl', 'lookupType', 'LUTFormat', 'dataOrder',
-        'tableOrder', 'enableCompCore', 'enableCompCoreGPU', 'compCoreSupport', 'compCoreGPUSupport', 'Engn',
-        'enableCompCoreThreads', 'gs99',
-    ],
-    'bool': [
-        'PstS', 'printSixteenBit', 'masterFXSwitch', 'enab', 'uglg', 'antialiasGloss',
-        'useShape', 'useTexture', 'masterFXSwitch', 'uglg', 'antialiasGloss', 'useShape',
-        'useTexture', 'Algn', 'Rvrs', 'Dthr', 'Invr', 'VctC', 'ShTr', 'layerConceals',
-        'strokeEnabled', 'fillEnabled', 'strokeStyleScaleLock', 'strokeStyleStrokeAdjust',
-        'hardProof', 'MpBl', 'paperWhite', 'useLegacy', 'Auto', 'Lab ', 'useTint', 'keyShapeInvalidated',
-        'autoExpandEnabled', 'autoNestEnabled', 'autoPositionEnabled', 'shrinkwrapOnSaveEnabled',
-        'present', 'showInDialog', 'overprint',
-    ],
-    'doub': [
-        'warpValue', 'warpPerspective', 'warpPerspectiveOther', 'Intr', 'Wdth', 'Hght',
-        'strokeStyleMiterLimit', 'strokeStyleResolution', 'layerTime', 'keyOriginResolution',
-        'xx', 'xy', 'yx', 'yy', 'tx', 'ty',
-    ],
-    'UntF': [
-        'Scl ', 'sdwO', 'hglO', 'lagl', 'Lald', 'srgR', 'blur', 'Sftn', 'Opct', 'Dstn', 'Angl',
-        'Ckmt', 'Nose', 'Inpr', 'ShdN', 'strokeStyleLineWidth', 'strokeStyleLineDashOffset',
-        'strokeStyleOpacity', 'H   ', 'Top ', 'Left', 'Btom', 'Rght', 'Rslt',
-        'topRight', 'topLeft', 'bottomLeft', 'bottomRight',
-    ],
-    'VlLs': [
-        'Crv ', 'Clrs', 'Mnm ', 'Mxm ', 'Trns', 'pathList', 'strokeStyleLineDashSet', 'FrLs',
-        'LaSt', 'Trnf', 'nonAffineTransform', 'keyDescriptorList', 'guideIndeces', 'gradientFillMulti',
-        'solidFillMulti', 'frameFXMulti', 'innerShadowMulti', 'dropShadowMulti',
-    ],
-    'ObAr': ['meshPoints', 'quiltSliceX', 'quiltSliceY'],
-    'obj ': ['null'],
-};
-var channels = [
-    'Rd  ', 'Grn ', 'Bl  ', 'Yllw', 'Ylw ', 'Cyn ', 'Mgnt', 'Blck', 'Gry ', 'Lmnc', 'A   ', 'B   ',
-];
-var fieldToArrayType = {
-    'Mnm ': 'long',
-    'Mxm ': 'long',
-    'FrLs': 'long',
-    'strokeStyleLineDashSet': 'UntF',
-    'Trnf': 'doub',
-    'nonAffineTransform': 'doub',
-    'keyDescriptorList': 'Objc',
-    'gradientFillMulti': 'Objc',
-    'solidFillMulti': 'Objc',
-    'frameFXMulti': 'Objc',
-    'innerShadowMulti': 'Objc',
-    'dropShadowMulti': 'Objc',
-};
-var fieldToType = {};
-for (var _i = 0, _a = Object.keys(typeToField); _i < _a.length; _i++) {
-    var type = _a[_i];
-    for (var _b = 0, _c = typeToField[type]; _b < _c.length; _b++) {
-        var field = _c[_b];
-        fieldToType[field] = type;
-    }
-}
-for (var _d = 0, _e = Object.keys(fieldToExtType); _d < _e.length; _d++) {
-    var field = _e[_d];
-    if (!fieldToType[field])
-        fieldToType[field] = 'Objc';
-}
-for (var _f = 0, _g = Object.keys(fieldToArrayExtType); _f < _g.length; _f++) {
-    var field = _g[_f];
-    fieldToArrayType[field] = 'Objc';
-}
-function getTypeByKey(key, value, root) {
-    if (key === 'Sz  ') {
-        return ('Wdth' in value) ? 'Objc' : (('units' in value) ? 'UntF' : 'doub');
-    }
-    else if (key === 'Type') {
-        return typeof value === 'string' ? 'enum' : 'long';
-    }
-    else if (key === 'AntA') {
-        return typeof value === 'string' ? 'enum' : 'bool';
-    }
-    else if (key === 'Hrzn' || key === 'Vrtc' || key === 'Top ' || key === 'Left' || key === 'Btom' || key === 'Rght') {
-        return typeof value === 'number' ? 'doub' : 'UntF';
-    }
-    else if (key === 'Vrsn') {
-        return typeof value === 'number' ? 'long' : 'Objc';
-    }
-    else if (key === 'Rd  ' || key === 'Grn ' || key === 'Bl  ') {
-        return root === 'artd' ? 'long' : 'doub';
-    }
-    else if (key === 'Trnf') {
-        return Array.isArray(value) ? 'VlLs' : 'Objc';
-    }
-    else {
-        return fieldToType[key];
-    }
-}
-function readAsciiStringOrClassId(reader) {
-    var length = (0, psdReader_1.readInt32)(reader);
-    return (0, psdReader_1.readAsciiString)(reader, length || 4);
-}
-exports.readAsciiStringOrClassId = readAsciiStringOrClassId;
-function writeAsciiStringOrClassId(writer, value) {
-    if (value.length === 4 && value !== 'warp') {
-        // write classId
-        (0, psdWriter_1.writeInt32)(writer, 0);
-        (0, psdWriter_1.writeSignature)(writer, value);
+function serializeGradient(grad) {
+    var _a, _b;
+    if (grad.type === 'solid') {
+        var samples_2 = Math.round(((_a = grad.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);
+        return {
+            'Nm  ': grad.name || '',
+            GrdF: 'GrdF.CstS',
+            Intr: samples_2,
+            Clrs: grad.colorStops.map(function (s) {
+                var _a;
+                return ({
+                    'Clr ': serializeColor(s.color),
+                    Type: 'Clry.UsrS',
+                    Lctn: Math.round(s.location * samples_2),
+                    Mdpn: Math.round(((_a = s.midpoint) !== null && _a !== void 0 ? _a : 0.5) * 100),
+                });
+            }),
+            Trns: grad.opacityStops.map(function (s) {
+                var _a;
+                return ({
+                    Opct: unitsPercent(s.opacity),
+                    Lctn: Math.round(s.location * samples_2),
+                    Mdpn: Math.round(((_a = s.midpoint) !== null && _a !== void 0 ? _a : 0.5) * 100),
+                });
+            }),
+        };
     }
     else {
-        // write ascii string
-        (0, psdWriter_1.writeInt32)(writer, value.length);
-        for (var i = 0; i < value.length; i++) {
-            (0, psdWriter_1.writeUint8)(writer, value.charCodeAt(i));
-        }
-    }
-}
-function readDescriptorStructure(reader) {
-    var object = {};
-    // object.__struct =
-    readClassStructure(reader);
-    var itemsCount = (0, psdReader_1.readUint32)(reader);
-    for (var i = 0; i < itemsCount; i++) {
-        var key = readAsciiStringOrClassId(reader);
-        var type = (0, psdReader_1.readSignature)(reader);
-        // console.log(`> '${key}' '${type}'`);
-        var data = readOSType(reader, type);
-        // if (!getTypeByKey(key, data)) console.log(`> '${key}' '${type}'`, data);
-        object[key] = data;
-    }
-    // console.log('//', struct);
-    return object;
-}
-exports.readDescriptorStructure = readDescriptorStructure;
-function writeDescriptorStructure(writer, name, classId, value, root) {
-    if (logErrors && !classId)
-        console.log('Missing classId for: ', name, classId, value);
-    // write class structure
-    (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name);
-    writeAsciiStringOrClassId(writer, classId);
-    var keys = Object.keys(value);
-    (0, psdWriter_1.writeUint32)(writer, keys.length);
-    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-        var key = keys_1[_i];
-        var type = getTypeByKey(key, value[key], root);
-        var extType = fieldToExtType[key];
-        if ((key === 'Strt' || key === 'Brgh') && 'H   ' in value) {
-            type = 'doub';
-        }
-        else if (channels.indexOf(key) !== -1) {
-            type = (classId === 'RGBC' && root !== 'artd') ? 'doub' : 'long';
-        }
-        else if (key === 'profile') {
-            type = classId === 'printOutput' ? 'TEXT' : 'tdta';
-        }
-        else if (key === 'strokeStyleContent') {
-            if (value[key]['Clr ']) {
-                extType = makeType('', 'solidColorLayer');
-            }
-            else if (value[key].Grad) {
-                extType = makeType('', 'gradientLayer');
-            }
-            else if (value[key].Ptrn) {
-                extType = makeType('', 'patternLayer');
-            }
-            else {
-                logErrors && console.log('Invalid strokeStyleContent value', value[key]);
-            }
-        }
-        else if (key === 'bounds' && root === 'quiltWarp') {
-            extType = makeType('', 'classFloatRect');
-        }
-        if (extType && extType.classID === 'RGBC') {
-            if ('H   ' in value[key])
-                extType = { classID: 'HSBC', name: '' };
-            // TODO: other color spaces
-        }
-        writeAsciiStringOrClassId(writer, key);
-        (0, psdWriter_1.writeSignature)(writer, type || 'long');
-        writeOSType(writer, type || 'long', value[key], key, extType, root);
-        if (logErrors && !type)
-            console.log("Missing descriptor field type for: '".concat(key, "' in"), value);
-    }
-}
-exports.writeDescriptorStructure = writeDescriptorStructure;
-function readOSType(reader, type) {
-    switch (type) {
-        case 'obj ': // Reference
-            return readReferenceStructure(reader);
-        case 'Objc': // Descriptor
-        case 'GlbO': // GlobalObject same as Descriptor
-            return readDescriptorStructure(reader);
-        case 'VlLs': { // List
-            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));
-            }
-            return items;
-        }
-        case 'doub': // Double
-            return (0, psdReader_1.readFloat64)(reader);
-        case 'UntF': { // Unit double
-            var units = (0, psdReader_1.readSignature)(reader);
-            var value = (0, psdReader_1.readFloat64)(reader);
-            if (!unitsMap[units])
-                throw new Error("Invalid units: ".concat(units));
-            return { units: unitsMap[units], value: value };
-        }
-        case 'UnFl': { // Unit float
-            var units = (0, psdReader_1.readSignature)(reader);
-            var value = (0, psdReader_1.readFloat32)(reader);
-            if (!unitsMap[units])
-                throw new Error("Invalid units: ".concat(units));
-            return { units: unitsMap[units], value: value };
-        }
-        case 'TEXT': // String
-            return (0, psdReader_1.readUnicodeString)(reader);
-        case 'enum': { // Enumerated
-            var type_2 = readAsciiStringOrClassId(reader);
-            var value = readAsciiStringOrClassId(reader);
-            return "".concat(type_2, ".").concat(value);
-        }
-        case 'long': // Integer
-            return (0, psdReader_1.readInt32)(reader);
-        case 'comp': { // Large Integer
-            var low = (0, psdReader_1.readUint32)(reader);
-            var high = (0, psdReader_1.readUint32)(reader);
-            return { low: low, high: high };
-        }
-        case 'bool': // Boolean
-            return !!(0, psdReader_1.readUint8)(reader);
-        case 'type': // Class
-        case 'GlbC': // Class
-            return readClassStructure(reader);
-        case 'alis': { // Alias
-            var length_2 = (0, psdReader_1.readInt32)(reader);
-            return (0, psdReader_1.readAsciiString)(reader, length_2);
-        }
-        case 'tdta': { // Raw Data
-            var length_3 = (0, psdReader_1.readInt32)(reader);
-            return (0, psdReader_1.readBytes)(reader, length_3);
-        }
-        case 'ObAr': { // Object array
-            (0, psdReader_1.readInt32)(reader); // version: 16
-            (0, psdReader_1.readUnicodeString)(reader); // name: ''
-            readAsciiStringOrClassId(reader); // 'rationalPoint'
-            var length_4 = (0, psdReader_1.readInt32)(reader);
-            var items = [];
-            for (var i = 0; i < length_4; i++) {
-                var type1 = readAsciiStringOrClassId(reader); // type Hrzn | Vrtc
-                (0, psdReader_1.readSignature)(reader); // UnFl
-                (0, psdReader_1.readSignature)(reader); // units ? '#Pxl'
-                var valuesCount = (0, psdReader_1.readInt32)(reader);
-                var values = [];
-                for (var j = 0; j < valuesCount; j++) {
-                    values.push((0, psdReader_1.readFloat64)(reader));
-                }
-                items.push({ type: type1, values: values });
-            }
-            return items;
-        }
-        case 'Pth ': { // File path
-            /*const length =*/ (0, psdReader_1.readInt32)(reader);
-            var sig = (0, psdReader_1.readSignature)(reader);
-            /*const pathSize =*/ (0, psdReader_1.readInt32LE)(reader);
-            var charsCount = (0, psdReader_1.readInt32LE)(reader);
-            var path = (0, psdReader_1.readUnicodeStringWithLength)(reader, charsCount);
-            return { sig: sig, path: path };
-        }
-        default:
-            throw new Error("Invalid TySh descriptor OSType: ".concat(type, " at ").concat(reader.offset.toString(16)));
+        return {
+            GrdF: 'GrdF.ClNs',
+            'Nm  ': grad.name || '',
+            ShTr: !!grad.addTransparency,
+            VctC: !!grad.restrictColors,
+            ClrS: exports.ClrS.encode(grad.colorModel),
+            RndS: grad.randomSeed || 0,
+            Smth: Math.round(((_b = grad.roughness) !== null && _b !== void 0 ? _b : 1) * 4096),
+            'Mnm ': (grad.min || [0, 0, 0, 0]).map(function (x) { return x * 100; }),
+            'Mxm ': (grad.max || [1, 1, 1, 1]).map(function (x) { return x * 100; }),
+        };
     }
 }
-var ObArTypes = {
-    meshPoints: 'rationalPoint',
-    quiltSliceX: 'UntF',
-    quiltSliceY: 'UntF',
-};
-function writeOSType(writer, type, value, key, extType, root) {
-    switch (type) {
-        case 'obj ': // Reference
-            writeReferenceStructure(writer, key, value);
-            break;
-        case 'Objc': // Descriptor
-        case 'GlbO': // GlobalObject same as Descriptor
-            if (!extType)
-                throw new Error("Missing ext type for: '".concat(key, "' (").concat(JSON.stringify(value), ")"));
-            writeDescriptorStructure(writer, extType.name, extType.classID, value, root);
-            break;
-        case 'VlLs': // List
-            (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], '', fieldToArrayExtType[key], root);
-                if (logErrors && !type_3)
-                    console.log("Missing descriptor array type for: '".concat(key, "' in"), value);
-            }
-            break;
-        case 'doub': // Double
-            (0, psdWriter_1.writeFloat64)(writer, value);
-            break;
-        case 'UntF': // Unit double
-            if (!unitsMapRev[value.units])
-                throw new Error("Invalid units: ".concat(value.units, " in ").concat(key));
-            (0, psdWriter_1.writeSignature)(writer, unitsMapRev[value.units]);
-            (0, psdWriter_1.writeFloat64)(writer, value.value);
-            break;
-        case 'UnFl': // Unit float
-            if (!unitsMapRev[value.units])
-                throw new Error("Invalid units: ".concat(value.units, " in ").concat(key));
-            (0, psdWriter_1.writeSignature)(writer, unitsMapRev[value.units]);
-            (0, psdWriter_1.writeFloat32)(writer, value.value);
-            break;
-        case 'TEXT': // String
-            (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, value);
-            break;
-        case 'enum': { // Enumerated
-            var _a = value.split('.'), _type = _a[0], val = _a[1];
-            writeAsciiStringOrClassId(writer, _type);
-            writeAsciiStringOrClassId(writer, val);
-            break;
-        }
-        case 'long': // Integer
-            (0, psdWriter_1.writeInt32)(writer, value);
-            break;
-        // case 'comp': // Large Integer
-        // 	writeLargeInteger(reader);
-        case 'bool': // Boolean
-            (0, psdWriter_1.writeUint8)(writer, value ? 1 : 0);
-            break;
-        // case 'type': // Class
-        // case 'GlbC': // Class
-        // 	writeClassStructure(reader);
-        // case 'alis': // Alias
-        // 	writeAliasStructure(reader);
-        case 'tdta': // Raw Data
-            (0, psdWriter_1.writeInt32)(writer, value.byteLength);
-            (0, psdWriter_1.writeBytes)(writer, value);
-            break;
-        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)
-                throw new Error("Not implemented ObArType for: ".concat(key));
-            writeAsciiStringOrClassId(writer, type_4);
-            (0, psdWriter_1.writeInt32)(writer, value.length);
-            for (var i = 0; i < value.length; i++) {
-                writeAsciiStringOrClassId(writer, value[i].type); // Hrzn | Vrtc
-                (0, psdWriter_1.writeSignature)(writer, 'UnFl');
-                (0, psdWriter_1.writeSignature)(writer, '#Pxl');
-                (0, psdWriter_1.writeInt32)(writer, value[i].values.length);
-                for (var j = 0; j < value[i].values.length; j++) {
-                    (0, psdWriter_1.writeFloat64)(writer, value[i].values[j]);
-                }
-            }
-            break;
-        }
-        // case 'Pth ': // File path
-        // 	writeFilePath(reader);
-        default:
-            throw new Error("Not implemented descriptor OSType: ".concat(type));
+function parseGradientContent(descriptor) {
+    var result = parseGradient(descriptor.Grad);
+    result.style = exports.GrdT.decode(descriptor.Type);
+    if (descriptor.Dthr !== undefined)
+        result.dither = descriptor.Dthr;
+    if (descriptor.Rvrs !== undefined)
+        result.reverse = descriptor.Rvrs;
+    if (descriptor.Angl !== undefined)
+        result.angle = parseAngle(descriptor.Angl);
+    if (descriptor['Scl '] !== undefined)
+        result.scale = parsePercent(descriptor['Scl ']);
+    if (descriptor.Algn !== undefined)
+        result.align = descriptor.Algn;
+    if (descriptor.Ofst !== undefined) {
+        result.offset = {
+            x: parsePercent(descriptor.Ofst.Hrzn),
+            y: parsePercent(descriptor.Ofst.Vrtc)
+        };
     }
+    return result;
 }
-function readReferenceStructure(reader) {
-    var itemsCount = (0, psdReader_1.readInt32)(reader);
-    var items = [];
-    for (var i = 0; i < itemsCount; i++) {
-        var type = (0, psdReader_1.readSignature)(reader);
-        switch (type) {
-            case 'prop': { // Property
-                readClassStructure(reader);
-                var keyID = readAsciiStringOrClassId(reader);
-                items.push(keyID);
-                break;
-            }
-            case 'Clss': // Class
-                items.push(readClassStructure(reader));
-                break;
-            case 'Enmr': { // Enumerated Reference
-                readClassStructure(reader);
-                var typeID = readAsciiStringOrClassId(reader);
-                var value = readAsciiStringOrClassId(reader);
-                items.push("".concat(typeID, ".").concat(value));
-                break;
-            }
-            case 'rele': { // Offset
-                // const { name, classID } =
-                readClassStructure(reader);
-                items.push((0, psdReader_1.readUint32)(reader));
-                break;
-            }
-            case 'Idnt': // Identifier
-                items.push((0, psdReader_1.readInt32)(reader));
-                break;
-            case 'indx': // Index
-                items.push((0, psdReader_1.readInt32)(reader));
-                break;
-            case 'name': { // Name
-                readClassStructure(reader);
-                items.push((0, psdReader_1.readUnicodeString)(reader));
-                break;
-            }
-            default:
-                throw new Error("Invalid descriptor reference type: ".concat(type));
-        }
+function parsePatternContent(descriptor) {
+    var result = {
+        name: descriptor.Ptrn['Nm  '],
+        id: descriptor.Ptrn.Idnt,
+    };
+    if (descriptor.Lnkd !== undefined)
+        result.linked = descriptor.Lnkd;
+    if (descriptor.phase !== undefined)
+        result.phase = { x: descriptor.phase.Hrzn, y: descriptor.phase.Vrtc };
+    return result;
+}
+function parseVectorContent(descriptor) {
+    if ('Grad' in descriptor) {
+        return parseGradientContent(descriptor);
+    }
+    else if ('Ptrn' in descriptor) {
+        return __assign({ type: 'pattern' }, parsePatternContent(descriptor));
+    }
+    else if ('Clr ' in descriptor) {
+        return { type: 'color', color: parseColor(descriptor['Clr ']) };
+    }
+    else {
+        throw new Error('Invalid vector content');
     }
-    return items;
 }
-function writeReferenceStructure(writer, _key, items) {
-    (0, psdWriter_1.writeInt32)(writer, items.length);
-    for (var i = 0; i < items.length; i++) {
-        var value = items[i];
-        var type = 'unknown';
-        if (typeof value === 'string') {
-            if (/^[a-z]+\.[a-z]+$/i.test(value)) {
-                type = 'Enmr';
-            }
-            else {
-                type = 'name';
-            }
-        }
-        (0, psdWriter_1.writeSignature)(writer, type);
-        switch (type) {
-            // case 'prop': // Property
-            // case 'Clss': // Class
-            case 'Enmr': { // Enumerated Reference
-                var _a = value.split('.'), typeID = _a[0], enumValue = _a[1];
-                writeClassStructure(writer, '\0', typeID);
-                writeAsciiStringOrClassId(writer, typeID);
-                writeAsciiStringOrClassId(writer, enumValue);
-                break;
-            }
-            // case 'rele': // Offset
-            // case 'Idnt': // Identifier
-            // case 'indx': // Index
-            case 'name': { // Name
-                writeClassStructure(writer, '\0', 'Lyr ');
-                (0, psdWriter_1.writeUnicodeString)(writer, value + '\0');
-                break;
-            }
-            default:
-                throw new Error("Invalid descriptor reference type: ".concat(type));
-        }
+exports.parseVectorContent = parseVectorContent;
+function serializeGradientContent(content) {
+    var result = {};
+    if (content.dither !== undefined)
+        result.Dthr = content.dither;
+    if (content.reverse !== undefined)
+        result.Rvrs = content.reverse;
+    if (content.angle !== undefined)
+        result.Angl = unitsAngle(content.angle);
+    result.Type = exports.GrdT.encode(content.style);
+    if (content.align !== undefined)
+        result.Algn = content.align;
+    if (content.scale !== undefined)
+        result['Scl '] = unitsPercent(content.scale);
+    if (content.offset) {
+        result.Ofst = {
+            Hrzn: unitsPercent(content.offset.x),
+            Vrtc: unitsPercent(content.offset.y),
+        };
     }
-    return items;
+    result.Grad = serializeGradient(content);
+    return result;
 }
-function readClassStructure(reader) {
-    var name = (0, psdReader_1.readUnicodeString)(reader);
-    var classID = readAsciiStringOrClassId(reader);
-    // console.log({ name, classID });
-    return { name: name, classID: classID };
+function serializePatternContent(content) {
+    var result = {
+        Ptrn: {
+            'Nm  ': content.name || '',
+            Idnt: content.id || '',
+        }
+    };
+    if (content.linked !== undefined)
+        result.Lnkd = !!content.linked;
+    if (content.phase !== undefined)
+        result.phase = { Hrzn: content.phase.x, Vrtc: content.phase.y };
+    return result;
 }
-function writeClassStructure(writer, name, classID) {
-    (0, psdWriter_1.writeUnicodeString)(writer, name);
-    writeAsciiStringOrClassId(writer, classID);
+function serializeVectorContent(content) {
+    if (content.type === 'color') {
+        return { key: 'SoCo', descriptor: { 'Clr ': serializeColor(content.color) } };
+    }
+    else if (content.type === 'pattern') {
+        return { key: 'PtFl', descriptor: serializePatternContent(content) };
+    }
+    else {
+        return { key: 'GdFl', descriptor: serializeGradientContent(content) };
+    }
 }
-function readVersionAndDescriptor(reader) {
-    var version = (0, psdReader_1.readUint32)(reader);
-    if (version !== 16)
-        throw new Error("Invalid descriptor version: ".concat(version));
-    var desc = readDescriptorStructure(reader);
-    // console.log(require('util').inspect(desc, false, 99, true));
-    return desc;
+exports.serializeVectorContent = serializeVectorContent;
+function parseColor(color) {
+    if ('H   ' in color) {
+        return { h: parsePercentOrAngle(color['H   ']), s: color.Strt, b: color.Brgh };
+    }
+    else if ('Rd  ' in color) {
+        return { r: color['Rd  '], g: color['Grn '], b: color['Bl  '] };
+    }
+    else if ('Cyn ' in color) {
+        return { c: color['Cyn '], m: color.Mgnt, y: color['Ylw '], k: color.Blck };
+    }
+    else if ('Gry ' in color) {
+        return { k: color['Gry '] };
+    }
+    else if ('Lmnc' in color) {
+        return { l: color.Lmnc, a: color['A   '], b: color['B   '] };
+    }
+    else {
+        throw new Error('Unsupported color descriptor');
+    }
 }
-exports.readVersionAndDescriptor = readVersionAndDescriptor;
-function writeVersionAndDescriptor(writer, name, classID, descriptor, root) {
-    if (root === void 0) { root = ''; }
-    (0, psdWriter_1.writeUint32)(writer, 16); // version
-    writeDescriptorStructure(writer, name, classID, descriptor, root);
+exports.parseColor = parseColor;
+function serializeColor(color) {
+    if (!color) {
+        return { 'Rd  ': 0, 'Grn ': 0, 'Bl  ': 0 };
+    }
+    else if ('r' in color) {
+        return { 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
+    }
+    else if ('h' in color) {
+        return { 'H   ': unitsAngle(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };
+    }
+    else if ('c' in color) {
+        return { 'Cyn ': color.c || 0, Mgnt: color.m || 0, 'Ylw ': color.y || 0, Blck: color.k || 0 };
+    }
+    else if ('l' in color) {
+        return { Lmnc: color.l || 0, 'A   ': color.a || 0, 'B   ': color.b || 0 };
+    }
+    else if ('k' in color) {
+        return { 'Gry ': color.k };
+    }
+    else {
+        throw new Error('Invalid color value');
+    }
 }
-exports.writeVersionAndDescriptor = writeVersionAndDescriptor;
+exports.serializeColor = serializeColor;
 function parseAngle(x) {
     if (x === undefined)
         return 0;
@@ -3647,6 +3963,17 @@ exports.GrdT = (0, helpers_1.createEnum)('GrdT', 'linear', {
     reflected: 'Rflc',
     diamond: 'Dmnd',
 });
+exports.animInterpStyleEnum = (0, helpers_1.createEnum)('animInterpStyle', 'linear', {
+    linear: 'Lnr ',
+    hold: 'hold',
+});
+exports.stdTrackID = (0, helpers_1.createEnum)('stdTrackID', 'opacity', {
+    opacity: 'opacityTrack',
+    style: 'styleTrack',
+    sheetTransform: 'sheetTransformTrack',
+    sheetPosition: 'sheetPositionTrack',
+    globalLighting: 'globalLightingTrack',
+});
 exports.gradientInterpolationMethodType = (0, helpers_1.createEnum)('gradientInterpolationMethodType', 'perceptual', {
     perceptual: 'Perc',
     linear: 'Lnr',
@@ -5003,6 +5330,163 @@ addHandler(1032, function (target) { return target.gridAndGuidesInformation !==
         (0, psdWriter_1.writeUint8)(writer, g.direction === 'horizontal' ? 1 : 0);
     }
 });
+// 0 - normal, 7 - multiply, 8 - screen, 23 - difference
+var onionSkinsBlendModes = [
+    'normal', undefined, undefined, undefined, undefined, undefined, undefined, 'multiply',
+    'screen', undefined, undefined, undefined, undefined, undefined, undefined, undefined,
+    undefined, undefined, undefined, undefined, undefined, undefined, undefined, 'difference',
+];
+addHandler(1078, // Onion Skins
+function (// Onion Skins
+target) { return target.onionSkins !== undefined; }, function (reader, target) {
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log('1078', require('util').inspect(desc, false, 99, true));
+    target.onionSkins = {
+        enabled: desc.enab,
+        framesBefore: desc.numBefore,
+        framesAfter: desc.numAfter,
+        frameSpacing: desc.Spcn,
+        minOpacity: desc.minOpacity / 100,
+        maxOpacity: desc.maxOpacity / 100,
+        blendMode: onionSkinsBlendModes[desc.BlnM] || 'normal',
+    };
+}, function (writer, target) {
+    var onionSkins = target.onionSkins;
+    var desc = {
+        Vrsn: 1,
+        enab: onionSkins.enabled,
+        numBefore: onionSkins.framesBefore,
+        numAfter: onionSkins.framesAfter,
+        Spcn: onionSkins.frameSpacing,
+        minOpacity: (onionSkins.minOpacity * 100) | 0,
+        maxOpacity: (onionSkins.maxOpacity * 100) | 0,
+        BlnM: Math.max(0, onionSkinsBlendModes.indexOf(onionSkins.blendMode)),
+    };
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+});
+addHandler(1075, // Timeline Information
+function (// Timeline Information
+target) { return target.timelineInformation !== undefined; }, function (reader, target, _, options) {
+    var _a, _b;
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log('1075', require('util').inspect(desc, false, 99, true));
+    target.timelineInformation = {
+        enabled: desc.enab,
+        frameStep: desc.frameStep,
+        frameRate: desc.frameRate,
+        time: desc.time,
+        duration: desc.duration,
+        workInTime: desc.workInTime,
+        workOutTime: desc.workOutTime,
+        repeats: desc.LCnt,
+        hasMotion: desc.hasMotion,
+        globalTracks: (0, descriptor_1.parseTrackList)(desc.globalTrackList, !!options.logMissingFeatures),
+    };
+    if ((_b = (_a = desc.audioClipGroupList) === null || _a === void 0 ? void 0 : _a.audioClipGroupList) === null || _b === void 0 ? void 0 : _b.length) {
+        target.timelineInformation.audioClipGroups = desc.audioClipGroupList.audioClipGroupList.map(function (g) { return ({
+            id: g.groupID,
+            muted: g.muted,
+            audioClips: g.audioClipList.map(function (_a) {
+                var clipID = _a.clipID, timeScope = _a.timeScope, muted = _a.muted, audioLevel = _a.audioLevel, frameReader = _a.frameReader;
+                return ({
+                    id: clipID,
+                    start: timeScope.Strt,
+                    duration: timeScope.duration,
+                    inTime: timeScope.inTime,
+                    outTime: timeScope.outTime,
+                    muted: muted,
+                    audioLevel: audioLevel,
+                    frameReader: {
+                        type: frameReader.frameReaderType,
+                        mediaDescriptor: frameReader.mediaDescriptor,
+                        link: {
+                            name: frameReader['Lnk ']['Nm  '],
+                            fullPath: frameReader['Lnk '].fullPath,
+                            relativePath: frameReader['Lnk '].relPath,
+                        },
+                    },
+                });
+            }),
+        }); });
+    }
+}, function (writer, target) {
+    var _a;
+    var timeline = target.timelineInformation;
+    var desc = {
+        Vrsn: 1,
+        enab: timeline.enabled,
+        frameStep: timeline.frameStep,
+        frameRate: timeline.frameRate,
+        time: timeline.time,
+        duration: timeline.duration,
+        workInTime: timeline.workInTime,
+        workOutTime: timeline.workOutTime,
+        LCnt: timeline.repeats,
+        globalTrackList: (0, descriptor_1.serializeTrackList)(timeline.globalTracks),
+        audioClipGroupList: {
+            audioClipGroupList: (_a = timeline.audioClipGroups) === null || _a === void 0 ? void 0 : _a.map(function (a) { return ({
+                groupID: a.id,
+                muted: a.muted,
+                audioClipList: a.audioClips.map(function (c) { return ({
+                    clipID: c.id,
+                    timeScope: {
+                        Vrsn: 1,
+                        Strt: c.start,
+                        duration: c.duration,
+                        inTime: c.inTime,
+                        outTime: c.outTime,
+                    },
+                    frameReader: {
+                        frameReaderType: c.frameReader.type,
+                        descVersion: 1,
+                        'Lnk ': {
+                            descVersion: 1,
+                            'Nm  ': c.frameReader.link.name,
+                            fullPath: c.frameReader.link.fullPath,
+                            relPath: c.frameReader.link.relativePath,
+                        },
+                        mediaDescriptor: c.frameReader.mediaDescriptor,
+                    },
+                    muted: c.muted,
+                    audioLevel: c.audioLevel,
+                }); }),
+            }); }),
+        },
+        hasMotion: timeline.hasMotion,
+    };
+    // console.log('WRITE:1075', require('util').inspect(desc, false, 99, true));
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'anim');
+});
+addHandler(1076, // Sheet Disclosure
+function (// Sheet Disclosure
+target) { return target.sheetDisclosure !== undefined; }, function (reader, target) {
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log('1076', require('util').inspect(desc, false, 99, true));
+    target.sheetDisclosure = {};
+    if (desc.sheetTimelineOptions) {
+        target.sheetDisclosure.sheetTimelineOptions = desc.sheetTimelineOptions.map(function (o) { return ({
+            sheetID: o.sheetID,
+            sheetDisclosed: o.sheetDisclosed,
+            lightsDisclosed: o.lightsDisclosed,
+            meshesDisclosed: o.meshesDisclosed,
+            materialsDisclosed: o.materialsDisclosed,
+        }); });
+    }
+}, function (writer, target) {
+    var disclosure = target.sheetDisclosure;
+    var desc = { Vrsn: 1 };
+    if (disclosure.sheetTimelineOptions) {
+        desc.sheetTimelineOptions = disclosure.sheetTimelineOptions.map(function (d) { return ({
+            Vrsn: 2,
+            sheetID: d.sheetID,
+            sheetDisclosed: d.sheetDisclosed,
+            lightsDisclosed: d.lightsDisclosed,
+            meshesDisclosed: d.meshesDisclosed,
+            materialsDisclosed: d.materialsDisclosed,
+        }); });
+    }
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+});
 addHandler(1054, function (target) { return target.urlsList !== undefined; }, function (reader, target, _, options) {
     var count = (0, psdReader_1.readUint32)(reader);
     if (count) {
@@ -5163,16 +5647,10 @@ var FrmD = (0, helpers_1.createEnum)('FrmD', '', {
     none: 'None',
     dispose: 'Disp',
 });
-// TODO: Unfinished
-helpers_1.MOCK_HANDLERS && addHandler(4000, // Plug-In resource(s)
+addHandler(4000, // Plug-In resource(s)
 function (// Plug-In resource(s)
-target) { return target._ir4000 !== undefined; }, function (reader, target, left, _a) {
+target) { return target.animations !== undefined; }, function (reader, target, left, _a) {
     var logMissingFeatures = _a.logMissingFeatures, logDevFeatures = _a.logDevFeatures;
-    if (helpers_1.MOCK_HANDLERS) {
-        LOG_MOCK_HANDLERS && console.log('image resource 4000', left());
-        target._ir4000 = (0, psdReader_1.readBytes)(reader, left());
-        return;
-    }
     var key = (0, psdReader_1.readSignature)(reader);
     if (key === 'mani') {
         (0, psdReader_1.checkSignature)(reader, 'IRFR');
@@ -5183,14 +5661,11 @@ target) { return target._ir4000 !== undefined; }, function (reader, target, left
                 (0, psdReader_1.readSection)(reader, 1, function (left) {
                     if (key_1 === 'AnDs') {
                         var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-                        // console.log('AnDs', desc);
-                        logDevFeatures && console.log('#4000 AnDs', desc);
-                        // logDevFeatures && console.log('#4000 AnDs', require('util').inspect(desc, false, 99, true));
-                        var result = {
+                        target.animations = {
                             // desc.AFSt ???
                             frames: desc.FrIn.map(function (x) { return ({
                                 id: x.FrID,
-                                delay: x.FrDl / 100,
+                                delay: (x.FrDl || 0) / 100,
                                 dispose: x.FrDs ? FrmD.decode(x.FrDs) : 'auto', // missing == auto
                                 // x.FrGA ???
                             }); }),
@@ -5198,11 +5673,11 @@ target) { return target._ir4000 !== undefined; }, function (reader, target, left
                                 id: x.FsID,
                                 frames: x.FsFr,
                                 repeats: x.LCnt,
-                                // x.AFrm ???
+                                activeFrame: x.AFrm || 0,
                             }); }),
                         };
-                        logDevFeatures && console.log('#4000 AnDs:result', result);
-                        // logDevFeatures && console.log('#4000 AnDs:result', require('util').inspect(result, false, 99, true));
+                        // console.log('#4000 AnDs', require('util').inspect(desc, false, 99, true));
+                        // console.log('#4000 AnDs:result', require('util').inspect(target.animations, false, 99, true));
                     }
                     else if (key_1 === 'Roll') {
                         var bytes = (0, psdReader_1.readBytes)(reader, left());
@@ -5224,10 +5699,50 @@ target) { return target._ir4000 !== undefined; }, function (reader, target, left
     }
     else {
         logMissingFeatures && console.log('Unhandled key in #4000:', key);
-        return;
     }
 }, function (writer, target) {
-    (0, psdWriter_1.writeBytes)(writer, target._ir4000);
+    if (target.animations) {
+        (0, psdWriter_1.writeSignature)(writer, 'mani');
+        (0, psdWriter_1.writeSignature)(writer, 'IRFR');
+        (0, psdWriter_1.writeSection)(writer, 1, function () {
+            (0, psdWriter_1.writeSignature)(writer, '8BIM');
+            (0, psdWriter_1.writeSignature)(writer, 'AnDs');
+            (0, psdWriter_1.writeSection)(writer, 1, function () {
+                var desc = {
+                    // AFSt: 0, // ???
+                    FrIn: [],
+                    FSts: [],
+                };
+                for (var i = 0; i < target.animations.frames.length; i++) {
+                    var f = target.animations.frames[i];
+                    var frame = {
+                        FrID: f.id,
+                    };
+                    if (f.delay)
+                        frame.FrDl = (f.delay * 100) | 0;
+                    frame.FrDs = FrmD.encode(f.dispose);
+                    // if (i === 0) frame.FrGA = 30; // ???
+                    desc.FrIn.push(frame);
+                }
+                for (var i = 0; i < target.animations.animations.length; i++) {
+                    var a = target.animations.animations[i];
+                    var anim = {
+                        FsID: a.id,
+                        AFrm: a.activeFrame | 0,
+                        FsFr: a.frames,
+                        LCnt: a.repeats | 0,
+                    };
+                    desc.FSts.push(anim);
+                }
+                (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+            });
+            // writeSignature(writer, '8BIM');
+            // writeSignature(writer, 'Roll');
+            // writeSection(writer, 1, () => {
+            // 	writeZeros(writer, 8);
+            // });
+        });
+    }
 });
 // TODO: Unfinished
 helpers_1.MOCK_HANDLERS && addHandler(4001, // Plug-In resource(s)
@@ -5364,7 +5879,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.readUnicodeStringWithLength = exports.readUnicodeString = exports.readPascalString = exports.readSignature = exports.readBytes = exports.readFixedPointPath32 = exports.readFixedPoint32 = exports.readFloat64 = exports.readFloat32 = exports.readUint32 = exports.readInt32LE = exports.readInt32 = exports.readUint16 = exports.readInt16 = exports.peekUint8 = exports.readUint8 = exports.createReader = exports.supportedColorModes = void 0;
+exports.readPattern = exports.readColor = exports.readSection = exports.readDataRLE = exports.readDataZipWithoutPrediction = exports.readPsd = exports.checkSignature = exports.skipBytes = exports.readAsciiString = 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.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");
@@ -5380,9 +5895,16 @@ function setupGrayscale(data) {
 }
 function createReader(buffer, offset, length) {
     var view = new DataView(buffer, offset, length);
-    return { view: view, offset: 0, strict: false };
+    return { view: view, offset: 0, strict: false, debug: false };
 }
 exports.createReader = createReader;
+function warnOrThrow(reader, message) {
+    if (reader.strict)
+        throw new Error(message);
+    if (reader.debug)
+        console.warn(message);
+}
+exports.warnOrThrow = warnOrThrow;
 function readUint8(reader) {
     reader.offset += 1;
     return reader.view.getUint8(reader.offset - 1);
@@ -5438,8 +5960,22 @@ function readFixedPointPath32(reader) {
 }
 exports.readFixedPointPath32 = readFixedPointPath32;
 function readBytes(reader, length) {
+    var start = reader.view.byteOffset + reader.offset;
     reader.offset += length;
-    return new Uint8Array(reader.view.buffer, reader.view.byteOffset + reader.offset - length, length);
+    if ((start + length) > reader.view.buffer.byteLength) {
+        // fix for broken PSD files that are missing part of file at the end
+        warnOrThrow(reader, 'Reading bytes exceeding buffer length');
+        if (length > (100 * 1024 * 1024))
+            throw new Error('Reading past end of file'); // limit to 100MB
+        var result = new Uint8Array(length);
+        var len = Math.min(length, reader.view.byteLength - start);
+        if (len > 0)
+            result.set(new Uint8Array(reader.view.buffer, start, len));
+        return result;
+    }
+    else {
+        return new Uint8Array(reader.view.buffer, start, length);
+    }
 }
 exports.readBytes = readBytes;
 function readSignature(reader) {
@@ -5828,7 +6364,7 @@ function readLayerChannelImageData(reader, psd, layer, channels, options) {
             }
             readData(reader, channel.length, targetData, compression, layerWidth, layerHeight, 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, reader.offset - start);
+                layer.imageDataRaw[channel.id] = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start + 2, channel.length - 2);
             }
             reader.offset = start + channel.length;
             if (targetData && psd.colorMode === 1 /* ColorMode.Grayscale */) {
@@ -6098,9 +6634,8 @@ function readDataRLE(reader, pixelData, _width, height, step, offsets, large) {
                     else {
                         // ignore 128
                     }
-                    if (i >= length_1) {
-                        throw new Error("Invalid RLE data: exceeded buffer size ".concat(i, "/").concat(length_1));
-                    }
+                    // This showed up on some images from non-photoshop programs, ignoring it seems to work just fine.
+                    // if (i >= length) throw new Error(`Invalid RLE data: exceeded buffer size ${i}/${length}`);
                 }
             }
         }
@@ -6122,14 +6657,12 @@ function readSection(reader, round, func, skipEmpty, eightBytes) {
     if (end > reader.view.byteLength)
         throw new Error('Section exceeds file size');
     var result = func(function () { return end - reader.offset; });
-    if (reader.offset !== end && reader.strict) {
+    if (reader.offset !== end) {
         if (reader.offset > end) {
-            // throw new Error('Exceeded section limits');
-            console.warn('Exceeded section limits');
+            warnOrThrow(reader, 'Exceeded section limits');
         }
         else {
-            // throw new Error(`Unread section data: ${end - reader.offset} bytes at 0x${reader.offset.toString(16)}`);
-            console.warn('Unread section data');
+            warnOrThrow(reader, "Unread section data"); // : ${end - reader.offset} bytes at 0x${reader.offset.toString(16)}`);
         }
     }
     while (end % round)
@@ -6463,7 +6996,7 @@ function writePsd(writer, psd, options) {
     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 imageResources = psd.imageResources || {};
-    var opt = __assign(__assign({}, options), { layerIds: [] });
+    var opt = __assign(__assign({}, options), { layerIds: new Set(), layerToId: new Map() });
     if (opt.generateThumbnail) {
         imageResources = __assign(__assign({}, imageResources), { thumbnail: createThumbnail(psd) });
     }