ag-psd 18.0.1 → 19.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/accept.js +18 -0
  3. package/dist/abr.d.ts +11 -0
  4. package/dist/abr.js +36 -7
  5. package/dist/abr.js.map +1 -1
  6. package/dist/bundle.js +59 -37
  7. package/dist/descriptor.d.ts +2 -2
  8. package/dist/descriptor.js +10 -11
  9. package/dist/descriptor.js.map +1 -1
  10. package/dist/psdWriter.js +13 -19
  11. package/dist/psdWriter.js.map +1 -1
  12. package/dist-es/abr.d.ts +11 -0
  13. package/dist-es/abr.js +36 -7
  14. package/dist-es/abr.js.map +1 -1
  15. package/dist-es/descriptor.d.ts +2 -2
  16. package/dist-es/descriptor.js +10 -11
  17. package/dist-es/descriptor.js.map +1 -1
  18. package/dist-es/psdWriter.js +13 -19
  19. package/dist-es/psdWriter.js.map +1 -1
  20. package/package.json +1 -1
  21. package/src/abr.ts +47 -13
  22. package/src/descriptor.ts +9 -11
  23. package/src/psdWriter.ts +13 -21
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # Changelog
2
2
 
3
+ ## v19.0.1
4
+ - Fixed incorrect layer trimming when using `layer.imageData` property instead of `layer.canvas`
5
+
6
+ ## v19.0.0
7
+ - Added brush type to ABR
8
+ - Fixed importing smudge and mixer brushes from ABR
9
+ - Fixed saving mask without canvas/imageData
10
+ - Fixed rare issue with saving files resulting in corrupted file
11
+
3
12
  ## v18.0.1
4
13
  - Fixed incorrect writing of `fillRule` field for vector paths
5
14
 
