ag-psd 30.1.1 → 30.2.0

package/dist/descriptor.js

@@ -1,15 +1,4 @@
 "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);
-};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -24,15 +13,15 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ESliceOrigin = exports.ESliceVertAlign = exports.ESliceHorzAlign = exports.ESliceType = exports.FrFl = exports.FStl = exports.ClrS = exports.gradientInterpolationMethodType = exports.stdTrackID = exports.animInterpStyleEnum = exports.GrdT = exports.IGSr = exports.BETE = exports.BESs = exports.bvlT = exports.BESl = exports.BlnM = exports.warpStyle = exports.Annt = exports.Ornt = exports.textGridding = exports.frac = exports.unitsValue = exports.unitsPercentF = exports.unitsPercent = exports.unitsAngle = exports.parseUnitsToNumber = exports.parseUnitsOrNumber = exports.parseUnits = exports.parsePercentOrAngle = exports.parsePercent = exports.parseAngle = exports.serializeColor = exports.parseColor = exports.serializeVectorContent = exports.parseVectorContent = exports.serializeTrackList = exports.parseTrackList = exports.parseEffects = exports.serializeEffects = exports.boundsToDescBounds = exports.descBoundsToBounds = exports.xyToHorzVrtc = exports.horzVrtcToXY = exports.writeVersionAndDescriptor = exports.readVersionAndDescriptor = exports.writeDescriptorStructure = exports.readDescriptorStructure = exports.readAsciiStringOrClassId = exports.setLogErrors = void 0;
 exports.presetKindType = exports.prjM = exports.FlMd = exports.IntC = exports.IntE = exports.Drct = exports.WndM = exports.CntE = exports.FlCl = exports.ExtR = exports.ExtT = exports.DfsM = exports.blurType = exports.Lns = exports.MztT = exports.Chnl = exports.Dstr = exports.ZZTy = exports.Wvtp = exports.SphM = exports.RplS = exports.Cnvr = exports.UndA = exports.DspM = exports.SmBQ = exports.SmBM = exports.BlrQ = exports.BlrM = exports.strokeStyleLineAlignment = exports.strokeStyleLineJoinType = exports.strokeStyleLineCapType = exports.ESliceBGColorType = void 0;
-var helpers_1 = require("./helpers");
-var psdReader_1 = require("./psdReader");
-var psdWriter_1 = require("./psdWriter");
+const helpers_1 = require("./helpers");
+const psdReader_1 = require("./psdReader");
+const psdWriter_1 = require("./psdWriter");
 function revMap(map) {
-    var result = {};
-    Object.keys(map).forEach(function (key) { return result[map[key]] = key; });
+    const result = {};
+    Object.keys(map).forEach(key => result[map[key]] = key);
     return result;
 }
