ag-psd 25.0.0 → 27.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v27.0.0
+- Added support for read-only field `text.textPath` with text path information for text layers. This field is extracted from psd.engineData, which is not fully supported yet.
+
+## v26.0.0
+- Added support for `realMask` section
+
 ## v25.0.0
 - Added support for `blendingRanges` section
 - Added support for `interpolationMethod` for gradients

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/dist/additionalInfo.js

@@ -20,6 +20,7 @@ var psdWriter_1 = require("./psdWriter");
 var descriptor_1 = require("./descriptor");
 var engineData_1 = require("./engineData");
 var text_1 = require("./text");
+var engineData2_1 = require("./engineData2");
 var fromAtoZ = 'abcdefghijklmnopqrstuvwxyz';
 exports.infoHandlers = [];
 exports.infoHandlersMap = {};
@@ -339,58 +340,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);
@@ -862,7 +860,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'),
@@ -1427,6 +1431,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),
@@ -3085,11 +3090,38 @@ addHandler('CgEd', function (target) {
         throw new Error('Unhandled CgEd case');
     }
 });
-addHandler('Txt2', hasKey('engineData'), function (reader, target, left) {
+function getTextLayersSortedByIndex(psd) {
+    var layers = [];
+    function collect(layer) {
+        var _a;
+        if (layer.children) {
+            for (var _i = 0, _b = layer.children; _i < _b.length; _i++) {
+                var child = _b[_i];
+                if (((_a = child.text) === null || _a === void 0 ? void 0 : _a.index) !== undefined) {
+                    layers[child.text.index] = child;
+                }
+                collect(child);
+            }
+        }
+    }
+    collect(psd);
+    return layers;
+}
+addHandler('Txt2', hasKey('engineData'), function (reader, target, left, psd) {
     var data = (0, psdReader_1.readBytes)(reader, left());
     target.engineData = (0, base64_js_1.fromByteArray)(data);
-    // const engineData = parseEngineData(data);
-    // const engineData2 = decodeEngineData2(engineData);
+    var layersByIndex = getTextLayersSortedByIndex(psd);
+    var engineData = (0, engineData_1.parseEngineData)(data);
+    var engineData2 = (0, engineData2_1.decodeEngineData2)(engineData);
+    var TextFrameSet = engineData2.ResourceDict.TextFrameSet;
+    if (TextFrameSet) {
+        for (var i = 0; i < TextFrameSet.length; i++) {
+            var layer = layersByIndex[i];
+            if (TextFrameSet[i].path && (layer === null || layer === void 0 ? void 0 : layer.text)) {
+                layer.text.textPath = TextFrameSet[i].path;
+            }
+        }
+    }
     // console.log(require('util').inspect(engineData, false, 99, true));
     // require('fs').writeFileSync('test_data.bin', data);
     // require('fs').writeFileSync('test_data.txt', require('util').inspect(engineData, false, 99, false), 'utf8');