ag-psd 19.0.1 → 20.0.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v20.0.0
+- Added support for reading 16bit image data, when reading PSD width default settings 16bit data will be converted to regular 8bit canvases, when `useImageData: true` is passed in read options the image data will be of type `Uint16Array` for 16bit images. Because of that type of `layer.imageData` and `psd.imageData` and `layer.mask.imageData` can be of different types depending on PSD file bitDepth.
+- Added support for reading image data compressed with zip with prediction mode.
+- Added support for layer comps (`psd.imageResources.layerComps` and `layer.comps` fields)
+
 ## v19.0.1
 - Fixed incorrect layer trimming when using `layer.imageData` property instead of `layer.canvas`
 

package/README_PSD.md

@@ -105,6 +105,12 @@ const psd: Psd = {
 
 - `filterMask` don't really know what this is, it can be ommited when writing.
 
+## Bitmaps and image data
+
+Image data can be accessed from `psd.canvas` or `layer.canvas` fields by default. These fields store regular HTMLCanvasElement (or node-canvas object when running in node.js). If `useImageData` option is set to true in read options then the image data will be available in `psd.imageData` and `layer.imageData` fields instead. Using image data option gives you direct access to pixel data without having to go through the canvas object, which bypasses alpha premultiplication and convertion from 16/32bit image data to 8bit canvas data.
+
+For 16/32bit documents `imageData` fields will contain pixel data as `Uint16Array` or `Uint32Array` respectfully.
+
 ## Layers and Groups
 
 Psd document object has `children` property that contains all root level layers and groups in order from top to bottom as they appear in Photoshop (take note that if you want to draw the layer images to generate document image then you need to draw them in reverse order). The `children` property will contain both regular layers and groups. Each group will have `children` property, containing all the layers and groups that are inside that group. So the document will have a tree structure like this:

package/TODO

@@ -1,8 +1,13 @@
+'pths'
+- cleanup errors from tests (make list of drawings that should ignore those errors)
+
+
 - can we remove sectionDivider property ?
 - can we remove nameSource property ?
 
 - improve vector fill / stroke help sections
 
+check: https://github.com/psd-tools/psd-tools
 check: https://github.com/TheNicker/libpsd
 
 - zip with prediction: https://github.com/TheNicker/libpsd/blob/master/src/psd_zip.c

package/dist/abr.js

@@ -74,21 +74,21 @@ function readAbr(buffer, options) {
                         var w = (0, psdReader_1.readInt32)(reader) - x;
                         if (w <= 0 || h <= 0)
                             throw new Error('Invalid bounds');
-                        var depth = (0, psdReader_1.readInt16)(reader);
+                        var bithDepth = (0, psdReader_1.readInt16)(reader);
                         var compression = (0, psdReader_1.readUint8)(reader); // 0 - raw, 1 - RLE
                         var alpha = new Uint8Array(w * h);
-                        if (depth === 8) {
+                        if (bithDepth === 8) {
                             if (compression === 0) {
                                 alpha.set((0, psdReader_1.readBytes)(reader, alpha.byteLength));
                             }
                             else if (compression === 1) {
-                                (0, psdReader_1.readDataRLE)(reader, { width: w, height: h, data: alpha }, w, h, 1, [0], false);
+                                (0, psdReader_1.readDataRLE)(reader, { width: w, height: h, data: alpha }, w, h, bithDepth, 1, [0], false);
                             }
                             else {
                                 throw new Error('Invalid compression');
                             }
                         }
-                        else if (depth === 16) {
+                        else if (bithDepth === 16) {
                             if (compression === 0) {
                                 for (var i = 0; i < alpha.byteLength; i++) {
                                     alpha[i] = (0, psdReader_1.readUint16)(reader) >> 8; // convert to 8bit values

package/dist/abr.js.map

@@ -1 +1 @@
-{"version":3,"file":"abr.js","sourceRoot":"../src/","sources":["abr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"abr.js","sourceRoot":"../src/","sources":["abr.ts"],"names":[],"mappings":"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"}

package/dist/additionalInfo.d.ts

@@ -1,12 +1,12 @@
-import { LayerAdditionalInfo, BezierPath, Psd, ReadOptions, WriteOptions, BooleanOperation, LayerEffectsInfo, LayerVectorMask } from './psd';
-import { PsdReader } from './psdReader';
+import { LayerAdditionalInfo, BezierPath, Psd, WriteOptions, BooleanOperation, LayerEffectsInfo, LayerVectorMask } from './psd';
+import { PsdReader, ReadOptionsExt } from './psdReader';
 import { PsdWriter } from './psdWriter';
 export interface ExtendedWriteOptions extends WriteOptions {
     layerIds: Set<number>;
     layerToId: Map<any, number>;
 }
 type HasMethod = (target: LayerAdditionalInfo) => boolean;
-type ReadMethod = (reader: PsdReader, target: LayerAdditionalInfo, left: () => number, psd: Psd, options: ReadOptions) => void;
+type ReadMethod = (reader: PsdReader, target: LayerAdditionalInfo, left: () => number, psd: Psd, options: ReadOptionsExt) => void;
 type WriteMethod = (writer: PsdWriter, target: LayerAdditionalInfo, psd: Psd, options: ExtendedWriteOptions) => void;
 export interface InfoHandler {
     key: string;

package/dist/additionalInfo.js

@@ -52,9 +52,11 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     if ((0, psdReader_1.readInt16)(reader) !== 50)
         throw new Error("Invalid TySh text version");
     var text = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log(require('util').inspect(text, false, 99, false), 'utf8');
     if ((0, psdReader_1.readInt16)(reader) !== 1)
         throw new Error("Invalid TySh warp version");
     var warp = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    // console.log(require('util').inspect(warp, false, 99, false), 'utf8');
     target.text = {
         transform: transform,
         left: (0, psdReader_1.readFloat32)(reader),
@@ -81,6 +83,7 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     if (text.EngineData) {
         var engineData = (0, engineData_1.parseEngineData)(text.EngineData);
         var textData = (0, text_1.decodeEngineData)(engineData);
+        // console.log(require('util').inspect(engineData, false, 99, false), 'utf8');
         // require('fs').writeFileSync(`layer-${target.name}.txt`, require('util').inspect(engineData, false, 99, false), 'utf8');
         // const before = parseEngineData(text.EngineData);
         // const after = encodeEngineData(engineData);
@@ -498,7 +501,7 @@ addHandler('lclr', hasKey('layerColor'), function (reader, target) {
     (0, psdWriter_1.writeZeros)(writer, 6);
 });
 addHandler('shmd', function (target) { return target.timestamp !== undefined || target.animationFrames !== undefined ||
-    target.animationFrameFlags !== undefined || target.timeline !== undefined; }, function (reader, target, left, _, options) {
+    target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined; }, function (reader, target, left, _, options) {
     var count = (0, psdReader_1.readUint32)(reader);
     var _loop_1 = function (i) {
         (0, psdReader_1.checkSignature)(reader, '8BIM');
@@ -562,8 +565,28 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                 target.timeline = timeline;
                 // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
             }
+            else if (key === 'cmls') {
+                var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                // console.log('cmls', require('util').inspect(desc, false, 99, true));
+                target.comps = {
+                    settings: [],
+                };
+                if (desc.origFXRefPoint)
+                    target.comps.originalEffectsReferencePoint = { x: desc.origFXRefPoint.Hrzn, y: desc.origFXRefPoint.Vrtc };
+                for (var _i = 0, _a = desc.layerSettings; _i < _a.length; _i++) {
+                    var item = _a[_i];
+                    target.comps.settings.push({ compList: item.compList });
+                    var t = target.comps.settings[target.comps.settings.length - 1];
+                    if ('enab' in item)
+                        t.enabled = item.enab;
+                    if (item.Ofst)
+                        t.offset = { x: item.Ofst.Hrzn, y: item.Ofst.Vrtc };
+                    if (item.FXRefPoint)
+                        t.effectsReferencePoint = { x: item.FXRefPoint.Hrzn, y: item.FXRefPoint.Vrtc };
+                }
+            }
             else {
-                options.logDevFeatures && console.log('Unhandled "shmd" section key', key);
+                options.logMissingFeatures && console.log('Unhandled "shmd" section key', key);
             }
             (0, psdReader_1.skipBytes)(reader, left());
         });
@@ -573,7 +596,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
     }
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target, _, options) {
-    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline;
+    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline, comps = target.comps;
     var count = 0;
     if (animationFrames)
         count++;
@@ -583,6 +606,8 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
         count++;
     if (timestamp !== undefined)
         count++;
+    if (comps)
+        count++;
     (0, psdWriter_1.writeUint32)(writer, count);
     if (animationFrames) {
         (0, psdWriter_1.writeSignature)(writer, '8BIM');
@@ -648,7 +673,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
             if (timeline.tracks) {
                 desc.trackList = (0, descriptor_1.serializeTrackList)(timeline.tracks);
             }
-            var id = options.layerToId.get(target) || target.id || 0;
+            var id = options.layerToId.get(target) || target.id;
             if (!id)
                 throw new Error('You need to provide layer.id value whan writing document with animations');
             desc.LyrI = id;
@@ -668,6 +693,37 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
             (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'metadata', desc);
         }, true);
     }
+    if (comps) {
+        (0, psdWriter_1.writeSignature)(writer, '8BIM');
+        (0, psdWriter_1.writeSignature)(writer, 'cmls');
+        (0, psdWriter_1.writeUint8)(writer, 0); // copy (always false)
+        (0, psdWriter_1.writeZeros)(writer, 3);
+        (0, psdWriter_1.writeSection)(writer, 2, function () {
+            var id = options.layerToId.get(target) || target.id;
+            if (!id)
+                throw new Error('You need to provide layer.id value whan writing document with layer comps');
+            var desc = {};
+            if (comps.originalEffectsReferencePoint) {
+                desc.origFXRefPoint = { Hrzn: comps.originalEffectsReferencePoint.x, Vrtc: comps.originalEffectsReferencePoint.y };
+            }
+            desc.LyrI = id;
+            desc.layerSettings = [];
+            for (var _i = 0, _a = comps.settings; _i < _a.length; _i++) {
+                var item = _a[_i];
+                var t = {};
+                if (item.enabled !== undefined)
+                    t.enab = item.enabled;
+                if (item.offset)
+                    t.Ofst = { Hrzn: item.offset.x, Vrtc: item.offset.y };
+                if (item.effectsReferencePoint)
+                    t.FXRefPoint = { Hrzn: item.effectsReferencePoint.x, Vrtc: item.effectsReferencePoint.y };
+                t.compList = item.compList;
+                desc.layerSettings.push(t);
+            }
+            // console.log('cmls', require('util').inspect(desc, false, 99, true));
+            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+        }, true);
+    }
 });
 addHandler('vstk', hasKey('vectorStroke'), function (reader, target, left) {
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
@@ -1844,6 +1900,38 @@ addHandler('fxrp', hasKey('referencePoint'), function (reader, target) {
     (0, psdWriter_1.writeFloat64)(writer, target.referencePoint.x);
     (0, psdWriter_1.writeFloat64)(writer, target.referencePoint.y);
 });
+addHandler('Lr16', function () { return false; }, function (reader, _target, _left, psd, options) {
+    (0, psdReader_1.readLayerInfo)(reader, psd, options);
+}, function (_writer, _target) {
+});
+addHandler('LMsk', hasKey('userMask'), function (reader, target) {
+    target.userMask = {
+        colorSpace: (0, psdReader_1.readColor)(reader),
+        opacity: (0, psdReader_1.readUint16)(reader) / 0xff,
+    };
+    var flag = (0, psdReader_1.readUint8)(reader);
+    if (flag !== 128)
+        throw new Error('Invalid flag value');
+    (0, psdReader_1.skipBytes)(reader, 1);
+}, function (writer, target) {
+    var userMask = target.userMask;
+    (0, psdWriter_1.writeColor)(writer, userMask.colorSpace);
+    (0, psdWriter_1.writeUint16)(writer, (0, helpers_1.clamp)(userMask.opacity, 0, 1) * 0xff);
+    (0, psdWriter_1.writeUint8)(writer, 128);
+    (0, psdWriter_1.writeZeros)(writer, 1);
+});
+if (helpers_1.MOCK_HANDLERS) {
+    addHandler('vowv', // appears with Lr16 section ?
+    function (// appears with Lr16 section ?
+    _) { return false; }, function (reader, target, left) {
+        var value = (0, psdReader_1.readUint32)(reader); // 2 ????
+        reader;
+        target;
+        console.log('vowv', { value: value }, left());
+    }, function (_writer, _target) {
+        // TODO: write
+    });
+}
 if (helpers_1.MOCK_HANDLERS) {
     addHandler('Patt', function (target) { return target._Patt !== undefined; }, function (reader, target, left) {
         // console.log('additional info: Patt');
@@ -2136,15 +2224,16 @@ addHandlerAlias('lnkD', 'lnk2');
 addHandlerAlias('lnk3', 'lnk2');
 addHandlerAlias('lnkE', 'lnk2');
 addHandler('pths', hasKey('pathList'), function (reader, target) {
-    var descriptor = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    target.pathList = []; // TODO: read paths (find example with non-empty list)
-    descriptor;
-    // console.log('pths', descriptor); // TODO: remove this
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
+    // console.log(require('util').inspect(desc, false, 99, true));
+    // if (options.throwForMissingFeatures && desc?.pathList?.length) throw new Error('non-empty pathList in `pths`');
+    desc;
+    target.pathList = []; // TODO: read paths
 }, function (writer, _target) {
-    var descriptor = {
+    var desc = {
         pathList: [], // TODO: write paths
     };
-    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'pathsDataClass', descriptor);
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'pathsDataClass', desc);
 });
 addHandler('lyvr', hasKey('version'), function (reader, target) { return target.version = (0, psdReader_1.readUint32)(reader); }, function (writer, target) { return (0, psdWriter_1.writeUint32)(writer, target.version); });
 function adjustmentType(type) {