-var unitsMap = {
+const unitsMap = {
     '#Ang': 'Angle',
     '#Rsl': 'Density',
     '#Rlt': 'Distance',
@@ -45,18 +34,18 @@ var unitsMap = {
     'RrIn': 'Inches',
     'RrCm': 'Centimeters',
 };
-var unitsMapRev = revMap(unitsMap);
-var logErrors = false;
+const unitsMapRev = revMap(unitsMap);
+let logErrors = false;
 function setLogErrors(value) {
     logErrors = value;
 }
 exports.setLogErrors = setLogErrors;
 function makeType(name, classID) {
-    return { name: name, classID: classID };
+    return { name, classID };
 }
-var nullType = makeType('', 'null');
-var USE_CHINESE = false; // Testing
-var fieldToExtType = {
+const nullType = makeType('', 'null');
+const USE_CHINESE = false; // Testing
+const fieldToExtType = {
     strokeStyleContent: makeType('', 'solidColorLayer'),
     printProofSetup: makeType(USE_CHINESE ? '校样设置' : 'Proof Setup', 'proofSetup'),
     Grad: makeType(USE_CHINESE ? '渐变' : 'Gradient', 'Grdn'),
@@ -139,7 +128,7 @@ var fieldToExtType = {
     FXRefPoint: nullType,
     ClMg: makeType('', 'ClMg'),
 };
-var fieldToArrayExtType = {
+const fieldToArrayExtType = {
     'Crv ': makeType('', 'CrPt'),
     Clrs: makeType('', 'Clrt'),
     Trns: makeType('', 'TrnS'),
@@ -172,7 +161,7 @@ var fieldToArrayExtType = {
     list: nullType,
     Adjs: makeType('', 'CrvA'),
 };
-var typeToField = {
+const typeToField = {
     'TEXT': [
         'Txt ', 'printerName', 'Nm  ', 'Idnt', 'blackAndWhitePresetFileName', 'LUT3DFileName',
         'presetFileName', 'curvesPresetFileName', 'mixerPresetFileName', 'placed', 'description', 'reason',
@@ -246,10 +235,10 @@ var typeToField = {
     'obj ': ['null', 'Chnl'],
     'Pth ': ['DspF'],
 };
-var channels = [
+const channels = [
     'Rd  ', 'Grn ', 'Bl  ', 'Yllw', 'Ylw ', 'Cyn ', 'Mgnt', 'Blck', 'Gry ', 'Lmnc', 'A   ', 'B   ',
 ];
-var fieldToArrayType = {
+const fieldToArrayType = {
     'Mnm ': 'long',
     'Mxm ': 'long',
     FrLs: 'long',
@@ -289,21 +278,17 @@ var fieldToArrayType = {
     compList: 'long',
     Chnl: 'enum',
 };
-var fieldToType = {};
-for (var _i = 0, _a = Object.keys(typeToField); _i < _a.length; _i++) {
-    var type = _a[_i];
-    for (var _b = 0, _c = typeToField[type]; _b < _c.length; _b++) {
-        var field = _c[_b];
+const fieldToType = {};
+for (const type of Object.keys(typeToField)) {
+    for (const field of typeToField[type]) {
         fieldToType[field] = type;
     }
 }
-for (var _d = 0, _e = Object.keys(fieldToExtType); _d < _e.length; _d++) {
-    var field = _e[_d];
+for (const field of Object.keys(fieldToExtType)) {
     if (!fieldToType[field])
         fieldToType[field] = 'Objc';
 }
-for (var _f = 0, _g = Object.keys(fieldToArrayExtType); _f < _g.length; _f++) {
-    var field = _g[_f];
+for (const field of Object.keys(fieldToArrayExtType)) {
     fieldToArrayType[field] = 'Objc';
 }
 function getTypeByKey(key, value, root, parent) {
@@ -347,7 +332,7 @@ function getTypeByKey(key, value, root, parent) {
     }
 }
 function readAsciiStringOrClassId(reader) {
-    var length = (0, psdReader_1.readInt32)(reader);
+    const length = (0, psdReader_1.readInt32)(reader);
     return (0, psdReader_1.readAsciiString)(reader, length || 4);
 }
 exports.readAsciiStringOrClassId = readAsciiStringOrClassId;
@@ -360,21 +345,21 @@ function writeAsciiStringOrClassId(writer, value) {
     else {
         // write ascii string
         (0, psdWriter_1.writeInt32)(writer, value.length);
-        for (var i = 0; i < value.length; i++) {
+        for (let i = 0; i < value.length; i++) {
             (0, psdWriter_1.writeUint8)(writer, value.charCodeAt(i));
         }
     }
 }
 function readDescriptorStructure(reader, includeClass) {
-    var struct = readClassStructure(reader);
-    var object = includeClass ? { _name: struct.name, _classID: struct.classID } : {};
+    const struct = readClassStructure(reader);
+    const object = includeClass ? { _name: struct.name, _classID: struct.classID } : {};
     // console.log('>> ', struct);
-    var itemsCount = (0, psdReader_1.readUint32)(reader);
-    for (var i = 0; i < itemsCount; i++) {
-        var key = readAsciiStringOrClassId(reader);
-        var type = (0, psdReader_1.readSignature)(reader);
+    const itemsCount = (0, psdReader_1.readUint32)(reader);
+    for (let i = 0; i < itemsCount; i++) {
+        const key = readAsciiStringOrClassId(reader);
+        const type = (0, psdReader_1.readSignature)(reader);
         // console.log(`> '${key}' '${type}'`);
-        var data = readOSType(reader, type, includeClass);
+        const data = readOSType(reader, type, includeClass);
         // if (!getTypeByKey(key, data)) console.log(`> '${key}' '${type}'`, data);
         object[key] = data;
     }
@@ -387,19 +372,18 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
     // write class structure
     (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, name);
     writeAsciiStringOrClassId(writer, classId);
-    var keys = Object.keys(value);
-    var keyCount = keys.length;
+    const keys = Object.keys(value);
+    let keyCount = keys.length;
     if ('_name' in value)
         keyCount--;
     if ('_classID' in value)
         keyCount--;
     (0, psdWriter_1.writeUint32)(writer, keyCount);
-    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-        var key = keys_1[_i];
+    for (const key of keys) {
         if (key === '_name' || key === '_classID')
             continue;
-        var type = getTypeByKey(key, value[key], root, value);
-        var extType = fieldToExtType[key];
+        let type = getTypeByKey(key, value[key], root, value);
+        let extType = fieldToExtType[key];
         if (key === 'bounds' && root === 'text') {
             extType = makeType('', 'bounds');
         }
@@ -503,7 +487,7 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
         (0, psdWriter_1.writeSignature)(writer, type || 'long');
         writeOSType(writer, type || 'long', value[key], key, extType, root);
         if (logErrors && !type)
-            console.log("Missing descriptor field type for: '".concat(key, "' in"), value);
+            console.log(`Missing descriptor field type for: '${key}' in`, value);
     }
 }
 exports.writeDescriptorStructure = writeDescriptorStructure;
@@ -515,10 +499,10 @@ function readOSType(reader, type, includeClass) {
         case 'GlbO': // GlobalObject same as Descriptor
             return readDescriptorStructure(reader, includeClass);
         case 'VlLs': { // List
-            var length_1 = (0, psdReader_1.readInt32)(reader);
-            var items = [];
-            for (var i = 0; i < length_1; i++) {
-                var itemType = (0, psdReader_1.readSignature)(reader);
+            const length = (0, psdReader_1.readInt32)(reader);
+            const items = [];
+            for (let i = 0; i < length; i++) {
+                const itemType = (0, psdReader_1.readSignature)(reader);
                 // console.log('  >', itemType);
                 items.push(readOSType(reader, itemType, includeClass));
             }
@@ -527,32 +511,32 @@ function readOSType(reader, type, includeClass) {
         case 'doub': // Double
             return (0, psdReader_1.readFloat64)(reader);
         case 'UntF': { // Unit double
-            var units = (0, psdReader_1.readSignature)(reader);
-            var value = (0, psdReader_1.readFloat64)(reader);
+            const units = (0, psdReader_1.readSignature)(reader);
+            const value = (0, psdReader_1.readFloat64)(reader);
             if (!unitsMap[units])
-                throw new Error("Invalid units: ".concat(units));
-            return { units: unitsMap[units], value: value };
+                throw new Error(`Invalid units: ${units}`);
+            return { units: unitsMap[units], value };
         }
         case 'UnFl': { // Unit float
-            var units = (0, psdReader_1.readSignature)(reader);
-            var value = (0, psdReader_1.readFloat32)(reader);
+            const units = (0, psdReader_1.readSignature)(reader);
+            const value = (0, psdReader_1.readFloat32)(reader);
             if (!unitsMap[units])
-                throw new Error("Invalid units: ".concat(units));
-            return { units: unitsMap[units], value: value };
+                throw new Error(`Invalid units: ${units}`);
+            return { units: unitsMap[units], value };
         }
         case 'TEXT': // String
             return (0, psdReader_1.readUnicodeString)(reader);
         case 'enum': { // Enumerated
-            var enumType = readAsciiStringOrClassId(reader);
-            var value = readAsciiStringOrClassId(reader);
-            return "".concat(enumType, ".").concat(value);
+            const enumType = readAsciiStringOrClassId(reader);
+            const value = readAsciiStringOrClassId(reader);
+            return `${enumType}.${value}`;
         }
         case 'long': // Integer
             return (0, psdReader_1.readInt32)(reader);
         case 'comp': { // Large Integer
-            var low = (0, psdReader_1.readUint32)(reader);
-            var high = (0, psdReader_1.readUint32)(reader);
-            return { low: low, high: high };
+            const low = (0, psdReader_1.readUint32)(reader);
+            const high = (0, psdReader_1.readUint32)(reader);
+            return { low, high };
         }
         case 'bool': // Boolean
             return !!(0, psdReader_1.readUint8)(reader);
@@ -560,45 +544,45 @@ function readOSType(reader, type, includeClass) {
         case 'GlbC': // Class
             return readClassStructure(reader);
         case 'alis': { // Alias
-            var length_2 = (0, psdReader_1.readInt32)(reader);
-            return (0, psdReader_1.readAsciiString)(reader, length_2);
+            const length = (0, psdReader_1.readInt32)(reader);
+            return (0, psdReader_1.readAsciiString)(reader, length);
         }
         case 'tdta': { // Raw Data
-            var length_3 = (0, psdReader_1.readInt32)(reader);
-            return (0, psdReader_1.readBytes)(reader, length_3);
+            const length = (0, psdReader_1.readInt32)(reader);
+            return (0, psdReader_1.readBytes)(reader, length);
         }
         case 'ObAr': { // Object array
             (0, psdReader_1.readInt32)(reader); // version: 16
             (0, psdReader_1.readUnicodeString)(reader); // name: ''
             readAsciiStringOrClassId(reader); // 'rationalPoint'
-            var length_4 = (0, psdReader_1.readInt32)(reader);
-            var items = [];
-            for (var i = 0; i < length_4; i++) {
-                var type1 = readAsciiStringOrClassId(reader); // type Hrzn | Vrtc
+            const length = (0, psdReader_1.readInt32)(reader);
+            const items = [];
+            for (let i = 0; i < length; i++) {
+                const type1 = readAsciiStringOrClassId(reader); // type Hrzn | Vrtc
                 (0, psdReader_1.readSignature)(reader); // UnFl
                 (0, psdReader_1.readSignature)(reader); // units ? '#Pxl'
-                var valuesCount = (0, psdReader_1.readInt32)(reader);
-                var values = [];
-                for (var j = 0; j < valuesCount; j++) {
+                const valuesCount = (0, psdReader_1.readInt32)(reader);
+                const values = [];
+                for (let j = 0; j < valuesCount; j++) {
                     values.push((0, psdReader_1.readFloat64)(reader));
                 }
-                items.push({ type: type1, values: values });
+                items.push({ type: type1, values });
             }
             return items;
         }
         case 'Pth ': { // File path
             /*const length =*/ (0, psdReader_1.readInt32)(reader); // total size of all fields below
-            var sig = (0, psdReader_1.readSignature)(reader);
+            const sig = (0, psdReader_1.readSignature)(reader);
             /*const pathSize =*/ (0, psdReader_1.readInt32LE)(reader); // the same as length
-            var charsCount = (0, psdReader_1.readInt32LE)(reader);
-            var path = (0, psdReader_1.readUnicodeStringWithLengthLE)(reader, charsCount);
-            return { sig: sig, path: path };
+            const charsCount = (0, psdReader_1.readInt32LE)(reader);
+            const path = (0, psdReader_1.readUnicodeStringWithLengthLE)(reader, charsCount);
+            return { sig, path };
         }
         default:
-            throw new Error("Invalid TySh descriptor OSType: ".concat(type, " at ").concat(reader.offset.toString(16)));
+            throw new Error(`Invalid TySh descriptor OSType: ${type} at ${reader.offset.toString(16)}`);
     }
 }
-var ObArTypes = {
+const ObArTypes = {
     meshPoints: 'rationalPoint',
     quiltSliceX: 'UntF',
     quiltSliceY: 'UntF',
@@ -611,40 +595,40 @@ function writeOSType(writer, type, value, key, extType, root) {
         case 'Objc': // Descriptor
         case 'GlbO': { // GlobalObject same as Descriptor
             if (typeof value !== 'object')
-                throw new Error("Invalid struct value: ".concat(JSON.stringify(value), ", key: ").concat(key));
+                throw new Error(`Invalid struct value: ${JSON.stringify(value)}, key: ${key}`);
             if (!extType)
-                throw new Error("Missing ext type for: '".concat(key, "' (").concat(JSON.stringify(value), ")"));
-            var name_1 = value._name || extType.name;
-            var classID = value._classID || extType.classID;
-            writeDescriptorStructure(writer, name_1, classID, value, root);
+                throw new Error(`Missing ext type for: '${key}' (${JSON.stringify(value)})`);
+            const name = value._name || extType.name;
+            const classID = value._classID || extType.classID;
+            writeDescriptorStructure(writer, name, classID, value, root);
             break;
         }
         case 'VlLs': // List
             if (!Array.isArray(value))
-                throw new Error("Invalid list value: ".concat(JSON.stringify(value), ", key: ").concat(key));
+                throw new Error(`Invalid list value: ${JSON.stringify(value)}, key: ${key}`);
             (0, psdWriter_1.writeInt32)(writer, value.length);
-            for (var i = 0; i < value.length; i++) {
-                var type_1 = fieldToArrayType[key];
-                (0, psdWriter_1.writeSignature)(writer, type_1 || 'long');
-                writeOSType(writer, type_1 || 'long', value[i], "".concat(key, "[]"), fieldToArrayExtType[key], root);
-                if (logErrors && !type_1)
-                    console.log("Missing descriptor array type for: '".concat(key, "' in"), value);
+            for (let i = 0; i < value.length; i++) {
+                const type = fieldToArrayType[key];
+                (0, psdWriter_1.writeSignature)(writer, type || 'long');
+                writeOSType(writer, type || 'long', value[i], `${key}[]`, fieldToArrayExtType[key], root);
+                if (logErrors && !type)
+                    console.log(`Missing descriptor array type for: '${key}' in`, value);
             }
             break;
         case 'doub': // Double
             if (typeof value !== 'number')
-                throw new Error("Invalid number value: ".concat(JSON.stringify(value), ", key: ").concat(key));
+                throw new Error(`Invalid number value: ${JSON.stringify(value)}, key: ${key}`);
             (0, psdWriter_1.writeFloat64)(writer, value);
             break;
         case 'UntF': // Unit double
             if (!unitsMapRev[value.units])
-                throw new Error("Invalid units: ".concat(value.units, " in ").concat(key));
+                throw new Error(`Invalid units: ${value.units} in ${key}`);
             (0, psdWriter_1.writeSignature)(writer, unitsMapRev[value.units]);
             (0, psdWriter_1.writeFloat64)(writer, value.value);
             break;
         case 'UnFl': // Unit float
             if (!unitsMapRev[value.units])
-                throw new Error("Invalid units: ".concat(value.units, " in ").concat(key));
+                throw new Error(`Invalid units: ${value.units} in ${key}`);
             (0, psdWriter_1.writeSignature)(writer, unitsMapRev[value.units]);
             (0, psdWriter_1.writeFloat32)(writer, value.value);
             break;
@@ -653,22 +637,22 @@ function writeOSType(writer, type, value, key, extType, root) {
             break;
         case 'enum': { // Enumerated
             if (typeof value !== 'string')
-                throw new Error("Invalid enum value: ".concat(JSON.stringify(value), ", key: ").concat(key));
-            var _a = value.split('.'), _type = _a[0], val = _a[1];
+                throw new Error(`Invalid enum value: ${JSON.stringify(value)}, key: ${key}`);
+            const [_type, val] = value.split('.');
             writeAsciiStringOrClassId(writer, _type);
             writeAsciiStringOrClassId(writer, val);
             break;
         }
         case 'long': // Integer
             if (typeof value !== 'number')
-                throw new Error("Invalid integer value: ".concat(JSON.stringify(value), ", key: ").concat(key));
+                throw new Error(`Invalid integer value: ${JSON.stringify(value)}, key: ${key}`);
             (0, psdWriter_1.writeInt32)(writer, value);
             break;
         // case 'comp': // Large Integer
         // 	writeLargeInteger(reader);
         case 'bool': // Boolean
             if (typeof value !== 'boolean')
-                throw new Error("Invalid boolean value: ".concat(JSON.stringify(value), ", key: ").concat(key));
+                throw new Error(`Invalid boolean value: ${JSON.stringify(value)}, key: ${key}`);
             (0, psdWriter_1.writeUint8)(writer, value ? 1 : 0);
             break;
         // case 'type': // Class
@@ -683,44 +667,44 @@ function writeOSType(writer, type, value, key, extType, root) {
         case 'ObAr': { // Object array
             (0, psdWriter_1.writeInt32)(writer, 16); // version
             (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, ''); // name
-            var type_2 = ObArTypes[key];
-            if (!type_2)
-                throw new Error("Not implemented ObArType for: ".concat(key));
-            writeAsciiStringOrClassId(writer, type_2);
+            const type = ObArTypes[key];
+            if (!type)
+                throw new Error(`Not implemented ObArType for: ${key}`);
+            writeAsciiStringOrClassId(writer, type);
             (0, psdWriter_1.writeInt32)(writer, value.length);
-            for (var i = 0; i < value.length; i++) {
+            for (let i = 0; i < value.length; i++) {
                 writeAsciiStringOrClassId(writer, value[i].type); // Hrzn | Vrtc
                 (0, psdWriter_1.writeSignature)(writer, 'UnFl');
                 (0, psdWriter_1.writeSignature)(writer, '#Pxl');
                 (0, psdWriter_1.writeInt32)(writer, value[i].values.length);
-                for (var j = 0; j < value[i].values.length; j++) {
+                for (let j = 0; j < value[i].values.length; j++) {
                     (0, psdWriter_1.writeFloat64)(writer, value[i].values[j]);
                 }
             }
             break;
         }
         case 'Pth ': { // File path
-            var length_5 = 4 + 4 + 4 + value.path.length * 2;
-            (0, psdWriter_1.writeInt32)(writer, length_5);
+            const length = 4 + 4 + 4 + value.path.length * 2;
+            (0, psdWriter_1.writeInt32)(writer, length);
             (0, psdWriter_1.writeSignature)(writer, value.sig);
-            (0, psdWriter_1.writeInt32LE)(writer, length_5);
+            (0, psdWriter_1.writeInt32LE)(writer, length);
             (0, psdWriter_1.writeInt32LE)(writer, value.path.length);
             (0, psdWriter_1.writeUnicodeStringWithoutLengthLE)(writer, value.path);
             break;
         }
         default:
-            throw new Error("Not implemented descriptor OSType: ".concat(type));
+            throw new Error(`Not implemented descriptor OSType: ${type}`);
     }
 }
 function readReferenceStructure(reader) {
-    var itemsCount = (0, psdReader_1.readInt32)(reader);
-    var items = [];
-    for (var i = 0; i < itemsCount; i++) {
-        var type = (0, psdReader_1.readSignature)(reader);
+    const itemsCount = (0, psdReader_1.readInt32)(reader);
+    const items = [];
+    for (let i = 0; i < itemsCount; i++) {
+        const type = (0, psdReader_1.readSignature)(reader);
         switch (type) {
             case 'prop': { // Property
                 readClassStructure(reader);
-                var keyID = readAsciiStringOrClassId(reader);
+                const keyID = readAsciiStringOrClassId(reader);
                 items.push(keyID);
                 break;
             }
@@ -729,9 +713,9 @@ function readReferenceStructure(reader) {
                 break;
             case 'Enmr': { // Enumerated Reference
                 readClassStructure(reader);
-                var typeID = readAsciiStringOrClassId(reader);
-                var value = readAsciiStringOrClassId(reader);
-                items.push("".concat(typeID, ".").concat(value));
+                const typeID = readAsciiStringOrClassId(reader);
+                const value = readAsciiStringOrClassId(reader);
+                items.push(`${typeID}.${value}`);
                 break;
             }
             case 'rele': { // Offset
@@ -752,16 +736,16 @@ function readReferenceStructure(reader) {
                 break;
             }
             default:
-                throw new Error("Invalid descriptor reference type: ".concat(type));
+                throw new Error(`Invalid descriptor reference type: ${type}`);
         }
     }
     return items;
 }
 function writeReferenceStructure(writer, _key, items) {
     (0, psdWriter_1.writeInt32)(writer, items.length);
-    for (var i = 0; i < items.length; i++) {
-        var value = items[i];
-        var type = 'unknown';
+    for (let i = 0; i < items.length; i++) {
+        const value = items[i];
+        let type = 'unknown';
         if (typeof value === 'string') {
             if (/^[a-z ]+\.[a-z ]+$/i.test(value)) {
                 type = 'Enmr';
@@ -775,7 +759,7 @@ function writeReferenceStructure(writer, _key, items) {
             // case 'prop': // Property
             // case 'Clss': // Class
             case 'Enmr': { // Enumerated Reference
-                var _a = value.split('.'), typeID = _a[0], enumValue = _a[1];
+                const [typeID, enumValue] = value.split('.');
                 writeClassStructure(writer, '\0', typeID);
                 writeAsciiStringOrClassId(writer, typeID);
                 writeAsciiStringOrClassId(writer, enumValue);
@@ -790,32 +774,30 @@ function writeReferenceStructure(writer, _key, items) {
                 break;
             }
             default:
-                throw new Error("Invalid descriptor reference type: ".concat(type));
+                throw new Error(`Invalid descriptor reference type: ${type}`);
         }
     }
     return items;
 }
 function readClassStructure(reader) {
-    var name = (0, psdReader_1.readUnicodeString)(reader);
-    var classID = readAsciiStringOrClassId(reader);
-    return { name: name, classID: classID };
+    const name = (0, psdReader_1.readUnicodeString)(reader);
+    const classID = readAsciiStringOrClassId(reader);
+    return { name, classID };
 }
 function writeClassStructure(writer, name, classID) {
     (0, psdWriter_1.writeUnicodeString)(writer, name);
     writeAsciiStringOrClassId(writer, classID);
 }
-function readVersionAndDescriptor(reader, includeClass) {
-    if (includeClass === void 0) { includeClass = false; }
-    var version = (0, psdReader_1.readUint32)(reader);
+function readVersionAndDescriptor(reader, includeClass = false) {
+    const version = (0, psdReader_1.readUint32)(reader);
     if (version !== 16)
-        throw new Error("Invalid descriptor version: ".concat(version));
-    var desc = readDescriptorStructure(reader, includeClass);
+        throw new Error(`Invalid descriptor version: ${version}`);
+    const desc = readDescriptorStructure(reader, includeClass);
     // console.log(require('util').inspect(desc, false, 99, true));
     return desc;
 }
 exports.readVersionAndDescriptor = readVersionAndDescriptor;
-function writeVersionAndDescriptor(writer, name, classID, descriptor, root) {
-    if (root === void 0) { root = ''; }
+function writeVersionAndDescriptor(writer, name, classID, descriptor, root = '') {
     (0, psdWriter_1.writeUint32)(writer, 16); // version
     writeDescriptorStructure(writer, name, classID, descriptor, root);
 }
@@ -838,18 +820,16 @@ function descBoundsToBounds(desc) {
 }
 exports.descBoundsToBounds = descBoundsToBounds;
 function boundsToDescBounds(bounds) {
-    var _a;
-    return _a = {
-            Left: unitsValue(bounds.left, 'bounds.left')
-        },
-        _a['Top '] = unitsValue(bounds.top, 'bounds.top'),
-        _a.Rght = unitsValue(bounds.right, 'bounds.right'),
-        _a.Btom = unitsValue(bounds.bottom, 'bounds.bottom'),
-        _a;
+    return {
+        Left: unitsValue(bounds.left, 'bounds.left'),
+        ['Top ']: unitsValue(bounds.top, 'bounds.top'),
+        Rght: unitsValue(bounds.right, 'bounds.right'),
+        Btom: unitsValue(bounds.bottom, 'bounds.bottom'),
+    };
 }
 exports.boundsToDescBounds = boundsToDescBounds;
 function parseFxObject(fx) {
-    var stroke = {
+    const stroke = {
         enabled: !!fx.enab,
         position: exports.FStl.decode(fx.Styl),
         fillType: exports.FrFl.decode(fx.PntT),
@@ -872,7 +852,7 @@ function parseFxObject(fx) {
     return stroke;
 }
 function serializeFxObject(stroke) {
-    var FrFX = {};
+    let FrFX = {};
     FrFX.enab = !!stroke.enabled;
     if (stroke.present !== undefined)
         FrFX.present = !!stroke.present;
@@ -886,46 +866,45 @@ function serializeFxObject(stroke) {
     if (stroke.color)
         FrFX['Clr '] = serializeColor(stroke.color);
     if (stroke.gradient)
-        FrFX = __assign(__assign({}, FrFX), serializeGradientContent(stroke.gradient));
+        FrFX = Object.assign(Object.assign({}, FrFX), serializeGradientContent(stroke.gradient));
     if (stroke.pattern)
-        FrFX = __assign(__assign({}, FrFX), serializePatternContent(stroke.pattern));
+        FrFX = Object.assign(Object.assign({}, FrFX), serializePatternContent(stroke.pattern));
     if (stroke.overprint !== undefined)
         FrFX.overprint = !!stroke.overprint;
     return FrFX;
 }
 function serializeEffects(e, log, multi) {
     var _a, _b, _c;
-    var info = multi ? {
+    const info = multi ? {
         'Scl ': unitsPercentF((_a = e.scale) !== null && _a !== void 0 ? _a : 1),
         masterFXSwitch: !e.disabled,
     } : {
         masterFXSwitch: !e.disabled,
         'Scl ': unitsPercentF((_b = e.scale) !== null && _b !== void 0 ? _b : 1),
     };
-    var arrayKeys = ['dropShadow', 'innerShadow', 'solidFill', 'gradientOverlay', 'stroke'];
-    for (var _i = 0, arrayKeys_1 = arrayKeys; _i < arrayKeys_1.length; _i++) {
-        var key = arrayKeys_1[_i];
+    const arrayKeys = ['dropShadow', 'innerShadow', 'solidFill', 'gradientOverlay', 'stroke'];
+    for (const key of arrayKeys) {
         if (e[key] && !Array.isArray(e[key]))
-            throw new Error("".concat(key, " should be an array"));
+            throw new Error(`${key} should be an array`);
     }
-    var useMulti = function (arr) { return !!arr && arr.length > 1 && multi; };
-    var useSingle = function (arr) { return !!arr && arr.length >= 1 && (!multi || arr.length === 1); };
+    const useMulti = (arr) => !!arr && arr.length > 1 && multi;
+    const useSingle = (arr) => !!arr && arr.length >= 1 && (!multi || arr.length === 1);
     if (useSingle(e.dropShadow))
         info.DrSh = serializeEffectObject(e.dropShadow[0], 'dropShadow', log);
     if (useMulti(e.dropShadow))
-        info.dropShadowMulti = e.dropShadow.map(function (i) { return serializeEffectObject(i, 'dropShadow', log); });
+        info.dropShadowMulti = e.dropShadow.map(i => serializeEffectObject(i, 'dropShadow', log));
     if (useSingle(e.innerShadow))
         info.IrSh = serializeEffectObject(e.innerShadow[0], 'innerShadow', log);
     if (useMulti(e.innerShadow))
-        info.innerShadowMulti = e.innerShadow.map(function (i) { return serializeEffectObject(i, 'innerShadow', log); });
+        info.innerShadowMulti = e.innerShadow.map(i => serializeEffectObject(i, 'innerShadow', log));
     if (e.outerGlow)
         info.OrGl = serializeEffectObject(e.outerGlow, 'outerGlow', log);
     if (useMulti(e.solidFill))
-        info.solidFillMulti = e.solidFill.map(function (i) { return serializeEffectObject(i, 'solidFill', log); });
+        info.solidFillMulti = e.solidFill.map(i => serializeEffectObject(i, 'solidFill', log));
     if (useMulti(e.gradientOverlay))
-        info.gradientFillMulti = e.gradientOverlay.map(function (i) { return serializeEffectObject(i, 'gradientOverlay', log); });
+        info.gradientFillMulti = e.gradientOverlay.map(i => serializeEffectObject(i, 'gradientOverlay', log));
     if (useMulti(e.stroke))
-        info.frameFXMulti = e.stroke.map(function (i) { return serializeFxObject(i); });
+        info.frameFXMulti = e.stroke.map(i => serializeFxObject(i));
     if (e.innerGlow)
         info.IrGl = serializeEffectObject(e.innerGlow, 'innerGlow', log);
     if (e.bevel)
@@ -942,12 +921,10 @@ function serializeEffects(e, log, multi) {
         info.FrFX = serializeFxObject((_c = e.stroke) === null || _c === void 0 ? void 0 : _c[0]);
     if (multi) {
         info.numModifyingFX = 0;
-        for (var _d = 0, _e = Object.keys(e); _d < _e.length; _d++) {
-            var key = _e[_d];
-            var value = e[key];
+        for (const key of Object.keys(e)) {
+            const value = e[key];
             if (Array.isArray(value)) {
-                for (var _f = 0, value_1 = value; _f < value_1.length; _f++) {
-                    var effect = value_1[_f];
+                for (const effect of value) {
                     if (effect.enabled)
                         info.numModifyingFX++;
                 }
@@ -961,8 +938,8 @@ function serializeEffects(e, log, multi) {
 }
 exports.serializeEffects = serializeEffects;
 function parseEffects(info, log) {
-    var effects = {};
-    var masterFXSwitch = info.masterFXSwitch, DrSh = info.DrSh, dropShadowMulti = info.dropShadowMulti, IrSh = info.IrSh, innerShadowMulti = info.innerShadowMulti, OrGl = info.OrGl, IrGl = info.IrGl, ebbl = info.ebbl, SoFi = info.SoFi, solidFillMulti = info.solidFillMulti, patternFill = info.patternFill, GrFl = info.GrFl, gradientFillMulti = info.gradientFillMulti, ChFX = info.ChFX, FrFX = info.FrFX, frameFXMulti = info.frameFXMulti, numModifyingFX = info.numModifyingFX, rest = __rest(info, ["masterFXSwitch", "DrSh", "dropShadowMulti", "IrSh", "innerShadowMulti", "OrGl", "IrGl", "ebbl", "SoFi", "solidFillMulti", "patternFill", "GrFl", "gradientFillMulti", "ChFX", "FrFX", "frameFXMulti", "numModifyingFX"]);
+    const effects = {};
+    const { masterFXSwitch, DrSh, dropShadowMulti, IrSh, innerShadowMulti, OrGl, IrGl, ebbl, SoFi, solidFillMulti, patternFill, GrFl, gradientFillMulti, ChFX, FrFX, frameFXMulti, numModifyingFX } = info, rest = __rest(info, ["masterFXSwitch", "DrSh", "dropShadowMulti", "IrSh", "innerShadowMulti", "OrGl", "IrGl", "ebbl", "SoFi", "solidFillMulti", "patternFill", "GrFl", "gradientFillMulti", "ChFX", "FrFX", "frameFXMulti", "numModifyingFX"]);
     if (!masterFXSwitch)
         effects.disabled = true;
     if (info['Scl '])
@@ -970,11 +947,11 @@ function parseEffects(info, log) {
     if (DrSh)
         effects.dropShadow = [parseEffectObject(DrSh, log)];
     if (dropShadowMulti)
-        effects.dropShadow = dropShadowMulti.map(function (i) { return parseEffectObject(i, log); });
+        effects.dropShadow = dropShadowMulti.map(i => parseEffectObject(i, log));
     if (IrSh)
         effects.innerShadow = [parseEffectObject(IrSh, log)];
     if (innerShadowMulti)
-        effects.innerShadow = innerShadowMulti.map(function (i) { return parseEffectObject(i, log); });
+        effects.innerShadow = innerShadowMulti.map(i => parseEffectObject(i, log));
     if (OrGl)
         effects.outerGlow = parseEffectObject(OrGl, log);
     if (IrGl)
@@ -984,76 +961,70 @@ function parseEffects(info, log) {
     if (SoFi)
         effects.solidFill = [parseEffectObject(SoFi, log)];
     if (solidFillMulti)
-        effects.solidFill = solidFillMulti.map(function (i) { return parseEffectObject(i, log); });
+        effects.solidFill = solidFillMulti.map(i => parseEffectObject(i, log));
     if (patternFill)
         effects.patternOverlay = parseEffectObject(patternFill, log);
     if (GrFl)
         effects.gradientOverlay = [parseEffectObject(GrFl, log)];
     if (gradientFillMulti)
-        effects.gradientOverlay = gradientFillMulti.map(function (i) { return parseEffectObject(i, log); });
+        effects.gradientOverlay = gradientFillMulti.map(i => parseEffectObject(i, log));
     if (ChFX)
         effects.satin = parseEffectObject(ChFX, log);
     if (FrFX)
         effects.stroke = [parseFxObject(FrFX)];
     if (frameFXMulti)
-        effects.stroke = frameFXMulti.map(function (i) { return parseFxObject(i); });
+        effects.stroke = frameFXMulti.map(i => parseFxObject(i));
     if (log && Object.keys(rest).length > 1)
         console.log('Unhandled effect keys:', rest);
     return effects;
 }
 exports.parseEffects = parseEffects;
 function parseKeyList(keyList, logMissingFeatures) {
-    var keys = [];
-    for (var j = 0; j < keyList.length; j++) {
-        var key = keyList[j];
-        var _a = key.time, denominator = _a.denominator, numerator = _a.numerator, selected = key.selected, animKey = key.animKey;
-        var time = { numerator: numerator, denominator: denominator };
-        var interpolation = exports.animInterpStyleEnum.decode(key.animInterpStyle);
+    const keys = [];
+    for (let j = 0; j < keyList.length; j++) {
+        const key = keyList[j];
+        const { time: { denominator, numerator }, selected, animKey } = key;
+        const time = { numerator, denominator };
+        const interpolation = exports.animInterpStyleEnum.decode(key.animInterpStyle);
         switch (animKey.Type) {
             case 'keyType.Opct':
-                keys.push({ interpolation: interpolation, time: time, selected: selected, type: 'opacity', value: parsePercent(animKey.Opct) });
+                keys.push({ interpolation, time, selected, type: 'opacity', value: parsePercent(animKey.Opct) });
                 break;
             case 'keyType.Pstn':
-                keys.push({ interpolation: interpolation, time: time, selected: selected, type: 'position', x: animKey.Hrzn, y: animKey.Vrtc });
+                keys.push({ interpolation, time, selected, type: 'position', x: animKey.Hrzn, y: animKey.Vrtc });
                 break;
             case 'keyType.Trnf':
                 keys.push({
-                    interpolation: interpolation,
-                    time: time,
-                    selected: selected,
-                    type: 'transform',
+                    interpolation, time, selected, type: 'transform',
                     scale: horzVrtcToXY(animKey['Scl ']), skew: horzVrtcToXY(animKey.Skew), rotation: animKey.rotation, translation: horzVrtcToXY(animKey.translation)
                 });
                 break;
             case 'keyType.sheetStyle': {
-                var key_1 = { interpolation: interpolation, time: time, selected: selected, type: 'style' };
+                const key = { interpolation, time, selected, type: 'style' };
                 if (animKey.sheetStyle.Lefx)
-                    key_1.style = parseEffects(animKey.sheetStyle.Lefx, logMissingFeatures);
-                keys.push(key_1);
+                    key.style = parseEffects(animKey.sheetStyle.Lefx, logMissingFeatures);
+                keys.push(key);
                 break;
             }
             case 'keyType.globalLighting': {
                 keys.push({
-                    interpolation: interpolation,
-                    time: time,
-                    selected: selected,
-                    type: 'globalLighting',
+                    interpolation, time, selected, type: 'globalLighting',
                     globalAngle: animKey.gblA, globalAltitude: animKey.globalAltitude
                 });
                 break;
             }
-            default: throw new Error("Unsupported keyType value");
+            default: throw new Error(`Unsupported keyType value`);
         }
     }
     return keys;
 }
 function serializeKeyList(keys) {
-    var keyList = [];
-    for (var j = 0; j < keys.length; j++) {
-        var key = keys[j];
-        var time = key.time, _a = key.selected, selected = _a === void 0 ? false : _a, interpolation = key.interpolation;
-        var animInterpStyle = exports.animInterpStyleEnum.encode(interpolation);
-        var animKey = void 0;
+    const keyList = [];
+    for (let j = 0; j < keys.length; j++) {
+        const key = keys[j];
+        const { time, selected = false, interpolation } = key;
+        const animInterpStyle = exports.animInterpStyleEnum.encode(interpolation);
+        let animKey;
         switch (key.type) {
             case 'opacity':
                 animKey = { Type: 'keyType.Opct', Opct: unitsPercent(key.value) };
@@ -1073,17 +1044,17 @@ function serializeKeyList(keys) {
                 animKey = { Type: 'keyType.globalLighting', gblA: key.globalAngle, globalAltitude: key.globalAltitude };
                 break;
             }
-            default: throw new Error("Unsupported keyType value");
+            default: throw new Error(`Unsupported keyType value`);
         }
-        keyList.push({ Vrsn: 1, animInterpStyle: animInterpStyle, time: time, animKey: animKey, selected: selected });
+        keyList.push({ Vrsn: 1, animInterpStyle, time, animKey, selected });
     }
     return keyList;
 }
 function parseTrackList(trackList, logMissingFeatures) {
-    var tracks = [];
-    for (var i = 0; i < trackList.length; i++) {
-        var tr = trackList[i];
-        var track = {
+    const tracks = [];
+    for (let i = 0; i < trackList.length; i++) {
+        const tr = trackList[i];
+        const track = {
             type: exports.stdTrackID.decode(tr.trackID),
             enabled: tr.enab,
             keys: parseKeyList(tr.keyList, logMissingFeatures),
@@ -1101,10 +1072,10 @@ function parseTrackList(trackList, logMissingFeatures) {
 }
 exports.parseTrackList = parseTrackList;
 function serializeTrackList(tracks) {
-    var trackList = [];
-    for (var i = 0; i < tracks.length; i++) {
-        var t = tracks[i];
-        trackList.push(__assign(__assign({ trackID: exports.stdTrackID.encode(t.type), Vrsn: 1, enab: !!t.enabled, Effc: !!t.effectParams }, (t.effectParams ? {
+    const trackList = [];
+    for (let i = 0; i < tracks.length; i++) {
+        const t = tracks[i];
+        trackList.push(Object.assign(Object.assign({ trackID: exports.stdTrackID.encode(t.type), Vrsn: 1, enab: !!t.enabled, Effc: !!t.effectParams }, (t.effectParams ? {
             effectParams: {
                 keyList: serializeKeyList(t.keys),
                 fillCanvas: t.effectParams.fillCanvas,
@@ -1116,10 +1087,9 @@ function serializeTrackList(tracks) {
 }
 exports.serializeTrackList = serializeTrackList;
 function parseEffectObject(obj, reportErrors) {
-    var result = {};
-    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
-        var key = _a[_i];
-        var val = obj[key];
+    const result = {};
+    for (const key of Object.keys(obj)) {
+        const val = obj[key];
         switch (key) {
             case 'enab':
                 result.enabled = !!val;
@@ -1242,7 +1212,7 @@ function parseEffectObject(obj, reportErrors) {
             case 'TrnS':
                 result.contour = {
                     name: val['Nm  '],
-                    curve: val['Crv '].map(function (p) { return ({ x: p.Hrzn, y: p.Vrtc }); }),
+                    curve: val['Crv '].map(p => ({ x: p.Hrzn, y: p.Vrtc })),
                 };
                 break;
             case 'Grad':
@@ -1260,22 +1230,21 @@ function parseEffectObject(obj, reportErrors) {
             case '_classID':
                 break;
             default:
-                reportErrors && console.log("Invalid effect key: '".concat(key, "', value:"), val);
+                reportErrors && console.log(`Invalid effect key: '${key}', value:`, val);
         }
     }
     return result;
 }
 function serializeEffectObject(obj, objName, reportErrors) {
-    var result = {
+    const result = {
         enab: false,
     };
     if (objName === 'dropShadow') {
         result.TrnS = { 'Nm  ': '', 'Crv ': [] };
     }
-    for (var _i = 0, _a = Object.keys(obj); _i < _a.length; _i++) {
-        var objKey = _a[_i];
-        var key = objKey;
-        var val = obj[key];
+    for (const objKey of Object.keys(obj)) {
+        const key = objKey;
+        const val = obj[key];
         switch (key) {
             case 'enabled':
                 result.enab = !!val;
@@ -1401,7 +1370,7 @@ function serializeEffectObject(obj, objName, reportErrors) {
             case 'contour': {
                 result[objName === 'satin' ? 'MpgS' : 'TrnS'] = {
                     'Nm  ': val.name,
-                    'Crv ': val.curve.map(function (p) { return ({ Hrzn: p.x, Vrtc: p.y }); }),
+                    'Crv ': val.curve.map(p => ({ Hrzn: p.x, Vrtc: p.y })),
                 };
                 break;
             }
@@ -1417,28 +1386,28 @@ function serializeEffectObject(obj, objName, reportErrors) {
                 result[key] = val;
                 break;
             default:
-                reportErrors && console.log("Invalid effect key: '".concat(key, "', value:"), val);
+                reportErrors && console.log(`Invalid effect key: '${key}', value:`, val);
         }
     }
     return result;
 }
 function parseGradient(grad) {
     if (grad.GrdF === 'GrdF.CstS') {
-        var samples_1 = grad.Intr || 4096;
+        const samples = grad.Intr || 4096;
         return {
             type: 'solid',
             name: grad['Nm  '],
             smoothness: grad.Intr / 4096,
-            colorStops: grad.Clrs.map(function (s) { return ({
+            colorStops: grad.Clrs.map(s => ({
                 color: parseColor(s['Clr ']),
-                location: s.Lctn / samples_1,
+                location: s.Lctn / samples,
                 midpoint: s.Mdpn / 100,
-            }); }),
-            opacityStops: grad.Trns.map(function (s) { return ({
+            })),
+            opacityStops: grad.Trns.map(s => ({
                 opacity: parsePercent(s.Opct),
-                location: s.Lctn / samples_1,
+                location: s.Lctn / samples,
                 midpoint: s.Mdpn / 100,
-            }); }),
+            })),
         };
     }
     else {
@@ -1450,33 +1419,33 @@ function parseGradient(grad) {
             randomSeed: grad.RndS,
             restrictColors: !!grad.VctC,
             addTransparency: !!grad.ShTr,
-            min: grad['Mnm '].map(function (x) { return x / 100; }),
-            max: grad['Mxm '].map(function (x) { return x / 100; }),
+            min: grad['Mnm '].map(x => x / 100),
+            max: grad['Mxm '].map(x => x / 100),
         };
     }
 }
 function serializeGradient(grad) {
     var _a, _b;
     if (grad.type === 'solid') {
-        var samples_2 = Math.round(((_a = grad.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);
+        const samples = Math.round(((_a = grad.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);
         return {
             'Nm  ': grad.name || '',
             GrdF: 'GrdF.CstS',
-            Intr: samples_2,
-            Clrs: grad.colorStops.map(function (s) {
+            Intr: samples,
+            Clrs: grad.colorStops.map(s => {
                 var _a;
                 return ({
                     'Clr ': serializeColor(s.color),
                     Type: 'Clry.UsrS',
-                    Lctn: Math.round(s.location * samples_2),
+                    Lctn: Math.round(s.location * samples),
                     Mdpn: Math.round(((_a = s.midpoint) !== null && _a !== void 0 ? _a : 0.5) * 100),
                 });
             }),
-            Trns: grad.opacityStops.map(function (s) {
+            Trns: grad.opacityStops.map(s => {
                 var _a;
                 return ({
                     Opct: unitsPercent(s.opacity),
-                    Lctn: Math.round(s.location * samples_2),
+                    Lctn: Math.round(s.location * samples),
                     Mdpn: Math.round(((_a = s.midpoint) !== null && _a !== void 0 ? _a : 0.5) * 100),
                 });
             }),
@@ -1491,13 +1460,13 @@ function serializeGradient(grad) {
             ClrS: exports.ClrS.encode(grad.colorModel),
             RndS: grad.randomSeed || 0,
             Smth: Math.round(((_b = grad.roughness) !== null && _b !== void 0 ? _b : 1) * 4096),
-            'Mnm ': (grad.min || [0, 0, 0, 0]).map(function (x) { return x * 100; }),
-            'Mxm ': (grad.max || [1, 1, 1, 1]).map(function (x) { return x * 100; }),
+            'Mnm ': (grad.min || [0, 0, 0, 0]).map(x => x * 100),
+            'Mxm ': (grad.max || [1, 1, 1, 1]).map(x => x * 100),
         };
     }
 }
 function parseGradientContent(descriptor) {
-    var result = parseGradient(descriptor.Grad);
+    const result = parseGradient(descriptor.Grad);
     result.style = exports.GrdT.decode(descriptor.Type);
     if (descriptor.Dthr !== undefined)
         result.dither = descriptor.Dthr;
@@ -1520,7 +1489,7 @@ function parseGradientContent(descriptor) {
     return result;
 }
 function parsePatternContent(descriptor) {
-    var result = {
+    const result = {
         name: descriptor.Ptrn['Nm  '],
         id: descriptor.Ptrn.Idnt,
     };
@@ -1535,7 +1504,7 @@ function parseVectorContent(descriptor) {
         return parseGradientContent(descriptor);
     }
     else if ('Ptrn' in descriptor) {
-        return __assign({ type: 'pattern' }, parsePatternContent(descriptor));
+        return Object.assign({ type: 'pattern' }, parsePatternContent(descriptor));
     }
     else if ('Clr ' in descriptor) {
         return { type: 'color', color: parseColor(descriptor['Clr ']) };
@@ -1546,7 +1515,7 @@ function parseVectorContent(descriptor) {
 }
 exports.parseVectorContent = parseVectorContent;
 function serializeGradientContent(content) {
-    var result = {};
+    const result = {};
     if (content.dither !== undefined)
         result.Dthr = content.dither;
     if (content.interpolationMethod !== undefined)
@@ -1570,7 +1539,7 @@ function serializeGradientContent(content) {
     return result;
 }
 function serializePatternContent(content) {
-    var result = {
+    const result = {
         Ptrn: {
             'Nm  ': content.name || '',
             Idnt: content.id || '',
@@ -1649,7 +1618,7 @@ function parseAngle(x) {
     if (x === undefined)
         return 0;
     if (x.units !== 'Angle')
-        throw new Error("Invalid units: ".concat(x.units));
+        throw new Error(`Invalid units: ${x.units}`);
     return x.value;
 }
 exports.parseAngle = parseAngle;
@@ -1657,7 +1626,7 @@ function parsePercent(x) {
     if (x === undefined)
         return 1;
     if (x.units !== 'Percent')
-        throw new Error("Invalid units: ".concat(x.units));
+        throw new Error(`Invalid units: ${x.units}`);
     return x.value / 100;
 }
 exports.parsePercent = parsePercent;
@@ -1668,29 +1637,26 @@ function parsePercentOrAngle(x) {
         return x.value / 100;
     if (x.units === 'Angle')
         return x.value / 360;
-    throw new Error("Invalid units: ".concat(x.units));
+    throw new Error(`Invalid units: ${x.units}`);
 }
 exports.parsePercentOrAngle = parsePercentOrAngle;
-function parseUnits(_a) {
-    var units = _a.units, value = _a.value;
+function parseUnits({ units, value }) {
     if (units !== 'Pixels' && units !== 'Millimeters' && units !== 'Points' && units !== 'None' &&
         units !== 'Picas' && units !== 'Inches' && units !== 'Centimeters' && units !== 'Density') {
-        throw new Error("Invalid units: ".concat(JSON.stringify({ units: units, value: value })));
+        throw new Error(`Invalid units: ${JSON.stringify({ units, value })}`);
     }
-    return { value: value, units: units };
+    return { value, units };
 }
 exports.parseUnits = parseUnits;
-function parseUnitsOrNumber(value, units) {
-    if (units === void 0) { units = 'Pixels'; }
+function parseUnitsOrNumber(value, units = 'Pixels') {
     if (typeof value === 'number')
-        return { value: value, units: units };
+        return { value, units };
     return parseUnits(value);
 }
 exports.parseUnitsOrNumber = parseUnitsOrNumber;
-function parseUnitsToNumber(_a, expectedUnits) {
-    var units = _a.units, value = _a.value;
+function parseUnitsToNumber({ units, value }, expectedUnits) {
     if (units !== expectedUnits)
-        throw new Error("Invalid units: ".concat(JSON.stringify({ units: units, value: value })));
+        throw new Error(`Invalid units: ${JSON.stringify({ units, value })}`);
     return value;
 }
 exports.parseUnitsToNumber = parseUnitsToNumber;
@@ -1710,20 +1676,19 @@ function unitsValue(x, key) {
     if (x == null)
         return { units: 'Pixels', value: 0 };
     if (typeof x !== 'object')
-        throw new Error("Invalid value: ".concat(JSON.stringify(x), " (key: ").concat(key, ") (should have value and units)"));
-    var units = x.units, value = x.value;
+        throw new Error(`Invalid value: ${JSON.stringify(x)} (key: ${key}) (should have value and units)`);
+    const { units, value } = x;
     if (typeof value !== 'number')
-        throw new Error("Invalid value in ".concat(JSON.stringify(x), " (key: ").concat(key, ")"));
+        throw new Error(`Invalid value in ${JSON.stringify(x)} (key: ${key})`);
     if (units !== 'Pixels' && units !== 'Millimeters' && units !== 'Points' && units !== 'None' &&
         units !== 'Picas' && units !== 'Inches' && units !== 'Centimeters' && units !== 'Density') {
-        throw new Error("Invalid units in ".concat(JSON.stringify(x), " (key: ").concat(key, ")"));
+        throw new Error(`Invalid units in ${JSON.stringify(x)} (key: ${key})`);
     }
-    return { units: units, value: value };
+    return { units, value };
 }
 exports.unitsValue = unitsValue;
-function frac(_a) {
-    var numerator = _a.numerator, denominator = _a.denominator;
-    return { numerator: numerator, denominator: denominator };
+function frac({ numerator, denominator }) {
+    return { numerator, denominator };
 }
 exports.frac = frac;
 exports.textGridding = (0, helpers_1.createEnum)('textGridding', 'none', {