ag-psd 18.0.0 → 19.0.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v19.0.0
+- Added brush type to ABR
+- Fixed importing smudge and mixer brushes from ABR
+- Fixed saving mask without canvas/imageData
+- Fixed rare issue with saving files resulting in corrupted file
+
+## v18.0.1
+- Fixed incorrect writing of `fillRule` field for vector paths
+
 ## v18.0.0
 - Added `fillRule` field to vector paths
 

package/accept.js

@@ -0,0 +1,18 @@
+const fs = require('fs');
+const path = require('path');
+
+for (const dir of fs.readdirSync(path.join('test', 'read-write'))) {
+  try {
+    if (fs.existsSync(path.join('results', 'read-write', dir, 'expected.psd'))) {
+      fs.unlinkSync(path.join('test', 'read-write', dir, 'expected.psd'));
+      fs.renameSync(
+        path.join('results', 'read-write', dir, 'expected.psd'),
+        path.join('test', 'read-write', dir, 'expected.psd'));
+      console.log('copied', dir);
+    } else {
+      console.log('skipped', dir);
+    }
+  } catch (e) {
+    console.log('failed', dir, e.message);
+  }
+}

package/dist/abr.d.ts

@@ -107,8 +107,12 @@ export interface Brush {
     interpretation?: boolean;
     useBrushSize: boolean;
     toolOptions?: {
+        type: 'brush' | 'mixer brush' | 'smudge brush';
         brushPreset: boolean;
         flow: number;
+        wetness?: number;
+        dryness?: number;
+        mix?: number;
         smooth: number;
         mode: BlendMode;
         opacity: number;
@@ -122,9 +126,16 @@ export interface Brush {
         usePressureOverridesSize: boolean;
         usePressureOverridesOpacity: boolean;
         useLegacy: boolean;
+        autoFill?: boolean;
+        autoClean?: boolean;
+        loadSolidColorOnly?: boolean;
+        sampleAllLayers?: boolean;
         flowDynamics?: BrushDynamics;
         opacityDynamics?: BrushDynamics;
         sizeDynamics?: BrushDynamics;
+        smudgeFingerPainting?: boolean;
+        smudgeSampleAllLayers?: boolean;
+        strength?: number;
     };
 }
 export declare function readAbr(buffer: ArrayBufferView, options?: {

package/dist/abr.js

@@ -4,6 +4,13 @@ exports.readAbr = void 0;
 var descriptor_1 = require("./descriptor");
 var psdReader_1 = require("./psdReader");
 var dynamicsControl = ['off', 'fade', 'pen pressure', 'pen tilt', 'stylus wheel', 'initial direction', 'direction', 'initial rotation', 'rotation'];
+var toBrushType = {
+    _: 'brush',
+    MixB: 'mixer brush',
+    SmTl: 'smudge brush',
+    // PbTl
+    // ErTl
+};
 function parseDynamics(desc) {
     return {
         control: dynamicsControl[desc.bVTy],
@@ -103,7 +110,7 @@ function readAbr(buffer, options) {
                     break;
                 }
                 case 'desc': {
-                    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+                    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
                     // console.log(require('util').inspect(desc, false, 99, true));
                     for (var _i = 0, _e = desc.Brsh; _i < _e.length; _i++) {
                         var brush = _e[_i];
@@ -204,6 +211,7 @@ function readAbr(buffer, options) {
                         var to = brush.toolOptions;
                         if (to) {
                             b.toolOptions = {
+                                type: toBrushType[to._classID] || 'brush',
                                 brushPreset: to.brushPreset,
                                 flow: (_a = to.flow) !== null && _a !== void 0 ? _a : 100,
                                 smooth: (_b = to.Smoo) !== null && _b !== void 0 ? _b : 0,
@@ -220,15 +228,36 @@ function readAbr(buffer, options) {
                                 usePressureOverridesOpacity: !!to.usePressureOverridesOpacity,
                                 useLegacy: !!to.useLegacy,
                             };
-                            if (to.prVr) {
+                            if (to.prVr)
                                 b.toolOptions.flowDynamics = parseDynamics(to.prVr);
-                            }
-                            if (to.opVr) {
+                            if (to.opVr)
                                 b.toolOptions.opacityDynamics = parseDynamics(to.opVr);
-                            }
-                            if (to.szVr) {
+                            if (to.szVr)
                                 b.toolOptions.sizeDynamics = parseDynamics(to.szVr);
-                            }
+                            if ('wetness' in to)
+                                b.toolOptions.wetness = to.wetness;
+                            if ('dryness' in to)
+                                b.toolOptions.dryness = to.dryness;
+                            if ('mix' in to)
+                                b.toolOptions.mix = to.mix;
+                            if ('autoFill' in to)
+                                b.toolOptions.autoFill = to.autoFill;
+                            if ('autoClean' in to)
+                                b.toolOptions.autoClean = to.autoClean;
+                            if ('loadSolidColorOnly' in to)
+                                b.toolOptions.loadSolidColorOnly = to.loadSolidColorOnly;
+                            if ('sampleAllLayers' in to)
+                                b.toolOptions.sampleAllLayers = to.sampleAllLayers;
+                            if ('SmdF' in to)
+                                b.toolOptions.smudgeFingerPainting = to.SmdF;
+                            if ('SmdS' in to)
+                                b.toolOptions.smudgeSampleAllLayers = to.SmdS;
+                            if ('Prs ' in to)
+                                b.toolOptions.strength = to['Prs '];
+                            if ('SmdF' in to)
+                                b.toolOptions.smudgeFingerPainting = to.SmdF;
+                            if ('SmdS' in to)
+                                b.toolOptions.smudgeSampleAllLayers = to.SmdS;
                         }
                         brushes.push(b);
                     }

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.js

@@ -183,7 +183,7 @@ function readVectorMask(reader, vectorMask, width, height, size) {
                     open: selector === 3,
                     operation: boolOp === -1 ? 'combine' : exports.booleanOperations[boolOp],
                     knots: [],
-                    fillRule: flags & 2 ? 'non-zero' : 'even-odd',
+                    fillRule: flags === 2 ? 'non-zero' : 'even-odd',
                 };
                 paths.push(path);
                 break;
@@ -262,7 +262,7 @@ addHandler('vmsk', hasKey('vectorMask'), function (reader, target, left, _a) {
         (0, psdWriter_1.writeUint16)(writer, path.open ? 3 : 0);
         (0, psdWriter_1.writeUint16)(writer, path.knots.length);
         (0, psdWriter_1.writeUint16)(writer, Math.abs(exports.booleanOperations.indexOf(path.operation))); // default to 1 if not found
-        (0, psdWriter_1.writeUint16)(writer, 1 | (path.fillRule === 'non-zero' ? 2 : 0));
+        (0, psdWriter_1.writeUint16)(writer, path.fillRule === 'non-zero' ? 2 : 1);
         (0, psdWriter_1.writeZeros)(writer, 18); // TODO: these are sometimes non-zero
         var linkedKnot = path.open ? 4 : 1;
         var unlinkedKnot = path.open ? 5 : 2;