ag-psd 28.0.1 → 28.1.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v28.1.0
+- Added support for reading and writing `choke` parameter for layer effects
+
 ## v28.0.0
 - **BREAKING CHANGE:** Removed `layersGroup` and `layerGroupsEnabledId` properties from `imageResources` and instead added `linkGroup` and `linkGroupEnabled` fields to layers.
 

package/README.md

@@ -164,18 +164,13 @@ Browser has to support `OffscreenCanvas` and `bitmaprenderer` context.
 importScripts('bundle.js');
 
 const createCanvas = (width, height) => {
-  const canvas = new OffscreenCanvas(width, height);
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
+  return new OffscreenCanvas(width, height);
 };
 
 const createCanvasFromData = (data) => {
   const image = new Image();
   image.src = 'data:image/jpeg;base64,' + agPsd.byteArrayToBase64(data);
   const canvas = new OffscreenCanvas(image.width, image.height);
-  canvas.width = image.width;
-  canvas.height = image.height;
   canvas.getContext('2d').drawImage(image, 0, 0);
   return canvas;
 };
@@ -227,18 +222,13 @@ xhr.send();
 importScripts('bundle.js');
 
 const createCanvas = (width, height) => {
-  const canvas = new OffscreenCanvas(width, height);
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
+  return OffscreenCanvas(width, height);
 };
 
 const createCanvasFromData = (data) => {
   const image = new Image();
   image.src = 'data:image/jpeg;base64,' + agPsd.byteArrayToBase64(data);
   const canvas = new OffscreenCanvas(image.width, image.height);
-  canvas.width = image.width;
-  canvas.height = image.height;
   canvas.getContext('2d').drawImage(image, 0, 0);
   return canvas;
 };

package/dist/additionalInfo.js

@@ -2402,6 +2402,26 @@ addHandler('pths', hasKey('pathList'), function (reader, target) {
     (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); });
+addHandler('lfxs', function () { return false; }, // TODO: not sure when we actually need to write this section
+// NOTE: this might be insufficient
+// target => target.effects !== undefined && (
+// 	!!target.effects.dropShadow?.some(e => e.choke) ||
+// 	!!target.effects.innerShadow?.some(e => e.choke) ||
+// 	!!target.effects.outerGlow?.choke ||
+// 	!!target.effects.innerGlow?.choke
+// ),
+function (reader, target, left) {
+    var version = (0, psdReader_1.readUint32)(reader);
+    if (version !== 0)
+        throw new Error("Invalid lfxs version");
+    var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
+    target.effects = (0, descriptor_1.parseEffects)(desc, !!reader.logMissingFeatures);
+    (0, psdReader_1.skipBytes)(reader, left());
+}, function (writer, target, _, options) {
+    var desc = (0, descriptor_1.serializeEffects)(target.effects, !!options.logMissingFeatures, true);
+    (0, psdWriter_1.writeUint32)(writer, 0); // version
+    (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+});
 function adjustmentType(type) {
     return function (target) { return !!target.adjustment && target.adjustment.type === type; };
 }
@@ -2863,7 +2883,8 @@ addHandler('thrs', adjustmentType('threshold'), function (reader, target, left)
 });
 var grdmColorModels = ['', '', '', 'rgb', 'hsb', '', 'lab'];
 addHandler('grdm', adjustmentType('gradient map'), function (reader, target, left) {
-    if ((0, psdReader_1.readUint16)(reader) !== 1)
+    var version = (0, psdReader_1.readUint16)(reader);
+    if (version !== 1 && version !== 3)
         throw new Error('Invalid grdm version');
     var info = {
         type: 'gradient map',
@@ -2871,6 +2892,12 @@ addHandler('grdm', adjustmentType('gradient map'), function (reader, target, lef
     };
     info.reverse = !!(0, psdReader_1.readUint8)(reader);
     info.dither = !!(0, psdReader_1.readUint8)(reader);
+    var hasMethod = !!(0, psdReader_1.readUint8)(reader);
+    reader.offset--;
+    if (hasMethod) {
+        var method = (0, psdReader_1.readSignature)(reader);
+        info.method = descriptor_1.gradientInterpolationMethodType.decode(method);
+    }
     info.name = (0, psdReader_1.readUnicodeString)(reader);
     info.colorStops = [];
     info.opacityStops = [];
@@ -2930,9 +2957,12 @@ addHandler('grdm', adjustmentType('gradient map'), function (reader, target, lef
 }, function (writer, target) {
     var _a, _b, _c;
     var info = target.adjustment;
-    (0, psdWriter_1.writeUint16)(writer, 1); // version
+    (0, psdWriter_1.writeUint16)(writer, info.method !== undefined ? 3 : 1); // version
     (0, psdWriter_1.writeUint8)(writer, info.reverse ? 1 : 0);
     (0, psdWriter_1.writeUint8)(writer, info.dither ? 1 : 0);
+    if (info.method !== undefined) {
+        (0, psdWriter_1.writeSignature)(writer, descriptor_1.gradientInterpolationMethodType.encode(info.method));
+    }
     (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, info.name || '');
     (0, psdWriter_1.writeUint16)(writer, info.colorStops && info.colorStops.length || 0);
     var interpolation = Math.round(((_a = info.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);