ag-psd 31.0.2 → 32.0.0

package/dist/additionalInfo.js

@@ -32,10 +32,6 @@ 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) => {
     if ((0, psdReader_1.readInt16)(reader) !== 1)
         throw new Error(`Invalid TySh version`);
@@ -74,7 +70,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');
@@ -88,6 +84,7 @@ addHandler('TySh', hasKey('text'), (reader, target, leftBytes) => {
     }
     (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 +97,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
@@ -419,12 +416,50 @@ 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;
+        while (options.layerIds.has(id))
+            id += 100; // make sure we don't have duplicate layer ids
+    }
+    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);
@@ -622,9 +657,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++) {
@@ -680,10 +714,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 +737,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 = {};
@@ -731,7 +759,7 @@ target => target.timestamp !== undefined || target.animationFrames !== undefined
         }, 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 +794,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',
@@ -1008,10 +1036,12 @@ addHandler('PlLd', hasKey('placedLayer'), (reader, target, left) => {
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', type, encodeWarp(warp), type);
 });
 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);
@@ -1280,7 +1310,7 @@ 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
@@ -1809,7 +1839,7 @@ function serializeFilterFXItem(f) {
                 _classID: 'rigidTransform',
                 'null': ['Ordn.Trgt'], // TODO: ???
                 rigidType: f.filter.rigidType,
-                puppetShapeList: f.filter.puppetShapeList.map(p => ({
+                puppetShapeList: (f.filter.puppetShapeList || []).map(p => ({
                     _name: '',
                     _classID: 'puppetShape',
                     rigidType: p.rigidType,
@@ -1894,7 +1924,7 @@ 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 ? {
                 Adjs: f.filter.adjustments.map(a => 'curve' in a ? {
@@ -1916,10 +1946,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;
@@ -2010,7 +2043,10 @@ 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 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  ': {
             _name: '',
@@ -2088,7 +2124,7 @@ addHandler('Lr32', () => false, (reader, _target, _left, psd, imageResources) =>
 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 +2133,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);
 });
@@ -2135,7 +2171,7 @@ interface CAIDesc {
 }
 
 addHandler(
-    'CAI ', // content credentials ? something to do with generative tech
+    'CAI ', // Content Authenticity Initiative
     () => false,
     (reader, _target, left) => {
         const version = readUint32(reader); // 3
@@ -2149,7 +2185,9 @@ addHandler(
 );
 // */
 if (helpers_1.MOCK_HANDLERS) {
-    addHandler('CAI ', target => target._CAI_ !== undefined, (reader, target, left) => {
+    addHandler('CAI ', // Content Authenticity Initiative / C2PA provenance metadata
+    // Content Authenticity Initiative / C2PA provenance metadata
+    target => target._CAI_ !== undefined, (reader, target, left) => {
         target._CAI_ = (0, psdReader_1.readBytes)(reader, left());
     }, (writer, target) => {
         (0, psdWriter_1.writeBytes)(writer, target._CAI_);
@@ -2167,8 +2205,8 @@ if (helpers_1.MOCK_HANDLERS) {
 // 	};
 // }
 if (helpers_1.MOCK_HANDLERS) {
-    addHandler('OCIO', // document color management info
-    // document color management info
+    addHandler('OCIO', // Document color management info
+    // Document color management info
     target => target._OCIO !== undefined, (reader, target, left) => {
         // const desc = readVersionAndDescriptor(reader, true) as OCIODescriptor;
         // console.log('OCIO', require('util').inspect(desc, false, 99, true));
@@ -2184,8 +2222,8 @@ if (helpers_1.MOCK_HANDLERS) {
 //  externalModelList?: [];
 // }
 if (helpers_1.MOCK_HANDLERS) {
-    addHandler('GenI', // generative tech
-    // generative tech
+    addHandler('GenI', // Generative Fill / generative AI (Firefly) features
+    // Generative Fill / generative AI (Firefly) features
     target => target._GenI !== undefined, (reader, target, left) => {
         // const desc = readVersionAndDescriptor(reader, true); // as GenIDescriptor;
         // console.log('GenI', require('util').inspect(desc, false, 99, true));
@@ -2215,7 +2253,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
@@ -2231,11 +2270,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');
@@ -2249,6 +2289,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());
@@ -2376,11 +2418,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;
@@ -2388,11 +2431,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)');
@@ -2401,7 +2446,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: {
@@ -2415,7 +2460,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 : '',
@@ -2424,6 +2469,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());
@@ -2432,11 +2479,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 || '');
@@ -2444,6 +2494,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) {
@@ -2532,7 +2584,25 @@ function writeLevelsChannel(writer, channel) {
 addHandler('levl', adjustmentType('levels'), (reader, target, left) => {
     if ((0, psdReader_1.readUint16)(reader) !== 2)
         throw new Error('Invalid levl version');
-    target.adjustment = Object.assign(Object.assign({}, target.adjustment), { type: 'levels', rgb: readLevelsChannel(reader), red: readLevelsChannel(reader), green: readLevelsChannel(reader), blue: readLevelsChannel(reader) });
+    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()) {
+        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));
+        }
+    }
     (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
     const info = target.adjustment;
@@ -2548,8 +2618,15 @@ addHandler('levl', adjustmentType('levels'), (reader, target, left) => {
     writeLevelsChannel(writer, info.red || defaultChannel);
     writeLevelsChannel(writer, info.green || defaultChannel);
     writeLevelsChannel(writer, info.blue || defaultChannel);
-    for (let i = 0; i < 59; i++)
+    for (let i = 0; i < (29 - 4); i++) {
+        writeLevelsChannel(writer, defaultChannel);
+    }
+    (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);
+    }
 });
 function readCurveChannel(reader) {
     const nodes = (0, psdReader_1.readUint16)(reader);
@@ -2791,10 +2868,15 @@ addHandler('phfl', adjustmentType('photo filter'), (reader, target, left) => {
     }
     else { // version 3
         // TODO: test this, this is probably wrong
+        // values are stored as L (0..100), a, b (-128..127) multiplied by 100,
+        // normalize them to the same scale as readColor() so they can be written back as version 2
+        const l = (0, psdReader_1.readInt32)(reader) / 100;
+        const a = (0, psdReader_1.readInt32)(reader) / 100;
+        const b = (0, psdReader_1.readInt32)(reader) / 100;
         color = {
-            l: (0, psdReader_1.readInt32)(reader) / 100,
-            a: (0, psdReader_1.readInt32)(reader) / 100,
-            b: (0, psdReader_1.readInt32)(reader) / 100,
+            l: l / 100,
+            a: (0, helpers_1.normalizeLabAB)(a),
+            b: (0, helpers_1.normalizeLabAB)(b),
         };
     }
     target.adjustment = {
@@ -2808,7 +2890,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);
 });
@@ -3011,10 +3093,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;
@@ -3027,18 +3110,18 @@ addHandler('grdm', adjustmentType('gradient map'), (reader, target, left) => {
     }
     (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);
@@ -3200,7 +3283,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) {
@@ -3282,7 +3365,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);
@@ -3311,7 +3393,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);
@@ -3335,12 +3417,12 @@ 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
@@ -3456,12 +3538,12 @@ 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) => {