package/accept.js ADDED
@@ -0,0 +1,18 @@
1
+ const fs = require('fs');
2
+ const path = require('path');
3
+
4
+ for (const dir of fs.readdirSync(path.join('test', 'read-write'))) {
5
+ try {
6
+ if (fs.existsSync(path.join('results', 'read-write', dir, 'expected.psd'))) {
7
+ fs.unlinkSync(path.join('test', 'read-write', dir, 'expected.psd'));
8
+ fs.renameSync(
9
+ path.join('results', 'read-write', dir, 'expected.psd'),
10
+ path.join('test', 'read-write', dir, 'expected.psd'));
11
+ console.log('copied', dir);
12
+ } else {
13
+ console.log('skipped', dir);
14
+ }
15
+ } catch (e) {
16
+ console.log('failed', dir, e.message);
17
+ }
18
+ }
package/dist/abr.d.ts CHANGED
@@ -107,8 +107,12 @@ export interface Brush {
107
107
  interpretation?: boolean;
108
108
  useBrushSize: boolean;
109
109
  toolOptions?: {
110
+ type: 'brush' | 'mixer brush' | 'smudge brush';
110
111
  brushPreset: boolean;
111
112
  flow: number;
113
+ wetness?: number;
114
+ dryness?: number;
115
+ mix?: number;
112
116
  smooth: number;
113
117
  mode: BlendMode;
114
118
  opacity: number;
@@ -122,9 +126,16 @@ export interface Brush {
122
126
  usePressureOverridesSize: boolean;
123
127
  usePressureOverridesOpacity: boolean;
124
128
  useLegacy: boolean;
129
+ autoFill?: boolean;
130
+ autoClean?: boolean;
131
+ loadSolidColorOnly?: boolean;
132
+ sampleAllLayers?: boolean;
125
133
  flowDynamics?: BrushDynamics;
126
134
  opacityDynamics?: BrushDynamics;
127
135
  sizeDynamics?: BrushDynamics;
136
+ smudgeFingerPainting?: boolean;
137
+ smudgeSampleAllLayers?: boolean;
138
+ strength?: number;
128
139
  };
129
140
  }
130
141
  export declare function readAbr(buffer: ArrayBufferView, options?: {
package/dist/abr.js CHANGED
@@ -4,6 +4,13 @@ exports.readAbr = void 0;
4
4
  var descriptor_1 = require("./descriptor");
5
5
  var psdReader_1 = require("./psdReader");
6
6
  var dynamicsControl = ['off', 'fade', 'pen pressure', 'pen tilt', 'stylus wheel', 'initial direction', 'direction', 'initial rotation', 'rotation'];
7
+ var toBrushType = {
8
+ _: 'brush',
9
+ MixB: 'mixer brush',
10
+ SmTl: 'smudge brush',
11
+ // PbTl
12
+ // ErTl
13
+ };
7
14
  function parseDynamics(desc) {
8
15
  return {
9
16
  control: dynamicsControl[desc.bVTy],
@@ -103,7 +110,7 @@ function readAbr(buffer, options) {
103
110
  break;
104
111
  }
105
112
  case 'desc': {
106
- var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
113
+ var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
107
114
  // console.log(require('util').inspect(desc, false, 99, true));
108
115
  for (var _i = 0, _e = desc.Brsh; _i < _e.length; _i++) {
109
116
  var brush = _e[_i];
@@ -204,6 +211,7 @@ function readAbr(buffer, options) {
204
211
  var to = brush.toolOptions;
205
212
  if (to) {
206
213
  b.toolOptions = {
214
+ type: toBrushType[to._classID] || 'brush',
207
215
  brushPreset: to.brushPreset,
208
216
  flow: (_a = to.flow) !== null && _a !== void 0 ? _a : 100,
209
217
  smooth: (_b = to.Smoo) !== null && _b !== void 0 ? _b : 0,
@@ -220,15 +228,36 @@ function readAbr(buffer, options) {
220
228
  usePressureOverridesOpacity: !!to.usePressureOverridesOpacity,
221
229
  useLegacy: !!to.useLegacy,
222
230
  };
223
- if (to.prVr) {
231
+ if (to.prVr)
224
232
  b.toolOptions.flowDynamics = parseDynamics(to.prVr);
225
- }
226
- if (to.opVr) {
233
+ if (to.opVr)
227
234
  b.toolOptions.opacityDynamics = parseDynamics(to.opVr);
228
- }
229
- if (to.szVr) {
235
+ if (to.szVr)
230
236
  b.toolOptions.sizeDynamics = parseDynamics(to.szVr);
231
- }
237
+ if ('wetness' in to)
238
+ b.toolOptions.wetness = to.wetness;
239
+ if ('dryness' in to)
240
+ b.toolOptions.dryness = to.dryness;
241
+ if ('mix' in to)
242
+ b.toolOptions.mix = to.mix;
243
+ if ('autoFill' in to)
244
+ b.toolOptions.autoFill = to.autoFill;
245
+ if ('autoClean' in to)
246
+ b.toolOptions.autoClean = to.autoClean;
247
+ if ('loadSolidColorOnly' in to)
248
+ b.toolOptions.loadSolidColorOnly = to.loadSolidColorOnly;
249
+ if ('sampleAllLayers' in to)
250
+ b.toolOptions.sampleAllLayers = to.sampleAllLayers;
251
+ if ('SmdF' in to)
252
+ b.toolOptions.smudgeFingerPainting = to.SmdF;
253
+ if ('SmdS' in to)
254
+ b.toolOptions.smudgeSampleAllLayers = to.SmdS;
255
+ if ('Prs ' in to)
256
+ b.toolOptions.strength = to['Prs '];
257
+ if ('SmdF' in to)
258
+ b.toolOptions.smudgeFingerPainting = to.SmdF;
259
+ if ('SmdS' in to)
260
+ b.toolOptions.smudgeSampleAllLayers = to.SmdS;
232
261
  }
233
262
  brushes.push(b);
234
263
  }
package/dist/abr.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"abr.js","sourceRoot":"../src/","sources":["abr.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abr.js","sourceRoot":"../src/","sources":["abr.ts"],"names":[],"mappings":"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"}
package/dist/bundle.js CHANGED
@@ -5,6 +5,13 @@ exports.readAbr = void 0;
5
5
  var descriptor_1 = require("./descriptor");
6
6
  var psdReader_1 = require("./psdReader");
7
7
  var dynamicsControl = ['off', 'fade', 'pen pressure', 'pen tilt', 'stylus wheel', 'initial direction', 'direction', 'initial rotation', 'rotation'];
8
+ var toBrushType = {
9
+ _: 'brush',
10
+ MixB: 'mixer brush',
11
+ SmTl: 'smudge brush',
12
+ // PbTl
13
+ // ErTl
14
+ };
8
15
  function parseDynamics(desc) {
9
16
  return {
10
17
  control: dynamicsControl[desc.bVTy],
@@ -104,7 +111,7 @@ function readAbr(buffer, options) {
104
111
  break;
105
112
  }
106
113
  case 'desc': {
107
- var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
114
+ var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
108
115
  // console.log(require('util').inspect(desc, false, 99, true));
109
116
  for (var _i = 0, _e = desc.Brsh; _i < _e.length; _i++) {
110
117
  var brush = _e[_i];
@@ -205,6 +212,7 @@ function readAbr(buffer, options) {
205
212
  var to = brush.toolOptions;
206
213
  if (to) {
207
214
  b.toolOptions = {
215
+ type: toBrushType[to._classID] || 'brush',
208
216
  brushPreset: to.brushPreset,
209
217
  flow: (_a = to.flow) !== null && _a !== void 0 ? _a : 100,
210
218
  smooth: (_b = to.Smoo) !== null && _b !== void 0 ? _b : 0,
@@ -221,15 +229,36 @@ function readAbr(buffer, options) {
221
229
  usePressureOverridesOpacity: !!to.usePressureOverridesOpacity,
222
230
  useLegacy: !!to.useLegacy,
223
231
  };
224
- if (to.prVr) {
232
+ if (to.prVr)
225
233
  b.toolOptions.flowDynamics = parseDynamics(to.prVr);
226
- }
227
- if (to.opVr) {
234
+ if (to.opVr)
228
235
  b.toolOptions.opacityDynamics = parseDynamics(to.opVr);
229
- }
230
- if (to.szVr) {
236
+ if (to.szVr)
231
237
  b.toolOptions.sizeDynamics = parseDynamics(to.szVr);
232
- }
238
+ if ('wetness' in to)
239
+ b.toolOptions.wetness = to.wetness;
240
+ if ('dryness' in to)
241
+ b.toolOptions.dryness = to.dryness;
242
+ if ('mix' in to)
243
+ b.toolOptions.mix = to.mix;
244
+ if ('autoFill' in to)
245
+ b.toolOptions.autoFill = to.autoFill;
246
+ if ('autoClean' in to)
247
+ b.toolOptions.autoClean = to.autoClean;
248
+ if ('loadSolidColorOnly' in to)
249
+ b.toolOptions.loadSolidColorOnly = to.loadSolidColorOnly;
250
+ if ('sampleAllLayers' in to)
251
+ b.toolOptions.sampleAllLayers = to.sampleAllLayers;
252
+ if ('SmdF' in to)
253
+ b.toolOptions.smudgeFingerPainting = to.SmdF;
254
+ if ('SmdS' in to)
255
+ b.toolOptions.smudgeSampleAllLayers = to.SmdS;
256
+ if ('Prs ' in to)
257
+ b.toolOptions.strength = to['Prs '];
258
+ if ('SmdF' in to)
259
+ b.toolOptions.smudgeFingerPainting = to.SmdF;
260
+ if ('SmdS' in to)
261
+ b.toolOptions.smudgeSampleAllLayers = to.SmdS;
233
262
  }
234
263
  brushes.push(b);
235
264
  }
@@ -3740,18 +3769,16 @@ function writeAsciiStringOrClassId(writer, value) {
3740
3769
  }
3741
3770
  }
3742
3771
  }
3743
- function readDescriptorStructure(reader) {
3744
- // const struct =
3745
- readClassStructure(reader);
3746
- // const object: any = { _name: struct.name, _classID: struct.classID };
3747
- var object = {};
3772
+ function readDescriptorStructure(reader, includeClass) {
3773
+ var struct = readClassStructure(reader);
3774
+ var object = includeClass ? { _name: struct.name, _classID: struct.classID } : {};
3748
3775
  // console.log('>> ', struct);
3749
3776
  var itemsCount = (0, psdReader_1.readUint32)(reader);
3750
3777
  for (var i = 0; i < itemsCount; i++) {
3751
3778
  var key = readAsciiStringOrClassId(reader);
3752
3779
  var type = (0, psdReader_1.readSignature)(reader);
3753
3780
  // console.log(`> '${key}' '${type}'`);
3754
- var data = readOSType(reader, type);
3781
+ var data = readOSType(reader, type, includeClass);
3755
3782
  // if (!getTypeByKey(key, data)) console.log(`> '${key}' '${type}'`, data);
3756
3783
  object[key] = data;
3757
3784
  }
@@ -3875,20 +3902,20 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
3875
3902
  }
3876
3903
  }
3877
3904
  exports.writeDescriptorStructure = writeDescriptorStructure;
3878
- function readOSType(reader, type) {
3905
+ function readOSType(reader, type, includeClass) {
3879
3906
  switch (type) {
3880
3907
  case 'obj ': // Reference
3881
3908
  return readReferenceStructure(reader);
3882
3909
  case 'Objc': // Descriptor
3883
3910
  case 'GlbO': // GlobalObject same as Descriptor
3884
- return readDescriptorStructure(reader);
3911
+ return readDescriptorStructure(reader, includeClass);
3885
3912
  case 'VlLs': { // List
3886
3913
  var length_1 = (0, psdReader_1.readInt32)(reader);
3887
3914
  var items = [];
3888
3915
  for (var i = 0; i < length_1; i++) {
3889
3916
  var type_1 = (0, psdReader_1.readSignature)(reader);
3890
3917
  // console.log(' >', type);
3891
- items.push(readOSType(reader, type_1));
3918
+ items.push(readOSType(reader, type_1, includeClass));
3892
3919
  }
3893
3920
  return items;
3894
3921
  }
@@ -4172,11 +4199,12 @@ function writeClassStructure(writer, name, classID) {
4172
4199
  (0, psdWriter_1.writeUnicodeString)(writer, name);
4173
4200
  writeAsciiStringOrClassId(writer, classID);
4174
4201
  }
4175
- function readVersionAndDescriptor(reader) {
4202
+ function readVersionAndDescriptor(reader, includeClass) {
4203
+ if (includeClass === void 0) { includeClass = false; }
4176
4204
  var version = (0, psdReader_1.readUint32)(reader);
4177
4205
  if (version !== 16)
4178
4206
  throw new Error("Invalid descriptor version: ".concat(version));
4179
- var desc = readDescriptorStructure(reader);
4207
+ var desc = readDescriptorStructure(reader, includeClass);
4180
4208
  // console.log(require('util').inspect(desc, false, 99, true));
4181
4209
  return desc;
4182
4210
  }
@@ -8634,7 +8662,7 @@ function writeSection(writer, round, func, writeTotalLength, large) {
8634
8662
  func();
8635
8663
  var length = writer.offset - offset - 4;
8636
8664
  var len = length;
8637
- while ((len % round) !== 0) {
8665
+ while ((writer.offset % round) !== 0) {
8638
8666
  writeUint8(writer, 0);
8639
8667
  len++;
8640
8668
  }
@@ -8805,11 +8833,11 @@ function writeLayerMaskData(writer, _a, layerData) {
8805
8833
  if (!mask)
8806
8834
  return;
8807
8835
  var m = layerData.mask || {};
8808
- writeInt32(writer, m.top);
8809
- writeInt32(writer, m.left);
8810
- writeInt32(writer, m.bottom);
8811
- writeInt32(writer, m.right);
8812
- writeUint8(writer, mask.defaultColor);
8836
+ writeInt32(writer, m.top || 0);
8837
+ writeInt32(writer, m.left || 0);
8838
+ writeInt32(writer, m.bottom || 0);
8839
+ writeInt32(writer, m.right || 0);
8840
+ writeUint8(writer, mask.defaultColor || 0);
8813
8841
  var params = 0;
8814
8842
  if (mask.userMaskDensity !== undefined)
8815
8843
  params |= 1 /* MaskParams.UserMaskDensity */;
@@ -8879,14 +8907,15 @@ function writeAdditionalLayerInfo(writer, target, psd, options) {
8879
8907
  key = 'vsms';
8880
8908
  if (handler.has(target)) {
8881
8909
  var large = options.psb && helpers_1.largeAdditionalInfoKeys.indexOf(key) !== -1;
8882
- writeSignature(writer, large ? '8B64' : '8BIM');
8883
- writeSignature(writer, key);
8910
+ var writeTotalLength = key !== 'Txt2' && key !== 'cinf' && key !== 'extn';
8884
8911
  var fourBytes = key === 'Txt2' || key === 'luni' || key === 'vmsk' || key === 'artb' || key === 'artd' ||
8885
8912
  key === 'vogk' || key === 'SoLd' || key === 'lnk2' || key === 'vscg' || key === 'vsms' || key === 'GdFl' ||
8886
8913
  key === 'lmfx' || key === 'lrFX' || key === 'cinf' || key === 'PlLd' || key === 'Anno';
8914
+ writeSignature(writer, large ? '8B64' : '8BIM');
8915
+ writeSignature(writer, key);
8887
8916
  writeSection(writer, fourBytes ? 4 : 2, function () {
8888
8917
  handler.write(writer, target, psd, options);
8889
- }, key !== 'Txt2' && key !== 'cinf' && key !== 'extn', large);
8918
+ }, writeTotalLength, large);
8890
8919
  }
8891
8920
  };
8892
8921
  for (var _i = 0, infoHandlers_1 = additionalInfo_1.infoHandlers; _i < infoHandlers_1.length; _i++) {
@@ -9015,7 +9044,6 @@ function getChannels(tempBuffer, layer, background, options) {
9015
9044
  }
9016
9045
  else {
9017
9046
  layerData.mask = { top: 0, left: 0, right: 0, bottom: 0 };
9018
- layerData.channels.push({ channelId: -2 /* ChannelID.UserMask */, compression: 0 /* Compression.RawData */, buffer: new Uint8Array(0), length: 0 });
9019
9047
  }
9020
9048
  }
9021
9049
  return layerData;
@@ -9030,7 +9058,7 @@ function cropImageData(data, left, top, width, height) {
9030
9058
  var dstData = croppedData.data;
9031
9059
  for (var y = 0; y < height; y++) {
9032
9060
  for (var x = 0; x < width; x++) {
9033
- var src = ((x + left) + (y + top) * width) * 4;
9061
+ var src = ((x + left) + (y + top) * data.width) * 4;
9034
9062
  var dst = (x + y * width) * 4;
9035
9063
  dstData[dst] = srcData[src];
9036
9064
  dstData[dst + 1] = srcData[src + 1];
@@ -9070,15 +9098,9 @@ function getLayerChannels(tempBuffer, layer, background, options) {
9070
9098
  bottom -= (data.height - trimmed.bottom);
9071
9099
  width = right - left;
9072
9100
  height = bottom - top;
9073
- if (!width || !height) {
9101
+ if (!width || !height)
9074
9102
  return { layer: layer, top: top, left: left, right: right, bottom: bottom, channels: channels };
9075
- }
9076
- if (layer.imageData) {
9077
- data = cropImageData(data, trimmed.left, trimmed.top, width, height);
9078
- }
9079
- else {
9080
- data = layer.canvas.getContext('2d').getImageData(trimmed.left, trimmed.top, width, height);
9081
- }
9103
+ data = cropImageData(data, trimmed.left, trimmed.top, width, height);
9082
9104
  }
9083
9105
  }
9084
9106
  var channelIds = [
package/dist/descriptor.d.ts CHANGED
@@ -3,9 +3,9 @@ import { PsdReader } from './psdReader';
3
3
  import { PsdWriter } from './psdWriter';
4
4
  export declare function setLogErrors(value: boolean): void;
5
5
  export declare function readAsciiStringOrClassId(reader: PsdReader): string;
6
- export declare function readDescriptorStructure(reader: PsdReader): any;
6
+ export declare function readDescriptorStructure(reader: PsdReader, includeClass: boolean): any;
7
7
  export declare function writeDescriptorStructure(writer: PsdWriter, name: string, classId: string, value: any, root: string): void;
8
- export declare function readVersionAndDescriptor(reader: PsdReader): any;
8
+ export declare function readVersionAndDescriptor(reader: PsdReader, includeClass?: boolean): any;
9
9
  export declare function writeVersionAndDescriptor(writer: PsdWriter, name: string, classID: string, descriptor: any, root?: string): void;
10
10
  export type DescriptorUnits = 'Angle' | 'Density' | 'Distance' | 'None' | 'Percent' | 'Pixels' | 'Millimeters' | 'Points' | 'Picas' | 'Inches' | 'Centimeters';
11
11
  export interface DescriptorUnitsValue {
package/dist/descriptor.js CHANGED
@@ -343,18 +343,16 @@ function writeAsciiStringOrClassId(writer, value) {
343
343
  }
344
344
  }
345
345
  }
346
- function readDescriptorStructure(reader) {
347
- // const struct =
348
- readClassStructure(reader);
349
- // const object: any = { _name: struct.name, _classID: struct.classID };
350
- var object = {};
346
+ function readDescriptorStructure(reader, includeClass) {
347
+ var struct = readClassStructure(reader);
348
+ var object = includeClass ? { _name: struct.name, _classID: struct.classID } : {};
351
349
  // console.log('>> ', struct);
352
350
  var itemsCount = (0, psdReader_1.readUint32)(reader);
353
351
  for (var i = 0; i < itemsCount; i++) {
354
352
  var key = readAsciiStringOrClassId(reader);
355
353
  var type = (0, psdReader_1.readSignature)(reader);
356
354
  // console.log(`> '${key}' '${type}'`);
357
- var data = readOSType(reader, type);
355
+ var data = readOSType(reader, type, includeClass);
358
356
  // if (!getTypeByKey(key, data)) console.log(`> '${key}' '${type}'`, data);
359
357
  object[key] = data;
360
358
  }
@@ -478,20 +476,20 @@ function writeDescriptorStructure(writer, name, classId, value, root) {
478
476
  }
479
477
  }
480
478
  exports.writeDescriptorStructure = writeDescriptorStructure;
481
- function readOSType(reader, type) {
479
+ function readOSType(reader, type, includeClass) {
482
480
  switch (type) {
483
481
  case 'obj ': // Reference
484
482
  return readReferenceStructure(reader);
485
483
  case 'Objc': // Descriptor
486
484
  case 'GlbO': // GlobalObject same as Descriptor
487
- return readDescriptorStructure(reader);
485
+ return readDescriptorStructure(reader, includeClass);
488
486
  case 'VlLs': { // List
489
487
  var length_1 = (0, psdReader_1.readInt32)(reader);
490
488
  var items = [];
491
489
  for (var i = 0; i < length_1; i++) {
492
490
  var type_1 = (0, psdReader_1.readSignature)(reader);
493
491
  // console.log(' >', type);
494
- items.push(readOSType(reader, type_1));
492
+ items.push(readOSType(reader, type_1, includeClass));
495
493
  }
496
494
  return items;
497
495
  }
@@ -775,11 +773,12 @@ function writeClassStructure(writer, name, classID) {
775
773
  (0, psdWriter_1.writeUnicodeString)(writer, name);
776
774
  writeAsciiStringOrClassId(writer, classID);
777
775
  }
778
- function readVersionAndDescriptor(reader) {
776
+ function readVersionAndDescriptor(reader, includeClass) {
777
+ if (includeClass === void 0) { includeClass = false; }
779
778
  var version = (0, psdReader_1.readUint32)(reader);
780
779
  if (version !== 16)
781
780
  throw new Error("Invalid descriptor version: ".concat(version));
782
- var desc = readDescriptorStructure(reader);
781
+ var desc = readDescriptorStructure(reader, includeClass);
783
782
  // console.log(require('util').inspect(desc, false, 99, true));
784
783
  return desc;
785
784
  }