ag-psd 30.1.1 → 30.2.0

package/dist/imageResources.js

@@ -1,34 +1,23 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resourceHandlersMap = exports.resourceHandlers = void 0;
-var base64_js_1 = require("base64-js");
-var psdReader_1 = require("./psdReader");
-var psdWriter_1 = require("./psdWriter");
-var helpers_1 = require("./helpers");
-var utf8_1 = require("./utf8");
-var descriptor_1 = require("./descriptor");
+const base64_js_1 = require("base64-js");
+const psdReader_1 = require("./psdReader");
+const psdWriter_1 = require("./psdWriter");
+const helpers_1 = require("./helpers");
+const utf8_1 = require("./utf8");
+const descriptor_1 = require("./descriptor");
 exports.resourceHandlers = [];
 exports.resourceHandlersMap = {};
 function addHandler(key, has, read, write) {
-    var handler = { key: key, has: has, read: read, write: write };
+    const handler = { key, has, read, write };
     exports.resourceHandlers.push(handler);
     exports.resourceHandlersMap[handler.key] = handler;
 }
-var LOG_MOCK_HANDLERS = false;
-var RESOLUTION_UNITS = [undefined, 'PPI', 'PPCM'];
-var MEASUREMENT_UNITS = [undefined, 'Inches', 'Centimeters', 'Points', 'Picas', 'Columns'];
-var hex = '0123456789abcdef';
+const LOG_MOCK_HANDLERS = false;
+const RESOLUTION_UNITS = [undefined, 'PPI', 'PPCM'];
+const MEASUREMENT_UNITS = [undefined, 'Inches', 'Centimeters', 'Points', 'Picas', 'Columns'];
+const hex = '0123456789abcdef';
 function charToNibble(code) {
     return code <= 57 ? code - 48 : code - 87;
 }
