ag-psd 25.0.0 → 27.0.0

package/dist/bundle.js

@@ -298,7 +298,7 @@ function readAbr(buffer, options) {
 }
 exports.readAbr = readAbr;
 
-},{"./descriptor":4,"./psdReader":11}],2:[function(require,module,exports){
+},{"./descriptor":4,"./psdReader":12}],2:[function(require,module,exports){
 "use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -321,6 +321,7 @@ var psdWriter_1 = require("./psdWriter");
 var descriptor_1 = require("./descriptor");
 var engineData_1 = require("./engineData");
 var text_1 = require("./text");
+var engineData2_1 = require("./engineData2");
 var fromAtoZ = 'abcdefghijklmnopqrstuvwxyz';
 exports.infoHandlers = [];
 exports.infoHandlersMap = {};
@@ -640,58 +641,55 @@ addHandler('vogk', hasKey('vectorOrigination'), function (reader, target, left)
     var desc = { keyDescriptorList: [] };
     for (var i = 0; i < orig.keyDescriptorList.length; i++) {
         var item = orig.keyDescriptorList[i];
-        if (item.keyShapeInvalidated) {
-            desc.keyDescriptorList.push({ keyShapeInvalidated: true, keyOriginIndex: i });
+        desc.keyDescriptorList.push({}); // we're adding keyOriginIndex at the end
+        var out = desc.keyDescriptorList[desc.keyDescriptorList.length - 1];
+        if (item.keyOriginType != null)
+            out.keyOriginType = item.keyOriginType;
+        if (item.keyOriginResolution != null)
+            out.keyOriginResolution = item.keyOriginResolution;
+        var radii = item.keyOriginRRectRadii;
+        if (radii) {
+            out.keyOriginRRectRadii = {
+                unitValueQuadVersion: 1,
+                topRight: (0, descriptor_1.unitsValue)(radii.topRight, 'topRight'),
+                topLeft: (0, descriptor_1.unitsValue)(radii.topLeft, 'topLeft'),
+                bottomLeft: (0, descriptor_1.unitsValue)(radii.bottomLeft, 'bottomLeft'),
+                bottomRight: (0, descriptor_1.unitsValue)(radii.bottomRight, 'bottomRight'),
+            };
         }
-        else {
-            desc.keyDescriptorList.push({}); // we're adding keyOriginIndex at the end
-            var out = desc.keyDescriptorList[desc.keyDescriptorList.length - 1];
-            if (item.keyOriginType != null)
-                out.keyOriginType = item.keyOriginType;
-            if (item.keyOriginResolution != null)
-                out.keyOriginResolution = item.keyOriginResolution;
-            var radii = item.keyOriginRRectRadii;
-            if (radii) {
-                out.keyOriginRRectRadii = {
-                    unitValueQuadVersion: 1,
-                    topRight: (0, descriptor_1.unitsValue)(radii.topRight, 'topRight'),
-                    topLeft: (0, descriptor_1.unitsValue)(radii.topLeft, 'topLeft'),
-                    bottomLeft: (0, descriptor_1.unitsValue)(radii.bottomLeft, 'bottomLeft'),
-                    bottomRight: (0, descriptor_1.unitsValue)(radii.bottomRight, 'bottomRight'),
-                };
-            }
-            var box = item.keyOriginShapeBoundingBox;
-            if (box) {
-                out.keyOriginShapeBBox = {
-                    unitValueQuadVersion: 1,
-                    'Top ': (0, descriptor_1.unitsValue)(box.top, 'top'),
-                    Left: (0, descriptor_1.unitsValue)(box.left, 'left'),
-                    Btom: (0, descriptor_1.unitsValue)(box.bottom, 'bottom'),
-                    Rght: (0, descriptor_1.unitsValue)(box.right, 'right'),
-                };
-            }
-            var corners = item.keyOriginBoxCorners;
-            if (corners && corners.length === 4) {
-                out.keyOriginBoxCorners = {
-                    rectangleCornerA: { Hrzn: corners[0].x, Vrtc: corners[0].y },
-                    rectangleCornerB: { Hrzn: corners[1].x, Vrtc: corners[1].y },
-                    rectangleCornerC: { Hrzn: corners[2].x, Vrtc: corners[2].y },
-                    rectangleCornerD: { Hrzn: corners[3].x, Vrtc: corners[3].y },
-                };
-            }
-            var transform = item.transform;
-            if (transform && transform.length === 6) {
-                out.Trnf = {
-                    xx: transform[0],
-                    xy: transform[1],
-                    yx: transform[2],
-                    yy: transform[3],
-                    tx: transform[4],
-                    ty: transform[5],
-                };
-            }
-            out.keyOriginIndex = i;
+        var box = item.keyOriginShapeBoundingBox;
+        if (box) {
+            out.keyOriginShapeBBox = {
+                unitValueQuadVersion: 1,
+                'Top ': (0, descriptor_1.unitsValue)(box.top, 'top'),
+                Left: (0, descriptor_1.unitsValue)(box.left, 'left'),
+                Btom: (0, descriptor_1.unitsValue)(box.bottom, 'bottom'),
+                Rght: (0, descriptor_1.unitsValue)(box.right, 'right'),
+            };
+        }
+        var corners = item.keyOriginBoxCorners;
+        if (corners && corners.length === 4) {
+            out.keyOriginBoxCorners = {
+                rectangleCornerA: { Hrzn: corners[0].x, Vrtc: corners[0].y },
+                rectangleCornerB: { Hrzn: corners[1].x, Vrtc: corners[1].y },
+                rectangleCornerC: { Hrzn: corners[2].x, Vrtc: corners[2].y },
+                rectangleCornerD: { Hrzn: corners[3].x, Vrtc: corners[3].y },
+            };
+        }
+        var transform = item.transform;
+        if (transform && transform.length === 6) {
+            out.Trnf = {
+                xx: transform[0],
+                xy: transform[1],
+                yx: transform[2],
+                yy: transform[3],
+                tx: transform[4],
+                ty: transform[5],
+            };
         }
+        if (item.keyShapeInvalidated != null)
+            out.keyShapeInvalidated = item.keyShapeInvalidated;
+        out.keyOriginIndex = i;
     }
     (0, psdWriter_1.writeInt32)(writer, 1); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
@@ -1163,7 +1161,13 @@ function isQuiltWarp(warp) {
 }
 function encodeWarp(warp) {
     var bounds = warp.bounds;
-    var desc = __assign(__assign({ warpStyle: descriptor_1.warpStyle.encode(warp.style) }, (warp.values ? { warpValues: warp.values } : { warpValue: warp.value || 0 })), { warpPerspective: warp.perspective || 0, warpPerspectiveOther: warp.perspectiveOther || 0, warpRotate: descriptor_1.Ornt.encode(warp.rotate), bounds: {
+    var desc = __assign(__assign({ warpStyle: descriptor_1.warpStyle.encode(warp.style) }, (warp.values ? { warpValues: warp.values } : { warpValue: warp.value || 0 })), { warpPerspective: warp.perspective || 0, warpPerspectiveOther: warp.perspectiveOther || 0, warpRotate: descriptor_1.Ornt.encode(warp.rotate), bounds: /*1 ? { // testing
+            _classID: 'classFloatRect',
+            'Top ': bounds && bounds.top && bounds.top.value || 0,
+            Left: bounds && bounds.left && bounds.left.value || 0,
+            Btom: bounds && bounds.bottom && bounds.bottom.value || 0,
+            Rght: bounds && bounds.right && bounds.right.value || 0,
+        } :*/ {
             'Top ': (0, descriptor_1.unitsValue)(bounds && bounds.top || { units: 'Pixels', value: 0 }, 'bounds.top'),
             Left: (0, descriptor_1.unitsValue)(bounds && bounds.left || { units: 'Pixels', value: 0 }, 'bounds.left'),
             Btom: (0, descriptor_1.unitsValue)(bounds && bounds.bottom || { units: 'Pixels', value: 0 }, 'bounds.bottom'),
@@ -1728,6 +1732,7 @@ function serializeFilterFXItem(f) {
                 'Rds ': uvRadius(f.filter),
             }, filterID: 697 });
         case 'gaussian blur': return __assign(__assign({}, base), { Fltr: {
+                // _name: '高斯模糊', // Testing
                 _name: 'Gaussian Blur',
                 _classID: 'GsnB',
                 'Rds ': uvRadius(f.filter),
@@ -3386,11 +3391,38 @@ addHandler('CgEd', function (target) {
         throw new Error('Unhandled CgEd case');
     }
 });
-addHandler('Txt2', hasKey('engineData'), function (reader, target, left) {
+function getTextLayersSortedByIndex(psd) {
+    var layers = [];
+    function collect(layer) {
+        var _a;
+        if (layer.children) {
+            for (var _i = 0, _b = layer.children; _i < _b.length; _i++) {
+                var child = _b[_i];
+                if (((_a = child.text) === null || _a === void 0 ? void 0 : _a.index) !== undefined) {
+                    layers[child.text.index] = child;
+                }
+                collect(child);
+            }
+        }
+    }
+    collect(psd);
+    return layers;
+}
+addHandler('Txt2', hasKey('engineData'), function (reader, target, left, psd) {
     var data = (0, psdReader_1.readBytes)(reader, left());
     target.engineData = (0, base64_js_1.fromByteArray)(data);
-    // const engineData = parseEngineData(data);
-    // const engineData2 = decodeEngineData2(engineData);
+    var layersByIndex = getTextLayersSortedByIndex(psd);
+    var engineData = (0, engineData_1.parseEngineData)(data);
+    var engineData2 = (0, engineData2_1.decodeEngineData2)(engineData);
+    var TextFrameSet = engineData2.ResourceDict.TextFrameSet;
+    if (TextFrameSet) {
+        for (var i = 0; i < TextFrameSet.length; i++) {
+            var layer = layersByIndex[i];
+            if (TextFrameSet[i].path && (layer === null || layer === void 0 ? void 0 : layer.text)) {
+                layer.text.textPath = TextFrameSet[i].path;
+            }
+        }
+    }
     // console.log(require('util').inspect(engineData, false, 99, true));
     // require('fs').writeFileSync('test_data.bin', data);
     // require('fs').writeFileSync('test_data.txt', require('util').inspect(engineData, false, 99, false), 'utf8');
@@ -3660,7 +3692,7 @@ addHandler('tsly', hasKey('transparencyShapesLayer'), function (reader, target)
     (0, psdWriter_1.writeZeros)(writer, 3);
 });
 
-},{"./descriptor":4,"./effectsHelpers":5,"./engineData":6,"./helpers":7,"./psdReader":11,"./psdWriter":12,"./text":13,"base64-js":15}],3:[function(require,module,exports){
+},{"./descriptor":4,"./effectsHelpers":5,"./engineData":6,"./engineData2":7,"./helpers":8,"./psdReader":12,"./psdWriter":13,"./text":14,"base64-js":16}],3:[function(require,module,exports){
 "use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -3709,7 +3741,7 @@ function readCsh(buffer) {
 }
 exports.readCsh = readCsh;
 
-},{"./additionalInfo":2,"./psdReader":11}],4:[function(require,module,exports){
+},{"./additionalInfo":2,"./psdReader":12}],4:[function(require,module,exports){
 "use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -3756,12 +3788,13 @@ function makeType(name, classID) {
     return { name: name, classID: classID };
 }
 var nullType = makeType('', 'null');
+var USE_CHINESE = false; // Testing
 var fieldToExtType = {
     strokeStyleContent: makeType('', 'solidColorLayer'),
-    // printProofSetup: makeType('校样设置', 'proofSetup'), // TESTING
-    printProofSetup: makeType('Proof Setup', 'proofSetup'),
+    printProofSetup: makeType(USE_CHINESE ? '校样设置' : 'Proof Setup', 'proofSetup'),
+    Grad: makeType(USE_CHINESE ? '渐变' : 'Gradient', 'Grdn'),
+    Trnf: makeType(USE_CHINESE ? '变换' : 'Transform', 'Trnf'),
     patternFill: makeType('', 'patternFill'),
-    Grad: makeType('Gradient', 'Grdn'),
     ebbl: makeType('', 'ebbl'),
     SoFi: makeType('', 'SoFi'),
     GrFl: makeType('', 'GrFl'),
@@ -3803,7 +3836,6 @@ var fieldToExtType = {
     rectangleCornerC: makeType('', 'Pnt '),
     rectangleCornerD: makeType('', 'Pnt '),
     compInfo: nullType,
-    Trnf: makeType('Transform', 'Trnf'),
     quiltWarp: makeType('', 'quiltWarp'),
     generatorSettings: nullType,
     crema: nullType,
@@ -5729,7 +5761,7 @@ exports.presetKindType = (0, helpers_1.createEnum)('presetKindType', 'presetKind
     default: 'presetKindDefault',
 });
 
-},{"./helpers":7,"./psdReader":11,"./psdWriter":12}],5:[function(require,module,exports){
+},{"./helpers":8,"./psdReader":12,"./psdWriter":13}],5:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeEffects = exports.readEffects = void 0;
@@ -6039,7 +6071,7 @@ function writeEffects(writer, effects) {
 }
 exports.writeEffects = writeEffects;
 
-},{"./helpers":7,"./psdReader":11,"./psdWriter":12}],6:[function(require,module,exports){
+},{"./helpers":8,"./psdReader":12,"./psdWriter":13}],6:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeEngineData = exports.parseEngineData = void 0;
@@ -6379,6 +6411,419 @@ exports.serializeEngineData = serializeEngineData;
 
 },{}],7:[function(require,module,exports){
 "use strict";
+/// Engine data 2 experiments
+// /test/engineData2.json:1109 is character codes
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeEngineData2 = void 0;
+var keysColor = {
+    '0': {
+        uproot: true,
+        children: {
+            '0': { name: 'Type' },
+            '1': { name: 'Values' },
+        },
+    },
+};
+var keysStyleSheet = {
+    '0': { name: 'Font' },
+    '1': { name: 'FontSize' },
+    '2': { name: 'FauxBold' },
+    '3': { name: 'FauxItalic' },
+    '4': { name: 'AutoLeading' },
+    '5': { name: 'Leading' },
+    '6': { name: 'HorizontalScale' },
+    '7': { name: 'VerticalScale' },
+    '8': { name: 'Tracking' },
+    '9': { name: 'BaselineShift' },
+    // '10': ???
+    '11': { name: 'Kerning?' },
+    '12': { name: 'FontCaps' },
+    '13': { name: 'FontBaseline' },
+    '15': { name: 'Strikethrough?' },
+    '16': { name: 'Underline?' },
+    '18': { name: 'Ligatures' },
+    '19': { name: 'DLigatures' },
+    // '20': ???
+    // '21': ???
+    // '22': ???
+    '23': { name: 'Fractions' },
+    '24': { name: 'Ordinals' },
+    // '25': ???
+    // '26': ???
+    // '27': ???
+    '28': { name: 'StylisticAlternates' },
+    // '29': ???
+    '30': { name: 'OldStyle?' },
+    '35': { name: 'BaselineDirection' },
+    '38': { name: 'Language' },
+    '52': { name: 'NoBreak' },
+    '53': { name: 'FillColor', children: keysColor },
+    '54': { name: 'StrokeColor', children: keysColor },
+    '55': { children: { '99': { uproot: true } } },
+    // '68': ???
+    // '70': ???
+    // '71': ???
+    // '72': ???
+    // '73': ???
+    '79': { children: keysColor },
+    // '85': ???
+    // '87': ???
+    // '88': ???
+};
+var keysParagraph = {
+    '0': { name: 'Justification' },
+    '1': { name: 'FirstLineIndent' },
+    '2': { name: 'StartIndent' },
+    '3': { name: 'EndIndent' },
+    '4': { name: 'SpaceBefore' },
+    '5': { name: 'SpaceAfter' },
+    '7': { name: 'AutoLeading' },
+    '9': { name: 'AutoHyphenate' },
+    '10': { name: 'HyphenatedWordSize' },
+    '11': { name: 'PreHyphen' },
+    '12': { name: 'PostHyphen' },
+    '13': { name: 'ConsecutiveHyphens?' },
+    '14': { name: 'Zone' },
+    '15': { name: 'HypenateCapitalizedWords' },
+    '17': { name: 'WordSpacing' },
+    '18': { name: 'LetterSpacing' },
+    '19': { name: 'GlyphSpacing' },
+    '32': { name: 'StyleSheet', children: keysStyleSheet },
+};
+var keysStyleSheetData = {
+    name: 'StyleSheetData',
+    children: keysStyleSheet,
+};
+var keysRoot = {
+    '0': {
+        name: 'ResourceDict',
+        children: {
+            '1': {
+                name: 'FontSet',
+                children: {
+                    '0': {
+                        uproot: true,
+                        children: {
+                            '0': {
+                                uproot: true,
+                                children: {
+                                    '0': {
+                                        uproot: true,
+                                        children: {
+                                            '0': { name: 'Name' },
+                                            '2': { name: 'FontType' },
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            '2': {
+                name: '2',
+                children: {},
+            },
+            '3': {
+                name: 'MojiKumiSet',
+                children: {
+                    '0': {
+                        uproot: true,
+                        children: {
+                            '0': {
+                                uproot: true,
+                                children: {
+                                    '0': { name: 'InternalName' },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            '4': {
+                name: 'KinsokuSet',
+                children: {
+                    '0': {
+                        uproot: true,
+                        children: {
+                            '0': {
+                                uproot: true,
+                                children: {
+                                    '0': { name: 'Name' },
+                                    '5': {
+                                        uproot: true,
+                                        children: {
+                                            '0': { name: 'NoStart' },
+                                            '1': { name: 'NoEnd' },
+                                            '2': { name: 'Keep' },
+                                            '3': { name: 'Hanging' },
+                                            '4': { name: 'Name' },
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            '5': {
+                name: 'StyleSheetSet',
+                children: {
+                    '0': {
+                        uproot: true,
+                        children: {
+                            '0': {
+                                uproot: true,
+                                children: {
+                                    '0': { name: 'Name' },
+                                    '6': keysStyleSheetData,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            '6': {
+                name: 'ParagraphSheetSet',
+                children: {
+                    '0': {
+                        uproot: true,
+                        children: {
+                            '0': {
+                                uproot: true,
+                                children: {
+                                    '0': { name: 'Name' },
+                                    '5': {
+                                        name: 'Properties',
+                                        children: keysParagraph,
+                                    },
+                                    '6': { name: 'DefaultStyleSheet' },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            '8': {
+                name: 'TextFrameSet',
+                children: {
+                    '0': {
+                        uproot: true,
+                        children: {
+                            '0': {
+                                name: 'path',
+                                children: {
+                                    '0': { name: 'name' },
+                                    '1': {
+                                        name: 'bezierCurve',
+                                        children: {
+                                            '0': { name: 'controlPoints' },
+                                        },
+                                    },
+                                    '2': {
+                                        name: 'data',
+                                        children: {
+                                            '0': { name: 'type' },
+                                            '1': { name: 'orientation' },
+                                            '2': { name: 'frameMatrix' },
+                                            '4': { name: '4' },
+                                            '6': { name: 'textRange' },
+                                            '7': { name: 'rowGutter' },
+                                            '8': { name: 'columnGutter' },
+                                            '9': { name: '9' },
+                                            '10': {
+                                                name: 'baselineAlignment',
+                                                children: {
+                                                    '0': { name: 'flag' },
+                                                    '1': { name: 'min' },
+                                                },
+                                            },
+                                            '11': {
+                                                name: 'pathData',
+                                                children: {
+                                                    '1': { name: '1' },
+                                                    '0': { name: 'reversed' },
+                                                    '2': { name: '2' },
+                                                    '3': { name: '3' },
+                                                    '4': { name: 'spacing' },
+                                                    '5': { name: '5' },
+                                                    '6': { name: '6' },
+                                                    '7': { name: '7' },
+                                                    '18': { name: '18' },
+                                                },
+                                            },
+                                            '12': { name: '12' },
+                                            '13': { name: '13' },
+                                        },
+                                    },
+                                    '3': { name: '3' },
+                                    '97': { name: 'uuid' },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            '9': {
+                name: 'Predefined',
+                children: {
+                    '0': {
+                        children: { '0': { uproot: true } },
+                    },
+                    '1': {
+                        children: { '0': { uproot: true } },
+                    },
+                },
+            },
+        },
+    },
+    '1': {
+        name: 'EngineDict',
+        children: {
+            '0': {
+                name: '0',
+                children: {
+                    // 0: ???
+                    // 1: ???
+                    // 2: ???
+                    '3': { name: 'SuperscriptSize' },
+                    '4': { name: 'SuperscriptPosition' },
+                    '5': { name: 'SubscriptSize' },
+                    '6': { name: 'SubscriptPosition' },
+                    '7': { name: 'SmallCapSize' },
+                    '8': { name: 'UseFractionalGlyphWidths' },
+                    '15': { children: { '0': { uproot: true } } },
+                    // 16: ???
+                    // 17: ???
+                },
+            },
+            '1': {
+                name: 'Editors?',
+                children: {
+                    '0': {
+                        name: 'Editor',
+                        children: {
+                            '0': { name: 'Text' },
+                            '5': {
+                                name: 'ParagraphRun',
+                                children: {
+                                    '0': {
+                                        name: 'RunArray',
+                                        children: {
+                                            '0': {
+                                                name: 'ParagraphSheet',
+                                                children: {
+                                                    '0': {
+                                                        uproot: true,
+                                                        children: {
+                                                            '0': { name: '0' },
+                                                            '5': {
+                                                                name: '5',
+                                                                children: keysParagraph,
+                                                            },
+                                                            '6': { name: '6' },
+                                                        },
+                                                    },
+                                                },
+                                            },
+                                            '1': { name: 'RunLength' },
+                                        },
+                                    },
+                                },
+                            },
+                            '6': {
+                                name: 'StyleRun',
+                                children: {
+                                    '0': {
+                                        name: 'RunArray',
+                                        children: {
+                                            '0': {
+                                                name: 'StyleSheet',
+                                                children: {
+                                                    '0': {
+                                                        uproot: true,
+                                                        children: {
+                                                            '6': keysStyleSheetData,
+                                                        },
+                                                    },
+                                                },
+                                            },
+                                            '1': { name: 'RunLength' },
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                    '1': {
+                        name: 'FontVectorData ???',
+                        // children: {
+                        // 	'0': {},
+                        // 	'2': {
+                        // 		// '5'
+                        // 		// '6'
+                        // 	},
+                        // }
+                        //     "1": [ // this is probably bounding box? there seem to be many of them nested
+                        //       0,
+                        //       0,
+                        //       999,
+                        //       176.30014
+                        //     ],
+                        // various types: /PC, /F, /R, /L, /S, /G
+                    },
+                },
+            },
+            '2': {
+                name: 'StyleSheet',
+                children: keysStyleSheet,
+            },
+            '3': {
+                name: 'ParagraphSheet',
+                children: keysParagraph,
+            },
+        },
+    },
+};
+function decodeObj(obj, keys) {
+    var _a, _b;
+    if (obj === null)
+        return obj;
+    if (Array.isArray(obj))
+        return obj.map(function (x) { return decodeObj(x, keys); });
+    if (typeof obj !== 'object')
+        return obj;
+    var result = {};
+    for (var _i = 0, _c = Object.keys(obj); _i < _c.length; _i++) {
+        var key = _c[_i];
+        if (keys[key]) {
+            if (keys[key].uproot) {
+                if (key !== '99')
+                    result = decodeObj(obj[key], (_a = keys[key].children) !== null && _a !== void 0 ? _a : {});
+                if (obj['99'])
+                    result._type = obj['99'];
+                break;
+            }
+            else {
+                result[keys[key].name || key] = decodeObj(obj[key], (_b = keys[key].children) !== null && _b !== void 0 ? _b : {});
+            }
+        }
+        else if (key === '99') {
+            result._type = obj[key];
+        }
+        else {
+            result[key] = decodeObj(obj[key], {});
+        }
+    }
+    return result;
+}
+function decodeEngineData2(data) {
+    return decodeObj(data, keysRoot);
+}
+exports.decodeEngineData2 = decodeEngineData2;
+
+},{}],8:[function(require,module,exports){
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initializeCanvas = exports.createImageData = exports.createCanvasFromData = exports.createCanvas = exports.writeDataZipWithoutPrediction = exports.writeDataRLE = exports.writeDataRaw = exports.decodeBitmap = exports.imageDataToCanvas = exports.resetImageData = exports.hasAlpha = exports.clamp = exports.offsetForChannel = exports.Compression = exports.ChannelID = exports.MaskParams = exports.LayerMaskFlags = exports.ColorSpace = exports.createEnum = exports.revMap = exports.largeAdditionalInfoKeys = exports.layerColors = exports.toBlendMode = exports.fromBlendMode = exports.RAW_IMAGE_DATA = exports.MOCK_HANDLERS = void 0;
 var base64_js_1 = require("base64-js");
@@ -6743,7 +7188,7 @@ function initializeCanvas(createCanvasMethod, createCanvasFromDataMethod, create
 }
 exports.initializeCanvas = initializeCanvas;
 
-},{"base64-js":15,"pako":18}],8:[function(require,module,exports){
+},{"base64-js":16,"pako":19}],9:[function(require,module,exports){
 "use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -6789,6 +7234,33 @@ function writeUtf8String(writer, value) {
     var 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++) {
+        if (buffer[i] & 0x80) {
+            notAscii = true;
+            break;
+        }
+    }
+    if (notAscii) {
+        var decoder = new TextDecoder('gbk');
+        return decoder.decode(buffer);
+    }
+    else {
+        return (0, utf8_1.decodeString)(buffer);
+    }
+}
+function writeEncodedString(writer, value) {
+    var ascii = '';
+    for (var 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);
+    (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) {
@@ -6936,15 +7408,22 @@ addHandler(1062, function (target) { return target.printScale !== undefined; },
     (0, psdWriter_1.writeFloat32)(writer, scale || 0);
 });
 addHandler(1006, function (target) { return target.alphaChannelNames !== undefined; }, function (reader, target, left) {
-    target.alphaChannelNames = [];
-    while (left() > 0) {
-        var value = (0, psdReader_1.readPascalString)(reader, 1);
-        target.alphaChannelNames.push(value);
+    if (!target.alphaChannelNames) { // skip if the unicode versions are already read
+        target.alphaChannelNames = [];
+        while (left() > 0) {
+            var value = readEncodedString(reader);
+            // const value = readPascalString(reader, 1);
+            target.alphaChannelNames.push(value);
+        }
+    }
+    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];
-        (0, psdWriter_1.writePascalString)(writer, name_1, 1);
+        writeEncodedString(writer, name_1);
+        // writePascalString(writer, name, 1);
     }
 });
 addHandler(1045, function (target) { return target.alphaChannelNames !== undefined; }, function (reader, target, left) {
@@ -7769,7 +8248,7 @@ target) { return target._ir4002 !== undefined; }, function (reader, target, left
     (0, psdWriter_1.writeBytes)(writer, target._ir4002);
 });
 
-},{"./descriptor":4,"./helpers":7,"./psdReader":11,"./psdWriter":12,"./utf8":14,"base64-js":15}],9:[function(require,module,exports){
+},{"./descriptor":4,"./helpers":8,"./psdReader":12,"./psdWriter":13,"./utf8":15,"base64-js":16}],10:[function(require,module,exports){
 (function (Buffer){(function (){
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
@@ -7825,7 +8304,7 @@ function writePsdBuffer(psd, options) {
 exports.writePsdBuffer = writePsdBuffer;
 
 }).call(this)}).call(this,require("buffer").Buffer)
-},{"./abr":1,"./csh":3,"./helpers":7,"./psd":10,"./psdReader":11,"./psdWriter":12,"base64-js":15,"buffer":16}],10:[function(require,module,exports){
+},{"./abr":1,"./csh":3,"./helpers":8,"./psd":11,"./psdReader":12,"./psdWriter":13,"base64-js":16,"buffer":17}],11:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayerCompCapturedInfo = exports.SectionDividerType = exports.ColorMode = void 0;
@@ -7855,7 +8334,7 @@ var LayerCompCapturedInfo;
     LayerCompCapturedInfo[LayerCompCapturedInfo["Appearance"] = 4] = "Appearance";
 })(LayerCompCapturedInfo = exports.LayerCompCapturedInfo || (exports.LayerCompCapturedInfo = {}));
 
-},{}],11:[function(require,module,exports){
+},{}],12:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readPattern = exports.readColor = exports.readSection = exports.readDataRLE = exports.readDataZip = exports.createImageDataBitDepth = exports.readAdditionalLayerInfo = exports.readGlobalLayerMaskInfo = exports.readData = exports.readLayerInfo = exports.readPsd = exports.checkSignature = exports.skipBytes = exports.readAsciiString = exports.readUnicodeStringWithLengthLE = exports.readUnicodeStringWithLength = exports.readUnicodeString = exports.readPascalString = exports.validSignatureAt = exports.readSignature = exports.readBytes = exports.readFixedPointPath32 = exports.readFixedPoint32 = exports.readFloat64 = exports.readFloat32 = exports.readUint32 = exports.readInt32LE = exports.readInt32 = exports.readUint16LE = exports.readUint16 = exports.readInt16 = exports.peekUint8 = exports.readUint8 = exports.warnOrThrow = exports.createReader = exports.supportedColorModes = void 0;
@@ -8264,9 +8743,7 @@ function readLayerRecord(reader, psd) {
     // 0x20 - effects/filters panel is expanded
     skipBytes(reader, 1);
     readSection(reader, 1, function (left) {
-        var mask = readLayerMaskData(reader);
-        if (mask)
-            layer.mask = mask;
+        readLayerMaskData(reader, layer);
         var blendingRanges = readLayerBlendingRanges(reader);
         if (blendingRanges)
             layer.blendingRanges = blendingRanges;
@@ -8280,11 +8757,12 @@ function readLayerRecord(reader, psd) {
     });
     return { layer: layer, channels: channels };
 }
-function readLayerMaskData(reader) {
+function readLayerMaskData(reader, layer) {
     return readSection(reader, 1, function (left) {
         if (!left())
             return undefined;
         var mask = {};
+        layer.mask = mask;
         mask.top = readInt32(reader);
         mask.left = readInt32(reader);
         mask.bottom = readInt32(reader);
@@ -8294,6 +8772,19 @@ function readLayerMaskData(reader) {
         mask.positionRelativeToLayer = (flags & 1 /* LayerMaskFlags.PositionRelativeToLayer */) !== 0;
         mask.disabled = (flags & 2 /* LayerMaskFlags.LayerMaskDisabled */) !== 0;
         mask.fromVectorData = (flags & 8 /* LayerMaskFlags.LayerMaskFromRenderingOtherData */) !== 0;
+        if (left() >= 18) {
+            var realMask = {};
+            layer.realMask = realMask;
+            var realFlags = readUint8(reader);
+            realMask.positionRelativeToLayer = (realFlags & 1 /* LayerMaskFlags.PositionRelativeToLayer */) !== 0;
+            realMask.disabled = (realFlags & 2 /* LayerMaskFlags.LayerMaskDisabled */) !== 0;
+            realMask.fromVectorData = (realFlags & 8 /* LayerMaskFlags.LayerMaskFromRenderingOtherData */) !== 0;
+            realMask.defaultColor = readUint8(reader); // Real user mask background. 0 or 255.
+            realMask.top = readInt32(reader);
+            realMask.left = readInt32(reader);
+            realMask.bottom = readInt32(reader);
+            realMask.right = readInt32(reader);
+        }
         if (flags & 16 /* LayerMaskFlags.MaskHasParametersAppliedToIt */) {
             var params = readUint8(reader);
             if (params & 1 /* MaskParams.UserMaskDensity */)
@@ -8305,23 +8796,7 @@ function readLayerMaskData(reader) {
             if (params & 8 /* MaskParams.VectorMaskFeather */)
                 mask.vectorMaskFeather = readFloat64(reader);
         }
-        if (left() > 2) {
-            // TODO: handle these values, this is RealUserMask
-            /*const realFlags = readUint8(reader);
-            const realUserMaskBackground = readUint8(reader);
-            const top2 = readInt32(reader);
-            const left2 = readInt32(reader);
-            const bottom2 = readInt32(reader);
-            const right2 = readInt32(reader);
-
-            // TEMP
-            (mask as any)._real = { realFlags, realUserMaskBackground, top2, left2, bottom2, right2 };*/
-            if (reader.logMissingFeatures) {
-                reader.log('Unhandled extra real user mask params');
-            }
-        }
         skipBytes(reader, left());
-        return mask;
     });
 }
 function readBlendingRange(reader) {
@@ -8383,20 +8858,28 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
         }
         if (compression > 3)
             throw new Error("Invalid compression: ".concat(compression));
-        if (channel.id === -2 /* ChannelID.UserMask */) {
-            var mask = layer.mask;
+        if (channel.id === -2 /* ChannelID.UserMask */ || channel.id === -3 /* ChannelID.RealUserMask */) {
+            var mask = channel.id === -2 /* ChannelID.UserMask */ ? layer.mask : layer.realMask;
             if (!mask)
-                throw new Error("Missing layer mask data");
+                throw new Error("Missing layer ".concat(channel.id === -2 /* ChannelID.UserMask */ ? 'mask' : 'real mask', " data"));
             var maskWidth = (mask.right || 0) - (mask.left || 0);
             var maskHeight = (mask.bottom || 0) - (mask.top || 0);
+            if (maskWidth < 0 || maskHeight < 0 || maskWidth > 30000 || maskHeight > 30000)
+                throw new Error('Invalid mask size');
             if (maskWidth && maskHeight) {
                 var maskData = createImageDataBitDepth(maskWidth, maskHeight, (_b = psd.bitsPerChannel) !== null && _b !== void 0 ? _b : 8);
                 (0, helpers_1.resetImageData)(maskData);
                 var start_1 = reader.offset;
                 readData(reader, channel.length, maskData, compression, maskWidth, maskHeight, (_c = psd.bitsPerChannel) !== null && _c !== void 0 ? _c : 8, 0, reader.large, 4);
                 if (helpers_1.RAW_IMAGE_DATA) {
-                    layer.maskDataRawCompression = compression;
-                    layer.maskDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start_1, reader.offset - start_1);
+                    if (channel.id === -2 /* ChannelID.UserMask */) {
+                        layer.maskDataRawCompression = compression;
+                        layer.maskDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start_1, reader.offset - start_1);
+                    }
+                    else {
+                        layer.realMaskDataRawCompression = compression;
+                        layer.realMaskDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start_1, reader.offset - start_1);
+                    }
                 }
                 setupGrayscale(maskData);
                 if (reader.useImageData) {
@@ -8407,12 +8890,6 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
                 }
             }
         }
-        else if (channel.id === -3 /* ChannelID.RealUserMask */) {
-            if (reader.logMissingFeatures) {
-                reader.log("RealUserMask not supported");
-            }
-            reader.offset = start + channel.length;
-        }
         else {
             var offset = (0, helpers_1.offsetForChannel)(channel.id, cmyk);
             var targetData = imageData;
@@ -9054,7 +9531,7 @@ function readPattern(reader) {
 }
 exports.readPattern = readPattern;
 
-},{"./additionalInfo":2,"./helpers":7,"./imageResources":8,"pako":18}],12:[function(require,module,exports){
+},{"./additionalInfo":2,"./helpers":8,"./imageResources":9,"pako":19}],13:[function(require,module,exports){
 "use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -9396,7 +9873,7 @@ function writeLayerInfo(writer, psd, globalAlpha, options) {
                 flags |= 0x01;
             if (layer.hidden)
                 flags |= 0x02;
-            if (layer.vectorMask || (layer.sectionDivider && layer.sectionDivider.type !== 0 /* SectionDividerType.Other */)) {
+            if (layer.vectorMask || (layer.sectionDivider && layer.sectionDivider.type !== 0 /* SectionDividerType.Other */) || layer.adjustment) {
                 flags |= 0x10; // pixel data irrelevant to appearance of document
             }
             if (layer.effectsOpen)
@@ -9429,36 +9906,52 @@ function writeLayerInfo(writer, psd, globalAlpha, options) {
     }, true, options.psb);
 }
 function writeLayerMaskData(writer, _a, layerData) {
-    var mask = _a.mask;
+    var mask = _a.mask, realMask = _a.realMask;
     writeSection(writer, 1, function () {
-        if (!mask)
+        if (!mask && !realMask)
             return;
+        var params = 0, flags = 0, realFlags = 0;
+        if (mask) {
+            if (mask.userMaskDensity !== undefined)
+                params |= 1 /* MaskParams.UserMaskDensity */;
+            if (mask.userMaskFeather !== undefined)
+                params |= 2 /* MaskParams.UserMaskFeather */;
+            if (mask.vectorMaskDensity !== undefined)
+                params |= 4 /* MaskParams.VectorMaskDensity */;
+            if (mask.vectorMaskFeather !== undefined)
+                params |= 8 /* MaskParams.VectorMaskFeather */;
+            if (mask.disabled)
+                flags |= 2 /* LayerMaskFlags.LayerMaskDisabled */;
+            if (mask.positionRelativeToLayer)
+                flags |= 1 /* LayerMaskFlags.PositionRelativeToLayer */;
+            if (mask.fromVectorData)
+                flags |= 8 /* LayerMaskFlags.LayerMaskFromRenderingOtherData */;
+            if (params)
+                flags |= 16 /* LayerMaskFlags.MaskHasParametersAppliedToIt */;
+        }
         var m = layerData.mask || {};
         writeInt32(writer, m.top || 0);
         writeInt32(writer, m.left || 0);
         writeInt32(writer, m.bottom || 0);
         writeInt32(writer, m.right || 0);
-        writeUint8(writer, mask.defaultColor || 0);
-        var params = 0;
-        if (mask.userMaskDensity !== undefined)
-            params |= 1 /* MaskParams.UserMaskDensity */;
-        if (mask.userMaskFeather !== undefined)
-            params |= 2 /* MaskParams.UserMaskFeather */;
-        if (mask.vectorMaskDensity !== undefined)
-            params |= 4 /* MaskParams.VectorMaskDensity */;
-        if (mask.vectorMaskFeather !== undefined)
-            params |= 8 /* MaskParams.VectorMaskFeather */;
-        var flags = 0;
-        if (mask.disabled)
-            flags |= 2 /* LayerMaskFlags.LayerMaskDisabled */;
-        if (mask.positionRelativeToLayer)
-            flags |= 1 /* LayerMaskFlags.PositionRelativeToLayer */;
-        if (mask.fromVectorData)
-            flags |= 8 /* LayerMaskFlags.LayerMaskFromRenderingOtherData */;
-        if (params)
-            flags |= 16 /* LayerMaskFlags.MaskHasParametersAppliedToIt */;
+        writeUint8(writer, mask && mask.defaultColor || 0);
         writeUint8(writer, flags);
-        if (params) {
+        if (realMask) {
+            if (realMask.disabled)
+                realFlags |= 2 /* LayerMaskFlags.LayerMaskDisabled */;
+            if (realMask.positionRelativeToLayer)
+                realFlags |= 1 /* LayerMaskFlags.PositionRelativeToLayer */;
+            if (realMask.fromVectorData)
+                realFlags |= 8 /* LayerMaskFlags.LayerMaskFromRenderingOtherData */;
+            var r = layerData.realMask || {};
+            writeUint8(writer, realFlags);
+            writeUint8(writer, realMask.defaultColor || 0);
+            writeInt32(writer, r.top || 0);
+            writeInt32(writer, r.left || 0);
+            writeInt32(writer, r.bottom || 0);
+            writeInt32(writer, r.right || 0);
+        }
+        if (params && mask) {
             writeUint8(writer, params);
             if (mask.userMaskDensity !== undefined)
                 writeUint8(writer, Math.round(mask.userMaskDensity * 0xff));
@@ -9469,7 +9962,6 @@ function writeLayerMaskData(writer, _a, layerData) {
             if (mask.vectorMaskFeather !== undefined)
                 writeFloat64(writer, mask.vectorMaskFeather);
         }
-        // TODO: handle rest of the fields
         writeZeros(writer, 2);
     });
 }
@@ -9535,8 +10027,8 @@ function writeAdditionalLayerInfo(writer, target, psd, options) {
 function addChildren(layers, children) {
     if (!children)
         return;
-    // const layerIds = [];
-    // const timestamps = []
+    // const layerIds: number[] = [2];
+    // const timestamps: number[] = [1740120767.0230637];
     for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
         var c = children_1[_i];
         if (c.children && c.canvas)
@@ -9549,6 +10041,7 @@ function addChildren(layers, children) {
                 sectionDivider: {
                     type: 3 /* SectionDividerType.BoundingSectionDivider */,
                 },
+                // blendingRanges: children[0].blendingRanges,
                 // nameSource: 'lset',
                 // id: layerIds.shift(),
                 // protected: {
@@ -9556,12 +10049,9 @@ function addChildren(layers, children) {
                 // 	composite: false,
                 // 	position: false,
                 // },
-                // layerColor: 'none',
+                // layerColor: 'red',
                 // timestamp: timestamps.shift(),
-                // referencePoint: {
-                // 	x: 0,
-                // 	y: 0,
-                // },
+                // referencePoint: { x: 0, y: 0 },
             });
             addChildren(layers, c.children);
             layers.push(__assign(__assign({}, c), { blendMode: c.blendMode === 'pass through' ? 'normal' : c.blendMode, sectionDivider: {
@@ -9620,47 +10110,46 @@ function createThumbnail(psd) {
     }
     return canvas;
 }
-function getChannels(tempBuffer, layer, background, options) {
-    var layerData = getLayerChannels(tempBuffer, layer, background, options);
-    var mask = layer.mask;
-    if (mask) {
-        var top_2 = mask.top | 0;
-        var left = mask.left | 0;
-        var right = mask.right | 0;
-        var bottom = mask.bottom | 0;
-        var _a = getLayerDimentions(mask), width = _a.width, height = _a.height;
-        var imageData = mask.imageData;
-        if (!imageData && mask.canvas && width && height) {
-            imageData = mask.canvas.getContext('2d').getImageData(0, 0, width, height);
-        }
-        if (width && height && imageData) {
-            right = left + width;
-            bottom = top_2 + height;
-            if (imageData.width !== width || imageData.height !== height) {
-                throw new Error('Invalid imageData dimentions');
-            }
-            var buffer = void 0;
-            var compression = void 0;
-            if (helpers_1.RAW_IMAGE_DATA && layer.maskDataRaw) {
-                // console.log('written raw layer image data');
-                buffer = layer.maskDataRaw;
-                compression = layer.maskDataRawCompression;
-            }
-            else if (options.compress) {
-                buffer = (0, helpers_1.writeDataZipWithoutPrediction)(imageData, [0]);
-                compression = 2 /* Compression.ZipWithoutPrediction */;
-            }
-            else {
-                buffer = (0, helpers_1.writeDataRLE)(tempBuffer, imageData, [0], !!options.psb);
-                compression = 1 /* Compression.RleCompressed */;
-            }
-            layerData.mask = { top: top_2, left: left, right: right, bottom: bottom };
-            layerData.channels.push({ channelId: -2 /* ChannelID.UserMask */, compression: compression, buffer: buffer, length: 2 + buffer.length });
+function getMaskChannels(tempBuffer, layerData, layer, mask, options, realMask) {
+    var top = mask.top | 0;
+    var left = mask.left | 0;
+    var right = mask.right | 0;
+    var bottom = mask.bottom | 0;
+    var _a = getLayerDimentions(mask), width = _a.width, height = _a.height;
+    var imageData = mask.imageData;
+    if (!imageData && mask.canvas && width && height) {
+        imageData = mask.canvas.getContext('2d').getImageData(0, 0, width, height);
+    }
+    if (width && height && imageData) {
+        right = left + width;
+        bottom = top + height;
+        if (imageData.width !== width || imageData.height !== height) {
+            throw new Error('Invalid imageData dimentions');
+        }
+        var buffer = void 0;
+        var compression = void 0;
+        if (helpers_1.RAW_IMAGE_DATA && layer[realMask ? 'realMaskDataRaw' : 'maskDataRaw']) {
+            buffer = layer[realMask ? 'realMaskDataRaw' : 'maskDataRaw'];
+            compression = layer[realMask ? 'realMaskDataRawCompression' : 'maskDataRawCompression'];
+        }
+        else if (options.compress) {
+            buffer = (0, helpers_1.writeDataZipWithoutPrediction)(imageData, [0]);
+            compression = 2 /* Compression.ZipWithoutPrediction */;
         }
         else {
-            layerData.mask = { top: 0, left: 0, right: 0, bottom: 0 };
+            buffer = (0, helpers_1.writeDataRLE)(tempBuffer, imageData, [0], !!options.psb);
+            compression = 1 /* Compression.RleCompressed */;
         }
+        layerData.channels.push({ channelId: realMask ? -3 /* ChannelID.RealUserMask */ : -2 /* ChannelID.UserMask */, compression: compression, buffer: buffer, length: 2 + buffer.length });
     }
+    layerData[realMask ? 'realMask' : 'mask'] = { top: top, left: left, right: right, bottom: bottom };
+}
+function getChannels(tempBuffer, layer, background, options) {
+    var layerData = getLayerChannels(tempBuffer, layer, background, options);
+    if (layer.mask)
+        getMaskChannels(tempBuffer, layerData, layer, layer.mask, options, false);
+    if (layer.realMask)
+        getMaskChannels(tempBuffer, layerData, layer, layer.realMask, options, true);
     return layerData;
 }
 function getLayerDimentions(_a) {
@@ -9835,7 +10324,7 @@ function writeColor(writer, color) {
 }
 exports.writeColor = writeColor;
 
-},{"./additionalInfo":2,"./helpers":7,"./imageResources":8}],13:[function(require,module,exports){
+},{"./additionalInfo":2,"./helpers":8,"./imageResources":9}],14:[function(require,module,exports){
 "use strict";
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
@@ -10414,7 +10903,7 @@ function encodeEngineData(data) {
 }
 exports.encodeEngineData = encodeEngineData;
 
-},{}],14:[function(require,module,exports){
+},{}],15:[function(require,module,exports){
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeString = exports.encodeString = exports.encodeStringTo = exports.stringLengthInBytes = void 0;
@@ -10573,7 +11062,7 @@ function decodeString(value) {
 }
 exports.decodeString = decodeString;
 
-},{}],15:[function(require,module,exports){
+},{}],16:[function(require,module,exports){
 'use strict'
 
 exports.byteLength = byteLength
@@ -10725,7 +11214,7 @@ function fromByteArray (uint8) {
   return parts.join('')
 }
 
-},{}],16:[function(require,module,exports){
+},{}],17:[function(require,module,exports){
 (function (Buffer){(function (){
 /*!
  * The buffer module from node.js, for the browser.
@@ -12506,7 +12995,7 @@ function numberIsNaN (obj) {
 }
 
 }).call(this)}).call(this,require("buffer").Buffer)
-},{"base64-js":15,"buffer":16,"ieee754":17}],17:[function(require,module,exports){
+},{"base64-js":16,"buffer":17,"ieee754":18}],18:[function(require,module,exports){
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 exports.read = function (buffer, offset, isLE, mLen, nBytes) {
   var e, m
@@ -12593,7 +13082,7 @@ exports.write = function (buffer, value, offset, isLE, mLen, nBytes) {
   buffer[offset + i - d] |= s * 128
 }
 
-},{}],18:[function(require,module,exports){
+},{}],19:[function(require,module,exports){
 // Top level file is just a mixin of submodules & constants
 'use strict';
 
@@ -12613,7 +13102,7 @@ module.exports.inflateRaw = inflateRaw;
 module.exports.ungzip = ungzip;
 module.exports.constants = constants;
 
-},{"./lib/deflate":19,"./lib/inflate":20,"./lib/zlib/constants":24}],19:[function(require,module,exports){
+},{"./lib/deflate":20,"./lib/inflate":21,"./lib/zlib/constants":25}],20:[function(require,module,exports){
 'use strict';
 
 
@@ -12995,7 +13484,7 @@ module.exports.deflateRaw = deflateRaw;
 module.exports.gzip = gzip;
 module.exports.constants = require('./zlib/constants');
 
-},{"./utils/common":21,"./utils/strings":22,"./zlib/constants":24,"./zlib/deflate":26,"./zlib/messages":31,"./zlib/zstream":33}],20:[function(require,module,exports){
+},{"./utils/common":22,"./utils/strings":23,"./zlib/constants":25,"./zlib/deflate":27,"./zlib/messages":32,"./zlib/zstream":34}],21:[function(require,module,exports){
 'use strict';
 
 
@@ -13416,7 +13905,7 @@ module.exports.inflateRaw = inflateRaw;
 module.exports.ungzip = inflate;
 module.exports.constants = require('./zlib/constants');
 
-},{"./utils/common":21,"./utils/strings":22,"./zlib/constants":24,"./zlib/gzheader":27,"./zlib/inflate":29,"./zlib/messages":31,"./zlib/zstream":33}],21:[function(require,module,exports){
+},{"./utils/common":22,"./utils/strings":23,"./zlib/constants":25,"./zlib/gzheader":28,"./zlib/inflate":30,"./zlib/messages":32,"./zlib/zstream":34}],22:[function(require,module,exports){
 'use strict';
 
 
@@ -13466,7 +13955,7 @@ module.exports.flattenChunks = (chunks) => {
   return result;
 };
 
-},{}],22:[function(require,module,exports){
+},{}],23:[function(require,module,exports){
 // String encode/decode helpers
 'use strict';
 
@@ -13642,7 +14131,7 @@ module.exports.utf8border = (buf, max) => {
   return (pos + _utf8len[buf[pos]] > max) ? pos : max;
 };
 
-},{}],23:[function(require,module,exports){
+},{}],24:[function(require,module,exports){
 'use strict';
 
 // Note: adler32 takes 12% for level 0 and 2% for level 6.
@@ -13695,7 +14184,7 @@ const adler32 = (adler, buf, len, pos) => {
 
 module.exports = adler32;
 
-},{}],24:[function(require,module,exports){
+},{}],25:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -13765,7 +14254,7 @@ module.exports = {
   //Z_NULL:                 null // Use -1 or null inline, depending on var type
 };
 
-},{}],25:[function(require,module,exports){
+},{}],26:[function(require,module,exports){
 'use strict';
 
 // Note: we can't get significant speed boost here.
@@ -13826,7 +14315,7 @@ const crc32 = (crc, buf, len, pos) => {
 
 module.exports = crc32;
 
-},{}],26:[function(require,module,exports){
+},{}],27:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -15876,7 +16365,7 @@ module.exports.deflatePrime = deflatePrime;
 module.exports.deflateTune = deflateTune;
 */
 
-},{"./adler32":23,"./constants":24,"./crc32":25,"./messages":31,"./trees":32}],27:[function(require,module,exports){
+},{"./adler32":24,"./constants":25,"./crc32":26,"./messages":32,"./trees":33}],28:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -15936,7 +16425,7 @@ function GZheader() {
 
 module.exports = GZheader;
 
-},{}],28:[function(require,module,exports){
+},{}],29:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -16282,7 +16771,7 @@ module.exports = function inflate_fast(strm, start) {
   return;
 };
 
-},{}],29:[function(require,module,exports){
+},{}],30:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -17856,7 +18345,7 @@ module.exports.inflateUndermine = inflateUndermine;
 module.exports.inflateValidate = inflateValidate;
 */
 
-},{"./adler32":23,"./constants":24,"./crc32":25,"./inffast":28,"./inftrees":30}],30:[function(require,module,exports){
+},{"./adler32":24,"./constants":25,"./crc32":26,"./inffast":29,"./inftrees":31}],31:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -18198,7 +18687,7 @@ const inflate_table = (type, lens, lens_index, codes, table, table_index, work,
 
 module.exports = inflate_table;
 
-},{}],31:[function(require,module,exports){
+},{}],32:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -18232,7 +18721,7 @@ module.exports = {
   '-6':   'incompatible version' /* Z_VERSION_ERROR (-6) */
 };
 
-},{}],32:[function(require,module,exports){
+},{}],33:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -19413,7 +19902,7 @@ module.exports._tr_flush_block  = _tr_flush_block;
 module.exports._tr_tally = _tr_tally;
 module.exports._tr_align = _tr_align;
 
-},{}],33:[function(require,module,exports){
+},{}],34:[function(require,module,exports){
 'use strict';
 
 // (C) 1995-2013 Jean-loup Gailly and Mark Adler
@@ -19462,5 +19951,5 @@ function ZStream() {
 
 module.exports = ZStream;
 
-},{}]},{},[9])(9)
+},{}]},{},[10])(10)
 });