ag-psd 31.0.3 → 33.0.0

package/dist/additionalInfo.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.booleanOperations = exports.infoHandlersMap = exports.infoHandlers = void 0;
 exports.readBezierKnot = readBezierKnot;
 exports.readVectorMask = readVectorMask;
+exports.writeVectorMask = writeVectorMask;
+exports.parseKeyDescriptorList = parseKeyDescriptorList;
+exports.serializeKeyDescriptorList = serializeKeyDescriptorList;
 exports.hasMultiEffects = hasMultiEffects;
 const base64_js_1 = require("base64-js");
 const effectsHelpers_1 = require("./effectsHelpers");
@@ -32,11 +35,8 @@ function readLength64(reader) {
         throw new Error(`Resource size above 4 GB limit at ${reader.offset.toString(16)}`);
     return (0, psdReader_1.readUint32)(reader);
 }
-function writeLength64(writer, length) {
-    (0, psdWriter_1.writeUint32)(writer, 0);
-    (0, psdWriter_1.writeUint32)(writer, length);
-}
 addHandler('TySh', hasKey('text'), (reader, target, leftBytes) => {
+    var _a;
     if ((0, psdReader_1.readInt16)(reader) !== 1)
         throw new Error(`Invalid TySh version`);
     const transform = [];
@@ -74,7 +74,7 @@ addHandler('TySh', hasKey('text'), (reader, target, leftBytes) => {
     if (text.boundingBox)
         target.text.boundingBox = (0, descriptor_1.descBoundsToBounds)(text.boundingBox);
     if (text.EngineData) {
-        const engineData = (0, engineData_1.parseEngineData)(text.EngineData);
+        const engineData = (0, engineData_1.parseEngineData)(text.EngineData, reader);
         const textData = (0, text_1.decodeEngineData)(engineData);
         // console.log(require('util').inspect(engineData, false, 99, false), 'utf8');
         // require('fs').writeFileSync(`layer-${target.name}.txt`, require('util').inspect(engineData, false, 99, false), 'utf8');
@@ -83,11 +83,13 @@ addHandler('TySh', hasKey('text'), (reader, target, leftBytes) => {
         // require('fs').writeFileSync('before.txt', require('util').inspect(before, false, 99, false), 'utf8');
         // require('fs').writeFileSync('after.txt', require('util').inspect(after, false, 99, false), 'utf8');
         // console.log(require('util').inspect(parseEngineData(text.EngineData), false, 99, true));
-        target.text = Object.assign(Object.assign({}, target.text), textData);
+        // descriptor anti-alias value is more reliable than the one from engine data
+        target.text = Object.assign(Object.assign(Object.assign({}, target.text), textData), { antiAlias: (_a = target.text.antiAlias) !== null && _a !== void 0 ? _a : textData.antiAlias });
         // console.log(require('util').inspect(target.text, false, 99, true));
     }
     (0, psdReader_1.skipBytes)(reader, leftBytes());
 }, (writer, target) => {
+    var _a, _b, _c, _d;
     const text = target.text;
     const warp = text.warp || {};
     const transform = text.transform || [1, 0, 0, 1, 0, 0];
@@ -100,10 +102,10 @@ addHandler('TySh', hasKey('text'), (reader, target, leftBytes) => {
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'TxLr', textDescriptor, 'text');
     (0, psdWriter_1.writeInt16)(writer, 1); // warp version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'warp', encodeWarp(warp));
-    (0, psdWriter_1.writeFloat32)(writer, text.left);
-    (0, psdWriter_1.writeFloat32)(writer, text.top);
-    (0, psdWriter_1.writeFloat32)(writer, text.right);
-    (0, psdWriter_1.writeFloat32)(writer, text.bottom);
+    (0, psdWriter_1.writeFloat32)(writer, (_a = text.left) !== null && _a !== void 0 ? _a : 0);
+    (0, psdWriter_1.writeFloat32)(writer, (_b = text.top) !== null && _b !== void 0 ? _b : 0);
+    (0, psdWriter_1.writeFloat32)(writer, (_c = text.right) !== null && _c !== void 0 ? _c : 0);
+    (0, psdWriter_1.writeFloat32)(writer, (_d = text.bottom) !== null && _d !== void 0 ? _d : 0);
     // writeZeros(writer, 2);
 });
 // vector fills
@@ -212,25 +214,8 @@ function readVectorMask(reader, vectorMask, width, height, size) {
     }
     return paths;
 }
-addHandler('vmsk', hasKey('vectorMask'), (reader, target, left, { width, height }) => {
-    if ((0, psdReader_1.readUint32)(reader) !== 3)
-        throw new Error('Invalid vmsk version');
-    target.vectorMask = { paths: [] };
-    const vectorMask = target.vectorMask;
-    const flags = (0, psdReader_1.readUint32)(reader);
-    vectorMask.invert = (flags & 1) !== 0;
-    vectorMask.notLink = (flags & 2) !== 0;
-    vectorMask.disable = (flags & 4) !== 0;
-    readVectorMask(reader, vectorMask, width, height, left());
-    // drawBezierPaths(vectorMask.paths, width, height, 'out.png');
-    (0, psdReader_1.skipBytes)(reader, left());
-}, (writer, target, { width, height }) => {
-    const vectorMask = target.vectorMask;
-    const flags = (vectorMask.invert ? 1 : 0) |
-        (vectorMask.notLink ? 2 : 0) |
-        (vectorMask.disable ? 4 : 0);
-    (0, psdWriter_1.writeUint32)(writer, 3); // version
-    (0, psdWriter_1.writeUint32)(writer, flags);
+// componentIndices - write index of path component for each subpath (Photoshop writes them for layer vector masks)
+function writeVectorMask(writer, vectorMask, width, height, componentIndices = false) {
     // initial entry
     (0, psdWriter_1.writeUint16)(writer, 6);
     (0, psdWriter_1.writeZeros)(writer, 24);
@@ -247,12 +232,18 @@ addHandler('vmsk', hasKey('vectorMask'), (reader, target, left, { width, height
     (0, psdWriter_1.writeUint16)(writer, 8);
     (0, psdWriter_1.writeUint16)(writer, vectorMask.fillStartsWithAllPixels ? 1 : 0);
     (0, psdWriter_1.writeZeros)(writer, 22);
+    let componentIndex = -1;
     for (const path of vectorMask.paths) {
+        // subpaths without operation are part of the same path component as previous subpath
+        if (path.operation || componentIndex < 0)
+            componentIndex++;
         (0, psdWriter_1.writeUint16)(writer, path.open ? 3 : 0);
         (0, psdWriter_1.writeUint16)(writer, path.knots.length);
         (0, psdWriter_1.writeUint16)(writer, path.operation ? exports.booleanOperations.indexOf(path.operation) : -1); // -1 for undefined
         (0, psdWriter_1.writeUint16)(writer, path.fillRule === 'non-zero' ? 2 : 1);
-        (0, psdWriter_1.writeZeros)(writer, 18); // TODO: these are sometimes non-zero
+        (0, psdWriter_1.writeZeros)(writer, 4);
+        (0, psdWriter_1.writeUint32)(writer, componentIndices ? componentIndex : 0);
+        (0, psdWriter_1.writeZeros)(writer, 10);
         const linkedKnot = path.open ? 4 : 1;
         const unlinkedKnot = path.open ? 5 : 2;
         for (const { linked, points } of path.knots) {
@@ -260,8 +251,29 @@ addHandler('vmsk', hasKey('vectorMask'), (reader, target, left, { width, height
             writeBezierKnot(writer, points, width, height);
         }
     }
+}
+addHandler('vmsk', hasKey('vectorMask'), (reader, target, left, { width, height }) => {
+    if ((0, psdReader_1.readUint32)(reader) !== 3)
+        throw new Error('Invalid vmsk version');
+    target.vectorMask = { paths: [] };
+    const vectorMask = target.vectorMask;
+    const flags = (0, psdReader_1.readUint32)(reader);
+    vectorMask.invert = (flags & 1) !== 0;
+    vectorMask.notLink = (flags & 2) !== 0;
+    vectorMask.disable = (flags & 4) !== 0;
+    readVectorMask(reader, vectorMask, width, height, left());
+    // drawBezierPaths(vectorMask.paths, width, height, 'out.png');
+    (0, psdReader_1.skipBytes)(reader, left());
+}, (writer, target, { width, height }) => {
+    const vectorMask = target.vectorMask;
+    const flags = (vectorMask.invert ? 1 : 0) |
+        (vectorMask.notLink ? 2 : 0) |
+        (vectorMask.disable ? 4 : 0);
+    (0, psdWriter_1.writeUint32)(writer, 3); // version
+    (0, psdWriter_1.writeUint32)(writer, flags);
+    writeVectorMask(writer, vectorMask, width, height, true);
 });
-// TODO: need to write vmsk if has outline ?
+// written instead of 'vmsk' for layers with vector stroke ('vscg' section)
 addHandlerAlias('vsms', 'vmsk');
 // addHandlerAlias('vmsk', 'vsms');
 addHandler('vowv', // something with vectors?
@@ -270,12 +282,8 @@ hasKey('vowv'), (reader, target) => {
 }, (writer, target) => {
     (0, psdWriter_1.writeUint32)(writer, target.vowv);
 });
-addHandler('vogk', hasKey('vectorOrigination'), (reader, target, left) => {
-    if ((0, psdReader_1.readInt32)(reader) !== 1)
-        throw new Error(`Invalid vogk version`);
-    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    // console.log(require('util').inspect(desc, false, 99, true));
-    target.vectorOrigination = { keyDescriptorList: [] };
+function parseKeyDescriptorList(desc) {
+    const keyDescriptorList = [];
     for (const i of desc.keyDescriptorList) {
         const item = {};
         if (i.keyShapeInvalidated != null)
@@ -314,15 +322,14 @@ addHandler('vogk', hasKey('vectorOrigination'), (reader, target, left) => {
         if (trnf) {
             item.transform = [trnf.xx, trnf.xy, trnf.yx, trnf.yy, trnf.tx, trnf.ty];
         }
-        target.vectorOrigination.keyDescriptorList.push(item);
+        keyDescriptorList.push(item);
     }
-    (0, psdReader_1.skipBytes)(reader, left());
-}, (writer, target) => {
-    target;
-    const orig = target.vectorOrigination;
+    return keyDescriptorList;
+}
+function serializeKeyDescriptorList(keyDescriptorList) {
     const desc = { keyDescriptorList: [] };
-    for (let i = 0; i < orig.keyDescriptorList.length; i++) {
-        const item = orig.keyDescriptorList[i];
+    for (let i = 0; i < keyDescriptorList.length; i++) {
+        const item = keyDescriptorList[i];
         desc.keyDescriptorList.push({}); // we're adding keyOriginIndex at the end
         const out = desc.keyDescriptorList[desc.keyDescriptorList.length - 1];
         if (item.keyOriginType != null)
@@ -373,10 +380,21 @@ addHandler('vogk', hasKey('vectorOrigination'), (reader, target, left) => {
             out.keyShapeInvalidated = item.keyShapeInvalidated;
         out.keyOriginIndex = i;
     }
+    return desc;
+}
+addHandler('vogk', hasKey('vectorOrigination'), (reader, target, left) => {
+    if ((0, psdReader_1.readInt32)(reader) !== 1)
+        throw new Error(`Invalid vogk version`);
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log(require('util').inspect(desc, false, 99, true));
+    target.vectorOrigination = { keyDescriptorList: parseKeyDescriptorList(desc) };
+    (0, psdReader_1.skipBytes)(reader, left());
+}, (writer, target) => {
+    const desc = serializeKeyDescriptorList(target.vectorOrigination.keyDescriptorList);
     (0, psdWriter_1.writeInt32)(writer, 1); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
-addHandler('lmfx', target => target.effects !== undefined && hasMultiEffects(target.effects), (reader, target, left) => {
+addHandler('lmfx', target => target.effects !== undefined && !isGroupLayer(target) && hasMultiEffects(target.effects), (reader, target, left) => {
     const version = (0, psdReader_1.readUint32)(reader);
     if (version !== 0)
         throw new Error('Invalid lmfx version');
@@ -419,12 +437,54 @@ addHandler('luni', hasKey('name'), (reader, target, left) => {
     // writeUint16(writer, 0); // padding (but not extending string length)
 });
 addHandler('lnsr', hasKey('nameSource'), (reader, target) => target.nameSource = (0, psdReader_1.readSignature)(reader), (writer, target) => (0, psdWriter_1.writeSignature)(writer, target.nameSource));
-addHandler('lyid', hasKey('id'), (reader, target) => {
+// these sections reference layer id
+function layerNeedsId(target) {
+    return !!(target.animationFrames || target.timeline || target.comps);
+}
+function getExplicitLayerIds(psd, options) {
+    if (!options.explicitLayerIds) {
+        const ids = new Set();
+        const addIds = (layers) => {
+            for (const layer of layers !== null && layers !== void 0 ? layers : []) {
+                if (layer.id !== undefined)
+                    ids.add(layer.id);
+                addIds(layer.children);
+            }
+        };
+        addIds(psd.children);
+        options.explicitLayerIds = ids;
+    }
+    return options.explicitLayerIds;
+}
+function getLayerId(target, options) {
+    var _a;
+    const id = (_a = options.layerToId.get(target)) !== null && _a !== void 0 ? _a : target.id;
+    if (id === undefined)
+        throw new Error('Missing layer id');
+    return id;
+}
+addHandler('lyid', target => target.id !== undefined || layerNeedsId(target), (reader, target) => {
     target.id = (0, psdReader_1.readUint32)(reader);
-}, (writer, target, _psd, options) => {
-    let id = target.id;
-    while (options.layerIds.has(id))
-        id += 100; // make sure we don't have duplicate layer ids
+}, (writer, target, psd, options) => {
+    var _a;
+    let id;
+    if (target.id !== undefined) {
+        id = target.id;
+        if (options.layerIds.has(id)) {
+            // make sure we don't have duplicate layer ids (and don't take id explicitly set on another layer)
+            const explicitIds = getExplicitLayerIds(psd, options);
+            while (options.layerIds.has(id) || explicitIds.has(id))
+                id += 100;
+        }
+    }
+    else {
+        // generate id for layers that don't have it, if it's referenced by other sections
+        const explicitIds = getExplicitLayerIds(psd, options);
+        id = (_a = options.nextGeneratedLayerId) !== null && _a !== void 0 ? _a : 1;
+        while (options.layerIds.has(id) || explicitIds.has(id))
+            id++;
+        options.nextGeneratedLayerId = id + 1;
+    }
     (0, psdWriter_1.writeUint32)(writer, id);
     options.layerIds.add(id);
     options.layerToId.set(target, id);
@@ -488,12 +548,15 @@ addHandler('lspf', hasKey('protected'), (reader, target) => {
     };
     if (flags & 0x08)
         target.protected.artboards = true;
+    if (flags & 0x80000000)
+        target.protected.all = true;
 }, (writer, target) => {
     const flags = (target.protected.transparency ? 0x01 : 0) |
         (target.protected.composite ? 0x02 : 0) |
         (target.protected.position ? 0x04 : 0) |
-        (target.protected.artboards ? 0x08 : 0);
-    (0, psdWriter_1.writeUint32)(writer, flags);
+        (target.protected.artboards ? 0x08 : 0) |
+        (target.protected.all ? 0x80000000 : 0);
+    (0, psdWriter_1.writeUint32)(writer, flags >>> 0);
 });
 addHandler('lclr', hasKey('layerColor'), (reader, target) => {
     const color = (0, psdReader_1.readUint16)(reader);
@@ -504,106 +567,160 @@ addHandler('lclr', hasKey('layerColor'), (reader, target) => {
     (0, psdWriter_1.writeUint16)(writer, index === -1 ? 0 : index);
     (0, psdWriter_1.writeZeros)(writer, 6);
 });
+function parseGeneratorSettings(settings) {
+    const result = {};
+    if (settings.exportAs) {
+        result.exportAs = {};
+        if (settings.exportAs.exportOption !== undefined)
+            result.exportAs.exportOption = settings.exportAs.exportOption;
+        if (settings.exportAs.scaleSettings !== undefined)
+            result.exportAs.scaleSettings = settings.exportAs.scaleSettings;
+    }
+    if (settings.generator_45_assets)
+        result.assets = settings.generator_45_assets.json;
+    if (settings.layerTime !== undefined)
+        result.layerTime = settings.layerTime;
+    if (settings.crema)
+        result.crema = settings.crema.json;
+    return result;
+}
+function serializeGeneratorSettings(generatorSettings) {
+    const settings = {
+        _name: '',
+        _classID: generatorSettings.assets !== undefined ? 'generatorSettings' : 'null',
+    };
+    if (generatorSettings.exportAs) {
+        settings.exportAs = { _name: '', _classID: 'null' };
+        if (generatorSettings.exportAs.exportOption !== undefined)
+            settings.exportAs.exportOption = generatorSettings.exportAs.exportOption;
+        if (generatorSettings.exportAs.scaleSettings !== undefined)
+            settings.exportAs.scaleSettings = generatorSettings.exportAs.scaleSettings;
+    }
+    if (generatorSettings.assets !== undefined)
+        settings.generator_45_assets = { _name: '', _classID: 'generatorSettings', json: generatorSettings.assets };
+    if (generatorSettings.layerTime !== undefined)
+        settings.layerTime = generatorSettings.layerTime;
+    if (generatorSettings.crema !== undefined)
+        settings.crema = { _name: '', _classID: 'null', json: generatorSettings.crema };
+    return { generatorSettings: settings };
+}
+// document (Psd object) stores generator settings in 'extn' section instead of 'shmd' section
+function isDocument(target) {
+    return target.width !== undefined;
+}
 addHandler('shmd', // Metadata setting
 // Metadata setting
-target => target.timestamp !== undefined || target.animationFrames !== undefined || target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined, (reader, target, left) => {
+target => target.timestamp !== undefined || target.animationFrames !== undefined || target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined ||
+    (target.generatorSettings !== undefined && !isDocument(target)), (reader, target, left) => {
     const count = (0, psdReader_1.readUint32)(reader);
     for (let i = 0; i < count; i++) {
-        (0, psdReader_1.checkSignature)(reader, '8BIM');
+        const signature = (0, psdReader_1.readSignature)(reader);
+        if (signature !== '8BIM' && signature !== '8ELE')
+            throw new Error(`Invalid shmd signature: '${signature}'`); // 8ELE in Photoshop Elements
         const key = (0, psdReader_1.readSignature)(reader);
         (0, psdReader_1.readUint8)(reader); // copy
         (0, psdReader_1.skipBytes)(reader, 3);
-        (0, psdReader_1.readSection)(reader, 1, left => {
-            if (key === 'cust') {
-                const 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') {
-                const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-                // console.log('mlst', target.name, require('util').inspect(desc, false, 99, true));
-                target.animationFrames = [];
-                for (let i = 0; i < desc.LaSt.length; i++) {
-                    const f = desc.LaSt[i];
-                    const 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, !!reader.logMissingFeatures);
-                    if (f.blendOptions && f.blendOptions.Opct)
-                        frame.opacity = (0, descriptor_1.parsePercent)(f.blendOptions.Opct);
-                    target.animationFrames.push(frame);
+        const end = reader.offset + 4 + reader.view.getUint32(reader.offset);
+        try {
+            (0, psdReader_1.readSection)(reader, 1, left => {
+                if (key === 'cust') {
+                    const 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 === 'mdyn') {
-                // frame flags
-                (0, psdReader_1.readUint16)(reader); // unknown
-                const propagate = (0, psdReader_1.readUint8)(reader);
-                const flags = (0, psdReader_1.readUint8)(reader);
-                target.animationFrameFlags = {
-                    propagateFrameOne: !propagate,
-                    unifyLayerPosition: (flags & 1) !== 0,
-                    unifyLayerStyle: (flags & 2) !== 0,
-                    unifyLayerVisibility: (flags & 4) !== 0,
-                };
-            }
-            else if (key === 'tmln') {
-                const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-                const timeScope = desc.timeScope;
-                // console.log('tmln', target.name, target.id, require('util').inspect(desc, false, 99, true));
-                const timeline = {
-                    start: (0, descriptor_1.frac)(timeScope.Strt),
-                    duration: (0, descriptor_1.frac)(timeScope.duration),
-                    inTime: (0, descriptor_1.frac)(timeScope.inTime),
-                    outTime: (0, descriptor_1.frac)(timeScope.outTime),
-                    autoScope: desc.autoScope,
-                    audioLevel: desc.audioLevel,
-                };
-                if (desc.trackList) {
-                    timeline.tracks = (0, descriptor_1.parseTrackList)(desc.trackList, !!reader.logMissingFeatures);
+                else if (key === 'mlst') {
+                    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                    // console.log('mlst', target.name, require('util').inspect(desc, false, 99, true));
+                    target.animationFrames = [];
+                    for (let i = 0; i < desc.LaSt.length; i++) {
+                        const f = desc.LaSt[i];
+                        const 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, !!reader.logMissingFeatures);
+                        if (f.blendOptions && f.blendOptions.Opct)
+                            frame.opacity = (0, descriptor_1.parsePercent)(f.blendOptions.Opct);
+                        target.animationFrames.push(frame);
+                    }
                 }
-                target.timeline = timeline;
-                // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
-            }
-            else if (key === 'cmls') {
-                const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-                // console.log('cmls', require('util').inspect(desc, false, 99, true));
-                target.comps = {
-                    settings: [],
-                };
-                if (desc.origFXRefPoint)
-                    target.comps.originalEffectsReferencePoint = { x: desc.origFXRefPoint.Hrzn, y: desc.origFXRefPoint.Vrtc };
-                for (const item of desc.layerSettings) {
-                    target.comps.settings.push({ compList: item.compList });
-                    const t = target.comps.settings[target.comps.settings.length - 1];
-                    if ('enab' in item)
-                        t.enabled = item.enab;
-                    if (item.Ofst)
-                        t.offset = { x: item.Ofst.Hrzn, y: item.Ofst.Vrtc };
-                    if (item.FXRefPoint)
-                        t.effectsReferencePoint = { x: item.FXRefPoint.Hrzn, y: item.FXRefPoint.Vrtc };
+                else if (key === 'mdyn') {
+                    // frame flags
+                    (0, psdReader_1.readUint16)(reader); // unknown
+                    const propagate = (0, psdReader_1.readUint8)(reader);
+                    const flags = (0, psdReader_1.readUint8)(reader);
+                    target.animationFrameFlags = {
+                        propagateFrameOne: !propagate,
+                        unifyLayerPosition: (flags & 1) !== 0,
+                        unifyLayerStyle: (flags & 2) !== 0,
+                        unifyLayerVisibility: (flags & 4) !== 0,
+                    };
                 }
-            }
-            else if (key === 'extn') {
-                const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-                // console.log(require('util').inspect(desc, false, 99, true));
-                desc; // TODO: save this
-                reader.logMissingFeatures && reader.log('Unhandled "shmd" section key', key);
-            }
-            else {
-                reader.logMissingFeatures && reader.log('Unhandled "shmd" section key', key);
-            }
-            (0, psdReader_1.skipBytes)(reader, left());
-        });
+                else if (key === 'tmln') {
+                    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                    const timeScope = desc.timeScope;
+                    // console.log('tmln', target.name, target.id, require('util').inspect(desc, false, 99, true));
+                    const timeline = {
+                        start: (0, descriptor_1.frac)(timeScope.Strt),
+                        duration: (0, descriptor_1.frac)(timeScope.duration),
+                        inTime: (0, descriptor_1.frac)(timeScope.inTime),
+                        outTime: (0, descriptor_1.frac)(timeScope.outTime),
+                        autoScope: desc.autoScope,
+                        audioLevel: desc.audioLevel,
+                    };
+                    if (desc.trackList) {
+                        timeline.tracks = (0, descriptor_1.parseTrackList)(desc.trackList, !!reader.logMissingFeatures);
+                    }
+                    target.timeline = timeline;
+                    // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
+                }
+                else if (key === 'cmls') {
+                    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                    // console.log('cmls', require('util').inspect(desc, false, 99, true));
+                    target.comps = {
+                        settings: [],
+                    };
+                    if (desc.origFXRefPoint)
+                        target.comps.originalEffectsReferencePoint = { x: desc.origFXRefPoint.Hrzn, y: desc.origFXRefPoint.Vrtc };
+                    for (const item of desc.layerSettings) {
+                        target.comps.settings.push({ compList: item.compList });
+                        const t = target.comps.settings[target.comps.settings.length - 1];
+                        if ('enab' in item)
+                            t.enabled = item.enab;
+                        if (item.Ofst)
+                            t.offset = { x: item.Ofst.Hrzn, y: item.Ofst.Vrtc };
+                        if (item.FXRefPoint)
+                            t.effectsReferencePoint = { x: item.FXRefPoint.Hrzn, y: item.FXRefPoint.Vrtc };
+                    }
+                }
+                else if (key === 'extn') {
+                    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                    if (desc.generatorSettings)
+                        target.generatorSettings = parseGeneratorSettings(desc.generatorSettings);
+                }
+                else {
+                    reader.logMissingFeatures && reader.log('Unhandled "shmd" section key', key);
+                }
+                (0, psdReader_1.skipBytes)(reader, left());
+            });
+        }
+        catch (e) {
+            // failure to read one item shouldn't drop all other items
+            if (reader.throwForMissingFeatures)
+                throw e;
+            reader.logMissingFeatures && reader.log(`Failed to read "shmd" section key ${key}: ${e.message}`);
+            reader.offset = end;
+        }
     }
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target, _, options) => {
     const { animationFrames, animationFrameFlags, timestamp, timeline, comps } = target;
+    const generatorSettings = isDocument(target) ? undefined : target.generatorSettings;
     let count = 0;
     if (animationFrames)
         count++;
@@ -615,6 +732,8 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
         count++;
     if (comps)
         count++;
+    if (generatorSettings)
+        count++;
     (0, psdWriter_1.writeUint32)(writer, count);
     if (animationFrames) {
         (0, psdWriter_1.writeSignature)(writer, '8BIM');
@@ -622,9 +741,8 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
         (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
         (0, psdWriter_1.writeZeros)(writer, 3);
         (0, psdWriter_1.writeSection)(writer, 2, () => {
-            var _a;
             const desc = {
-                LaID: (_a = target.id) !== null && _a !== void 0 ? _a : 0,
+                LaID: getLayerId(target, options),
                 LaSt: [],
             };
             for (let i = 0; i < animationFrames.length; i++) {
@@ -638,9 +756,9 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
                 if (f.referencePoint)
                     frame.FXRf = (0, descriptor_1.xyToHorzVrtc)(f.referencePoint);
                 if (f.effects)
-                    frame.Lefx = (0, descriptor_1.serializeEffects)(f.effects, false, false);
+                    frame.Lefx = (0, descriptor_1.serializeEffects)(f.effects, false, hasMultiEffects(f.effects));
                 if (f.opacity !== undefined)
-                    frame.blendOptions = { Opct: (0, descriptor_1.unitsPercent)(f.opacity) };
+                    frame.blendOptions = { Opct: (0, descriptor_1.unitsPercentF)(f.opacity) };
                 desc.LaSt.push(frame);
             }
             (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
@@ -680,10 +798,7 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
             if (timeline.tracks) {
                 desc.trackList = (0, descriptor_1.serializeTrackList)(timeline.tracks);
             }
-            const id = options.layerToId.get(target) || target.id;
-            if (!id)
-                throw new Error('You need to provide layer.id value whan writing document with animations');
-            desc.LyrI = id;
+            desc.LyrI = getLayerId(target, options);
             // console.log('WRITE:tmln', target.name, target.id, require('util').inspect(desc, false, 99, true));
             (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'anim');
         }, true);
@@ -706,14 +821,11 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
         (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
         (0, psdWriter_1.writeZeros)(writer, 3);
         (0, psdWriter_1.writeSection)(writer, 2, () => {
-            const id = options.layerToId.get(target) || target.id;
-            if (!id)
-                throw new Error('You need to provide layer.id value whan writing document with layer comps');
             const desc = {};
             if (comps.originalEffectsReferencePoint) {
                 desc.origFXRefPoint = { Hrzn: comps.originalEffectsReferencePoint.x, Vrtc: comps.originalEffectsReferencePoint.y };
             }
-            desc.LyrI = id;
+            desc.LyrI = getLayerId(target, options);
             desc.layerSettings = [];
             for (const item of comps.settings) {
                 const t = {};
@@ -730,8 +842,17 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
             (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
         }, true);
     }
+    if (generatorSettings) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'extn');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, () => {
+            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', serializeGeneratorSettings(generatorSettings));
+        }, true);
+    }
 });
-addHandler('PxSc', () => false, (reader, target) => {
+addHandler('PxSc', hasKey('pixelSource'), (reader, target) => {
     const desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
     // console.log('PxSc', require('util').inspect(desc, false, 99, true));
     if (desc.pixelSourceType === 1986285651) {
@@ -766,7 +887,7 @@ addHandler('PxSc', () => false, (reader, target) => {
         _classID: 'PixelSource',
         pixelSourceType: 1986285651, // vdP
         descVersion: 1,
-        origin: { Hrzn: source.origin.x, Vrtc: source.origin.y },
+        origin: { Hrzn: source.origin.x, Vrtc: source.origin.y }, // written as 'null' class with 'long' values (see writeDescriptorStructure)
         interpretation: {
             _name: '',
             _classID: 'footageInterpretation',
@@ -809,7 +930,7 @@ addHandler('vstk', hasKey('vectorStroke'), (reader, target, left) => {
         lineAlignment: descriptor_1.strokeStyleLineAlignment.decode(desc.strokeStyleLineAlignment),
         scaleLock: desc.strokeStyleScaleLock,
         strokeAdjust: desc.strokeStyleStrokeAdjust,
-        lineDashSet: desc.strokeStyleLineDashSet.map(descriptor_1.parseUnits),
+        lineDashSet: (desc.strokeStyleLineDashSet || []).map(descriptor_1.parseUnits),
         blendMode: descriptor_1.BlnM.decode(desc.strokeStyleBlendMode),
         opacity: (0, descriptor_1.parsePercent)(desc.strokeStyleOpacity),
         content: (0, descriptor_1.parseVectorContent)(desc.strokeStyleContent),
@@ -847,9 +968,11 @@ hasKey('artboard'), (reader, target, left) => {
         rect: { top: rect['Top '], left: rect.Left, bottom: rect.Btom, right: rect.Rght },
         guideIndices: desc.guideIndeces,
         presetName: desc.artboardPresetName,
-        color: (0, descriptor_1.parseColor)(desc['Clr ']),
-        backgroundType: desc.artboardBackgroundType,
     };
+    if (desc['Clr '])
+        target.artboard.color = (0, descriptor_1.parseColor)(desc['Clr ']);
+    if (desc.artboardBackgroundType !== undefined)
+        target.artboard.backgroundType = desc.artboardBackgroundType;
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
     var _a;
@@ -955,14 +1078,15 @@ function encodeWarp(warp) {
     }
     return desc;
 }
-addHandler('PlLd', hasKey('placedLayer'), (reader, target, left) => {
+addHandler('PlLd', target => !!target.placedLayer && !target.placedLayer.external, // linked smart objects are stored in SoLE
+(reader, target, left) => {
     if ((0, psdReader_1.readSignature)(reader) !== 'plcL')
         throw new Error(`Invalid PlLd signature`);
     if ((0, psdReader_1.readInt32)(reader) !== 3)
         throw new Error(`Invalid PlLd version`);
     const id = (0, psdReader_1.readPascalString)(reader, 1);
     const pageNumber = (0, psdReader_1.readInt32)(reader);
-    const totalPages = (0, psdReader_1.readInt32)(reader); // TODO: check how this works ?
+    const totalPages = (0, psdReader_1.readInt32)(reader); // for multi-page documents (PDF)
     (0, psdReader_1.readInt32)(reader); // anitAliasPolicy 16
     const placedLayerType = (0, psdReader_1.readInt32)(reader); // 0 = unknown, 1 = vector, 2 = raster, 3 = image stack
     if (!placedLayerTypes[placedLayerType])
@@ -1007,11 +1131,15 @@ addHandler('PlLd', hasKey('placedLayer'), (reader, target, left) => {
     const type = isQuilt ? 'quiltWarp' : 'warp';
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', type, encodeWarp(warp), type);
 });
+const levelsFilterKeys = ['_name', '_classID', 'presetKind', 'Adjs'];
+const levelsFilterAdjustmentKeys = ['_name', '_classID', 'Chnl', 'Inpt', 'Otpt', 'Gmm '];
 function uint8ToFloat32(array) {
-    return new Float32Array(array.buffer.slice(array.byteOffset), 0, array.byteLength / 4);
+    const length = Math.floor(array.byteLength / 4);
+    return new Float32Array(array.buffer.slice(array.byteOffset, array.byteOffset + length * 4), 0, length);
 }
 function uint8ToUint32(array) {
-    return new Uint32Array(array.buffer.slice(array.byteOffset), 0, array.byteLength / 4);
+    const length = Math.floor(array.byteLength / 4);
+    return new Uint32Array(array.buffer.slice(array.byteOffset, array.byteOffset + length * 4), 0, length);
 }
 function toUint8(array) {
     return new Uint8Array(array.buffer, array.byteOffset, array.byteLength);
@@ -1047,7 +1175,7 @@ function pointToHrznVrtc(point) {
         Vrtc: (0, descriptor_1.unitsValue)(point.y, 'y'),
     };
 }
-function parseFilterFXItem(f, options) {
+function parseFilterFXItem(f, reader) {
     const base = {
         name: f['Nm  '],
         opacity: (0, descriptor_1.parsePercent)(f.blendOptions.Opct),
@@ -1095,7 +1223,7 @@ function parseFilterFXItem(f, options) {
                     undefinedAreas: descriptor_1.UndA.decode(f.Fltr.UndA),
                     displacementFile: {
                         signature: f.Fltr.DspF.sig,
-                        path: f.Fltr.DspF.path, // TODO: this is decoded incorrectly ???
+                        path: f.Fltr.DspF.path,
                     },
                 } });
             case 'Pnch': return Object.assign(Object.assign({}, base), { type: 'pinch', filter: {
@@ -1280,10 +1408,9 @@ function parseFilterFXItem(f, options) {
                         { x: f.Fltr.PuX2, y: f.Fltr.PuY2, },
                         { x: f.Fltr.PuX3, y: f.Fltr.PuY3, },
                     ],
-                    puppetShapeList: f.Fltr.puppetShapeList.map(p => ({
+                    puppetShapeList: (f.Fltr.puppetShapeList || []).map(p => ({
                         rigidType: p.rigidType,
-                        // TODO: VrsM
-                        // TODO: VrsN
+                        // VrsM / VrsN - version (always 1.0)
                         originalVertexArray: uint8ToPoints(p.originalVertexArray),
                         deformedVertexArray: uint8ToPoints(p.deformedVertexArray),
                         indexArray: Array.from(uint8ToUint32(p.indexArray)),
@@ -1380,7 +1507,7 @@ function parseFilterFXItem(f, options) {
                 ;
             case 'Crvs':
                 {
-                    return Object.assign(Object.assign({}, base), { type: 'curves', filter: Object.assign({ presetKind: descriptor_1.presetKindType.decode(f.Fltr.presetKind) }, (f.Fltr.Adjs ? {
+                    return Object.assign(Object.assign({}, base), { type: 'curves', filter: Object.assign(Object.assign({}, (f.Fltr.presetKind !== undefined ? { presetKind: descriptor_1.presetKindType.decode(f.Fltr.presetKind) } : {})), (f.Fltr.Adjs ? {
                             adjustments: f.Fltr.Adjs.map(a => {
                                 const channels = a.Chnl.map(descriptor_1.Chnl.decode);
                                 if (a['Crv ']) {
@@ -1404,6 +1531,35 @@ function parseFilterFXItem(f, options) {
                         } : {})) });
                 }
                 ;
+            case 'Lvls':
+                {
+                    const adjustments = f.Fltr.Adjs;
+                    const isKnown = (obj, keys) => Object.keys(obj).every(k => keys.indexOf(k) !== -1);
+                    // skip filter with settings we don't know about
+                    if (!isKnown(f.Fltr, levelsFilterKeys) || (adjustments && !adjustments.every(a => isKnown(a, levelsFilterAdjustmentKeys)))) {
+                        if (reader.throwForMissingFeatures)
+                            throw new Error('Unknown levels filter settings');
+                        reader.logMissingFeatures && reader.log(`Skipped levels smart filter with unknown settings`);
+                        return undefined;
+                    }
+                    return Object.assign(Object.assign({}, base), { type: 'levels', filter: Object.assign(Object.assign({}, (f.Fltr.presetKind !== undefined ? { presetKind: descriptor_1.presetKindType.decode(f.Fltr.presetKind) } : {})), (adjustments ? {
+                            adjustments: adjustments.map(a => {
+                                const result = { channels: a.Chnl.map(descriptor_1.Chnl.decode) };
+                                if (a.Inpt) {
+                                    result.shadowInput = a.Inpt[0];
+                                    result.highlightInput = a.Inpt[1];
+                                }
+                                if (a.Otpt) {
+                                    result.shadowOutput = a.Otpt[0];
+                                    result.highlightOutput = a.Otpt[1];
+                                }
+                                if (a['Gmm '] !== undefined)
+                                    result.midtoneInput = a['Gmm '];
+                                return result;
+                            }),
+                        } : {})) });
+                }
+                ;
             case 'BrgC':
                 {
                     return Object.assign(Object.assign({}, base), { type: 'brightness/contrast', filter: {
@@ -1414,10 +1570,11 @@ function parseFilterFXItem(f, options) {
                 }
                 ;
             default:
-                if (options.throwForMissingFeatures) {
+                if (reader.throwForMissingFeatures) {
                     // console.log('FILTER', require('util').inspect(f, false, 99, true));
                     throw new Error(`Unknown filter classId: ${f.Fltr._classID}`);
                 }
+                reader.logMissingFeatures && reader.log(`Unhandled smart filter: ${f.Fltr._classID} (${f['Nm  ']})`);
                 return undefined;
         }
     }
@@ -1437,21 +1594,23 @@ function parseFilterFXItem(f, options) {
             case 1314149187: return Object.assign(Object.assign({}, base), { type: 'ntsc colors' });
             case 1231976050: return Object.assign(Object.assign({}, base), { type: 'invert' });
             default:
-                if (options.throwForMissingFeatures) {
+                if (reader.throwForMissingFeatures) {
                     // console.log('FILTER', require('util').inspect(f, false, 99, true));
                     throw new Error(`Unknown filterID: ${f.filterID}`);
                 }
+                reader.logMissingFeatures && reader.log(`Unhandled smart filter: ${f.filterID} (${f['Nm  ']})`);
+                return undefined;
         }
     }
 }
-function parseFilterFX(desc, options) {
+function parseFilterFX(desc, reader) {
     return {
         enabled: desc.enab,
         validAtPosition: desc.validAtPosition,
         maskEnabled: desc.filterMaskEnable,
         maskLinked: desc.filterMaskLinked,
         maskExtendWithWhite: desc.filterMaskExtendWithWhite,
-        list: desc.filterFXList.map(x => parseFilterFXItem(x, options)).filter((x) => !!x),
+        list: desc.filterFXList.map(x => parseFilterFXItem(x, reader)).filter((x) => !!x),
     };
 }
 function uvRadius(t) {
@@ -1807,14 +1966,14 @@ function serializeFilterFXItem(f) {
         case 'puppet': return Object.assign(Object.assign({}, base), { Fltr: {
                 _name: 'Rigid Transform',
                 _classID: 'rigidTransform',
-                'null': ['Ordn.Trgt'], // TODO: ???
+                'null': ['Ordn.Trgt'], // target layer reference
                 rigidType: f.filter.rigidType,
-                puppetShapeList: f.filter.puppetShapeList.map(p => ({
+                puppetShapeList: (f.filter.puppetShapeList || []).map(p => ({
                     _name: '',
                     _classID: 'puppetShape',
                     rigidType: p.rigidType,
-                    VrsM: 1, // TODO: ???
-                    VrsN: 0, // TODO: ???
+                    VrsM: 1, // version major
+                    VrsN: 0, // version minor
                     originalVertexArray: toUint8(new Float32Array(pointsToArray(p.originalVertexArray))),
                     deformedVertexArray: toUint8(new Float32Array(pointsToArray(p.deformedVertexArray))),
                     indexArray: toUint8(new Uint32Array(p.indexArray)),
@@ -1894,9 +2053,9 @@ function serializeFilterFXItem(f) {
                 _classID: 'perspectiveWarpTransform',
                 vertices: f.filter.vertices.map(pointToHrznVrtc),
                 warpedVertices: f.filter.warpedVertices.map(pointToHrznVrtc),
-                quads: f.filter.quads.map(indices => ({ indices })),
+                quads: f.filter.quads.map(indices => ({ _name: '', _classID: 'quadIndices', indices })),
             }, filterID: 442 });
-        case 'curves': return Object.assign(Object.assign({}, base), { Fltr: Object.assign({ _name: 'Curves', _classID: 'Crvs', presetKind: descriptor_1.presetKindType.encode(f.filter.presetKind) }, (f.filter.adjustments ? {
+        case 'curves': return Object.assign(Object.assign({}, base), { Fltr: Object.assign(Object.assign({ _name: 'Curves', _classID: 'Crvs' }, (f.filter.presetKind !== undefined ? { presetKind: descriptor_1.presetKindType.encode(f.filter.presetKind) } : {})), (f.filter.adjustments ? {
                 Adjs: f.filter.adjustments.map(a => 'curve' in a ? {
                     _name: '',
                     _classID: 'CrvA',
@@ -1909,6 +2068,21 @@ function serializeFilterFXItem(f) {
                     Mpng: a.values,
                 })
             } : {})), filterID: 1131574899 });
+        case 'levels': return Object.assign(Object.assign({}, base), { Fltr: Object.assign(Object.assign({ _name: 'Levels', _classID: 'Lvls' }, (f.filter.presetKind !== undefined ? { presetKind: descriptor_1.presetKindType.encode(f.filter.presetKind) } : {})), (f.filter.adjustments ? {
+                Adjs: f.filter.adjustments.map(a => {
+                    var _a, _b, _c, _d;
+                    const adjustment = { _name: '', _classID: 'LvlA', Chnl: a.channels.map(descriptor_1.Chnl.encode) };
+                    if (a.shadowInput !== undefined || a.highlightInput !== undefined) {
+                        adjustment.Inpt = [Math.round((_a = a.shadowInput) !== null && _a !== void 0 ? _a : 0), Math.round((_b = a.highlightInput) !== null && _b !== void 0 ? _b : 255)];
+                    }
+                    if (a.shadowOutput !== undefined || a.highlightOutput !== undefined) {
+                        adjustment.Otpt = [Math.round((_c = a.shadowOutput) !== null && _c !== void 0 ? _c : 0), Math.round((_d = a.highlightOutput) !== null && _d !== void 0 ? _d : 255)];
+                    }
+                    if (a.midtoneInput !== undefined)
+                        adjustment['Gmm '] = a.midtoneInput;
+                    return adjustment;
+                }),
+            } : {})), filterID: 1282829427 });
         case 'brightness/contrast': return Object.assign(Object.assign({}, base), { Fltr: {
                 _name: 'Brightness/Contrast',
                 _classID: 'BrgC',
@@ -1916,10 +2090,13 @@ function serializeFilterFXItem(f) {
                 Cntr: f.filter.contrast,
                 useLegacy: !!f.filter.useLegacy,
             }, filterID: 1114793795 });
-        // case 'hsb/hsl': return {
-        // TODO: ...
-        // };
-        default: throw new Error(`Unknow filter type: ${f.type}`);
+        case 'hsb/hsl': return Object.assign(Object.assign({}, base), { Fltr: {
+                _name: 'HSB/HSL',
+                _classID: 'HsbP',
+                Inpt: descriptor_1.ClrS.encode(f.filter.inputMode),
+                Otpt: descriptor_1.ClrS.encode(f.filter.rowOrder),
+            }, filterID: 1215521360 });
+        default: throw new Error(`Unknown filter type: ${f.type}`);
     }
 }
 // let t: any;
@@ -1956,7 +2133,8 @@ function getWarpFromPlacedLayer(placed) {
         },
     };
 }
-addHandler('SoLd', hasKey('placedLayer'), (reader, target, left) => {
+addHandler('SoLd', target => !!target.placedLayer && !target.placedLayer.external, // linked smart objects are stored in SoLE
+(reader, target, left) => {
     if ((0, psdReader_1.readSignature)(reader) !== 'soLD')
         throw new Error(`Invalid SoLd type`);
     const version = (0, psdReader_1.readInt32)(reader);
@@ -2010,13 +2188,21 @@ addHandler('SoLd', hasKey('placedLayer'), (reader, target, left) => {
     if (!placed.id || typeof placed.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(placed.id)) {
         throw new Error('Placed layer ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
     }
-    const desc = Object.assign(Object.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, 
+    const placedType = placedLayerTypes.indexOf(placed.type);
+    if (placedType === -1)
+        throw new Error('Invalid placedLayer type');
+    const warp = getWarpFromPlacedLayer(placed);
+    // size of linked image matches warp bounds if it's not provided
+    const bounds = warp.bounds;
+    const width = placed.width || (bounds ? bounds.right.value - bounds.left.value : 0);
+    const height = placed.height || (bounds ? bounds.bottom.value - bounds.top.value : 0);
+    const desc = Object.assign(Object.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: placedType, Trnf: placed.transform, nonAffineTransform: (_b = placed.nonAffineTransform) !== null && _b !== void 0 ? _b : placed.transform, 
         // quiltWarp: {} as any,
-        warp: encodeWarp(getWarpFromPlacedLayer(placed)), 'Sz  ': {
+        warp: encodeWarp(warp), 'Sz  ': {
             _name: '',
             _classID: 'Pnt ',
-            Wdth: placed.width || 0, // TODO: find size ?
-            Hght: placed.height || 0, // TODO: find size ?
+            Wdth: width,
+            Hght: height,
         }, Rslt: placed.resolution ? (0, descriptor_1.unitsValue)(placed.resolution, 'resolution') : { units: 'Density', value: 72 } });
     if (placed.filter) {
         desc.filterFX = {
@@ -2030,14 +2216,6 @@ addHandler('SoLd', hasKey('placedLayer'), (reader, target, left) => {
             filterFXList: placed.filter.list.map(f => serializeFilterFXItem(f)),
         };
     }
-    // TODO:
-    // desc.comp = -1;
-    // desc.compInfo = { _name: '', _classID: 'null', compID: -1, originalCompID: -1 } as any;
-    // desc.ClMg = {
-    // 	_name: '',
-    // 	_classID: 'ClMg',
-    // 	placedLayerOCIOConversion: 'placedLayerOCIOConversion.placedLayerOCIOConvertEmbedded'
-    // } as any;
     // if (JSON.stringify(t) !== JSON.stringify(desc)) {
     // 	console.log('read', require('util').inspect(t, false, 99, true));
     // 	console.log('write', require('util').inspect(desc, false, 99, true));
@@ -2067,7 +2245,13 @@ addHandler('SoLd', hasKey('placedLayer'), (reader, target, left) => {
         desc.compInfo = placed.compInfo;
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, desc.quiltWarp ? 'quiltWarp' : 'warp');
 });
-addHandlerAlias('SoLE', 'SoLd');
+const soLdHandler = exports.infoHandlersMap['SoLd'];
+addHandler('SoLE', // linked smart object (Photoshop doesn't write PlLd for these)
+// linked smart object (Photoshop doesn't write PlLd for these)
+target => { var _a; return !!((_a = target.placedLayer) === null || _a === void 0 ? void 0 : _a.external); }, (reader, target, left, psd, imageResources) => {
+    soLdHandler.read(reader, target, left, psd, imageResources);
+    target.placedLayer.external = true;
+}, soLdHandler.write);
 addHandler('fxrp', hasKey('referencePoint'), (reader, target) => {
     target.referencePoint = {
         x: (0, psdReader_1.readFloat64)(reader),
@@ -2077,18 +2261,41 @@ addHandler('fxrp', hasKey('referencePoint'), (reader, target) => {
     (0, psdWriter_1.writeFloat64)(writer, target.referencePoint.x);
     (0, psdWriter_1.writeFloat64)(writer, target.referencePoint.y);
 });
-addHandler('Lr16', () => false, (reader, _target, _left, psd, imageResources) => {
-    (0, psdReader_1.readLayerInfo)(reader, psd, imageResources);
-}, (_writer, _target) => {
-});
-addHandler('Lr32', () => false, (reader, _target, _left, psd, imageResources) => {
-    (0, psdReader_1.readLayerInfo)(reader, psd, imageResources);
-}, (_writer, _target) => {
-});
+function createGlobalLayerInfoHandler(key, bitsPerChannel) {
+    addHandler(key, () => false, (reader, _target, left, psd, imageResources) => {
+        var _a;
+        // Photoshop writes empty (or 8bit compatibility) layer info section alongside Lr16/Lr32 in 16/32bit documents,
+        // layers from global info with matching bit depth replace layers from that section, other ones are only used
+        // if the section is empty
+        if (!reader.layersInGlobalInfo && (psd.bitsPerChannel === bitsPerChannel || !((_a = psd.children) === null || _a === void 0 ? void 0 : _a.length))) {
+            const sectionLayers = psd.children;
+            psd.children = [];
+            try {
+                (0, psdReader_1.readLayerInfo)(reader, psd, imageResources);
+            }
+            catch (e) {
+                psd.children = sectionLayers; // keep layers from layer info section if global info is broken
+                throw e;
+            }
+            reader.layersInGlobalInfo = true;
+        }
+        (0, psdReader_1.skipBytes)(reader, left());
+    }, () => { });
+}
+createGlobalLayerInfoHandler('Lr16', 16);
+createGlobalLayerInfoHandler('Lr32', 32);
+createGlobalLayerInfoHandler('Layr', undefined);
+// merged transparency markers, first extra channel of composite image is transparency
+for (const key of ['Mtrn', 'Mt16', 'Mt32']) {
+    addHandler(key, () => false, (reader, _target, left) => {
+        reader.globalAlpha = true;
+        (0, psdReader_1.skipBytes)(reader, left());
+    }, () => { });
+}
 addHandler('LMsk', hasKey('userMask'), (reader, target) => {
     target.userMask = {
         colorSpace: (0, psdReader_1.readColor)(reader),
-        opacity: (0, psdReader_1.readUint16)(reader) / 0xff,
+        opacity: (0, psdReader_1.readUint16)(reader) / 100,
     };
     const flag = (0, psdReader_1.readUint8)(reader);
     if (flag !== 128)
@@ -2097,7 +2304,7 @@ addHandler('LMsk', hasKey('userMask'), (reader, target) => {
 }, (writer, target) => {
     const userMask = target.userMask;
     (0, psdWriter_1.writeColor)(writer, userMask.colorSpace);
-    (0, psdWriter_1.writeUint16)(writer, (0, helpers_1.clamp)(userMask.opacity, 0, 1) * 0xff);
+    (0, psdWriter_1.writeUint16)(writer, Math.round((0, helpers_1.clamp)(userMask.opacity, 0, 1) * 100));
     (0, psdWriter_1.writeUint8)(writer, 128);
     (0, psdWriter_1.writeZeros)(writer, 1);
 });
@@ -2108,11 +2315,13 @@ if (helpers_1.MOCK_HANDLERS) {
     }, (writer, target) => false && (0, psdWriter_1.writeBytes)(writer, target._Patt));
 }
 else {
-    addHandler('Patt', // TODO: handle also Pat2 & Pat3
-    // TODO: handle also Pat2 & Pat3
+    addHandler('Patt', // 'Pat2' and 'Pat3' (16 and 32 bit documents) are aliases, patterns are always written as 8 bit
+    // 'Pat2' and 'Pat3' (16 and 32 bit documents) are aliases, patterns are always written as 8 bit
     target => !!(target.patterns && target.patterns.length > 0), (reader, target, left) => {
         while (left() > 0) {
-            const pattern = (0, psdReader_1.readPattern)(reader);
+            const pattern = (0, psdReader_1.readPatternSafe)(reader);
+            if (!pattern)
+                continue;
             if (target.patterns === undefined)
                 target.patterns = [];
             target.patterns.push(pattern);
@@ -2217,7 +2426,8 @@ addHandler('Anno', target => target.annotations !== undefined, (reader, target,
     const count = (0, psdReader_1.readUint32)(reader);
     const annotations = [];
     for (let i = 0; i < count; i++) {
-        /*const length =*/ (0, psdReader_1.readUint32)(reader);
+        const recordStart = reader.offset;
+        const length = (0, psdReader_1.readUint32)(reader); // includes the length field itself
         const type = (0, psdReader_1.readSignature)(reader);
         const open = !!(0, psdReader_1.readUint8)(reader);
         /*const flags =*/ (0, psdReader_1.readUint8)(reader); // always 28
@@ -2233,11 +2443,12 @@ addHandler('Anno', target => target.annotations !== undefined, (reader, target,
         const dataLength = (0, psdReader_1.readUint32)(reader);
         let data;
         if (type === 'txtA') {
+            const dataStart = reader.offset;
             if (dataLength >= 2 && (0, psdReader_1.readUint16)(reader) === 0xfeff) {
-                data = (0, psdReader_1.readUnicodeStringWithLength)(reader, (dataLength - 2) / 2);
+                data = (0, psdReader_1.readUnicodeStringWithLength)(reader, Math.floor((dataLength - 2) / 2));
             }
             else {
-                reader.offset -= 2;
+                reader.offset = dataStart;
                 data = (0, psdReader_1.readAsciiString)(reader, dataLength);
             }
             data = data.replace(/\r/g, '\n');
@@ -2251,6 +2462,8 @@ addHandler('Anno', target => target.annotations !== undefined, (reader, target,
         annotations.push({
             type: type === 'txtA' ? 'text' : 'sound', open, iconLocation, popupLocation, color, author, name, date, data,
         });
+        if (length >= (reader.offset - recordStart))
+            reader.offset = recordStart + length;
     }
     target.annotations = annotations;
     (0, psdReader_1.skipBytes)(reader, left());
@@ -2296,6 +2509,10 @@ addHandler('Anno', target => target.annotations !== undefined, (reader, target,
         writer.view.setUint32(dataOffset - 4, writer.offset - dataOffset, false);
     }
 });
+function readFileTypeSignature(reader) {
+    const value = (0, psdReader_1.readSignature)(reader);
+    return /^[\0 ]*$/.test(value) ? '' : value.trim(); // empty value is stored as spaces or zeros
+}
 function createLnkHandler(tag) {
     addHandler(tag, (target) => {
         const psd = target;
@@ -2317,8 +2534,8 @@ function createLnkHandler(tag) {
             const version = (0, psdReader_1.readInt32)(reader);
             const id = (0, psdReader_1.readPascalString)(reader, 1);
             const name = (0, psdReader_1.readUnicodeString)(reader);
-            const fileType = (0, psdReader_1.readSignature)(reader).trim(); // '    ' if empty
-            const fileCreator = (0, psdReader_1.readSignature)(reader).trim(); // '    ' or '\0\0\0\0' if empty
+            const fileType = readFileTypeSignature(reader); // '    ' if empty
+            const fileCreator = readFileTypeSignature(reader); // '    ' or '\0\0\0\0' if empty
             const dataSize = readLength64(reader);
             const hasFileOpenDescriptor = (0, psdReader_1.readUint8)(reader);
             const fileOpenDescriptor = hasFileOpenDescriptor ? (0, descriptor_1.readVersionAndDescriptor)(reader) : undefined;
@@ -2378,11 +2595,12 @@ function createLnkHandler(tag) {
         }
         (0, psdReader_1.skipBytes)(reader, left()); // ?
     }, (writer, target) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const psd = target;
         for (const file of psd.linkedFiles) {
             if ((tag === 'lnkE') !== !!file.linkedFile)
                 continue;
+            const external = tag === 'lnkE';
             let version = 2;
             if (file.assetLockedState != null)
                 version = 7;
@@ -2390,11 +2608,13 @@ function createLnkHandler(tag) {
                 version = 6;
             else if (file.childDocumentID != null)
                 version = 5;
-            else if (tag === 'lnkE')
-                version = 3;
-            writeLength64(writer, 0);
+            // liFE version 2 is the only one with embedded data, it has no date and its file size is the size of the data,
+            // versions 5+ can't store the data, so it's not written in that case
+            else if (external && !file.data)
+                version = 4;
+            (0, psdWriter_1.writeUint64)(writer, 0);
             const sizeOffset = writer.offset;
-            (0, psdWriter_1.writeSignature)(writer, (tag === 'lnkE') ? 'liFE' : (file.data ? 'liFD' : 'liFA'));
+            (0, psdWriter_1.writeSignature)(writer, external ? 'liFE' : (file.data ? 'liFD' : 'liFA'));
             (0, psdWriter_1.writeInt32)(writer, version);
             if (!file.id || typeof file.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(file.id)) {
                 throw new Error('Linked file ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
@@ -2403,7 +2623,7 @@ function createLnkHandler(tag) {
             (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.name || '');
             (0, psdWriter_1.writeSignature)(writer, file.type ? `${file.type}    `.substring(0, 4) : '    ');
             (0, psdWriter_1.writeSignature)(writer, file.creator ? `${file.creator}    `.substring(0, 4) : '\0\0\0\0');
-            writeLength64(writer, file.data ? file.data.byteLength : 0);
+            (0, psdWriter_1.writeUint64)(writer, (!external && file.data) ? file.data.byteLength : 0);
             if (file.descriptor && file.descriptor.compInfo) {
                 const desc = {
                     compInfo: {
@@ -2417,7 +2637,7 @@ function createLnkHandler(tag) {
             else {
                 (0, psdWriter_1.writeUint8)(writer, 0);
             }
-            if (tag === 'lnkE') {
+            if (external) {
                 const desc = {
                     descVersion: 2,
                     'Nm  ': (_b = (_a = file.linkedFile) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : '',
@@ -2426,6 +2646,8 @@ function createLnkHandler(tag) {
                     relPath: (_h = (_g = file.linkedFile) === null || _g === void 0 ? void 0 : _g.relativePath) !== null && _h !== void 0 ? _h : '',
                 };
                 (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'ExternalFileLink', desc);
+            }
+            if (external && version > 3) {
                 const time = file.time ? new Date(file.time) : new Date();
                 (0, psdWriter_1.writeInt32)(writer, time.getUTCFullYear());
                 (0, psdWriter_1.writeUint8)(writer, time.getUTCMonth());
@@ -2434,11 +2656,14 @@ function createLnkHandler(tag) {
                 (0, psdWriter_1.writeUint8)(writer, time.getUTCMinutes());
                 (0, psdWriter_1.writeFloat64)(writer, time.getUTCSeconds() + time.getUTCMilliseconds() / 1000);
             }
-            if (file.data) {
-                (0, psdWriter_1.writeBytes)(writer, file.data);
+            if (external) {
+                (0, psdWriter_1.writeUint64)(writer, (version === 2 ? (_j = file.data) === null || _j === void 0 ? void 0 : _j.byteLength : (_k = file.linkedFile) === null || _k === void 0 ? void 0 : _k.fileSize) || 0); // file size
+            }
+            else if (file.data) {
+                (0, psdWriter_1.writeBytes)(writer, file.data); // liFD
             }
             else {
-                writeLength64(writer, ((_j = file.linkedFile) === null || _j === void 0 ? void 0 : _j.fileSize) || 0);
+                (0, psdWriter_1.writeZeros)(writer, 8); // liFA
             }
             if (version >= 5)
                 (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.childDocumentID || '');
@@ -2446,6 +2671,8 @@ function createLnkHandler(tag) {
                 (0, psdWriter_1.writeFloat64)(writer, file.assetModTime || 0);
             if (version >= 7)
                 (0, psdWriter_1.writeUint8)(writer, file.assetLockedState || 0);
+            if (external && version === 2 && file.data)
+                (0, psdWriter_1.writeBytes)(writer, file.data);
             let size = writer.offset - sizeOffset;
             writer.view.setUint32(sizeOffset - 4, size, false); // write size
             while (size % 4) {
@@ -2459,28 +2686,40 @@ createLnkHandler('lnk2');
 createLnkHandler('lnkE');
 addHandlerAlias('lnkD', 'lnk2');
 addHandlerAlias('lnk3', 'lnk2');
-addHandler('pths', hasKey('pathList'), (reader, target) => {
+// unicode names of saved paths (path data is stored in image resources 2000-2998)
+addHandler('pths', target => { var _a; return ((_a = target.imageResources) === null || _a === void 0 ? void 0 : _a.savedPaths) !== undefined; }, (reader, _target, left, psd) => {
+    var _a, _b;
     const desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
-    // console.log(require('util').inspect(desc, false, 99, true));
-    // if (options.throwForMissingFeatures && desc?.pathList?.length) throw new Error('non-empty pathList in `pths`');
-    desc;
-    target.pathList = []; // TODO: read paths
-}, (writer, _target) => {
+    const imageResources = (_a = psd.imageResources) !== null && _a !== void 0 ? _a : (psd.imageResources = {});
+    const savedPaths = (_b = imageResources.savedPaths) !== null && _b !== void 0 ? _b : (imageResources.savedPaths = []);
+    for (let i = 0; i < desc.pathList.length && i < savedPaths.length; i++) {
+        const { pathUnicodeName, pathSymmetryClass } = desc.pathList[i];
+        const path = savedPaths[i];
+        // clipping path is referenced by (non-unicode) name
+        if (imageResources.clippingPath && imageResources.clippingPath.name === path.name) {
+            imageResources.clippingPath.name = pathUnicodeName;
+        }
+        path.name = pathUnicodeName;
+        if (pathSymmetryClass)
+            path.symmetryMode = pathSymmetryClass.pathSymmetryMode.split('.')[1];
+    }
+    (0, psdReader_1.skipBytes)(reader, left());
+}, (writer, _target, psd) => {
     const desc = {
-        pathList: [], // TODO: write paths
+        pathList: psd.imageResources.savedPaths.map(path => (Object.assign({ _name: '', _classID: 'pathInfoClass', pathUnicodeName: path.name }, (path.symmetryMode ? {
+            pathSymmetryClass: {
+                _name: '',
+                _classID: 'pathSymmetryClass',
+                pathSymmetryMode: `pathSymmetryModeEnum.${path.symmetryMode}`,
+            },
+        } : {})))),
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'pathsDataClass', desc);
 });
 addHandler('lyvr', hasKey('version'), (reader, target) => target.version = (0, psdReader_1.readUint32)(reader), (writer, target) => (0, psdWriter_1.writeUint32)(writer, target.version));
-addHandler('lfxs', () => false, // TODO: not sure when we actually need to write this section
-// NOTE: this might be insufficient
-// target => target.effects !== undefined && (
-// 	!!target.effects.dropShadow?.some(e => e.choke) ||
-// 	!!target.effects.innerShadow?.some(e => e.choke) ||
-// 	!!target.effects.outerGlow?.choke ||
-// 	!!target.effects.innerGlow?.choke
-// ),
-(reader, target, left) => {
+addHandler('lfxs', // effects of group layers (instead of 'lfx2' / 'lmfx')
+// effects of group layers (instead of 'lfx2' / 'lmfx')
+target => target.effects !== undefined && isGroupLayer(target), (reader, target, left) => {
     const version = (0, psdReader_1.readUint32)(reader);
     if (version !== 0)
         throw new Error(`Invalid lfxs version`);
@@ -2524,6 +2763,10 @@ function readLevelsChannel(reader) {
     const midtoneInput = (0, psdReader_1.readInt16)(reader) / 100;
     return { shadowInput, highlightInput, shadowOutput, highlightOutput, midtoneInput };
 }
+const defaultLevelsChannel = { shadowInput: 0, highlightInput: 255, shadowOutput: 0, highlightOutput: 255, midtoneInput: 1 };
+function isDefaultLevelsChannel(c) {
+    return c.shadowInput === 0 && c.highlightInput === 255 && c.shadowOutput === 0 && c.highlightOutput === 255 && c.midtoneInput === 1;
+}
 function writeLevelsChannel(writer, channel) {
     (0, psdWriter_1.writeInt16)(writer, channel.shadowInput);
     (0, psdWriter_1.writeInt16)(writer, channel.highlightInput);
@@ -2534,48 +2777,36 @@ function writeLevelsChannel(writer, channel) {
 addHandler('levl', adjustmentType('levels'), (reader, target, left) => {
     if ((0, psdReader_1.readUint16)(reader) !== 2)
         throw new Error('Invalid levl version');
-    const levels = [];
-    for (let i = 0; i < 29 && left(); i++) {
-        levels.push(readLevelsChannel(reader));
-    }
-    const [rgb, red, green, blue] = levels;
-    target.adjustment = Object.assign(Object.assign({}, target.adjustment), { type: 'levels', rgb,
-        red,
-        green,
-        blue });
-    if (left()) {
+    const channels = [];
+    for (let i = 0; i < 29 && left() >= 10; i++) {
+        channels.push(readLevelsChannel(reader));
+    }
+    if (left() >= 8) {
         if ((0, psdReader_1.readSignature)(reader) !== 'Lvls')
             throw new Error(`Invalid levl signature`);
         if ((0, psdReader_1.readUint16)(reader) !== 3)
             throw new Error(`Invalid levl version`);
         const totalChannelRecords = (0, psdReader_1.readUint16)(reader);
-        for (let i = 0; i < (totalChannelRecords - levels.length) && left(); i++) {
-            levels.push(readLevelsChannel(reader));
+        while (channels.length < totalChannelRecords && left() >= 10) {
+            channels.push(readLevelsChannel(reader));
         }
     }
+    // records for all possible channels are stored, skip unused ones
+    while (channels.length && isDefaultLevelsChannel(channels[channels.length - 1]))
+        channels.pop();
+    target.adjustment = Object.assign(Object.assign({}, target.adjustment), { type: 'levels', channels });
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
-    const info = target.adjustment;
-    const defaultChannel = {
-        shadowInput: 0,
-        highlightInput: 255,
-        shadowOutput: 0,
-        highlightOutput: 255,
-        midtoneInput: 1,
-    };
+    const channels = target.adjustment.channels || [];
     (0, psdWriter_1.writeUint16)(writer, 2); // version
-    writeLevelsChannel(writer, info.rgb || defaultChannel);
-    writeLevelsChannel(writer, info.red || defaultChannel);
-    writeLevelsChannel(writer, info.green || defaultChannel);
-    writeLevelsChannel(writer, info.blue || defaultChannel);
-    for (let i = 0; i < (29 - 4); i++) {
-        writeLevelsChannel(writer, defaultChannel);
+    for (let i = 0; i < 29; i++) {
+        writeLevelsChannel(writer, channels[i] || defaultLevelsChannel);
     }
     (0, psdWriter_1.writeSignature)(writer, 'Lvls');
     (0, psdWriter_1.writeUint16)(writer, 3); // version
     (0, psdWriter_1.writeUint16)(writer, 62); // total count
-    for (let i = 0; i < (62 - 29); i++) {
-        writeLevelsChannel(writer, defaultChannel);
+    for (let i = 29; i < 62; i++) {
+        writeLevelsChannel(writer, channels[i] || defaultLevelsChannel);
     }
 });
 function readCurveChannel(reader) {
@@ -2600,17 +2831,16 @@ addHandler('curv', adjustmentType('curves'), (reader, target, left) => {
     if ((0, psdReader_1.readUint16)(reader) !== 1)
         throw new Error('Invalid curv version');
     (0, psdReader_1.readUint16)(reader);
-    const channels = (0, psdReader_1.readUint16)(reader);
-    const info = { type: 'curves' };
-    if (channels & 1)
-        info.rgb = readCurveChannel(reader);
-    if (channels & 2)
-        info.red = readCurveChannel(reader);
-    if (channels & 4)
-        info.green = readCurveChannel(reader);
-    if (channels & 8)
-        info.blue = readCurveChannel(reader);
-    target.adjustment = Object.assign(Object.assign({}, target.adjustment), info);
+    const channelsMask = (0, psdReader_1.readUint16)(reader);
+    const channels = [];
+    for (let i = 0; i < 16; i++) {
+        if (channelsMask & (1 << i)) {
+            while (channels.length < i)
+                channels.push([]);
+            channels.push(readCurveChannel(reader));
+        }
+    }
+    target.adjustment = Object.assign(Object.assign({}, target.adjustment), { type: 'curves', channels });
     // ignoring, duplicate information
     // checkSignature(reader, 'Crv ');
     // const cVersion = readUint16(reader);
@@ -2626,57 +2856,29 @@ addHandler('curv', adjustmentType('curves'), (reader, target, left) => {
     // }
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
-    const info = target.adjustment;
-    const { rgb, red, green, blue } = info;
-    let channels = 0;
-    let channelCount = 0;
-    if (rgb && rgb.length) {
-        channels |= 1;
-        channelCount++;
-    }
-    if (red && red.length) {
-        channels |= 2;
-        channelCount++;
-    }
-    if (green && green.length) {
-        channels |= 4;
-        channelCount++;
-    }
-    if (blue && blue.length) {
-        channels |= 8;
-        channelCount++;
+    var _a;
+    const channels = (target.adjustment.channels || []).slice(0, 16);
+    const used = [];
+    let channelsMask = 0;
+    for (let i = 0; i < channels.length; i++) {
+        if ((_a = channels[i]) === null || _a === void 0 ? void 0 : _a.length) {
+            channelsMask |= 1 << i;
+            used.push(i);
+        }
     }
     (0, psdWriter_1.writeUint8)(writer, 0);
     (0, psdWriter_1.writeUint16)(writer, 1); // version
     (0, psdWriter_1.writeUint16)(writer, 0);
-    (0, psdWriter_1.writeUint16)(writer, channels);
-    if (rgb && rgb.length)
-        writeCurveChannel(writer, rgb);
-    if (red && red.length)
-        writeCurveChannel(writer, red);
-    if (green && green.length)
-        writeCurveChannel(writer, green);
-    if (blue && blue.length)
-        writeCurveChannel(writer, blue);
+    (0, psdWriter_1.writeUint16)(writer, channelsMask);
+    for (const i of used)
+        writeCurveChannel(writer, channels[i]);
     (0, psdWriter_1.writeSignature)(writer, 'Crv ');
     (0, psdWriter_1.writeUint16)(writer, 4); // version
     (0, psdWriter_1.writeUint16)(writer, 0);
-    (0, psdWriter_1.writeUint16)(writer, channelCount);
-    if (rgb && rgb.length) {
-        (0, psdWriter_1.writeUint16)(writer, 0);
-        writeCurveChannel(writer, rgb);
-    }
-    if (red && red.length) {
-        (0, psdWriter_1.writeUint16)(writer, 1);
-        writeCurveChannel(writer, red);
-    }
-    if (green && green.length) {
-        (0, psdWriter_1.writeUint16)(writer, 2);
-        writeCurveChannel(writer, green);
-    }
-    if (blue && blue.length) {
-        (0, psdWriter_1.writeUint16)(writer, 3);
-        writeCurveChannel(writer, blue);
+    (0, psdWriter_1.writeUint16)(writer, used.length);
+    for (const i of used) {
+        (0, psdWriter_1.writeUint16)(writer, i);
+        writeCurveChannel(writer, channels[i]);
     }
 });
 addHandler('expA', adjustmentType('exposure'), (reader, target, left) => {
@@ -2733,12 +2935,34 @@ function writeHueChannel(writer, channel) {
 addHandler('hue2', adjustmentType('hue/saturation'), (reader, target, left) => {
     if ((0, psdReader_1.readUint16)(reader) !== 2)
         throw new Error('Invalid hue2 version');
-    target.adjustment = Object.assign(Object.assign({}, target.adjustment), { type: 'hue/saturation', master: readHueChannel(reader), reds: readHueChannel(reader), yellows: readHueChannel(reader), greens: readHueChannel(reader), cyans: readHueChannel(reader), blues: readHueChannel(reader), magentas: readHueChannel(reader) });
+    const colorize = !!(0, psdReader_1.readUint8)(reader);
+    (0, psdReader_1.skipBytes)(reader, 1);
+    const colorizeHue = (0, psdReader_1.readInt16)(reader); // stored as -180..180
+    const colorizeSaturation = (0, psdReader_1.readInt16)(reader);
+    const colorizeLightness = (0, psdReader_1.readInt16)(reader);
+    target.adjustment = Object.assign(Object.assign({}, target.adjustment), { type: 'hue/saturation', colorize, colorization: {
+            hue: colorizeHue < 0 ? colorizeHue + 360 : colorizeHue,
+            saturation: colorizeSaturation,
+            lightness: colorizeLightness,
+        }, master: {
+            hue: (0, psdReader_1.readInt16)(reader),
+            saturation: (0, psdReader_1.readInt16)(reader),
+            lightness: (0, psdReader_1.readInt16)(reader),
+        }, reds: readHueChannel(reader), yellows: readHueChannel(reader), greens: readHueChannel(reader), cyans: readHueChannel(reader), blues: readHueChannel(reader), magentas: readHueChannel(reader) });
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const info = target.adjustment;
     (0, psdWriter_1.writeUint16)(writer, 2); // version
-    writeHueChannel(writer, info.master);
+    (0, psdWriter_1.writeUint8)(writer, info.colorize ? 1 : 0);
+    (0, psdWriter_1.writeUint8)(writer, 0);
+    const colorizeHue = Math.round((_b = (_a = info.colorization) === null || _a === void 0 ? void 0 : _a.hue) !== null && _b !== void 0 ? _b : 0);
+    (0, psdWriter_1.writeInt16)(writer, colorizeHue > 180 ? colorizeHue - 360 : colorizeHue);
+    (0, psdWriter_1.writeInt16)(writer, Math.round((_d = (_c = info.colorization) === null || _c === void 0 ? void 0 : _c.saturation) !== null && _d !== void 0 ? _d : 0));
+    (0, psdWriter_1.writeInt16)(writer, Math.round((_f = (_e = info.colorization) === null || _e === void 0 ? void 0 : _e.lightness) !== null && _f !== void 0 ? _f : 0));
+    (0, psdWriter_1.writeInt16)(writer, Math.round((_h = (_g = info.master) === null || _g === void 0 ? void 0 : _g.hue) !== null && _h !== void 0 ? _h : 0));
+    (0, psdWriter_1.writeInt16)(writer, Math.round((_k = (_j = info.master) === null || _j === void 0 ? void 0 : _j.saturation) !== null && _k !== void 0 ? _k : 0));
+    (0, psdWriter_1.writeInt16)(writer, Math.round((_m = (_l = info.master) === null || _l === void 0 ? void 0 : _l.lightness) !== null && _m !== void 0 ? _m : 0));
     writeHueChannel(writer, info.reds);
     writeHueChannel(writer, info.yellows);
     writeHueChannel(writer, info.greens);
@@ -2817,11 +3041,18 @@ addHandler('phfl', adjustmentType('photo filter'), (reader, target, left) => {
         color = (0, psdReader_1.readColor)(reader);
     }
     else { // version 3
-        // TODO: test this, this is probably wrong
+        // XYZ color relative to D50 white point, 32768 = 1.0 (not documented, matches colors of Photoshop presets),
+        // converted to Lab (same scale as readColor()) so it can be written back as version 2
+        const x = (0, psdReader_1.readInt32)(reader) / 32768;
+        const y = (0, psdReader_1.readInt32)(reader) / 32768;
+        const z = (0, psdReader_1.readInt32)(reader) / 32768;
+        if (!(x >= 0 && y >= 0 && z >= 0 && x <= 2 && y <= 2 && z <= 2))
+            throw new Error('Invalid phfl XYZ color');
+        const f = (t) => t > 216 / 24389 ? Math.cbrt(t) : (24389 / 27 * t + 16) / 116;
         color = {
-            l: (0, psdReader_1.readInt32)(reader) / 100,
-            a: (0, psdReader_1.readInt32)(reader) / 100,
-            b: (0, psdReader_1.readInt32)(reader) / 100,
+            l: Math.max(0, 116 * f(y) - 16) / 100,
+            a: (0, helpers_1.normalizeLabAB)(500 * (f(x) - f(y))),
+            b: (0, helpers_1.normalizeLabAB)(200 * (f(y) - f(z))),
         };
     }
     target.adjustment = {
@@ -2835,7 +3066,7 @@ addHandler('phfl', adjustmentType('photo filter'), (reader, target, left) => {
     const info = target.adjustment;
     (0, psdWriter_1.writeUint16)(writer, 2); // version
     (0, psdWriter_1.writeColor)(writer, info.color || { l: 0, a: 0, b: 0 });
-    (0, psdWriter_1.writeUint32)(writer, (info.density || 0) * 100);
+    (0, psdWriter_1.writeUint32)(writer, Math.round(Math.max(0, info.density || 0) * 100));
     (0, psdWriter_1.writeUint8)(writer, info.preserveLuminosity ? 1 : 0);
     (0, psdWriter_1.writeZeros)(writer, 3);
 });
@@ -2989,7 +3220,7 @@ addHandler('grdm', adjustmentType('gradient map'), (reader, target, left) => {
     reader.offset--;
     if (hasMethod) {
         const method = (0, psdReader_1.readSignature)(reader);
-        info.method = descriptor_1.gradientInterpolationMethodType.decode(method);
+        info.method = descriptor_1.gradientInterpolationMethodType.decode(`gradientInterpolationMethodType.${method}`);
     }
     info.name = (0, psdReader_1.readUnicodeString)(reader);
     info.colorStops = [];
@@ -3038,10 +3269,11 @@ addHandler('grdm', adjustmentType('gradient map'), (reader, target, left) => {
         (0, psdReader_1.readUint16)(reader) / 0x8000,
     ];
     (0, psdReader_1.skipBytes)(reader, left());
+    // stop locations are always in 0..4096 range, independent of smoothness
     for (const s of info.colorStops)
-        s.location /= interpolation;
+        s.location /= 4096;
     for (const s of info.opacityStops)
-        s.location /= interpolation;
+        s.location /= 4096;
     target.adjustment = info;
 }, (writer, target) => {
     var _a, _b, _c;
@@ -3050,22 +3282,22 @@ addHandler('grdm', adjustmentType('gradient map'), (reader, target, left) => {
     (0, psdWriter_1.writeUint8)(writer, info.reverse ? 1 : 0);
     (0, psdWriter_1.writeUint8)(writer, info.dither ? 1 : 0);
     if (info.method !== undefined) {
-        (0, psdWriter_1.writeSignature)(writer, descriptor_1.gradientInterpolationMethodType.encode(info.method));
+        (0, psdWriter_1.writeSignature)(writer, descriptor_1.gradientInterpolationMethodType.encode(info.method).split('.')[1]);
     }
     (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, info.name || '');
     (0, psdWriter_1.writeUint16)(writer, info.colorStops && info.colorStops.length || 0);
-    const interpolation = Math.round(((_a = info.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);
+    const interpolation = Math.round((0, helpers_1.clamp)((_a = info.smoothness) !== null && _a !== void 0 ? _a : 1, 0, 1) * 4096);
     for (const s of info.colorStops || []) {
-        (0, psdWriter_1.writeUint32)(writer, Math.round(s.location * interpolation));
+        (0, psdWriter_1.writeUint32)(writer, Math.round((0, helpers_1.clamp)(s.location, 0, 1) * 4096));
         (0, psdWriter_1.writeUint32)(writer, Math.round(s.midpoint * 100));
         (0, psdWriter_1.writeColor)(writer, s.color);
         (0, psdWriter_1.writeZeros)(writer, 2);
     }
     (0, psdWriter_1.writeUint16)(writer, info.opacityStops && info.opacityStops.length || 0);
     for (const s of info.opacityStops || []) {
-        (0, psdWriter_1.writeUint32)(writer, Math.round(s.location * interpolation));
+        (0, psdWriter_1.writeUint32)(writer, Math.round((0, helpers_1.clamp)(s.location, 0, 1) * 4096));
         (0, psdWriter_1.writeUint32)(writer, Math.round(s.midpoint * 100));
-        (0, psdWriter_1.writeUint16)(writer, Math.round(s.opacity * 0xff));
+        (0, psdWriter_1.writeUint16)(writer, Math.round((0, helpers_1.clamp)(s.opacity, 0, 1) * 0xff));
     }
     (0, psdWriter_1.writeUint16)(writer, 2); // expansion count
     (0, psdWriter_1.writeUint16)(writer, interpolation);
@@ -3227,7 +3459,7 @@ addHandler('Txt2', hasKey('engineData'), (reader, target, left, psd) => {
     const data = (0, psdReader_1.readBytes)(reader, left());
     target.engineData = (0, base64_js_1.fromByteArray)(data);
     const layersByIndex = getTextLayersSortedByIndex(psd);
-    const engineData = (0, engineData_1.parseEngineData)(data);
+    const engineData = (0, engineData_1.parseEngineData)(data, reader);
     const engineData2 = (0, engineData2_1.decodeEngineData2)(engineData);
     const TextFrameSet = engineData2.ResourceDict.TextFrameSet;
     if (TextFrameSet) {
@@ -3309,7 +3541,6 @@ addHandler('FEid', hasKey('filterEffectsMasks'), (reader, target, leftBytes) =>
         }
     }
 }, (writer, target) => {
-    var _a;
     (0, psdWriter_1.writeInt32)(writer, 3); // version
     for (const mask of target.filterEffectsMasks) {
         (0, psdWriter_1.writeUint32)(writer, 0);
@@ -3338,7 +3569,7 @@ addHandler('FEid', hasKey('filterEffectsMasks'), (reader, target, leftBytes) =>
             }
         }
         writer.view.setUint32(length2Offset - 4, writer.offset - length2Offset, false);
-        const extra = (_a = target.filterEffectsMasks[target.filterEffectsMasks.length - 1]) === null || _a === void 0 ? void 0 : _a.extra;
+        const extra = mask.extra;
         if (extra) {
             (0, psdWriter_1.writeUint8)(writer, 1);
             (0, psdWriter_1.writeInt32)(writer, extra.top);
@@ -3362,28 +3593,33 @@ addHandlerAlias('FXid', 'FEid');
 addHandler('FMsk', hasKey('filterMask'), (reader, target) => {
     target.filterMask = {
         colorSpace: (0, psdReader_1.readColor)(reader),
-        opacity: (0, psdReader_1.readUint16)(reader) / 0xff,
+        opacity: (0, psdReader_1.readUint16)(reader) / 100,
     };
 }, (writer, target) => {
     var _a;
     (0, psdWriter_1.writeColor)(writer, target.filterMask.colorSpace);
-    (0, psdWriter_1.writeUint16)(writer, (0, helpers_1.clamp)((_a = target.filterMask.opacity) !== null && _a !== void 0 ? _a : 1, 0, 1) * 0xff);
+    (0, psdWriter_1.writeUint16)(writer, Math.round((0, helpers_1.clamp)((_a = target.filterMask.opacity) !== null && _a !== void 0 ? _a : 1, 0, 1) * 100));
 });
 addHandler('artd', // document-wide artboard info
 // document-wide artboard info
 target => target.artboards !== undefined, (reader, target, left) => {
     const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.artboards = {
-        count: desc['Cnt '],
-        autoExpandOffset: { horizontal: desc.autoExpandOffset.Hrzn, vertical: desc.autoExpandOffset.Vrtc },
-        origin: { horizontal: desc.origin.Hrzn, vertical: desc.origin.Vrtc },
-        autoExpandEnabled: desc.autoExpandEnabled,
-        autoNestEnabled: desc.autoNestEnabled,
-        autoPositionEnabled: desc.autoPositionEnabled,
-        shrinkwrapOnSaveEnabled: !!desc.shrinkwrapOnSaveEnabled,
-        docDefaultNewArtboardBackgroundColor: (0, descriptor_1.parseColor)(desc.docDefaultNewArtboardBackgroundColor),
-        docDefaultNewArtboardBackgroundType: desc.docDefaultNewArtboardBackgroundType,
-    };
+    const artboards = target.artboards = { count: desc['Cnt '] };
+    if (desc.autoExpandOffset)
+        artboards.autoExpandOffset = { horizontal: desc.autoExpandOffset.Hrzn, vertical: desc.autoExpandOffset.Vrtc };
+    if (desc.origin)
+        artboards.origin = { horizontal: desc.origin.Hrzn, vertical: desc.origin.Vrtc };
+    if (desc.autoExpandEnabled !== undefined)
+        artboards.autoExpandEnabled = desc.autoExpandEnabled;
+    if (desc.autoNestEnabled !== undefined)
+        artboards.autoNestEnabled = desc.autoNestEnabled;
+    if (desc.autoPositionEnabled !== undefined)
+        artboards.autoPositionEnabled = desc.autoPositionEnabled;
+    artboards.shrinkwrapOnSaveEnabled = !!desc.shrinkwrapOnSaveEnabled;
+    if (desc.docDefaultNewArtboardBackgroundColor)
+        artboards.docDefaultNewArtboardBackgroundColor = (0, descriptor_1.parseColor)(desc.docDefaultNewArtboardBackgroundColor);
+    if (desc.docDefaultNewArtboardBackgroundType !== undefined)
+        artboards.docDefaultNewArtboardBackgroundType = desc.docDefaultNewArtboardBackgroundType;
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
     var _a, _b, _c, _d, _e;
@@ -3401,17 +3637,19 @@ target => target.artboards !== undefined, (reader, target, left) => {
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'artd');
 });
+function isGroupLayer(target) {
+    return !!target.children;
+}
 function hasMultiEffects(effects) {
     return Object.keys(effects).map(key => effects[key]).some(v => Array.isArray(v) && v.length > 1);
 }
-addHandler('lfx2', target => target.effects !== undefined && !hasMultiEffects(target.effects), (reader, target, left) => {
+addHandler('lfx2', target => target.effects !== undefined && !isGroupLayer(target) && !hasMultiEffects(target.effects), (reader, target, left) => {
     const version = (0, psdReader_1.readUint32)(reader);
     if (version !== 0)
         throw new Error(`Invalid lfx2 version`);
     const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     // console.log('READ', require('util').inspect(desc, false, 99, true));
-    // TODO: don't discard if we got it from lmfx
-    // discard if read in 'lrFX' section
+    // discard if read in 'lrFX' section ('lmfx' and 'lfx2' are never stored together)
     target.effects = (0, descriptor_1.parseEffects)(desc, !!reader.logMissingFeatures);
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target, _, options) => {
@@ -3468,27 +3706,25 @@ addHandler('cinf', hasKey('compositorUsed'), (reader, target, left) => {
         desc.compCoreGPUSupport = `reason.${cinf.compCoreGPUSupport}`;
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
-// extension settings ?, ignore it
-addHandler('extn', target => target._extn !== undefined, (reader, target) => {
+// generator settings of the document (layers store them in 'shmd' section)
+addHandler('extn', target => target.generatorSettings !== undefined && isDocument(target), (reader, target, left) => {
     const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    // console.log(require('util').inspect(desc, false, 99, true));
-    if (helpers_1.MOCK_HANDLERS)
-        target._extn = desc;
+    if (desc.generatorSettings)
+        target.generatorSettings = parseGeneratorSettings(desc.generatorSettings);
+    (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
-    // TODO: need to add correct types for desc fields (resources/src.psd)
-    if (helpers_1.MOCK_HANDLERS)
-        (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', target._extn);
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', serializeGeneratorSettings(target.generatorSettings));
 });
 addHandler('iOpa', hasKey('fillOpacity'), (reader, target) => {
     target.fillOpacity = (0, psdReader_1.readUint8)(reader) / 0xff;
     (0, psdReader_1.skipBytes)(reader, 3);
 }, (writer, target) => {
-    (0, psdWriter_1.writeUint8)(writer, target.fillOpacity * 0xff);
+    (0, psdWriter_1.writeUint8)(writer, Math.round((0, helpers_1.clamp)(target.fillOpacity, 0, 1) * 0xff));
     (0, psdWriter_1.writeZeros)(writer, 3);
 });
 addHandler('brst', hasKey('channelBlendingRestrictions'), (reader, target, left) => {
     target.channelBlendingRestrictions = [];
-    while (left() > 4) {
+    while (left() >= 4) {
         target.channelBlendingRestrictions.push((0, psdReader_1.readInt32)(reader));
     }
 }, (writer, target) => {