@@ -36,25 +25,25 @@ function byteAt(value, index) {
     return (charToNibble(value.charCodeAt(index)) << 4) | charToNibble(value.charCodeAt(index + 1));
 }
 function readUtf8String(reader, length) {
-    var buffer = (0, psdReader_1.readBytes)(reader, length);
+    const buffer = (0, psdReader_1.readBytes)(reader, length);
     return (0, utf8_1.decodeString)(buffer);
 }
 function writeUtf8String(writer, value) {
-    var buffer = (0, utf8_1.encodeString)(value);
+    const buffer = (0, utf8_1.encodeString)(value);
     (0, psdWriter_1.writeBytes)(writer, buffer);
 }
 function readEncodedString(reader) {
-    var length = (0, psdReader_1.readUint8)(reader);
-    var buffer = (0, psdReader_1.readBytes)(reader, length);
-    var notAscii = false;
-    for (var i = 0; i < buffer.byteLength; i++) {
+    const length = (0, psdReader_1.readUint8)(reader);
+    const buffer = (0, psdReader_1.readBytes)(reader, length);
+    let notAscii = false;
+    for (let i = 0; i < buffer.byteLength; i++) {
         if (buffer[i] & 0x80) {
             notAscii = true;
             break;
         }
     }
     if (notAscii) {
-        var decoder = new TextDecoder('gbk');
+        const decoder = new TextDecoder('gbk');
         return decoder.decode(buffer);
     }
     else {
@@ -62,61 +51,61 @@ function readEncodedString(reader) {
     }
 }
 function writeEncodedString(writer, value) {
-    var ascii = '';
-    for (var i = 0, code = value.codePointAt(i++); code !== undefined; code = value.codePointAt(i++)) {
+    let ascii = '';
+    for (let i = 0, code = value.codePointAt(i++); code !== undefined; code = value.codePointAt(i++)) {
         ascii += code > 0x7f ? '?' : String.fromCodePoint(code);
     }
-    var buffer = (0, utf8_1.encodeString)(ascii);
+    const buffer = (0, utf8_1.encodeString)(ascii);
     (0, psdWriter_1.writeUint8)(writer, buffer.byteLength);
     (0, psdWriter_1.writeBytes)(writer, buffer);
 }
 helpers_1.MOCK_HANDLERS && addHandler(1028, // IPTC-NAA record
-function (// IPTC-NAA record
-target) { return target._ir1028 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1028);
 });
-addHandler(1061, function (target) { return target.captionDigest !== undefined; }, function (reader, target) {
-    var captionDigest = '';
-    for (var i = 0; i < 16; i++) {
-        var byte = (0, psdReader_1.readUint8)(reader);
+addHandler(1061, target => target.captionDigest !== undefined, (reader, target) => {
+    let captionDigest = '';
+    for (let i = 0; i < 16; i++) {
+        const byte = (0, psdReader_1.readUint8)(reader);
         captionDigest += hex[byte >> 4];
         captionDigest += hex[byte & 0xf];
     }
     target.captionDigest = captionDigest;
-}, function (writer, target) {
-    for (var i = 0; i < 16; i++) {
+}, (writer, target) => {
+    for (let i = 0; i < 16; i++) {
         (0, psdWriter_1.writeUint8)(writer, byteAt(target.captionDigest, i * 2));
     }
 });
-addHandler(1060, function (target) { return target.xmpMetadata !== undefined; }, function (reader, target, left) {
+addHandler(1060, target => target.xmpMetadata !== undefined, (reader, target, left) => {
     target.xmpMetadata = readUtf8String(reader, left());
-}, function (writer, target) {
+}, (writer, target) => {
     writeUtf8String(writer, target.xmpMetadata);
 });
-var Inte = (0, helpers_1.createEnum)('Inte', 'perceptual', {
+const Inte = (0, helpers_1.createEnum)('Inte', 'perceptual', {
     'perceptual': 'Img ',
     'saturation': 'Grp ',
     'relative colorimetric': 'Clrm',
     'absolute colorimetric': 'AClr',
 });
 helpers_1.MOCK_HANDLERS && addHandler(1085, // Windows DEVMODE. Variable OS specific info for Windows.
-function (// Windows DEVMODE. Variable OS specific info for Windows.
-target) { return target._ir1085 !== undefined; }, function (reader, target, left) {
+// Windows DEVMODE. Variable OS specific info for Windows.
+target => target._ir1085 !== undefined, (reader, target, left) => {
     target._ir1085 = (0, psdReader_1.readBytes)(reader, left());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1085);
 });
-addHandler(1082, function (target) { return target.printInformation !== undefined; }, function (reader, target) {
+addHandler(1082, target => target.printInformation !== undefined, (reader, target) => {
     var _a, _b;
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     target.printInformation = {
         printerName: desc.printerName || '',
         renderingIntent: Inte.decode((_a = desc.Inte) !== null && _a !== void 0 ? _a : 'Inte.Img '),
     };
-    var info = target.printInformation;
+    const info = target.printInformation;
     if (desc.PstS !== undefined)
         info.printerManagesColors = desc.PstS;
     if (desc['Nm  '] !== undefined)
@@ -140,10 +129,10 @@ addHandler(1082, function (target) { return target.printInformation !== undefine
             };
         }
     }
-}, function (writer, target) {
+}, (writer, target) => {
     var _a, _b;
-    var info = target.printInformation;
-    var desc = {};
+    const info = target.printInformation;
+    const desc = {};
     if (info.printerManagesColors) {
         desc.PstS = true;
     }
@@ -168,39 +157,39 @@ addHandler(1082, function (target) { return target.printInformation !== undefine
     }
     else {
         desc.printProofSetup = {
-            Bltn: ((_b = info.proofSetup) === null || _b === void 0 ? void 0 : _b.builtin) ? "builtinProof.".concat(info.proofSetup.builtin) : 'builtinProof.proofCMYK',
+            Bltn: ((_b = info.proofSetup) === null || _b === void 0 ? void 0 : _b.builtin) ? `builtinProof.${info.proofSetup.builtin}` : 'builtinProof.proofCMYK',
         };
     }
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'printOutput', desc);
 });
 helpers_1.MOCK_HANDLERS && addHandler(1083, // Print style
-function (// Print style
-target) { return target._ir1083 !== undefined; }, function (reader, target, left) {
+// 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));
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1083);
 });
-addHandler(1005, function (target) { return target.resolutionInfo !== undefined; }, function (reader, target) {
-    var horizontalResolution = (0, psdReader_1.readFixedPoint32)(reader);
-    var horizontalResolutionUnit = (0, psdReader_1.readUint16)(reader);
-    var widthUnit = (0, psdReader_1.readUint16)(reader);
-    var verticalResolution = (0, psdReader_1.readFixedPoint32)(reader);
-    var verticalResolutionUnit = (0, psdReader_1.readUint16)(reader);
-    var heightUnit = (0, psdReader_1.readUint16)(reader);
+addHandler(1005, target => target.resolutionInfo !== undefined, (reader, target) => {
+    const horizontalResolution = (0, psdReader_1.readFixedPoint32)(reader);
+    const horizontalResolutionUnit = (0, psdReader_1.readUint16)(reader);
+    const widthUnit = (0, psdReader_1.readUint16)(reader);
+    const verticalResolution = (0, psdReader_1.readFixedPoint32)(reader);
+    const verticalResolutionUnit = (0, psdReader_1.readUint16)(reader);
+    const heightUnit = (0, psdReader_1.readUint16)(reader);
     target.resolutionInfo = {
-        horizontalResolution: horizontalResolution,
+        horizontalResolution,
         horizontalResolutionUnit: RESOLUTION_UNITS[horizontalResolutionUnit] || 'PPI',
         widthUnit: MEASUREMENT_UNITS[widthUnit] || 'Inches',
-        verticalResolution: verticalResolution,
+        verticalResolution,
         verticalResolutionUnit: RESOLUTION_UNITS[verticalResolutionUnit] || 'PPI',
         heightUnit: MEASUREMENT_UNITS[heightUnit] || 'Inches',
     };
-}, function (writer, target) {
-    var info = target.resolutionInfo;
+}, (writer, target) => {
+    const info = target.resolutionInfo;
     (0, psdWriter_1.writeFixedPoint32)(writer, info.horizontalResolution || 0);
     (0, psdWriter_1.writeUint16)(writer, Math.max(1, RESOLUTION_UNITS.indexOf(info.horizontalResolutionUnit)));
     (0, psdWriter_1.writeUint16)(writer, Math.max(1, MEASUREMENT_UNITS.indexOf(info.widthUnit)));
@@ -208,26 +197,26 @@ addHandler(1005, function (target) { return target.resolutionInfo !== undefined;
     (0, psdWriter_1.writeUint16)(writer, Math.max(1, RESOLUTION_UNITS.indexOf(info.verticalResolutionUnit)));
     (0, psdWriter_1.writeUint16)(writer, Math.max(1, MEASUREMENT_UNITS.indexOf(info.heightUnit)));
 });
-var printScaleStyles = ['centered', 'size to fit', 'user defined'];
-addHandler(1062, function (target) { return target.printScale !== undefined; }, function (reader, target) {
+const printScaleStyles = ['centered', 'size to fit', 'user defined'];
+addHandler(1062, target => target.printScale !== undefined, (reader, target) => {
     target.printScale = {
         style: printScaleStyles[(0, psdReader_1.readInt16)(reader)],
         x: (0, psdReader_1.readFloat32)(reader),
         y: (0, psdReader_1.readFloat32)(reader),
         scale: (0, psdReader_1.readFloat32)(reader),
     };
-}, function (writer, target) {
-    var _a = target.printScale, style = _a.style, x = _a.x, y = _a.y, scale = _a.scale;
+}, (writer, target) => {
+    const { style, x, y, scale } = target.printScale;
     (0, psdWriter_1.writeInt16)(writer, Math.max(0, printScaleStyles.indexOf(style)));
     (0, psdWriter_1.writeFloat32)(writer, x || 0);
     (0, psdWriter_1.writeFloat32)(writer, y || 0);
     (0, psdWriter_1.writeFloat32)(writer, scale || 0);
 });
-addHandler(1006, function (target) { return target.alphaChannelNames !== undefined; }, function (reader, target, left) {
+addHandler(1006, target => target.alphaChannelNames !== undefined, (reader, target, left) => {
     if (!target.alphaChannelNames) { // skip if the unicode versions are already read
         target.alphaChannelNames = [];
         while (left() > 0) {
-            var value = readEncodedString(reader);
+            const value = readEncodedString(reader);
             // const value = readPascalString(reader, 1);
             target.alphaChannelNames.push(value);
         }
@@ -235,45 +224,42 @@ addHandler(1006, function (target) { return target.alphaChannelNames !== undefin
     else {
         (0, psdReader_1.skipBytes)(reader, left());
     }
-}, function (writer, target) {
-    for (var _i = 0, _a = target.alphaChannelNames; _i < _a.length; _i++) {
-        var name_1 = _a[_i];
-        writeEncodedString(writer, name_1);
+}, (writer, target) => {
+    for (const name of target.alphaChannelNames) {
+        writeEncodedString(writer, name);
         // writePascalString(writer, name, 1);
     }
 });
-addHandler(1045, function (target) { return target.alphaChannelNames !== undefined; }, function (reader, target, left) {
+addHandler(1045, target => target.alphaChannelNames !== undefined, (reader, target, left) => {
     target.alphaChannelNames = [];
     while (left() > 0) {
         target.alphaChannelNames.push((0, psdReader_1.readUnicodeString)(reader));
     }
-}, function (writer, target) {
-    for (var _i = 0, _a = target.alphaChannelNames; _i < _a.length; _i++) {
-        var name_2 = _a[_i];
-        (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name_2);
+}, (writer, target) => {
+    for (const name of target.alphaChannelNames) {
+        (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name);
     }
 });
-helpers_1.MOCK_HANDLERS && addHandler(1077, function (target) { return target._ir1077 !== undefined; }, function (reader, target, left) {
+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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1077);
 });
-addHandler(1053, function (target) { return target.alphaIdentifiers !== undefined; }, function (reader, target, left) {
+addHandler(1053, target => target.alphaIdentifiers !== undefined, (reader, target, left) => {
     target.alphaIdentifiers = [];
     while (left() >= 4) {
         target.alphaIdentifiers.push((0, psdReader_1.readUint32)(reader));
     }
-}, function (writer, target) {
-    for (var _i = 0, _a = target.alphaIdentifiers; _i < _a.length; _i++) {
-        var id = _a[_i];
+}, (writer, target) => {
+    for (const id of target.alphaIdentifiers) {
         (0, psdWriter_1.writeUint32)(writer, id);
     }
 });
-addHandler(1010, function (target) { return target.backgroundColor !== undefined; }, function (reader, target) { return target.backgroundColor = (0, psdReader_1.readColor)(reader); }, function (writer, target) { return (0, psdWriter_1.writeColor)(writer, target.backgroundColor); });
-addHandler(1037, function (target) { return target.globalAngle !== undefined; }, function (reader, target) { return target.globalAngle = (0, psdReader_1.readInt32)(reader); }, function (writer, target) { return (0, psdWriter_1.writeInt32)(writer, target.globalAngle); });
-addHandler(1049, function (target) { return target.globalAltitude !== undefined; }, function (reader, target) { return target.globalAltitude = (0, psdReader_1.readUint32)(reader); }, function (writer, target) { return (0, psdWriter_1.writeUint32)(writer, target.globalAltitude); });
-addHandler(1011, function (target) { return target.printFlags !== undefined; }, function (reader, target) {
+addHandler(1010, target => target.backgroundColor !== undefined, (reader, target) => target.backgroundColor = (0, psdReader_1.readColor)(reader), (writer, target) => (0, psdWriter_1.writeColor)(writer, target.backgroundColor));
+addHandler(1037, target => target.globalAngle !== undefined, (reader, target) => target.globalAngle = (0, psdReader_1.readInt32)(reader), (writer, target) => (0, psdWriter_1.writeInt32)(writer, target.globalAngle));
+addHandler(1049, target => target.globalAltitude !== undefined, (reader, target) => target.globalAltitude = (0, psdReader_1.readUint32)(reader), (writer, target) => (0, psdWriter_1.writeUint32)(writer, target.globalAltitude));
+addHandler(1011, target => target.printFlags !== undefined, (reader, target) => {
     target.printFlags = {
         labels: !!(0, psdReader_1.readUint8)(reader),
         cropMarks: !!(0, psdReader_1.readUint8)(reader),
@@ -285,8 +271,8 @@ addHandler(1011, function (target) { return target.printFlags !== undefined; },
         caption: !!(0, psdReader_1.readUint8)(reader),
         printFlags: !!(0, psdReader_1.readUint8)(reader),
     };
-}, function (writer, target) {
-    var flags = target.printFlags;
+}, (writer, target) => {
+    const flags = target.printFlags;
     (0, psdWriter_1.writeUint8)(writer, flags.labels ? 1 : 0);
     (0, psdWriter_1.writeUint8)(writer, flags.cropMarks ? 1 : 0);
     (0, psdWriter_1.writeUint8)(writer, flags.colorBars ? 1 : 0);
@@ -298,59 +284,59 @@ addHandler(1011, function (target) { return target.printFlags !== undefined; },
     (0, psdWriter_1.writeUint8)(writer, flags.printFlags ? 1 : 0);
 });
 addHandler(1034, // Copyright flag
-function (// Copyright flag
-target) { return target.copyrighted !== undefined; }, function (reader, target) {
+// Copyright flag
+target => target.copyrighted !== undefined, (reader, target) => {
     target.copyrighted = !!(0, psdReader_1.readUint8)(reader);
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeUint8)(writer, target.copyrighted ? 1 : 0);
 });
 addHandler(1035, // URL
-function (// URL
-target) { return target.url !== undefined; }, function (reader, target, left) {
+// URL
+target => target.url !== undefined, (reader, target, left) => {
     target.url = (0, psdReader_1.readAsciiString)(reader, left());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeAsciiString)(writer, target.url);
 });
 helpers_1.MOCK_HANDLERS && addHandler(10000, // Print flags
-function (// Print flags
-target) { return target._ir10000 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir10000);
 });
 helpers_1.MOCK_HANDLERS && addHandler(1013, // Color halftoning
-function (// Color halftoning
-target) { return target._ir1013 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1013);
 });
 helpers_1.MOCK_HANDLERS && addHandler(1016, // Color transfer functions
-function (// Color transfer functions
-target) { return target._ir1016 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1016);
 });
 addHandler(1080, // Count Information
-function (// Count Information
-target) { return target.countInformation !== undefined; }, function (reader, target) {
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.countInformation = desc.countGroupList.map(function (g) { return ({
+// Count Information
+target => target.countInformation !== undefined, (reader, target) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    target.countInformation = desc.countGroupList.map(g => ({
         color: { r: g['Rd  '], g: g['Grn '], b: g['Bl  '] },
         name: g['Nm  '],
         size: g['Rds '],
         fontSize: g.fontSize,
         visible: g.Vsbl,
-        points: g.countObjectList.map(function (p) { return ({ x: p['X   '], y: p['Y   '] }); }),
-    }); });
-}, function (writer, target) {
-    var desc = {
+        points: g.countObjectList.map(p => ({ x: p['X   '], y: p['Y   '] })),
+    }));
+}, (writer, target) => {
+    const desc = {
         Vrsn: 1,
-        countGroupList: target.countInformation.map(function (g) { return ({
+        countGroupList: target.countInformation.map(g => ({
             'Rd  ': g.color.r,
             'Grn ': g.color.g,
             'Bl  ': g.color.b,
@@ -358,86 +344,81 @@ target) { return target.countInformation !== undefined; }, function (reader, tar
             'Rds ': g.size,
             fontSize: g.fontSize,
             Vsbl: g.visible,
-            countObjectList: g.points.map(function (p) { return ({ 'X   ': p.x, 'Y   ': p.y }); }),
-        }); }),
+            countObjectList: g.points.map(p => ({ 'X   ': p.x, 'Y   ': p.y })),
+        })),
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'Cnt ', desc);
 });
-addHandler(1024, function (target) { return target.layerState !== undefined; }, function (reader, target) { return target.layerState = (0, psdReader_1.readUint16)(reader); }, function (writer, target) { return (0, psdWriter_1.writeUint16)(writer, target.layerState); });
-addHandler(1026, function (target) { return target.layersGroup !== undefined; }, function (reader, target, left) {
+addHandler(1024, target => target.layerState !== undefined, (reader, target) => target.layerState = (0, psdReader_1.readUint16)(reader), (writer, target) => (0, psdWriter_1.writeUint16)(writer, target.layerState));
+addHandler(1026, target => target.layersGroup !== undefined, (reader, target, left) => {
     target.layersGroup = [];
     while (left() > 0) {
         target.layersGroup.push((0, psdReader_1.readUint16)(reader));
     }
-}, function (writer, target) {
-    for (var _i = 0, _a = target.layersGroup; _i < _a.length; _i++) {
-        var g = _a[_i];
+}, (writer, target) => {
+    for (const g of target.layersGroup) {
         (0, psdWriter_1.writeUint16)(writer, g);
     }
 });
-addHandler(1072, function (target) { return target.layerGroupsEnabledId !== undefined; }, function (reader, target, left) {
+addHandler(1072, target => target.layerGroupsEnabledId !== undefined, (reader, target, left) => {
     target.layerGroupsEnabledId = [];
     while (left() > 0) {
         target.layerGroupsEnabledId.push((0, psdReader_1.readUint8)(reader));
     }
-}, function (writer, target) {
-    for (var _i = 0, _a = target.layerGroupsEnabledId; _i < _a.length; _i++) {
-        var id = _a[_i];
+}, (writer, target) => {
+    for (const id of target.layerGroupsEnabledId) {
         (0, psdWriter_1.writeUint8)(writer, id);
     }
 });
-addHandler(1069, function (target) { return target.layerSelectionIds !== undefined; }, function (reader, target) {
-    var count = (0, psdReader_1.readUint16)(reader);
+addHandler(1069, target => target.layerSelectionIds !== undefined, (reader, target) => {
+    let count = (0, psdReader_1.readUint16)(reader);
     target.layerSelectionIds = [];
     while (count--) {
         target.layerSelectionIds.push((0, psdReader_1.readUint32)(reader));
     }
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeUint16)(writer, target.layerSelectionIds.length);
-    for (var _i = 0, _a = target.layerSelectionIds; _i < _a.length; _i++) {
-        var id = _a[_i];
+    for (const id of target.layerSelectionIds) {
         (0, psdWriter_1.writeUint32)(writer, id);
     }
 });
-addHandler(1032, function (target) { return target.gridAndGuidesInformation !== undefined; }, function (reader, target) {
-    var version = (0, psdReader_1.readUint32)(reader);
-    var horizontal = (0, psdReader_1.readUint32)(reader);
-    var vertical = (0, psdReader_1.readUint32)(reader);
-    var count = (0, psdReader_1.readUint32)(reader);
+addHandler(1032, target => target.gridAndGuidesInformation !== undefined, (reader, target) => {
+    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: ".concat(version));
+        throw new Error(`Invalid 1032 resource version: ${version}`);
     target.gridAndGuidesInformation = {
-        grid: { horizontal: horizontal, vertical: vertical },
+        grid: { horizontal, vertical },
         guides: [],
     };
-    for (var i = 0; i < count; i++) {
+    for (let i = 0; i < count; i++) {
         target.gridAndGuidesInformation.guides.push({
             location: (0, psdReader_1.readUint32)(reader) / 32,
             direction: (0, psdReader_1.readUint8)(reader) ? 'horizontal' : 'vertical'
         });
     }
-}, function (writer, target) {
-    var info = target.gridAndGuidesInformation;
-    var grid = info.grid || { horizontal: 18 * 32, vertical: 18 * 32 };
-    var guides = info.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, 1);
     (0, psdWriter_1.writeUint32)(writer, grid.horizontal);
     (0, psdWriter_1.writeUint32)(writer, grid.vertical);
     (0, psdWriter_1.writeUint32)(writer, guides.length);
-    for (var _i = 0, guides_1 = guides; _i < guides_1.length; _i++) {
-        var g = guides_1[_i];
+    for (const g of guides) {
         (0, psdWriter_1.writeUint32)(writer, g.location * 32);
         (0, psdWriter_1.writeUint8)(writer, g.direction === 'horizontal' ? 1 : 0);
     }
 });
 addHandler(1065, // Layer Comps
-function (// Layer Comps
-target) { return target.layerComps !== undefined; }, function (reader, target) {
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
+// Layer Comps
+target => target.layerComps !== undefined, (reader, target) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
     // console.log('CompList', require('util').inspect(desc, false, 99, true));
     target.layerComps = { list: [] };
-    for (var _i = 0, _a = desc.list; _i < _a.length; _i++) {
-        var item = _a[_i];
+    for (const item of desc.list) {
         target.layerComps.list.push({
             id: item.compID,
             name: item['Nm  '],
@@ -448,12 +429,11 @@ target) { return target.layerComps !== undefined; }, function (reader, target) {
     }
     if ('lastAppliedComp' in desc)
         target.layerComps.lastApplied = desc.lastAppliedComp;
-}, function (writer, target) {
-    var layerComps = target.layerComps;
-    var desc = { list: [] };
-    for (var _i = 0, _a = layerComps.list; _i < _a.length; _i++) {
-        var item = _a[_i];
-        var t = {};
+}, (writer, target) => {
+    const layerComps = target.layerComps;
+    const desc = { list: [] };
+    for (const item of layerComps.list) {
+        const t = {};
         t._classID = 'Comp';
         t['Nm  '] = item.name;
         if ('comment' in item)
@@ -468,24 +448,24 @@ target) { return target.layerComps !== undefined; }, function (reader, target) {
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'CompList', desc);
 });
 helpers_1.MOCK_HANDLERS && addHandler(1092, // ???
-function (// ???
-target) { return target._ir1092 !== undefined; }, function (reader, target, left) {
+// ???
+target => target._ir1092 !== undefined, (reader, target, left) => {
     LOG_MOCK_HANDLERS && console.log('image resource 1092', left());
     // 16 bytes, seems to be 4 integers
     target._ir1092 = (0, psdReader_1.readBytes)(reader, left());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1092);
 });
 // 0 - normal, 7 - multiply, 8 - screen, 23 - difference
-var onionSkinsBlendModes = [
+const onionSkinsBlendModes = [
     'normal', undefined, undefined, undefined, undefined, undefined, undefined, 'multiply',
     'screen', undefined, undefined, undefined, undefined, undefined, undefined, undefined,
     undefined, undefined, undefined, undefined, undefined, undefined, undefined, 'difference',
 ];
 addHandler(1078, // Onion Skins
-function (// Onion Skins
-target) { return target.onionSkins !== undefined; }, function (reader, target) {
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+// Onion Skins
+target => target.onionSkins !== undefined, (reader, target) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     // console.log('1078', require('util').inspect(desc, false, 99, true));
     target.onionSkins = {
         enabled: desc.enab,
@@ -496,9 +476,9 @@ target) { return target.onionSkins !== undefined; }, function (reader, target) {
         maxOpacity: desc.maxOpacity / 100,
         blendMode: onionSkinsBlendModes[desc.BlnM] || 'normal',
     };
-}, function (writer, target) {
-    var onionSkins = target.onionSkins;
-    var desc = {
+}, (writer, target) => {
+    const onionSkins = target.onionSkins;
+    const desc = {
         Vrsn: 1,
         enab: onionSkins.enabled,
         numBefore: onionSkins.framesBefore,
@@ -511,10 +491,10 @@ target) { return target.onionSkins !== undefined; }, function (reader, target) {
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
 addHandler(1075, // Timeline Information
-function (// Timeline Information
-target) { return target.timelineInformation !== undefined; }, function (reader, target) {
+// Timeline Information
+target => target.timelineInformation !== undefined, (reader, target) => {
     var _a, _b;
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     target.timelineInformation = {
         enabled: desc.enab,
         frameStep: (0, descriptor_1.frac)(desc.frameStep),
@@ -528,36 +508,33 @@ target) { return target.timelineInformation !== undefined; }, function (reader,
         globalTracks: (0, descriptor_1.parseTrackList)(desc.globalTrackList, !!reader.logMissingFeatures),
     };
     if ((_b = (_a = desc.audioClipGroupList) === null || _a === void 0 ? void 0 : _a.audioClipGroupList) === null || _b === void 0 ? void 0 : _b.length) {
-        target.timelineInformation.audioClipGroups = desc.audioClipGroupList.audioClipGroupList.map(function (g) { return ({
+        target.timelineInformation.audioClipGroups = desc.audioClipGroupList.audioClipGroupList.map(g => ({
             id: g.groupID,
             muted: g.muted,
-            audioClips: g.audioClipList.map(function (_a) {
-                var clipID = _a.clipID, timeScope = _a.timeScope, muted = _a.muted, audioLevel = _a.audioLevel, frameReader = _a.frameReader;
-                return ({
-                    id: clipID,
-                    start: (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),
-                    muted: muted,
-                    audioLevel: audioLevel,
-                    frameReader: {
-                        type: frameReader.frameReaderType,
-                        mediaDescriptor: frameReader.mediaDescriptor,
-                        link: {
-                            name: frameReader['Lnk ']['Nm  '],
-                            fullPath: frameReader['Lnk '].fullPath,
-                            relativePath: frameReader['Lnk '].relPath,
-                        },
+            audioClips: g.audioClipList.map(({ clipID, timeScope, muted, audioLevel, frameReader }) => ({
+                id: clipID,
+                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),
+                muted: muted,
+                audioLevel: audioLevel,
+                frameReader: {
+                    type: frameReader.frameReaderType,
+                    mediaDescriptor: frameReader.mediaDescriptor,
+                    link: {
+                        name: frameReader['Lnk ']['Nm  '],
+                        fullPath: frameReader['Lnk '].fullPath,
+                        relativePath: frameReader['Lnk '].relPath,
                     },
-                });
-            }),
-        }); });
+                },
+            })),
+        }));
     }
-}, function (writer, target) {
+}, (writer, target) => {
     var _a;
-    var timeline = target.timelineInformation;
-    var desc = {
+    const timeline = target.timelineInformation;
+    const desc = {
         Vrsn: 1,
         enab: timeline.enabled,
         frameStep: timeline.frameStep,
@@ -569,10 +546,10 @@ target) { return target.timelineInformation !== undefined; }, function (reader,
         LCnt: timeline.repeats,
         globalTrackList: (0, descriptor_1.serializeTrackList)(timeline.globalTracks),
         audioClipGroupList: {
-            audioClipGroupList: (_a = timeline.audioClipGroups) === null || _a === void 0 ? void 0 : _a.map(function (a) { return ({
+            audioClipGroupList: (_a = timeline.audioClipGroups) === null || _a === void 0 ? void 0 : _a.map(a => ({
                 groupID: a.id,
                 muted: a.muted,
-                audioClipList: a.audioClips.map(function (c) { return ({
+                audioClipList: a.audioClips.map(c => ({
                     clipID: c.id,
                     timeScope: {
                         Vrsn: 1,
@@ -594,59 +571,59 @@ target) { return target.timelineInformation !== undefined; }, function (reader,
                     },
                     muted: c.muted,
                     audioLevel: c.audioLevel,
-                }); }),
-            }); }),
+                })),
+            })),
         },
         hasMotion: timeline.hasMotion,
     };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'anim');
 });
 addHandler(1076, // Sheet Disclosure
-function (// Sheet Disclosure
-target) { return target.sheetDisclosure !== undefined; }, function (reader, target) {
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+// Sheet Disclosure
+target => target.sheetDisclosure !== undefined, (reader, target) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     target.sheetDisclosure = {};
     if (desc.sheetTimelineOptions) {
-        target.sheetDisclosure.sheetTimelineOptions = desc.sheetTimelineOptions.map(function (o) { return ({
+        target.sheetDisclosure.sheetTimelineOptions = desc.sheetTimelineOptions.map(o => ({
             sheetID: o.sheetID,
             sheetDisclosed: o.sheetDisclosed,
             lightsDisclosed: o.lightsDisclosed,
             meshesDisclosed: o.meshesDisclosed,
             materialsDisclosed: o.materialsDisclosed,
-        }); });
+        }));
     }
-}, function (writer, target) {
-    var disclosure = target.sheetDisclosure;
-    var desc = { Vrsn: 1 };
+}, (writer, target) => {
+    const disclosure = target.sheetDisclosure;
+    const desc = { Vrsn: 1 };
     if (disclosure.sheetTimelineOptions) {
-        desc.sheetTimelineOptions = disclosure.sheetTimelineOptions.map(function (d) { return ({
+        desc.sheetTimelineOptions = disclosure.sheetTimelineOptions.map(d => ({
             Vrsn: 2,
             sheetID: d.sheetID,
             sheetDisclosed: d.sheetDisclosed,
             lightsDisclosed: d.lightsDisclosed,
             meshesDisclosed: d.meshesDisclosed,
             materialsDisclosed: d.materialsDisclosed,
-        }); });
+        }));
     }
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
 addHandler(1054, // URL List
-function (// URL List
-target) { return target.urlsList !== undefined; }, function (reader, target) {
-    var count = (0, psdReader_1.readUint32)(reader);
+// URL List
+target => target.urlsList !== undefined, (reader, target) => {
+    const count = (0, psdReader_1.readUint32)(reader);
     target.urlsList = [];
-    for (var i = 0; i < count; i++) {
-        var long = (0, psdReader_1.readSignature)(reader);
+    for (let i = 0; i < count; i++) {
+        const long = (0, psdReader_1.readSignature)(reader);
         if (long !== 'slic' && reader.throwForMissingFeatures)
             throw new Error('Unknown long');
-        var id = (0, psdReader_1.readUint32)(reader);
-        var url = (0, psdReader_1.readUnicodeString)(reader);
-        target.urlsList.push({ id: id, url: url, ref: 'slice' });
+        const id = (0, psdReader_1.readUint32)(reader);
+        const url = (0, psdReader_1.readUnicodeString)(reader);
+        target.urlsList.push({ id, url, ref: 'slice' });
     }
-}, function (writer, target) {
-    var list = target.urlsList;
+}, (writer, target) => {
+    const list = target.urlsList;
     (0, psdWriter_1.writeUint32)(writer, list.length);
-    for (var i = 0; i < list.length; i++) {
+    for (let i = 0; i < list.length; i++) {
         (0, psdWriter_1.writeSignature)(writer, 'slic');
         (0, psdWriter_1.writeUint32)(writer, list[i].id);
         (0, psdWriter_1.writeUnicodeString)(writer, list[i].url);
@@ -661,71 +638,58 @@ function boundsFromBounds(bounds) {
 function clamped(array, index) {
     return array[Math.max(0, Math.min(array.length - 1, index))];
 }
-var sliceOrigins = ['autoGenerated', 'layer', 'userGenerated'];
-var sliceTypes = ['noImage', 'image'];
-var sliceAlignments = ['default'];
+const sliceOrigins = ['autoGenerated', 'layer', 'userGenerated'];
+const sliceTypes = ['noImage', 'image'];
+const sliceAlignments = ['default'];
 addHandler(1050, // Slices
-function (// Slices
-target) { return target.slices ? target.slices.length : 0; }, function (reader, target) {
-    var version = (0, psdReader_1.readUint32)(reader);
+// Slices
+target => target.slices ? target.slices.length : 0, (reader, target) => {
+    const version = (0, psdReader_1.readUint32)(reader);
     if (version === 6) {
         if (!target.slices)
             target.slices = [];
-        var top_1 = (0, psdReader_1.readInt32)(reader);
-        var left = (0, psdReader_1.readInt32)(reader);
-        var bottom = (0, psdReader_1.readInt32)(reader);
-        var right = (0, psdReader_1.readInt32)(reader);
-        var groupName = (0, psdReader_1.readUnicodeString)(reader);
-        var count = (0, psdReader_1.readUint32)(reader);
-        target.slices.push({ bounds: { top: top_1, left: left, bottom: bottom, right: right }, groupName: groupName, slices: [] });
-        var slices_1 = target.slices[target.slices.length - 1].slices;
-        for (var i = 0; i < count; i++) {
-            var id = (0, psdReader_1.readUint32)(reader);
-            var groupId = (0, psdReader_1.readUint32)(reader);
-            var origin_1 = clamped(sliceOrigins, (0, psdReader_1.readUint32)(reader));
-            var associatedLayerId = origin_1 == 'layer' ? (0, psdReader_1.readUint32)(reader) : 0;
-            var name_3 = (0, psdReader_1.readUnicodeString)(reader);
-            var type = clamped(sliceTypes, (0, psdReader_1.readUint32)(reader));
-            var left_1 = (0, psdReader_1.readInt32)(reader);
-            var top_2 = (0, psdReader_1.readInt32)(reader);
-            var right_1 = (0, psdReader_1.readInt32)(reader);
-            var bottom_1 = (0, psdReader_1.readInt32)(reader);
-            var url = (0, psdReader_1.readUnicodeString)(reader);
-            var target_1 = (0, psdReader_1.readUnicodeString)(reader);
-            var message = (0, psdReader_1.readUnicodeString)(reader);
-            var altTag = (0, psdReader_1.readUnicodeString)(reader);
-            var cellTextIsHTML = !!(0, psdReader_1.readUint8)(reader);
-            var cellText = (0, psdReader_1.readUnicodeString)(reader);
-            var horizontalAlignment = clamped(sliceAlignments, (0, psdReader_1.readUint32)(reader));
-            var verticalAlignment = clamped(sliceAlignments, (0, psdReader_1.readUint32)(reader));
-            var a = (0, psdReader_1.readUint8)(reader);
-            var r = (0, psdReader_1.readUint8)(reader);
-            var g = (0, psdReader_1.readUint8)(reader);
-            var b = (0, psdReader_1.readUint8)(reader);
-            var backgroundColorType = ((a + r + g + b) === 0) ? 'none' : (a === 0 ? 'matte' : 'color');
-            slices_1.push({
-                id: id,
-                groupId: groupId,
-                origin: origin_1,
-                associatedLayerId: associatedLayerId,
-                name: name_3,
-                target: target_1,
-                message: message,
-                altTag: altTag,
-                cellTextIsHTML: cellTextIsHTML,
-                cellText: cellText,
-                horizontalAlignment: horizontalAlignment,
-                verticalAlignment: verticalAlignment,
-                type: type,
-                url: url,
-                bounds: { top: top_2, left: left_1, bottom: bottom_1, right: right_1 },
-                backgroundColorType: backgroundColorType,
-                backgroundColor: { r: r, g: g, b: b, a: a },
+        const top = (0, psdReader_1.readInt32)(reader);
+        const left = (0, psdReader_1.readInt32)(reader);
+        const bottom = (0, psdReader_1.readInt32)(reader);
+        const right = (0, psdReader_1.readInt32)(reader);
+        const groupName = (0, psdReader_1.readUnicodeString)(reader);
+        const count = (0, psdReader_1.readUint32)(reader);
+        target.slices.push({ bounds: { top, left, bottom, right }, groupName, slices: [] });
+        const slices = target.slices[target.slices.length - 1].slices;
+        for (let i = 0; i < count; i++) {
+            const id = (0, psdReader_1.readUint32)(reader);
+            const groupId = (0, psdReader_1.readUint32)(reader);
+            const origin = clamped(sliceOrigins, (0, psdReader_1.readUint32)(reader));
+            const associatedLayerId = origin == 'layer' ? (0, psdReader_1.readUint32)(reader) : 0;
+            const name = (0, psdReader_1.readUnicodeString)(reader);
+            const type = clamped(sliceTypes, (0, psdReader_1.readUint32)(reader));
+            const left = (0, psdReader_1.readInt32)(reader);
+            const top = (0, psdReader_1.readInt32)(reader);
+            const right = (0, psdReader_1.readInt32)(reader);
+            const bottom = (0, psdReader_1.readInt32)(reader);
+            const url = (0, psdReader_1.readUnicodeString)(reader);
+            const target = (0, psdReader_1.readUnicodeString)(reader);
+            const message = (0, psdReader_1.readUnicodeString)(reader);
+            const altTag = (0, psdReader_1.readUnicodeString)(reader);
+            const cellTextIsHTML = !!(0, psdReader_1.readUint8)(reader);
+            const cellText = (0, psdReader_1.readUnicodeString)(reader);
+            const horizontalAlignment = clamped(sliceAlignments, (0, psdReader_1.readUint32)(reader));
+            const verticalAlignment = clamped(sliceAlignments, (0, psdReader_1.readUint32)(reader));
+            const a = (0, psdReader_1.readUint8)(reader);
+            const r = (0, psdReader_1.readUint8)(reader);
+            const g = (0, psdReader_1.readUint8)(reader);
+            const b = (0, psdReader_1.readUint8)(reader);
+            const backgroundColorType = ((a + r + g + b) === 0) ? 'none' : (a === 0 ? 'matte' : 'color');
+            slices.push({
+                id, groupId, origin, associatedLayerId, name, target, message, altTag, cellTextIsHTML, cellText,
+                horizontalAlignment, verticalAlignment, type, url,
+                bounds: { top, left, bottom, right },
+                backgroundColorType, backgroundColor: { r, g, b, a },
             });
         }
-        var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-        desc.slices.forEach(function (d) {
-            var slice = slices_1.find(function (s) { return d.sliceID == s.id; });
+        const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+        desc.slices.forEach(d => {
+            const slice = slices.find(s => d.sliceID == s.id);
             if (slice) {
                 slice.topOutset = d.topOutset;
                 slice.leftOutset = d.leftOutset;
@@ -735,20 +699,20 @@ target) { return target.slices ? target.slices.length : 0; }, function (reader,
         });
     }
     else if (version === 7 || version === 8) {
-        var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+        const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
         if (!target.slices)
             target.slices = [];
         target.slices.push({
             groupName: desc.baseName,
             bounds: boundsFromBounds(desc.bounds),
-            slices: desc.slices.map(function (s) { return (__assign(__assign({}, (s['Nm  '] ? { name: s['Nm  '] } : {})), { id: s.sliceID, groupId: s.groupID, associatedLayerId: 0, origin: descriptor_1.ESliceOrigin.decode(s.origin), type: descriptor_1.ESliceType.decode(s.Type), bounds: boundsFromBounds(s.bounds), url: s.url, target: s.null, message: s.Msge, altTag: s.altTag, cellTextIsHTML: s.cellTextIsHTML, cellText: s.cellText, horizontalAlignment: descriptor_1.ESliceHorzAlign.decode(s.horzAlign), verticalAlignment: descriptor_1.ESliceVertAlign.decode(s.vertAlign), backgroundColorType: descriptor_1.ESliceBGColorType.decode(s.bgColorType), backgroundColor: s.bgColor ? { r: s.bgColor['Rd  '], g: s.bgColor['Grn '], b: s.bgColor['Bl  '], a: s.bgColor.alpha } : { r: 0, g: 0, b: 0, a: 0 }, topOutset: s.topOutset || 0, leftOutset: s.leftOutset || 0, bottomOutset: s.bottomOutset || 0, rightOutset: s.rightOutset || 0 })); }),
+            slices: desc.slices.map(s => (Object.assign(Object.assign({}, (s['Nm  '] ? { name: s['Nm  '] } : {})), { id: s.sliceID, groupId: s.groupID, associatedLayerId: 0, origin: descriptor_1.ESliceOrigin.decode(s.origin), type: descriptor_1.ESliceType.decode(s.Type), bounds: boundsFromBounds(s.bounds), url: s.url, target: s.null, message: s.Msge, altTag: s.altTag, cellTextIsHTML: s.cellTextIsHTML, cellText: s.cellText, horizontalAlignment: descriptor_1.ESliceHorzAlign.decode(s.horzAlign), verticalAlignment: descriptor_1.ESliceVertAlign.decode(s.vertAlign), backgroundColorType: descriptor_1.ESliceBGColorType.decode(s.bgColorType), backgroundColor: s.bgColor ? { r: s.bgColor['Rd  '], g: s.bgColor['Grn '], b: s.bgColor['Bl  '], a: s.bgColor.alpha } : { r: 0, g: 0, b: 0, a: 0 }, topOutset: s.topOutset || 0, leftOutset: s.leftOutset || 0, bottomOutset: s.bottomOutset || 0, rightOutset: s.rightOutset || 0 }))),
         });
     }
     else {
-        throw new Error("Invalid slices version (".concat(version, ")"));
+        throw new Error(`Invalid slices version (${version})`);
     }
-}, function (writer, target, index) {
-    var _a = target.slices[index], bounds = _a.bounds, groupName = _a.groupName, slices = _a.slices;
+}, (writer, target, index) => {
+    const { bounds, groupName, slices } = target.slices[index];
     (0, psdWriter_1.writeUint32)(writer, 6); // version
     (0, psdWriter_1.writeInt32)(writer, bounds.top);
     (0, psdWriter_1.writeInt32)(writer, bounds.left);
@@ -756,9 +720,9 @@ target) { return target.slices ? target.slices.length : 0; }, function (reader,
     (0, psdWriter_1.writeInt32)(writer, bounds.right);
     (0, psdWriter_1.writeUnicodeString)(writer, groupName);
     (0, psdWriter_1.writeUint32)(writer, slices.length);
-    for (var i = 0; i < slices.length; i++) {
-        var slice = slices[i];
-        var _b = slice.backgroundColor, a = _b.a, r = _b.r, g = _b.g, b = _b.b;
+    for (let i = 0; i < slices.length; i++) {
+        const slice = slices[i];
+        let { a, r, g, b } = slice.backgroundColor;
         if (slice.backgroundColorType === 'none') {
             a = r = g = b = 0;
         }
@@ -790,14 +754,14 @@ target) { return target.slices ? target.slices.length : 0; }, function (reader,
         (0, psdWriter_1.writeUint8)(writer, g);
         (0, psdWriter_1.writeUint8)(writer, b);
     }
-    var desc = {
+    const desc = {
         bounds: boundsToBounds(bounds),
         slices: [],
     };
-    slices.forEach(function (s) {
-        var slice = __assign(__assign({ sliceID: s.id, groupID: s.groupId, origin: descriptor_1.ESliceOrigin.encode(s.origin), Type: descriptor_1.ESliceType.encode(s.type), bounds: boundsToBounds(s.bounds) }, (s.name ? { 'Nm  ': s.name } : {})), { url: s.url, null: s.target, Msge: s.message, altTag: s.altTag, cellTextIsHTML: s.cellTextIsHTML, cellText: s.cellText, horzAlign: descriptor_1.ESliceHorzAlign.encode(s.horizontalAlignment), vertAlign: descriptor_1.ESliceVertAlign.encode(s.verticalAlignment), bgColorType: descriptor_1.ESliceBGColorType.encode(s.backgroundColorType) });
+    slices.forEach(s => {
+        const slice = Object.assign(Object.assign({ sliceID: s.id, groupID: s.groupId, origin: descriptor_1.ESliceOrigin.encode(s.origin), Type: descriptor_1.ESliceType.encode(s.type), bounds: boundsToBounds(s.bounds) }, (s.name ? { 'Nm  ': s.name } : {})), { url: s.url, null: s.target, Msge: s.message, altTag: s.altTag, cellTextIsHTML: s.cellTextIsHTML, cellText: s.cellText, horzAlign: descriptor_1.ESliceHorzAlign.encode(s.horizontalAlignment), vertAlign: descriptor_1.ESliceVertAlign.encode(s.verticalAlignment), bgColorType: descriptor_1.ESliceBGColorType.encode(s.backgroundColorType) });
         if (s.backgroundColorType === 'color') {
-            var _a = s.backgroundColor, r = _a.r, g = _a.g, b = _a.b, a = _a.a;
+            const { r, g, b, a } = s.backgroundColor;
             slice.bgColor = { 'Rd  ': r, 'Grn ': g, 'Bl  ': b, alpha: a };
         }
         slice.topOutset = s.topOutset || 0;
@@ -808,56 +772,56 @@ target) { return target.slices ? target.slices.length : 0; }, function (reader,
     });
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc, 'slices');
 });
-addHandler(1064, function (target) { return target.pixelAspectRatio !== undefined; }, function (reader, target) {
+addHandler(1064, target => target.pixelAspectRatio !== undefined, (reader, target) => {
     if ((0, psdReader_1.readUint32)(reader) > 2)
         throw new Error('Invalid pixelAspectRatio version');
     target.pixelAspectRatio = { aspect: (0, psdReader_1.readFloat64)(reader) };
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeUint32)(writer, 2); // version
     (0, psdWriter_1.writeFloat64)(writer, target.pixelAspectRatio.aspect);
 });
-addHandler(1041, function (target) { return target.iccUntaggedProfile !== undefined; }, function (reader, target) {
+addHandler(1041, target => target.iccUntaggedProfile !== undefined, (reader, target) => {
     target.iccUntaggedProfile = !!(0, psdReader_1.readUint8)(reader);
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeUint8)(writer, target.iccUntaggedProfile ? 1 : 0);
 });
 helpers_1.MOCK_HANDLERS && addHandler(1039, // ICC Profile
-function (// ICC Profile
-target) { return target._ir1039 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1039);
 });
-addHandler(1044, function (target) { return target.idsSeedNumber !== undefined; }, function (reader, target) { return target.idsSeedNumber = (0, psdReader_1.readUint32)(reader); }, function (writer, target) { return (0, psdWriter_1.writeUint32)(writer, target.idsSeedNumber); });
-addHandler(1036, function (target) { return target.thumbnail !== undefined || target.thumbnailRaw !== undefined; }, function (reader, target, left) {
-    var format = (0, psdReader_1.readUint32)(reader); // 1 = kJpegRGB, 0 = kRawRGB
-    var width = (0, psdReader_1.readUint32)(reader);
-    var height = (0, psdReader_1.readUint32)(reader);
+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(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.
     (0, psdReader_1.readUint32)(reader); // totalSize = widthBytes * height * planes
     (0, psdReader_1.readUint32)(reader); // sizeAfterCompression
-    var bitsPerPixel = (0, psdReader_1.readUint16)(reader); // 24
-    var planes = (0, psdReader_1.readUint16)(reader); // 1
+    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: ".concat(format, ", bitsPerPixel: ").concat(bitsPerPixel, ", planes: ").concat(planes, ")"));
+        reader.logMissingFeatures && reader.log(`Invalid thumbnail data (format: ${format}, bitsPerPixel: ${bitsPerPixel}, planes: ${planes})`);
         (0, psdReader_1.skipBytes)(reader, left());
         return;
     }
-    var size = left();
-    var data = (0, psdReader_1.readBytes)(reader, size);
+    const size = left();
+    const data = (0, psdReader_1.readBytes)(reader, size);
     if (reader.useRawThumbnail) {
-        target.thumbnailRaw = { width: width, height: height, data: data };
+        target.thumbnailRaw = { width, height, data };
     }
     else if (data.byteLength) {
         target.thumbnail = (0, helpers_1.createCanvasFromData)(data);
     }
-}, function (writer, target) {
+}, (writer, target) => {
     var _a;
-    var width = 0;
-    var height = 0;
-    var data = new Uint8Array(0);
+    let width = 0;
+    let height = 0;
+    let data = new Uint8Array(0);
     if (target.thumbnailRaw) {
         width = target.thumbnailRaw.width;
         height = target.thumbnailRaw.height;
@@ -865,7 +829,7 @@ addHandler(1036, function (target) { return target.thumbnail !== undefined || ta
     }
     else {
         try {
-            var dataUrl = (_a = target.thumbnail.toDataURL('image/jpeg', 1)) === null || _a === void 0 ? void 0 : _a.substring('data:image/jpeg;base64,'.length);
+            const dataUrl = (_a = target.thumbnail.toDataURL('image/jpeg', 1)) === null || _a === void 0 ? void 0 : _a.substring('data:image/jpeg;base64,'.length);
             if (dataUrl) {
                 data = (0, base64_js_1.toByteArray)(dataUrl); // this sometimes fails for some reason, maybe some browser bugs
                 width = target.thumbnail.width;
@@ -874,11 +838,11 @@ addHandler(1036, function (target) { return target.thumbnail !== undefined || ta
         }
         catch (_b) { }
     }
-    var bitsPerPixel = 24;
-    var widthBytes = Math.floor((width * bitsPerPixel + 31) / 32) * 4;
-    var planes = 1;
-    var totalSize = widthBytes * height * planes;
-    var sizeAfterCompression = data.length;
+    const bitsPerPixel = 24;
+    const widthBytes = Math.floor((width * bitsPerPixel + 31) / 32) * 4;
+    const planes = 1;
+    const totalSize = widthBytes * height * planes;
+    const sizeAfterCompression = data.length;
     (0, psdWriter_1.writeUint32)(writer, 1); // 1 = kJpegRGB
     (0, psdWriter_1.writeUint32)(writer, width);
     (0, psdWriter_1.writeUint32)(writer, height);
@@ -889,8 +853,8 @@ addHandler(1036, function (target) { return target.thumbnail !== undefined || ta
     (0, psdWriter_1.writeUint16)(writer, planes);
     (0, psdWriter_1.writeBytes)(writer, data);
 });
-addHandler(1057, function (target) { return target.versionInfo !== undefined; }, function (reader, target, left) {
-    var version = (0, psdReader_1.readUint32)(reader);
+addHandler(1057, target => target.versionInfo !== undefined, (reader, target, left) => {
+    const version = (0, psdReader_1.readUint32)(reader);
     if (version !== 1)
         throw new Error('Invalid versionInfo version');
     target.versionInfo = {
@@ -900,8 +864,8 @@ addHandler(1057, function (target) { return target.versionInfo !== undefined; },
         fileVersion: (0, psdReader_1.readUint32)(reader),
     };
     (0, psdReader_1.skipBytes)(reader, left());
-}, function (writer, target) {
-    var versionInfo = target.versionInfo;
+}, (writer, target) => {
+    const versionInfo = target.versionInfo;
     (0, psdWriter_1.writeUint32)(writer, 1); // version
     (0, psdWriter_1.writeUint8)(writer, versionInfo.hasRealMergedData ? 1 : 0);
     (0, psdWriter_1.writeUnicodeString)(writer, versionInfo.writerName);
@@ -909,109 +873,106 @@ addHandler(1057, function (target) { return target.versionInfo !== undefined; },
     (0, psdWriter_1.writeUint32)(writer, versionInfo.fileVersion);
 });
 helpers_1.MOCK_HANDLERS && addHandler(1058, // EXIF data 1.
-function (// EXIF data 1.
-target) { return target._ir1058 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1058);
 });
-addHandler(7000, function (target) { return target.imageReadyVariables !== undefined; }, function (reader, target, left) {
+addHandler(7000, target => target.imageReadyVariables !== undefined, (reader, target, left) => {
     target.imageReadyVariables = readUtf8String(reader, left());
-}, function (writer, target) {
+}, (writer, target) => {
     writeUtf8String(writer, target.imageReadyVariables);
 });
-addHandler(7001, function (target) { return target.imageReadyDataSets !== undefined; }, function (reader, target, left) {
+addHandler(7001, target => target.imageReadyDataSets !== undefined, (reader, target, left) => {
     target.imageReadyDataSets = readUtf8String(reader, left());
-}, function (writer, target) {
+}, (writer, target) => {
     writeUtf8String(writer, target.imageReadyDataSets);
 });
-addHandler(1088, function (target) { return target.pathSelectionState !== undefined; }, function (reader, target, _left) {
-    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+addHandler(1088, target => target.pathSelectionState !== undefined, (reader, target, _left) => {
+    const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
     target.pathSelectionState = desc['null'];
-}, function (writer, target) {
-    var desc = { 'null': target.pathSelectionState };
+}, (writer, target) => {
+    const desc = { 'null': target.pathSelectionState };
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
-helpers_1.MOCK_HANDLERS && addHandler(1025, function (target) { return target._ir1025 !== undefined; }, function (reader, target, left) {
+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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir1025);
 });
-var FrmD = (0, helpers_1.createEnum)('FrmD', '', {
+const FrmD = (0, helpers_1.createEnum)('FrmD', '', {
     auto: 'Auto',
     none: 'None',
     dispose: 'Disp',
 });
 addHandler(4000, // Plug-In resource(s)
-function (// Plug-In resource(s)
-target) { return target.animations !== undefined; }, function (reader, target, left) {
-    var key = (0, psdReader_1.readSignature)(reader);
+// Plug-In resource(s)
+target => target.animations !== undefined, (reader, target, left) => {
+    const key = (0, psdReader_1.readSignature)(reader);
     if (key === 'mani') {
         (0, psdReader_1.checkSignature)(reader, 'IRFR');
-        (0, psdReader_1.readSection)(reader, 1, function (left) {
-            var _loop_1 = function () {
+        (0, psdReader_1.readSection)(reader, 1, left => {
+            while (left() > 0) {
                 (0, psdReader_1.checkSignature)(reader, '8BIM');
-                var key_1 = (0, psdReader_1.readSignature)(reader);
-                (0, psdReader_1.readSection)(reader, 1, function (left) {
-                    if (key_1 === 'AnDs') {
-                        var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                const key = (0, psdReader_1.readSignature)(reader);
+                (0, psdReader_1.readSection)(reader, 1, left => {
+                    if (key === 'AnDs') {
+                        const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
                         target.animations = {
                             // desc.AFSt ???
-                            frames: desc.FrIn.map(function (x) { return ({
+                            frames: desc.FrIn.map(x => ({
                                 id: x.FrID,
                                 delay: (x.FrDl || 0) / 100,
                                 dispose: x.FrDs ? FrmD.decode(x.FrDs) : 'auto', // missing == auto
                                 // x.FrGA ???
-                            }); }),
-                            animations: desc.FSts.map(function (x) { return ({
+                            })),
+                            animations: desc.FSts.map(x => ({
                                 id: x.FsID,
                                 frames: x.FsFr,
                                 repeats: x.LCnt,
                                 activeFrame: x.AFrm || 0,
-                            }); }),
+                            })),
                         };
                         // console.log('#4000 AnDs', require('util').inspect(desc, false, 99, true));
                         // console.log('#4000 AnDs:result', require('util').inspect(target.animations, false, 99, true));
                     }
-                    else if (key_1 === 'Roll') {
-                        var bytes = (0, psdReader_1.readBytes)(reader, left());
+                    else if (key === 'Roll') {
+                        const bytes = (0, psdReader_1.readBytes)(reader, left());
                         reader.logDevFeatures && reader.log('#4000 Roll', bytes);
                     }
                     else {
-                        reader.logMissingFeatures && reader.log('Unhandled subsection in #4000', key_1);
+                        reader.logMissingFeatures && reader.log('Unhandled subsection in #4000', key);
                     }
                 });
-            };
-            while (left() > 0) {
-                _loop_1();
             }
         });
     }
     else if (key === 'mopt') {
-        var bytes = (0, psdReader_1.readBytes)(reader, left());
+        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);
     }
-}, function (writer, target) {
+}, (writer, target) => {
     if (target.animations) {
         (0, psdWriter_1.writeSignature)(writer, 'mani');
         (0, psdWriter_1.writeSignature)(writer, 'IRFR');
-        (0, psdWriter_1.writeSection)(writer, 1, function () {
+        (0, psdWriter_1.writeSection)(writer, 1, () => {
             (0, psdWriter_1.writeSignature)(writer, '8BIM');
             (0, psdWriter_1.writeSignature)(writer, 'AnDs');
-            (0, psdWriter_1.writeSection)(writer, 1, function () {
-                var desc = {
+            (0, psdWriter_1.writeSection)(writer, 1, () => {
+                const desc = {
                     // AFSt: 0, // ???
                     FrIn: [],
                     FSts: [],
                 };
-                for (var i = 0; i < target.animations.frames.length; i++) {
-                    var f = target.animations.frames[i];
-                    var frame = {
+                for (let i = 0; i < target.animations.frames.length; i++) {
+                    const f = target.animations.frames[i];
+                    const frame = {
                         FrID: f.id,
                     };
                     if (f.delay)
@@ -1020,9 +981,9 @@ target) { return target.animations !== undefined; }, function (reader, target, l
                     // if (i === 0) frame.FrGA = 30; // ???
                     desc.FrIn.push(frame);
                 }
-                for (var i = 0; i < target.animations.animations.length; i++) {
-                    var a = target.animations.animations[i];
-                    var anim = {
+                for (let i = 0; i < target.animations.animations.length; i++) {
+                    const a = target.animations.animations[i];
+                    const anim = {
                         FsID: a.id,
                         AFrm: a.activeFrame | 0,
                         FsFr: a.frames,
@@ -1042,39 +1003,39 @@ target) { return target.animations !== undefined; }, function (reader, target, l
 });
 // TODO: Unfinished
 helpers_1.MOCK_HANDLERS && addHandler(4001, // Plug-In resource(s)
-function (// Plug-In resource(s)
-target) { return target._ir4001 !== undefined; }, function (reader, target, left) {
+// 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;
     }
-    var key = (0, psdReader_1.readSignature)(reader);
+    const key = (0, psdReader_1.readSignature)(reader);
     if (key === 'mfri') {
-        var version = (0, psdReader_1.readUint32)(reader);
+        const version = (0, psdReader_1.readUint32)(reader);
         if (version !== 2)
             throw new Error('Invalid mfri version');
-        var length_1 = (0, psdReader_1.readUint32)(reader);
-        var bytes = (0, psdReader_1.readBytes)(reader, length_1);
+        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') {
-        var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+        const desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
         reader.logDevFeatures && reader.log('mset', desc);
     }
     else {
         reader.logMissingFeatures && reader.log('Unhandled key in #4001', key);
     }
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir4001);
 });
 // TODO: Unfinished
 helpers_1.MOCK_HANDLERS && addHandler(4002, // Plug-In resource(s)
-function (// Plug-In resource(s)
-target) { return target._ir4002 !== undefined; }, function (reader, target, left) {
+// 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());
-}, function (writer, target) {
+}, (writer, target) => {
     (0, psdWriter_1.writeBytes)(writer, target._ir4002);
 });
 //# sourceMappingURL=imageResources.js.map