ag-psd 25.0.0 → 26.0.0

package/dist/bundle.js

@@ -640,58 +640,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 +1160,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 +1731,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),
@@ -3756,12 +3760,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 +3808,6 @@ var fieldToExtType = {
     rectangleCornerC: makeType('', 'Pnt '),
     rectangleCornerD: makeType('', 'Pnt '),
     compInfo: nullType,
-    Trnf: makeType('Transform', 'Trnf'),
     quiltWarp: makeType('', 'quiltWarp'),
     generatorSettings: nullType,
     crema: nullType,
@@ -6789,6 +6793,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 +6967,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) {
@@ -8264,9 +8302,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 +8316,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 +8331,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 +8355,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 +8417,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 +8449,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;
@@ -9396,7 +9432,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 +9465,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 +9521,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 +9586,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 +9600,7 @@ function addChildren(layers, children) {
                 sectionDivider: {
                     type: 3 /* SectionDividerType.BoundingSectionDivider */,
                 },
+                // blendingRanges: children[0].blendingRanges,
                 // nameSource: 'lset',
                 // id: layerIds.shift(),
                 // protected: {
@@ -9556,12 +9608,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 +9669,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) {

package/dist/descriptor.js

@@ -44,12 +44,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'),
@@ -91,7 +92,6 @@ var fieldToExtType = {
     rectangleCornerC: makeType('', 'Pnt '),
     rectangleCornerD: makeType('', 'Pnt '),
     compInfo: nullType,
-    Trnf: makeType('Transform', 'Trnf'),
     quiltWarp: makeType('', 'quiltWarp'),
     generatorSettings: nullType,
     crema: nullType,