ag-psd 24.0.0 → 26.0.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v26.0.0
+- Added support for `realMask` section
+
+## v25.0.0
+- Added support for `blendingRanges` section
+- Added support for `interpolationMethod` for gradients
+
 ## v24.0.0
 - Added support for `curves` smart object filter
 - Added support for reading and writing `palette` field

package/{TODO → TODO.md}

@@ -25,6 +25,7 @@ check: https://github.com/TheNicker/libpsd
 
 - decompress image data in FEid section
 
+```ts
   if (!channelLength) throw new Error('filterEffect: Empty channel');
   const compression = readUint16(reader);
   const data = createImageDataBitDepth(right - left, bottom - top, depth, 1);
@@ -43,4 +44,49 @@ check: https://github.com/TheNicker/libpsd
   const data = createImageDataBitDepth(right - left, bottom - top, depth, 1);
   readData(reader, extraLength - 2, data, compression, data.width, data.height, depth, 0, false, 1);
   target.filterEffectsMasks[target.filterEffectsMasks.length - 1].extra = { top, left, bottom, right, data };
+```
 
+```ts
+export function decodeUtf16String(buffer: Uint8Array) {
+	let result = '';
+
+	for (let i = 0; i < buffer.byteLength;) {
+		const w1 = (buffer[i++] << 8) | buffer[i++];
+
+		if ((w1 & 0xF800) !== 0xD800) { // w1 < 0xD800 || w1 > 0xDFFF
+			result += String.fromCharCode(w1);
+			continue;
+		}
+
+		if ((w1 & 0xFC00) === 0xD800) { // w1 >= 0xD800 && w1 <= 0xDBFF
+			throw new Error('Invalid utf-16');
+		}
+
+		if (i === buffer.byteLength) {
+			throw new Error('Invalid utf-16');
+		}
+
+		const w2 = (buffer[i++] << 8) | buffer[i++];
+
+		if ((w2 & 0xFC00) !== 0xDC00) { // w2 < 0xDC00 || w2 > 0xDFFF)
+			throw new Error('Invalid utf-16');
+		}
+
+		result += String.fromCharCode(((w1 & 0x3ff) << 10) + (w2 & 0x3ff) + 0x10000);
+	}
+
+	return result;
+}
+
+export function encodeUtf16String(value: string) {
+	const buffer = new Uint8Array(value.length * 2);
+
+	for (let i = 0, j = 0; i < value.length; i++, j += 2) {
+		const word = value.charCodeAt(i);
+		buffer[j] = (word >> 8) & 0xff;
+		buffer[j + 1] = word & 0xff;
+	}
+
+	return buffer;
+}
+```

package/accept.js

@@ -9,7 +9,7 @@ if (type === 'read-write' || type === 'write') {
         const file = `expected.${ext}`;
         if (fs.existsSync(path.join('results', type, dir, file))) {
           fs.unlinkSync(path.join('test', type, dir, file));
-          fs.renameSync(
+          fs.copyFileSync(
             path.join('results', type, dir, file),
             path.join('test', type, dir, file));
           console.log('copied', dir);
@@ -22,6 +22,23 @@ if (type === 'read-write' || type === 'write') {
       console.log('failed', dir, e.message);
     }
   }
+} else if (type === 'read') {
+  for (const dir of fs.readdirSync(path.join('test', type))) {
+    try {
+      const file = `data.json`;
+      if (fs.existsSync(path.join('results', type, dir, file))) {
+        fs.unlinkSync(path.join('test', type, dir, file));
+        fs.copyFileSync(
+          path.join('results', type, dir, file),
+          path.join('test', type, dir, file));
+        console.log('copied', dir);
+      } else {
+        console.log('skipped', dir);
+      }
+    } catch (e) {
+      console.log('failed', dir, e.message);
+    }
+  }
 } else {
   console.error('Invalid type:', type);
 }

package/dist/additionalInfo.js

@@ -278,6 +278,13 @@ addHandler('vmsk', hasKey('vectorMask'), function (reader, target, left, _a) {
 });
 // TODO: need to write vmsk if has outline ?
 addHandlerAlias('vsms', 'vmsk');
+// addHandlerAlias('vmsk', 'vsms');
+addHandler('vowv', // something with vectors?
+hasKey('vowv'), function (reader, target) {
+    target.vowv = (0, psdReader_1.readUint32)(reader); // always 2 ????
+}, function (writer, target) {
+    (0, psdWriter_1.writeUint32)(writer, target.vowv);
+});
 addHandler('vogk', hasKey('vectorOrigination'), function (reader, target, left) {
     if ((0, psdReader_1.readInt32)(reader) !== 1)
         throw new Error("Invalid vogk version");
@@ -332,58 +339,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);
@@ -855,7 +859,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'),
@@ -1420,6 +1430,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),
@@ -2032,18 +2043,6 @@ addHandler('LMsk', hasKey('userMask'), function (reader, target) {
     (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); // always 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');