ag-psd 32.0.0 → 34.0.0

package/dist-es/imageResources.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resourceHandlersMap = exports.resourceHandlers = void 0;
 const base64_js_1 = require("base64-js");
+const additionalInfo_1 = require("./additionalInfo");
 const psdReader_1 = require("./psdReader");
 const psdWriter_1 = require("./psdWriter");
 const helpers_1 = require("./helpers");
@@ -9,10 +10,12 @@ const utf8_1 = require("./utf8");
 const descriptor_1 = require("./descriptor");
 exports.resourceHandlers = [];
 exports.resourceHandlersMap = {};
-function addHandler(key, has, read, write) {
-    const handler = { key, has, read, write };
+function addHandler(key, has, read, write, options = {}) {
+    var _a;
+    const handler = { key, keyCount: (_a = options.keyCount) !== null && _a !== void 0 ? _a : 1, has, read, write, name: options.name };
     exports.resourceHandlers.push(handler);
-    exports.resourceHandlersMap[handler.key] = handler;
+    for (let i = 0; i < handler.keyCount; i++)
+        exports.resourceHandlersMap[handler.key + i] = handler;
 }
 const LOG_MOCK_HANDLERS = false;
 const RESOLUTION_UNITS = [undefined, 'PPI', 'PPCM'];
@@ -30,27 +33,18 @@ function byteAt(value, index) {
 }
 function readUtf8String(reader, length) {
     const buffer = (0, psdReader_1.readBytes)(reader, length);
-    return (0, utf8_1.decodeString)(buffer);
+    return (0, psdReader_1.decodeUtf8)(reader, buffer);
 }
 function writeUtf8String(writer, value) {
     const buffer = (0, utf8_1.encodeString)(value);
     (0, psdWriter_1.writeBytes)(writer, buffer);
 }
-let gbkDecoder;
-function getGbkDecoder() {
-    if (gbkDecoder === undefined) {
-        try {
-            gbkDecoder = new TextDecoder('gbk');
-        }
-        catch (_a) {
-            gbkDecoder = null;
-        }
-    }
-    return gbkDecoder;
-}
 function readEncodedString(reader) {
     const length = (0, psdReader_1.readUint8)(reader);
     const buffer = (0, psdReader_1.readBytes)(reader, length);
+    return decodeEncodedString(reader, buffer);
+}
+function decodeEncodedString(reader, buffer) {
     let notAscii = false;
     for (let i = 0; i < buffer.byteLength; i++) {
         if (buffer[i] & 0x80) {
@@ -59,17 +53,20 @@ function readEncodedString(reader) {
         }
     }
     if (notAscii) {
-        const decoder = getGbkDecoder();
-        if (decoder) {
-            try {
-                return decoder.decode(buffer);
+        // encoding is ambiguous, many GBK strings are also valid UTF-8 and vice versa, GBK is preferred,
+        // UTF-8 is only used if the string is not valid GBK
+        for (const decoder of [(0, psdReader_1.getGbkStrictDecoder)(reader), (0, psdReader_1.getUtf8StrictDecoder)(reader)]) {
+            if (decoder) {
+                try {
+                    return decoder.decode(buffer);
+                }
+                catch (_a) { }
             }
-            catch (_a) { }
         }
     }
-    return (0, utf8_1.decodeString)(buffer);
+    return (0, psdReader_1.decodeUtf8)(reader, buffer);
 }
-function writeEncodedString(writer, value) {
+function toShortAsciiString(value) {
     let ascii = '';
     for (let i = 0; i < value.length;) {
         const code = value.codePointAt(i);
@@ -77,19 +74,19 @@ function writeEncodedString(writer, value) {
         i += code > 0xffff ? 2 : 1; // skip low surrogate of astral characters
     }
     // length is stored in a single byte
-    if (ascii.length > 255)
-        ascii = ascii.substring(0, 255);
-    const buffer = (0, utf8_1.encodeString)(ascii);
+    return ascii.length > 255 ? ascii.substring(0, 255) : ascii;
+}
+function writeEncodedString(writer, value) {
+    const buffer = (0, utf8_1.encodeString)(toShortAsciiString(value));
     (0, psdWriter_1.writeUint8)(writer, buffer.byteLength);
     (0, psdWriter_1.writeBytes)(writer, buffer);
 }
-helpers_1.MOCK_HANDLERS && addHandler(1028, // IPTC-NAA record
+addHandler(1028, // IPTC-NAA record
 // IPTC-NAA record
-target => target._ir1028 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1028', left());
-    target._ir1028 = (0, psdReader_1.readBytes)(reader, left());
+target => target.iptcData !== undefined, (reader, target, left) => {
+    target.iptcData = (0, psdReader_1.readBytes)(reader, left());
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1028);
+    (0, psdWriter_1.writeBytes)(writer, target.iptcData);
 });
 addHandler(1061, target => target.captionDigest !== undefined, (reader, target) => {
     let captionDigest = '';
@@ -115,12 +112,12 @@ const Inte = (0, helpers_1.createEnum)('Inte', 'perceptual', {
     'relative colorimetric': 'Clrm',
     'absolute colorimetric': 'AClr',
 });
-helpers_1.MOCK_HANDLERS && addHandler(1085, // Windows DEVMODE. Variable OS specific info for Windows.
+addHandler(1085, // Windows DEVMODE. Variable OS specific info for Windows.
 // Windows DEVMODE. Variable OS specific info for Windows.
-target => target._ir1085 !== undefined, (reader, target, left) => {
-    target._ir1085 = (0, psdReader_1.readBytes)(reader, left());
+target => target.windowsDevMode !== undefined, (reader, target, left) => {
+    target.windowsDevMode = (0, psdReader_1.readBytes)(reader, left());
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1085);
+    (0, psdWriter_1.writeBytes)(writer, target.windowsDevMode);
 });
 addHandler(1082, target => target.printInformation !== undefined, (reader, target) => {
     var _a, _b;
@@ -132,6 +129,8 @@ addHandler(1082, target => target.printInformation !== undefined, (reader, targe
     const info = target.printInformation;
     if (desc.PstS !== undefined)
         info.printerManagesColors = desc.PstS;
+    if (desc.ClrS === 'ClrS.Grys')
+        info.printerProfileColorSpace = 'grayscale';
     if (desc['Nm  '] !== undefined)
         info.printerProfile = desc['Nm  '];
     if (desc.MpBl !== undefined)
@@ -154,7 +153,6 @@ addHandler(1082, target => target.printInformation !== undefined, (reader, targe
         }
     }
 }, (writer, target) => {
-    var _a, _b;
     const info = target.printInformation;
     const desc = {};
     if (info.printerManagesColors) {
@@ -163,11 +161,12 @@ addHandler(1082, target => target.printInformation !== undefined, (reader, targe
     else {
         if (info.hardProof !== undefined)
             desc.hardProof = !!info.hardProof;
-        desc.ClrS = 'ClrS.RGBC'; // TODO: ???
-        desc['Nm  '] = (_a = info.printerProfile) !== null && _a !== void 0 ? _a : 'CIE RGB';
+        desc.ClrS = info.printerProfileColorSpace === 'grayscale' ? 'ClrS.Grys' : 'ClrS.RGBC';
+        if (info.printerProfile !== undefined)
+            desc['Nm  '] = info.printerProfile;
     }
     desc.Inte = Inte.encode(info.renderingIntent);
-    if (!info.printerManagesColors)
+    if (!info.printerManagesColors && info.blackPointCompensation !== undefined)
         desc.MpBl = !!info.blackPointCompensation;
     desc.printSixteenBit = !!info.printSixteenBit;
     desc.printerName = info.printerName || '';
@@ -179,23 +178,77 @@ addHandler(1082, target => target.printInformation !== undefined, (reader, targe
             paperWhite: !!info.proofSetup.paperWhite,
         };
     }
-    else {
+    else if (info.proofSetup) {
         desc.printProofSetup = {
-            Bltn: ((_b = info.proofSetup) === null || _b === void 0 ? void 0 : _b.builtin) ? `builtinProof.${info.proofSetup.builtin}` : 'builtinProof.proofCMYK',
+            Bltn: `builtinProof.${info.proofSetup.builtin || 'proofCMYK'}`,
         };
     }
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'printOutput', desc);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1083, // Print style
+addHandler(1083, // Print style
 // Print style
-target => target._ir1083 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1083', left());
-    target._ir1083 = (0, psdReader_1.readBytes)(reader, left());
-    // TODO:
-    // const desc = readVersionAndDescriptor(reader);
-    // console.log('1083', require('util').inspect(desc, false, 99, true));
+target => target.printStyle !== undefined, (reader, target) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    target.printStyle = {
+        caption: desc.Cptn,
+        calibrationBars: desc.Clbr,
+        registrationMarks: desc.RgsM,
+        cornerCropMarks: desc.CrnC,
+        centerCropMarks: desc.CntC,
+        labels: desc.Lbls,
+        negative: desc.Ngtv,
+        emulsionDown: desc.EmlD,
+        interpolate: desc.Intr,
+        backgroundColor: (0, descriptor_1.parseColor)(desc.Bckg),
+        border: (0, descriptor_1.parseUnits)(desc.BrdT),
+        bleed: (0, descriptor_1.parseUnits)(desc['Bld ']),
+        resolution: (0, descriptor_1.parseUnits)(desc.Rslt),
+        vectorData: desc.vectorData,
+        pagePosition: desc.PgPs === 'PgPs.PgPC' ? 'centered' : desc.PgPs,
+        left: (0, descriptor_1.parseUnits)(desc.Left),
+        top: (0, descriptor_1.parseUnits)(desc['Top ']),
+        scale: (0, descriptor_1.parsePercent)(desc['Scl ']),
+    };
+    if (desc.cropWhenPrinting !== undefined) {
+        target.printStyle.cropWhenPrinting = desc.cropWhenPrinting;
+        target.printStyle.cropRect = {
+            top: desc.cropRectTop || 0,
+            left: desc.cropRectLeft || 0,
+            bottom: desc.cropRectBottom || 0,
+            right: desc.cropRectRight || 0,
+        };
+    }
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1083);
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const style = target.printStyle;
+    const desc = {
+        Cptn: !!style.caption,
+        Clbr: !!style.calibrationBars,
+        RgsM: !!style.registrationMarks,
+        CrnC: !!style.cornerCropMarks,
+        CntC: !!style.centerCropMarks,
+        Lbls: !!style.labels,
+        Ngtv: !!style.negative,
+        EmlD: !!style.emulsionDown,
+        Intr: !!style.interpolate,
+        Bckg: (0, descriptor_1.serializeColor)(style.backgroundColor || { r: 255, g: 255, b: 255 }),
+        BrdT: (0, descriptor_1.unitsValue)(style.border || { units: 'Distance', value: 0 }, 'border'),
+        'Bld ': (0, descriptor_1.unitsValue)(style.bleed || { units: 'Distance', value: 0 }, 'bleed'),
+        Rslt: (0, descriptor_1.unitsValue)(style.resolution || { units: 'Pixels', value: 72 }, 'resolution'),
+        vectorData: (_a = style.vectorData) !== null && _a !== void 0 ? _a : true,
+        PgPs: (!style.pagePosition || style.pagePosition === 'centered') ? 'PgPs.PgPC' : style.pagePosition,
+        Left: (0, descriptor_1.unitsValue)(style.left || { units: 'Distance', value: 0 }, 'left'),
+        'Top ': (0, descriptor_1.unitsValue)(style.top || { units: 'Distance', value: 0 }, 'top'),
+        'Scl ': (0, descriptor_1.unitsPercentF)((_b = style.scale) !== null && _b !== void 0 ? _b : 1),
+    };
+    if (style.cropWhenPrinting !== undefined || style.cropRect) {
+        desc.cropWhenPrinting = !!style.cropWhenPrinting;
+        desc.cropRectBottom = (_d = (_c = style.cropRect) === null || _c === void 0 ? void 0 : _c.bottom) !== null && _d !== void 0 ? _d : 0;
+        desc.cropRectLeft = (_f = (_e = style.cropRect) === null || _e === void 0 ? void 0 : _e.left) !== null && _f !== void 0 ? _f : 0;
+        desc.cropRectRight = (_h = (_g = style.cropRect) === null || _g === void 0 ? void 0 : _g.right) !== null && _h !== void 0 ? _h : 0;
+        desc.cropRectTop = (_k = (_j = style.cropRect) === null || _j === void 0 ? void 0 : _j.top) !== null && _k !== void 0 ? _k : 0;
+    }
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'printOutputOptions', desc);
 });
 addHandler(1005, target => target.resolutionInfo !== undefined, (reader, target) => {
     const horizontalResolution = (0, psdReader_1.readFixedPoint32)(reader);
@@ -264,11 +317,61 @@ addHandler(1045, target => target.alphaChannelNames !== undefined, (reader, targ
         (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name);
     }
 });
-helpers_1.MOCK_HANDLERS && addHandler(1077, target => target._ir1077 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1077', left());
-    target._ir1077 = (0, psdReader_1.readBytes)(reader, left());
+const displayInfoKinds = ['selected', 'protected', 'spot'];
+const supportedColorSpaces = [0 /* ColorSpace.RGB */, 1 /* ColorSpace.HSB */, 2 /* ColorSpace.CMYK */, 7 /* ColorSpace.Lab */, 8 /* ColorSpace.Grayscale */];
+function readDisplayInfo(reader) {
+    const info = { opacity: 0, kind: 'selected' };
+    const colorSpace = reader.view.getUint16(reader.offset);
+    if (supportedColorSpaces.indexOf(colorSpace) !== -1) {
+        info.color = (0, psdReader_1.readColor)(reader);
+    }
+    else {
+        // keep color in unknown color space as it is, so the channel info is not lost or misaligned
+        (0, psdReader_1.skipBytes)(reader, 2);
+        info.rawColor = { colorSpace, values: [(0, psdReader_1.readUint16)(reader), (0, psdReader_1.readUint16)(reader), (0, psdReader_1.readUint16)(reader), (0, psdReader_1.readUint16)(reader)] };
+    }
+    info.opacity = (0, psdReader_1.readUint16)(reader) / 100;
+    const kind = displayInfoKinds[(0, psdReader_1.readUint8)(reader)];
+    if (!kind)
+        throw new Error('Invalid display info kind');
+    info.kind = kind;
+    return info;
+}
+addHandler(1007, // Display info (obsolete, replaced by 1077), written back as 1077
+() => false, (reader, target, left) => {
+    const info = [];
+    while (left() >= 14) {
+        info.push(readDisplayInfo(reader));
+        (0, psdReader_1.skipBytes)(reader, 1); // padding
+    }
+    // 1077 resource has more precise data and is used if present
+    if (!target.alphaChannelDisplayInfo)
+        target.alphaChannelDisplayInfo = info;
+}, () => { });
+addHandler(1077, // Display info (alpha and spot channels)
+// Display info (alpha and spot channels)
+target => target.alphaChannelDisplayInfo !== undefined, (reader, target, left) => {
+    const version = (0, psdReader_1.readUint32)(reader);
+    if (version !== 1)
+        throw new Error(`Invalid display info version: ${version}`);
+    target.alphaChannelDisplayInfo = [];
+    while (left() >= 13) {
+        target.alphaChannelDisplayInfo.push(readDisplayInfo(reader));
+    }
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1077);
+    (0, psdWriter_1.writeUint32)(writer, 1); // version
+    for (const info of target.alphaChannelDisplayInfo) {
+        if (!info.color && info.rawColor) {
+            (0, psdWriter_1.writeUint16)(writer, info.rawColor.colorSpace);
+            for (let i = 0; i < 4; i++)
+                (0, psdWriter_1.writeUint16)(writer, info.rawColor.values[i] | 0);
+        }
+        else {
+            (0, psdWriter_1.writeColor)(writer, info.color || { r: 255, g: 0, b: 0 });
+        }
+        (0, psdWriter_1.writeUint16)(writer, Math.round((0, helpers_1.clamp)(info.opacity, 0, 1) * 100));
+        (0, psdWriter_1.writeUint8)(writer, Math.max(0, displayInfoKinds.indexOf(info.kind)));
+    }
 });
 addHandler(1053, target => target.alphaIdentifiers !== undefined, (reader, target, left) => {
     target.alphaIdentifiers = [];
@@ -321,30 +424,133 @@ target => target.url !== undefined, (reader, target, left) => {
 }, (writer, target) => {
     (0, psdWriter_1.writeAsciiString)(writer, target.url);
 });
-helpers_1.MOCK_HANDLERS && addHandler(10000, // Print flags
-// Print flags
-target => target._ir10000 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 10000', left());
-    target._ir10000 = (0, psdReader_1.readBytes)(reader, left());
+addHandler(10000, // Print flags information
+// Print flags information
+target => target.printFlagsInfo !== undefined, (reader, target) => {
+    const version = (0, psdReader_1.readUint16)(reader);
+    if (version !== 1)
+        throw new Error(`Invalid print flags information version: ${version}`);
+    const centerCropMarks = !!(0, psdReader_1.readUint8)(reader);
+    (0, psdReader_1.skipBytes)(reader, 1);
+    const bleedWidth = (0, psdReader_1.readUint32)(reader);
+    const bleedWidthScale = (0, psdReader_1.readUint16)(reader);
+    target.printFlagsInfo = { centerCropMarks, bleedWidth, bleedWidthScale };
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir10000);
+    const info = target.printFlagsInfo;
+    (0, psdWriter_1.writeUint16)(writer, 1); // version
+    (0, psdWriter_1.writeUint8)(writer, info.centerCropMarks ? 1 : 0);
+    (0, psdWriter_1.writeUint8)(writer, 0);
+    (0, psdWriter_1.writeUint32)(writer, info.bleedWidth | 0);
+    (0, psdWriter_1.writeUint16)(writer, info.bleedWidthScale | 0);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1013, // Color halftoning
-// Color halftoning
-target => target._ir1013 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1013', left());
-    target._ir1013 = (0, psdReader_1.readBytes)(reader, left());
+addHandler(1046, // Indexed color table count
+// Indexed color table count
+target => target.indexedColorCount !== undefined, (reader, target) => {
+    target.indexedColorCount = (0, psdReader_1.readUint16)(reader);
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1013);
+    (0, psdWriter_1.writeUint16)(writer, target.indexedColorCount);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1016, // Color transfer functions
-// Color transfer functions
-target => target._ir1016 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1016', left());
-    target._ir1016 = (0, psdReader_1.readBytes)(reader, left());
+addHandler(1047, // Transparency index
+// Transparency index
+target => target.transparencyIndex !== undefined, (reader, target) => {
+    target.transparencyIndex = (0, psdReader_1.readUint16)(reader);
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1016);
+    (0, psdWriter_1.writeUint16)(writer, target.transparencyIndex);
 });
+const halftoneFrequencyUnits = ['lines/inch', 'lines/cm']; // 1, 2
+const halftoneShapes = ['round', 'ellipse', 'line', 'square', 'cross', undefined, 'diamond']; // 0 - 6
+function readHalftoneScreens(reader, left) {
+    const screens = [];
+    while (left() >= 18) {
+        const frequency = (0, psdReader_1.readFixedPoint32)(reader);
+        const frequencyUnits = halftoneFrequencyUnits[(0, psdReader_1.readUint16)(reader) - 1];
+        if (!frequencyUnits)
+            throw new Error('Invalid halftone screen frequency units');
+        const angle = (0, psdReader_1.readFixedPoint32)(reader);
+        const shape = halftoneShapes[(0, psdReader_1.readInt16)(reader)];
+        if (!shape)
+            throw new Error('Invalid halftone screen shape');
+        (0, psdReader_1.skipBytes)(reader, 4);
+        const accurateScreens = !!(0, psdReader_1.readUint8)(reader);
+        const printerDefaultScreens = !!(0, psdReader_1.readUint8)(reader);
+        screens.push({ frequency, frequencyUnits, angle, shape, accurateScreens, printerDefaultScreens });
+    }
+    return screens;
+}
+function writeHalftoneScreens(writer, screens) {
+    for (const screen of screens) {
+        (0, psdWriter_1.writeFixedPoint32)(writer, screen.frequency);
+        (0, psdWriter_1.writeUint16)(writer, Math.max(0, halftoneFrequencyUnits.indexOf(screen.frequencyUnits)) + 1);
+        (0, psdWriter_1.writeFixedPoint32)(writer, screen.angle);
+        (0, psdWriter_1.writeInt16)(writer, Math.max(0, halftoneShapes.indexOf(screen.shape)));
+        (0, psdWriter_1.writeZeros)(writer, 4);
+        (0, psdWriter_1.writeUint8)(writer, screen.accurateScreens ? 1 : 0);
+        (0, psdWriter_1.writeUint8)(writer, screen.printerDefaultScreens ? 1 : 0);
+    }
+}
+addHandler(1012, // Grayscale and multichannel halftoning information
+// Grayscale and multichannel halftoning information
+target => target.grayscaleHalftoneScreens !== undefined, (reader, target, left) => target.grayscaleHalftoneScreens = readHalftoneScreens(reader, left), (writer, target) => writeHalftoneScreens(writer, target.grayscaleHalftoneScreens));
+addHandler(1013, // Color halftoning information
+// Color halftoning information
+target => target.colorHalftoneScreens !== undefined, (reader, target, left) => target.colorHalftoneScreens = readHalftoneScreens(reader, left), (writer, target) => writeHalftoneScreens(writer, target.colorHalftoneScreens));
+function readTransferFunctions(reader, left) {
+    const functions = [];
+    while (left() >= 28) {
+        const curve = [];
+        for (let i = 0; i < 13; i++)
+            curve.push((0, psdReader_1.readInt16)(reader));
+        const override = !!(0, psdReader_1.readUint16)(reader);
+        functions.push({ curve, override });
+    }
+    return functions;
+}
+function writeTransferFunctions(writer, functions) {
+    var _a;
+    for (const f of functions) {
+        for (let i = 0; i < 13; i++)
+            (0, psdWriter_1.writeInt16)(writer, (_a = f.curve[i]) !== null && _a !== void 0 ? _a : -1);
+        (0, psdWriter_1.writeUint16)(writer, f.override ? 1 : 0);
+    }
+}
+addHandler(1014, // Duotone halftoning information
+// Duotone halftoning information
+target => target.duotoneHalftoneScreens !== undefined, (reader, target, left) => target.duotoneHalftoneScreens = readHalftoneScreens(reader, left), (writer, target) => writeHalftoneScreens(writer, target.duotoneHalftoneScreens));
+addHandler(1017, // Duotone transfer functions
+// Duotone transfer functions
+target => target.duotoneTransferFunctions !== undefined, (reader, target, left) => target.duotoneTransferFunctions = readTransferFunctions(reader, left), (writer, target) => writeTransferFunctions(writer, target.duotoneTransferFunctions));
+addHandler(1018, // Duotone image information
+// Duotone image information
+target => target.duotoneImageInformation !== undefined, (reader, target, left) => target.duotoneImageInformation = (0, psdReader_1.readBytes)(reader, left()), (writer, target) => (0, psdWriter_1.writeBytes)(writer, target.duotoneImageInformation));
+addHandler(1066, // Alternate duotone colors
+// Alternate duotone colors
+target => target.alternateDuotoneColors !== undefined, (reader, target, left) => {
+    if ((0, psdReader_1.readUint16)(reader) !== 1)
+        throw new Error('Invalid alternate duotone colors version');
+    const colors = [];
+    const count = (0, psdReader_1.readUint16)(reader);
+    for (let i = 0; i < count && left() >= 10; i++)
+        colors.push((0, psdReader_1.readColor)(reader));
+    const labCount = (0, psdReader_1.readUint16)(reader);
+    if (labCount * 3 > left())
+        throw new Error('Invalid alternate duotone colors Lab table size');
+    const labColors = (0, psdReader_1.readBytes)(reader, labCount * 3);
+    target.alternateDuotoneColors = { colors, labColors };
+}, (writer, target) => {
+    const { colors, labColors } = target.alternateDuotoneColors;
+    (0, psdWriter_1.writeUint16)(writer, 1); // version
+    (0, psdWriter_1.writeUint16)(writer, colors.length);
+    for (const color of colors)
+        (0, psdWriter_1.writeColor)(writer, color);
+    (0, psdWriter_1.writeUint16)(writer, Math.floor(labColors.byteLength / 3));
+    (0, psdWriter_1.writeBytes)(writer, labColors.subarray(0, Math.floor(labColors.byteLength / 3) * 3));
+});
+addHandler(1015, // Grayscale and multichannel transfer function
+// Grayscale and multichannel transfer function
+target => target.grayscaleTransferFunctions !== undefined, (reader, target, left) => target.grayscaleTransferFunctions = readTransferFunctions(reader, left), (writer, target) => writeTransferFunctions(writer, target.grayscaleTransferFunctions));
+addHandler(1016, // Color transfer functions
+// Color transfer functions
+target => target.colorTransferFunctions !== undefined, (reader, target, left) => target.colorTransferFunctions = readTransferFunctions(reader, left), (writer, target) => writeTransferFunctions(writer, target.colorTransferFunctions));
 addHandler(1080, // Count Information
 // Count Information
 target => target.countInformation !== undefined, (reader, target) => {
@@ -407,22 +613,27 @@ addHandler(1069, target => target.layerSelectionIds !== undefined, (reader, targ
     }
 });
 addHandler(1032, target => target.gridAndGuidesInformation !== undefined, (reader, target) => {
+    var _a;
     const version = (0, psdReader_1.readUint32)(reader);
     const horizontal = (0, psdReader_1.readUint32)(reader);
     const vertical = (0, psdReader_1.readUint32)(reader);
     const count = (0, psdReader_1.readUint32)(reader);
     if (version !== 1)
         throw new Error(`Invalid 1032 resource version: ${version}`);
-    target.gridAndGuidesInformation = {
-        grid: { horizontal, vertical },
-        guides: [],
-    };
+    const previous = (_a = target.gridAndGuidesInformation) === null || _a === void 0 ? void 0 : _a.guides; // in case guides were already read from 1092
+    const guides = [];
     for (let i = 0; i < count; i++) {
-        target.gridAndGuidesInformation.guides.push({
+        const guide = {
             location: (0, psdReader_1.readInt32)(reader) / 32,
             direction: (0, psdReader_1.readUint8)(reader) ? 'horizontal' : 'vertical'
-        });
+        };
+        if ((previous === null || previous === void 0 ? void 0 : previous.length) === count && previous[i].color)
+            guide.color = previous[i].color;
+        if ((previous === null || previous === void 0 ? void 0 : previous.length) === count && previous[i].id)
+            guide.id = previous[i].id;
+        guides.push(guide);
     }
+    target.gridAndGuidesInformation = { grid: { horizontal, vertical }, guides };
 }, (writer, target) => {
     const info = target.gridAndGuidesInformation;
     const grid = info.grid || { horizontal: 18 * 32, vertical: 18 * 32 };
@@ -436,6 +647,76 @@ addHandler(1032, target => target.gridAndGuidesInformation !== undefined, (reade
         (0, psdWriter_1.writeUint8)(writer, g.direction === 'horizontal' ? 1 : 0);
     }
 });
+const defaultGuideColor = { r: 74, g: 255, b: 255 }; // Photoshop default (cyan)
+addHandler(1092, // Grid and guides information with guide colors (same as 1032 with color of each guide)
+// Grid and guides information with guide colors (same as 1032 with color of each guide)
+target => target.gridAndGuidesInformation !== undefined, (reader, target) => {
+    var _a;
+    const version = (0, psdReader_1.readUint32)(reader);
+    if (version !== 2)
+        throw new Error(`Invalid 1092 resource version: ${version}`);
+    const horizontal = (0, psdReader_1.readUint32)(reader);
+    const vertical = (0, psdReader_1.readUint32)(reader);
+    const count = (0, psdReader_1.readUint32)(reader);
+    const guides = [];
+    for (let i = 0; i < count; i++) {
+        const location = (0, psdReader_1.readInt32)(reader) / 32;
+        const direction = (0, psdReader_1.readUint8)(reader) ? 'horizontal' : 'vertical';
+        (0, psdReader_1.skipBytes)(reader, 1);
+        const color = { r: (0, psdReader_1.readUint8)(reader), g: (0, psdReader_1.readUint8)(reader), b: (0, psdReader_1.readUint8)(reader) };
+        guides.push({ location, direction, color });
+    }
+    const existing = (_a = target.gridAndGuidesInformation) === null || _a === void 0 ? void 0 : _a.guides;
+    if (existing && existing.length === count) {
+        existing.forEach((guide, i) => guide.color = guides[i].color);
+    }
+    else {
+        target.gridAndGuidesInformation = { grid: { horizontal, vertical }, guides };
+    }
+}, (writer, target) => {
+    const info = target.gridAndGuidesInformation;
+    const grid = info.grid || { horizontal: 18 * 32, vertical: 18 * 32 };
+    const guides = info.guides || [];
+    (0, psdWriter_1.writeUint32)(writer, 2); // version
+    (0, psdWriter_1.writeUint32)(writer, Math.round(grid.horizontal));
+    (0, psdWriter_1.writeUint32)(writer, Math.round(grid.vertical));
+    (0, psdWriter_1.writeUint32)(writer, guides.length);
+    for (const g of guides) {
+        const color = g.color || defaultGuideColor;
+        (0, psdWriter_1.writeInt32)(writer, Math.round(g.location * 32));
+        (0, psdWriter_1.writeUint8)(writer, g.direction === 'horizontal' ? 1 : 0);
+        (0, psdWriter_1.writeUint8)(writer, 0);
+        (0, psdWriter_1.writeUint8)(writer, Math.round(color.r));
+        (0, psdWriter_1.writeUint8)(writer, Math.round(color.g));
+        (0, psdWriter_1.writeUint8)(writer, Math.round(color.b));
+    }
+});
+const emptyGuid = '00000000-0000-0000-0000-000000000000';
+addHandler(1097, // Guide ids
+// Guide ids
+target => !!target.gridAndGuidesInformation && (target.gridAndGuidesInformation.guides || []).every(g => g.id), (reader, target) => {
+    var _a;
+    const count = (0, psdReader_1.readUint32)(reader);
+    const ids = [];
+    for (let i = 0; i < count; i++) {
+        ids.push((0, psdReader_1.readAsciiString)(reader, (0, psdReader_1.readUint32)(reader)));
+        (0, psdReader_1.readUint32)(reader); // unknown, always 0
+        (0, psdReader_1.readAsciiString)(reader, (0, psdReader_1.readUint32)(reader)); // unknown, always empty guid
+    }
+    const guides = (_a = target.gridAndGuidesInformation) === null || _a === void 0 ? void 0 : _a.guides;
+    if (guides && guides.length === count)
+        guides.forEach((guide, i) => guide.id = ids[i]);
+}, (writer, target) => {
+    const guides = target.gridAndGuidesInformation.guides || [];
+    (0, psdWriter_1.writeUint32)(writer, guides.length);
+    for (const g of guides) {
+        (0, psdWriter_1.writeUint32)(writer, g.id.length);
+        (0, psdWriter_1.writeAsciiString)(writer, g.id);
+        (0, psdWriter_1.writeUint32)(writer, 0);
+        (0, psdWriter_1.writeUint32)(writer, emptyGuid.length);
+        (0, psdWriter_1.writeAsciiString)(writer, emptyGuid);
+    }
+});
 addHandler(1065, // Layer Comps
 // Layer Comps
 target => target.layerComps !== undefined, (reader, target) => {
@@ -529,7 +810,7 @@ target => target.timelineInformation !== undefined, (reader, target) => {
         workOutTime: (0, descriptor_1.frac)(desc.workOutTime),
         repeats: desc.LCnt,
         hasMotion: desc.hasMotion,
-        globalTracks: (0, descriptor_1.parseTrackList)(desc.globalTrackList, !!reader.logMissingFeatures),
+        globalTracks: (0, descriptor_1.parseTrackList)(desc.globalTrackList, reader),
     };
     if ((_b = (_a = desc.audioClipGroupList) === null || _a === void 0 ? void 0 : _a.audioClipGroupList) === null || _b === void 0 ? void 0 : _b.length) {
         target.timelineInformation.audioClipGroups = desc.audioClipGroupList.audioClipGroupList.map(g => ({
@@ -568,7 +849,7 @@ target => target.timelineInformation !== undefined, (reader, target) => {
         workInTime: timeline.workInTime,
         workOutTime: timeline.workOutTime,
         LCnt: timeline.repeats,
-        globalTrackList: (0, descriptor_1.serializeTrackList)(timeline.globalTracks),
+        globalTrackList: (0, descriptor_1.serializeTrackList)(timeline.globalTracks, writer),
         audioClipGroupList: {
             audioClipGroupList: ((_a = timeline.audioClipGroups) !== null && _a !== void 0 ? _a : []).map(a => ({
                 groupID: a.id,
@@ -816,27 +1097,127 @@ addHandler(1041, target => target.iccUntaggedProfile !== undefined, (reader, tar
 }, (writer, target) => {
     (0, psdWriter_1.writeUint8)(writer, target.iccUntaggedProfile ? 1 : 0);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1039, // ICC Profile
+addHandler(1039, // ICC Profile
 // ICC Profile
-target => target._ir1039 !== undefined, (reader, target, left) => {
-    // TODO: this is raw bytes, just return as a byte array
-    LOG_MOCK_HANDLERS && console.log('image resource 1039', left());
-    target._ir1039 = (0, psdReader_1.readBytes)(reader, left());
+target => target.iccProfile !== undefined, (reader, target, left) => {
+    target.iccProfile = (0, psdReader_1.readBytes)(reader, left());
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1039);
+    (0, psdWriter_1.writeBytes)(writer, target.iccProfile);
 });
 addHandler(1044, target => target.idsSeedNumber !== undefined, (reader, target) => target.idsSeedNumber = (0, psdReader_1.readUint32)(reader), (writer, target) => (0, psdWriter_1.writeUint32)(writer, target.idsSeedNumber));
+addHandler(1038, // Color samplers (Photoshop 5.0, replaced by 1073 in CS3)
+// Color samplers (Photoshop 5.0, replaced by 1073 in CS3)
+target => target.colorSamplers !== undefined && !target.colorSamplers.some(s => s.depth !== undefined), (reader, target, left) => {
+    var _a;
+    const version = (0, psdReader_1.readUint32)(reader);
+    if (version !== 1)
+        throw new Error(`Invalid color samplers version: ${version}`);
+    if ((_a = target.colorSamplers) === null || _a === void 0 ? void 0 : _a.some(s => s.depth !== undefined))
+        return (0, psdReader_1.skipBytes)(reader, left()); // already read from 1073
+    const count = (0, psdReader_1.readUint32)(reader);
+    target.colorSamplers = [];
+    for (let i = 0; i < count && left() >= 10; i++) {
+        // vertical and horizontal position in 1/16 pixel (inferred from sample files, the specification describes
+        // these values as horizontal and vertical fixed point numbers)
+        const y = (0, psdReader_1.readInt32)(reader) / 16;
+        const x = (0, psdReader_1.readInt32)(reader) / 16;
+        const colorSpace = (0, psdReader_1.readInt16)(reader);
+        target.colorSamplers.push({ x, y, colorSpace });
+    }
+}, (writer, target) => {
+    (0, psdWriter_1.writeUint32)(writer, 1); // version
+    (0, psdWriter_1.writeUint32)(writer, target.colorSamplers.length);
+    for (const sampler of target.colorSamplers) {
+        (0, psdWriter_1.writeInt32)(writer, Math.round(sampler.y * 16));
+        (0, psdWriter_1.writeInt32)(writer, Math.round(sampler.x * 16));
+        (0, psdWriter_1.writeInt16)(writer, sampler.colorSpace);
+    }
+});
+addHandler(1073, // Color samplers (Photoshop CS3)
+// Color samplers (Photoshop CS3)
+target => target.colorSamplers !== undefined && target.colorSamplers.some(s => s.depth !== undefined), (reader, target, left) => {
+    const version = (0, psdReader_1.readUint32)(reader);
+    if (version < 1 || version > 3)
+        throw new Error(`Invalid color samplers version: ${version}`);
+    const count = (0, psdReader_1.readUint32)(reader);
+    target.colorSamplers = [];
+    for (let i = 0; i < count && left() >= 10; i++) {
+        // position is fixed point value for sampler version 1 (stored the same way as in 1038 resource) or float for version 2
+        const samplerVersion = version === 3 ? (0, psdReader_1.readUint32)(reader) : version;
+        const y = samplerVersion === 1 ? (0, psdReader_1.readInt32)(reader) / 16 : (0, psdReader_1.readFloat32)(reader);
+        const x = samplerVersion === 1 ? (0, psdReader_1.readInt32)(reader) / 16 : (0, psdReader_1.readFloat32)(reader);
+        const colorSpace = (0, psdReader_1.readInt16)(reader);
+        const depth = version >= 2 ? (0, psdReader_1.readInt16)(reader) : 1;
+        target.colorSamplers.push({ x, y, colorSpace, depth });
+    }
+}, (writer, target) => {
+    var _a;
+    (0, psdWriter_1.writeUint32)(writer, 3); // version
+    (0, psdWriter_1.writeUint32)(writer, target.colorSamplers.length);
+    for (const sampler of target.colorSamplers) {
+        (0, psdWriter_1.writeUint32)(writer, 1); // sampler version
+        (0, psdWriter_1.writeInt32)(writer, Math.round(sampler.y * 16));
+        (0, psdWriter_1.writeInt32)(writer, Math.round(sampler.x * 16));
+        (0, psdWriter_1.writeInt16)(writer, sampler.colorSpace);
+        (0, psdWriter_1.writeInt16)(writer, (_a = sampler.depth) !== null && _a !== void 0 ? _a : 1);
+    }
+});
+addHandler(1022, // Quick Mask information
+// Quick Mask information
+target => target.quickMaskInfo !== undefined, (reader, target) => {
+    const channelId = (0, psdReader_1.readUint16)(reader);
+    const initiallyEmpty = !!(0, psdReader_1.readUint8)(reader);
+    target.quickMaskInfo = { channelId, initiallyEmpty };
+}, (writer, target) => {
+    (0, psdWriter_1.writeUint16)(writer, target.quickMaskInfo.channelId);
+    (0, psdWriter_1.writeUint8)(writer, target.quickMaskInfo.initiallyEmpty ? 1 : 0);
+});
+addHandler(1074, // Measurement scale
+// Measurement scale
+target => target.measurementScale !== undefined, (reader, target, left) => {
+    target.measurementScale = (0, psdReader_1.readBytes)(reader, left());
+}, (writer, target) => {
+    (0, psdWriter_1.writeBytes)(writer, target.measurementScale);
+});
+addHandler(1042, // Effects visible (only present when effects are hidden)
+// Effects visible (only present when effects are hidden)
+target => target.effectsVisible !== undefined, (reader, target) => {
+    target.effectsVisible = !!(0, psdReader_1.readUint8)(reader);
+}, (writer, target) => {
+    (0, psdWriter_1.writeUint8)(writer, target.effectsVisible ? 1 : 0);
+});
 addHandler(1036, target => target.thumbnail !== undefined || target.thumbnailRaw !== undefined, (reader, target, left) => {
     const format = (0, psdReader_1.readUint32)(reader); // 1 = kJpegRGB, 0 = kRawRGB
     const width = (0, psdReader_1.readUint32)(reader);
     const height = (0, psdReader_1.readUint32)(reader);
-    (0, psdReader_1.readUint32)(reader); // widthBytes = (width * bits_per_pixel + 31) / 32 * 4.
+    const widthBytes = (0, psdReader_1.readUint32)(reader); // widthBytes = (width * bits_per_pixel + 31) / 32 * 4.
     (0, psdReader_1.readUint32)(reader); // totalSize = widthBytes * height * planes
     (0, psdReader_1.readUint32)(reader); // sizeAfterCompression
     const bitsPerPixel = (0, psdReader_1.readUint16)(reader); // 24
-    const planes = (0, psdReader_1.readUint16)(reader); // 1
-    if (format !== 1 || bitsPerPixel !== 24 || planes !== 1) {
-        reader.logMissingFeatures && reader.log(`Invalid thumbnail data (format: ${format}, bitsPerPixel: ${bitsPerPixel}, planes: ${planes})`);
+    (0, psdReader_1.readUint16)(reader); // planes, should be 1 (some applications write 3)
+    if (format === 0 && bitsPerPixel === 24 && widthBytes >= width * 3 && widthBytes * height <= left()) {
+        // raw RGB data, rows are padded to 4 bytes
+        if (reader.useRawThumbnail) {
+            reader.logMissingFeatures && reader.log('Raw thumbnail data is not supported with useRawThumbnail option');
+            (0, psdReader_1.skipBytes)(reader, left());
+            return;
+        }
+        const data = (0, psdReader_1.readBytes)(reader, widthBytes * height);
+        const imageData = (0, helpers_1.createImageData)(width, height);
+        for (let y = 0, dst = 0; y < height; y++) {
+            for (let x = 0, src = y * widthBytes; x < width; x++, src += 3, dst += 4) {
+                imageData.data[dst + 0] = data[src + 0];
+                imageData.data[dst + 1] = data[src + 1];
+                imageData.data[dst + 2] = data[src + 2];
+                imageData.data[dst + 3] = 255;
+            }
+        }
+        target.thumbnail = (0, helpers_1.imageDataToCanvas)(imageData);
+        (0, psdReader_1.skipBytes)(reader, left());
+        return;
+    }
+    if (format !== 1 || bitsPerPixel !== 24) {
+        reader.logMissingFeatures && reader.log(`Invalid thumbnail data (format: ${format}, bitsPerPixel: ${bitsPerPixel})`);
         (0, psdReader_1.skipBytes)(reader, left());
         return;
     }
@@ -903,13 +1284,12 @@ addHandler(1057, target => target.versionInfo !== undefined, (reader, target, le
     (0, psdWriter_1.writeUnicodeString)(writer, versionInfo.readerName);
     (0, psdWriter_1.writeUint32)(writer, versionInfo.fileVersion);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1058, // EXIF data 1.
-// EXIF data 1.
-target => target._ir1058 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1058', left());
-    target._ir1058 = (0, psdReader_1.readBytes)(reader, left());
+addHandler(1058, // EXIF data 1
+// EXIF data 1
+target => target.exifData !== undefined, (reader, target, left) => {
+    target.exifData = (0, psdReader_1.readBytes)(reader, left());
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1058);
+    (0, psdWriter_1.writeBytes)(writer, target.exifData);
 });
 addHandler(7000, target => target.imageReadyVariables !== undefined, (reader, target, left) => {
     target.imageReadyVariables = readUtf8String(reader, left());
@@ -928,22 +1308,101 @@ addHandler(1088, target => target.pathSelectionState !== undefined, (reader, tar
     const desc = { 'null': (0, descriptor_1.pathSelectionStateToReference)(target.pathSelectionState) };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1025, target => target._ir1025 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 1025', left());
-    target._ir1025 = (0, psdReader_1.readBytes)(reader, left());
+addHandler(1025, // Work path
+// Work path
+target => target.workPath !== undefined, (reader, target, left, { width, height }) => {
+    target.workPath = { paths: [] };
+    (0, additionalInfo_1.readVectorMask)(reader, target.workPath, width, height, left());
+    (0, psdReader_1.skipBytes)(reader, left());
+}, (writer, target, _index, { width, height }) => {
+    (0, additionalInfo_1.writeVectorMask)(writer, target.workPath, width, height);
+});
+const MAX_SAVED_PATHS = 999; // ids 2000-2998
+addHandler(2000, // Saved paths (one resource for each path, named after the path)
+// Saved paths (one resource for each path, named after the path)
+target => target.savedPaths ? Math.min(target.savedPaths.length, MAX_SAVED_PATHS) : 0, (reader, target, left, { signature, id, name, width, height }) => {
+    var _a, _b;
+    if (signature !== '8BIM') { // ImageReady ('MeSa') resources use the same ids for other data
+        reader.logMissingFeatures && reader.log(`Unhandled image resource: ${signature} ${id}`);
+        (0, psdReader_1.skipBytes)(reader, left());
+        return;
+    }
+    const savedPaths = (_a = target.savedPaths) !== null && _a !== void 0 ? _a : (target.savedPaths = []);
+    const path = { name: decodeEncodedString(reader, name), paths: [] };
+    (0, additionalInfo_1.readVectorMask)(reader, path, width, height, left());
+    (0, psdReader_1.skipBytes)(reader, left());
+    const keyDescriptorList = (_b = target.savedPathsOrigination) === null || _b === void 0 ? void 0 : _b[savedPaths.length];
+    if (keyDescriptorList)
+        path.vectorOrigination = { keyDescriptorList };
+    savedPaths.push(path);
+}, (writer, target, index, { width, height }) => {
+    (0, additionalInfo_1.writeVectorMask)(writer, target.savedPaths[index], width, height);
+}, { keyCount: MAX_SAVED_PATHS, name: (target, index) => toShortAsciiString(target.savedPaths[index].name) });
+addHandler(3000, // Origin path info (origination data of saved paths)
+// Origin path info (origination data of saved paths)
+target => { var _a; return !!((_a = target.savedPaths) === null || _a === void 0 ? void 0 : _a.some(path => path.vectorOrigination)); }, (reader, target, left) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    desc.keyRootDescriptorList.forEach((item, i) => {
+        var _a, _b;
+        const keyDescriptorList = (0, additionalInfo_1.parseKeyDescriptorList)(item);
+        if (!keyDescriptorList.length)
+            return; // written for paths without origination data
+        const path = (_a = target.savedPaths) === null || _a === void 0 ? void 0 : _a[i];
+        if (path) {
+            path.vectorOrigination = { keyDescriptorList };
+        }
+        else { // saved paths are stored after this resource
+            ((_b = target.savedPathsOrigination) !== null && _b !== void 0 ? _b : (target.savedPathsOrigination = []))[i] = keyDescriptorList;
+        }
+    });
+    (0, psdReader_1.skipBytes)(reader, left());
 }, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir1025);
+    const desc = {
+        keyRootDescriptorList: target.savedPaths.slice(0, MAX_SAVED_PATHS)
+            .map(path => { var _a, _b; return (0, additionalInfo_1.serializeKeyDescriptorList)((_b = (_a = path.vectorOrigination) === null || _a === void 0 ? void 0 : _a.keyDescriptorList) !== null && _b !== void 0 ? _b : []); }),
+    };
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+}, { name: () => 'OriginDataIRB' });
+addHandler(2999, // Clipping path
+// Clipping path
+target => target.clippingPath !== undefined, (reader, target, left) => {
+    const name = readEncodedString(reader);
+    const flatness = (0, psdReader_1.readFixedPoint32)(reader);
+    (0, psdReader_1.skipBytes)(reader, left()); // fill rule (ignored by Photoshop)
+    target.clippingPath = { name, flatness };
+}, (writer, target) => {
+    writeEncodedString(writer, target.clippingPath.name);
+    (0, psdWriter_1.writeFixedPoint32)(writer, target.clippingPath.flatness);
+    (0, psdWriter_1.writeUint16)(writer, 1); // fill rule (ignored by Photoshop)
 });
 const FrmD = (0, helpers_1.createEnum)('FrmD', 'auto', {
     auto: 'Auto',
     none: 'None',
     dispose: 'Disp',
 });
-addHandler(4000, // Plug-In resource(s)
-// Plug-In resource(s)
-target => target.animations !== undefined, (reader, target, left) => {
+// plug-in resources are written with consecutive ids starting at 4000, in the same order as Photoshop writes them
+function pluginResourceKeys(target) {
+    const keys = [];
+    if (target.outputSettings !== undefined)
+        keys.push('mset');
+    if (target.animations !== undefined)
+        keys.push('mani', 'mfri');
+    return keys;
+}
+addHandler(4000, // Plug-In resource(s), identified by key stored in the data (ids 4000-4999)
+// Plug-In resource(s), identified by key stored in the data (ids 4000-4999)
+target => pluginResourceKeys(target).length, (reader, target, left) => {
     const key = (0, psdReader_1.readSignature)(reader);
-    if (key === 'mani') {
+    if (key === 'mset') {
+        // Save for Web output settings
+        target.outputSettings = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
+        (0, psdReader_1.skipBytes)(reader, left());
+    }
+    else if (key === 'mfri') {
+        // frame count, active frame and animation count, same data as in animations (mani)
+        (0, psdReader_1.skipBytes)(reader, left());
+    }
+    else if (key === 'mani') {
         (0, psdReader_1.checkSignature)(reader, 'IRFR');
         (0, psdReader_1.readSection)(reader, 1, left => {
             while (left() > 0) {
@@ -969,6 +1428,7 @@ target => target.animations !== undefined, (reader, target, left) => {
                         };
                         // console.log('#4000 AnDs', require('util').inspect(desc, false, 99, true));
                         // console.log('#4000 AnDs:result', require('util').inspect(target.animations, false, 99, true));
+                        (0, psdReader_1.skipBytes)(reader, left()); // padding
                     }
                     else if (key === 'Roll') {
                         const bytes = (0, psdReader_1.readBytes)(reader, left());
@@ -976,20 +1436,39 @@ target => target.animations !== undefined, (reader, target, left) => {
                     }
                     else {
                         reader.logMissingFeatures && reader.log('Unhandled subsection in #4000', key);
+                        (0, psdReader_1.skipBytes)(reader, left());
                     }
                 });
             }
         });
+        (0, psdReader_1.skipBytes)(reader, left()); // unknown data after animations section
     }
     else if (key === 'mopt') {
         const bytes = (0, psdReader_1.readBytes)(reader, left());
         reader.logDevFeatures && reader.log('#4000 mopt', bytes);
     }
     else {
-        reader.logMissingFeatures && reader.log('Unhandled key in #4000:', key);
+        reader.logMissingFeatures && reader.log(`Unhandled plug-in resource key: ${key}`);
+        (0, psdReader_1.skipBytes)(reader, left());
     }
-}, (writer, target) => {
-    if (target.animations) {
+}, (writer, target, index) => {
+    var _a, _b;
+    const key = pluginResourceKeys(target)[index];
+    if (key === 'mset') {
+        (0, psdWriter_1.writeSignature)(writer, 'mset');
+        (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', target.outputSettings, descriptor_1.outputSettingsRoot);
+    }
+    else if (key === 'mfri') {
+        const animations = target.animations;
+        (0, psdWriter_1.writeSignature)(writer, 'mfri');
+        (0, psdWriter_1.writeUint32)(writer, 2); // version
+        (0, psdWriter_1.writeUint32)(writer, 16); // length
+        (0, psdWriter_1.writeUint32)(writer, animations.frames.length);
+        (0, psdWriter_1.writeUint32)(writer, (_b = (_a = animations.animations[0]) === null || _a === void 0 ? void 0 : _a.activeFrame) !== null && _b !== void 0 ? _b : 0);
+        (0, psdWriter_1.writeUint32)(writer, animations.animations.length);
+        (0, psdWriter_1.writeUint32)(writer, 0);
+    }
+    else if (key === 'mani') {
         (0, psdWriter_1.writeSignature)(writer, 'mani');
         (0, psdWriter_1.writeSignature)(writer, 'IRFR');
         (0, psdWriter_1.writeSection)(writer, 1, () => {
@@ -1031,42 +1510,5 @@ target => target.animations !== undefined, (reader, target, left) => {
             // });
         });
     }
-});
-// TODO: Unfinished
-helpers_1.MOCK_HANDLERS && addHandler(4001, // Plug-In resource(s)
-// Plug-In resource(s)
-target => target._ir4001 !== undefined, (reader, target, left) => {
-    if (helpers_1.MOCK_HANDLERS) {
-        LOG_MOCK_HANDLERS && console.log('image resource 4001', left());
-        target._ir4001 = (0, psdReader_1.readBytes)(reader, left());
-        return;
-    }
-    const key = (0, psdReader_1.readSignature)(reader);
-    if (key === 'mfri') {
-        const version = (0, psdReader_1.readUint32)(reader);
-        if (version !== 2)
-            throw new Error('Invalid mfri version');
-        const length = (0, psdReader_1.readUint32)(reader);
-        const bytes = (0, psdReader_1.readBytes)(reader, length);
-        reader.logDevFeatures && reader.log('mfri', bytes);
-    }
-    else if (key === 'mset') {
-        const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-        reader.logDevFeatures && reader.log('mset', desc);
-    }
-    else {
-        reader.logMissingFeatures && reader.log('Unhandled key in #4001', key);
-    }
-}, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir4001);
-});
-// TODO: Unfinished
-helpers_1.MOCK_HANDLERS && addHandler(4002, // Plug-In resource(s)
-// Plug-In resource(s)
-target => target._ir4002 !== undefined, (reader, target, left) => {
-    LOG_MOCK_HANDLERS && console.log('image resource 4002', left());
-    target._ir4002 = (0, psdReader_1.readBytes)(reader, left());
-}, (writer, target) => {
-    (0, psdWriter_1.writeBytes)(writer, target._ir4002);
-});
+}, { keyCount: 1000 });
 //# sourceMappingURL=imageResources.js.map