ag-psd 19.0.1 → 20.1.0

package/dist-es/additionalInfo.js

@@ -12,9 +12,9 @@ var __assign = (this && this.__assign) || function () {
 import { fromByteArray, toByteArray } from 'base64-js';
 import { readEffects, writeEffects } from './effectsHelpers';
 import { clamp, createEnum, layerColors, MOCK_HANDLERS } from './helpers';
-import { readSignature, readUnicodeString, skipBytes, readUint32, readUint8, readFloat64, readUint16, readBytes, readInt16, checkSignature, readFloat32, readFixedPointPath32, readSection, readColor, readInt32, readPascalString, readUnicodeStringWithLength, readAsciiString, readPattern, } from './psdReader';
-import { writeZeros, writeSignature, writeBytes, writeUint32, writeUint16, writeFloat64, writeUint8, writeInt16, writeFloat32, writeFixedPointPath32, writeUnicodeString, writeSection, writeUnicodeStringWithPadding, writeColor, writePascalString, writeInt32, } from './psdWriter';
-import { Annt, BlnM, parsePercent, parseUnits, parseUnitsOrNumber, strokeStyleLineAlignment, strokeStyleLineCapType, strokeStyleLineJoinType, textGridding, unitsPercent, unitsValue, warpStyle, writeVersionAndDescriptor, readVersionAndDescriptor, Ornt, horzVrtcToXY, xyToHorzVrtc, serializeEffects, parseEffects, parseColor, serializeColor, serializeVectorContent, parseVectorContent, parseTrackList, serializeTrackList, BlrM, BlrQ, SmBQ, SmBM, DspM, UndA, Cnvr, RplS, SphM, Wvtp, ZZTy, Dstr, Chnl, MztT, Lns, blurType, DfsM, ExtT, ExtR, FlCl, CntE, WndM, Drct, IntE, IntC, FlMd, unitsPercentF, frac, ClrS, descBoundsToBounds, boundsToDescBounds, } from './descriptor';
+import { readSignature, readUnicodeString, skipBytes, readUint32, readUint8, readFloat64, readUint16, readBytes, readInt16, checkSignature, readFloat32, readFixedPointPath32, readSection, readColor, readInt32, readPascalString, readUnicodeStringWithLength, readAsciiString, readPattern, readLayerInfo } from './psdReader';
+import { writeZeros, writeSignature, writeBytes, writeUint32, writeUint16, writeFloat64, writeUint8, writeInt16, writeFloat32, writeFixedPointPath32, writeUnicodeString, writeSection, writeUnicodeStringWithPadding, writeColor, writePascalString, writeInt32 } from './psdWriter';
+import { Annt, BlnM, parsePercent, parseUnits, parseUnitsOrNumber, strokeStyleLineAlignment, strokeStyleLineCapType, strokeStyleLineJoinType, textGridding, unitsPercent, unitsValue, warpStyle, writeVersionAndDescriptor, readVersionAndDescriptor, Ornt, horzVrtcToXY, xyToHorzVrtc, serializeEffects, parseEffects, parseColor, serializeColor, serializeVectorContent, parseVectorContent, parseTrackList, serializeTrackList, BlrM, BlrQ, SmBQ, SmBM, DspM, UndA, Cnvr, RplS, SphM, Wvtp, ZZTy, Dstr, Chnl, MztT, Lns, blurType, DfsM, ExtT, ExtR, FlCl, CntE, WndM, Drct, IntE, IntC, FlMd, unitsPercentF, frac, ClrS, descBoundsToBounds, boundsToDescBounds } from './descriptor';
 import { serializeEngineData, parseEngineData } from './engineData';
 import { encodeEngineData, decodeEngineData } from './text';
 var fromAtoZ = 'abcdefghijklmnopqrstuvwxyz';
@@ -49,9 +49,11 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     if (readInt16(reader) !== 50)
         throw new Error("Invalid TySh text version");
     var text = readVersionAndDescriptor(reader);
+    // console.log(require('util').inspect(text, false, 99, false), 'utf8');
     if (readInt16(reader) !== 1)
         throw new Error("Invalid TySh warp version");
     var warp = readVersionAndDescriptor(reader);
+    // console.log(require('util').inspect(warp, false, 99, false), 'utf8');
     target.text = {
         transform: transform,
         left: readFloat32(reader),
@@ -78,6 +80,7 @@ addHandler('TySh', hasKey('text'), function (reader, target, leftBytes) {
     if (text.EngineData) {
         var engineData = parseEngineData(text.EngineData);
         var textData = decodeEngineData(engineData);
+        // console.log(require('util').inspect(engineData, false, 99, false), 'utf8');
         // require('fs').writeFileSync(`layer-${target.name}.txt`, require('util').inspect(engineData, false, 99, false), 'utf8');
         // const before = parseEngineData(text.EngineData);
         // const after = encodeEngineData(engineData);
@@ -493,7 +496,7 @@ addHandler('lclr', hasKey('layerColor'), function (reader, target) {
     writeZeros(writer, 6);
 });
 addHandler('shmd', function (target) { return target.timestamp !== undefined || target.animationFrames !== undefined ||
-    target.animationFrameFlags !== undefined || target.timeline !== undefined; }, function (reader, target, left, _, options) {
+    target.animationFrameFlags !== undefined || target.timeline !== undefined || target.comps !== undefined; }, function (reader, target, left, _, options) {
     var count = readUint32(reader);
     var _loop_1 = function (i) {
         checkSignature(reader, '8BIM');
@@ -557,8 +560,28 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
                 target.timeline = timeline;
                 // console.log('tmln:result', target.name, target.id, require('util').inspect(timeline, false, 99, true));
             }
+            else if (key === 'cmls') {
+                var desc = readVersionAndDescriptor(reader);
+                // console.log('cmls', require('util').inspect(desc, false, 99, true));
+                target.comps = {
+                    settings: [],
+                };
+                if (desc.origFXRefPoint)
+                    target.comps.originalEffectsReferencePoint = { x: desc.origFXRefPoint.Hrzn, y: desc.origFXRefPoint.Vrtc };
+                for (var _i = 0, _a = desc.layerSettings; _i < _a.length; _i++) {
+                    var item = _a[_i];
+                    target.comps.settings.push({ compList: item.compList });
+                    var t = target.comps.settings[target.comps.settings.length - 1];
+                    if ('enab' in item)
+                        t.enabled = item.enab;
+                    if (item.Ofst)
+                        t.offset = { x: item.Ofst.Hrzn, y: item.Ofst.Vrtc };
+                    if (item.FXRefPoint)
+                        t.effectsReferencePoint = { x: item.FXRefPoint.Hrzn, y: item.FXRefPoint.Vrtc };
+                }
+            }
             else {
-                options.logDevFeatures && console.log('Unhandled "shmd" section key', key);
+                options.logMissingFeatures && console.log('Unhandled "shmd" section key', key);
             }
             skipBytes(reader, left());
         });
@@ -568,7 +591,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
     }
     skipBytes(reader, left());
 }, function (writer, target, _, options) {
-    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline;
+    var animationFrames = target.animationFrames, animationFrameFlags = target.animationFrameFlags, timestamp = target.timestamp, timeline = target.timeline, comps = target.comps;
     var count = 0;
     if (animationFrames)
         count++;
@@ -578,6 +601,8 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
         count++;
     if (timestamp !== undefined)
         count++;
+    if (comps)
+        count++;
     writeUint32(writer, count);
     if (animationFrames) {
         writeSignature(writer, '8BIM');
@@ -643,7 +668,7 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
             if (timeline.tracks) {
                 desc.trackList = serializeTrackList(timeline.tracks);
             }
-            var id = options.layerToId.get(target) || target.id || 0;
+            var id = options.layerToId.get(target) || target.id;
             if (!id)
                 throw new Error('You need to provide layer.id value whan writing document with animations');
             desc.LyrI = id;
@@ -663,6 +688,37 @@ addHandler('shmd', function (target) { return target.timestamp !== undefined ||
             writeVersionAndDescriptor(writer, '', 'metadata', desc);
         }, true);
     }
+    if (comps) {
+        writeSignature(writer, '8BIM');
+        writeSignature(writer, 'cmls');
+        writeUint8(writer, 0); // copy (always false)
+        writeZeros(writer, 3);
+        writeSection(writer, 2, function () {
+            var id = options.layerToId.get(target) || target.id;
+            if (!id)
+                throw new Error('You need to provide layer.id value whan writing document with layer comps');
+            var desc = {};
+            if (comps.originalEffectsReferencePoint) {
+                desc.origFXRefPoint = { Hrzn: comps.originalEffectsReferencePoint.x, Vrtc: comps.originalEffectsReferencePoint.y };
+            }
+            desc.LyrI = id;
+            desc.layerSettings = [];
+            for (var _i = 0, _a = comps.settings; _i < _a.length; _i++) {
+                var item = _a[_i];
+                var t = {};
+                if (item.enabled !== undefined)
+                    t.enab = item.enabled;
+                if (item.offset)
+                    t.Ofst = { Hrzn: item.offset.x, Vrtc: item.offset.y };
+                if (item.effectsReferencePoint)
+                    t.FXRefPoint = { Hrzn: item.effectsReferencePoint.x, Vrtc: item.effectsReferencePoint.y };
+                t.compList = item.compList;
+                desc.layerSettings.push(t);
+            }
+            // console.log('cmls', require('util').inspect(desc, false, 99, true));
+            writeVersionAndDescriptor(writer, '', 'null', desc);
+        }, true);
+    }
 });
 addHandler('vstk', hasKey('vectorStroke'), function (reader, target, left) {
     var desc = readVersionAndDescriptor(reader);
@@ -1839,6 +1895,42 @@ addHandler('fxrp', hasKey('referencePoint'), function (reader, target) {
     writeFloat64(writer, target.referencePoint.x);
     writeFloat64(writer, target.referencePoint.y);
 });
+addHandler('Lr16', function () { return false; }, function (reader, _target, _left, psd, options) {
+    readLayerInfo(reader, psd, options);
+}, function (_writer, _target) {
+});
+addHandler('Lr32', function () { return false; }, function (reader, _target, _left, psd, options) {
+    readLayerInfo(reader, psd, options);
+}, function (_writer, _target) {
+});
+addHandler('LMsk', hasKey('userMask'), function (reader, target) {
+    target.userMask = {
+        colorSpace: readColor(reader),
+        opacity: readUint16(reader) / 0xff,
+    };
+    var flag = readUint8(reader);
+    if (flag !== 128)
+        throw new Error('Invalid flag value');
+    skipBytes(reader, 1);
+}, function (writer, target) {
+    var userMask = target.userMask;
+    writeColor(writer, userMask.colorSpace);
+    writeUint16(writer, clamp(userMask.opacity, 0, 1) * 0xff);
+    writeUint8(writer, 128);
+    writeZeros(writer, 1);
+});
+if (MOCK_HANDLERS) {
+    addHandler('vowv', // appears with Lr16 section ?
+    function (// appears with Lr16 section ?
+    _) { return false; }, function (reader, target, left) {
+        var value = readUint32(reader); // 2 ????
+        reader;
+        target;
+        console.log('vowv', { value: value }, left());
+    }, function (_writer, _target) {
+        // TODO: write
+    });
+}
 if (MOCK_HANDLERS) {
     addHandler('Patt', function (target) { return target._Patt !== undefined; }, function (reader, target, left) {
         // console.log('additional info: Patt');
@@ -2131,15 +2223,16 @@ addHandlerAlias('lnkD', 'lnk2');
 addHandlerAlias('lnk3', 'lnk2');
 addHandlerAlias('lnkE', 'lnk2');
 addHandler('pths', hasKey('pathList'), function (reader, target) {
-    var descriptor = readVersionAndDescriptor(reader);
-    target.pathList = []; // TODO: read paths (find example with non-empty list)
-    descriptor;
-    // console.log('pths', descriptor); // TODO: remove this
+    var desc = readVersionAndDescriptor(reader, true);
+    // console.log(require('util').inspect(desc, false, 99, true));
+    // if (options.throwForMissingFeatures && desc?.pathList?.length) throw new Error('non-empty pathList in `pths`');
+    desc;
+    target.pathList = []; // TODO: read paths
 }, function (writer, _target) {
-    var descriptor = {
+    var desc = {
         pathList: [], // TODO: write paths
     };
-    writeVersionAndDescriptor(writer, '', 'pathsDataClass', descriptor);
+    writeVersionAndDescriptor(writer, '', 'pathsDataClass', desc);
 });
 addHandler('lyvr', hasKey('version'), function (reader, target) { return target.version = readUint32(reader); }, function (writer, target) { return writeUint32(writer, target.version); });
 function adjustmentType(type) {
@@ -2834,9 +2927,11 @@ addHandler('Txt2', hasKey('engineData'), function (reader, target, left) {
     var data = readBytes(reader, left());
     target.engineData = fromByteArray(data);
     // const engineData = parseEngineData(data);
+    // const engineData2 = decodeEngineData2(engineData);
     // console.log(require('util').inspect(engineData, false, 99, true));
-    // require('fs').writeFileSync('resources/engineData2Simple.txt', require('util').inspect(engineData, false, 99, false), 'utf8');
-    // require('fs').writeFileSync('test_data.json', JSON.stringify(ed, null, 2), 'utf8');
+    // require('fs').writeFileSync('test_data.bin', data);
+    // require('fs').writeFileSync('test_data.txt', require('util').inspect(engineData, false, 99, false), 'utf8');
+    // require('fs').writeFileSync('test_data.json', JSON.stringify(engineData2, null, 2), 'utf8');
 }, function (writer, target) {
     var buffer = toByteArray(target.engineData);
     writeBytes(writer, buffer);