ag-psd 17.0.4 → 17.0.6

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v17.0.6
+- Fixed broken file after saving with layer name longer than 255 characters
+
+## v17.0.5
+- Fixed incorrect parsing of external linked files
+- Fixed incorrect parsing of compositorUsed section when some fields are missing
+
 ## v17.0.4
 - Fixed saving smart layers without placedLayer.warp field present for newer versions of photoshop
 

package/dist/additionalInfo.js

@@ -1861,6 +1861,42 @@ else {
     }, function (_writer, _target) {
     });
 }
+/*
+interface CAIDesc {
+    enab: boolean;
+    generationalGuid: string;
+}
+
+addHandler(
+    'CAI ', // content credentials ? something to do with generative tech
+    () => false,
+    (reader, _target, left) => {
+        const version = readUint32(reader); // 3
+        const desc = readVersionAndDescriptor(reader) as CAIDesc;
+        console.log('CAI', require('util').inspect(desc, false, 99, true));
+        console.log('CAI', { version });
+        console.log('CAI left', readBytes(reader, left())); // 8 bytes left, all zeroes
+    },
+    (_writer, _target) => {
+    },
+);
+*/
+/*
+interface GenIDesc {
+    isUsingGenTech: number;
+}
+
+addHandler(
+    'GenI', // generative tech
+    () => false,
+    (reader, _target, left) => {
+        const desc = readVersionAndDescriptor(reader) as GenIDesc;
+        console.log('GenI', require('util').inspect(desc, false, 99, true));
+    },
+    (_writer, _target) => {
+    },
+);
+*/
 function readRect(reader) {
     var top = (0, psdReader_1.readInt32)(reader);
     var left = (0, psdReader_1.readInt32)(reader);
@@ -1977,6 +2013,9 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         var size = readLength64(reader); // size
         var startOffset = reader.offset;
         var type = (0, psdReader_1.readSignature)(reader);
+        // liFD - linked file data
+        // liFE - linked file external
+        // liFA - linked file alias
         var version = (0, psdReader_1.readInt32)(reader);
         var id = (0, psdReader_1.readPascalString)(reader, 1);
         var name_3 = (0, psdReader_1.readUnicodeString)(reader);
@@ -1986,7 +2025,7 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         var hasFileOpenDescriptor = (0, psdReader_1.readUint8)(reader);
         var fileOpenDescriptor = hasFileOpenDescriptor ? (0, descriptor_1.readVersionAndDescriptor)(reader) : undefined;
         var linkedFileDescriptor = type === 'liFE' ? (0, descriptor_1.readVersionAndDescriptor)(reader) : undefined;
-        var file = { id: id, name: name_3, data: undefined };
+        var file = { id: id, name: name_3 };
         if (fileType)
             file.type = fileType;
         if (fileCreator)
@@ -2014,14 +2053,14 @@ addHandler('lnk2', function (target) { return !!target.linkedFiles && target.lin
         if (type === 'liFA')
             (0, psdReader_1.skipBytes)(reader, 8);
         if (type === 'liFD')
-            file.data = (0, psdReader_1.readBytes)(reader, dataSize);
+            file.data = (0, psdReader_1.readBytes)(reader, dataSize); // seems to be a typo in docs
         if (version >= 5)
             file.childDocumentID = (0, psdReader_1.readUnicodeString)(reader);
         if (version >= 6)
             file.assetModTime = (0, psdReader_1.readFloat64)(reader);
         if (version >= 7)
             file.assetLockedState = (0, psdReader_1.readUint8)(reader);
-        if (type === 'liFE')
+        if (type === 'liFE' && version === 2)
             file.data = (0, psdReader_1.readBytes)(reader, fileSize);
         if (options.skipLinkedFilesData)
             file.data = undefined;
@@ -2962,11 +3001,15 @@ addHandler('cinf', hasKey('compositorUsed'), function (reader, target, left) {
         description: desc.description,
         reason: desc.reason,
         engine: enumValue(desc.Engn),
-        enableCompCore: enumValue(desc.enableCompCore),
-        enableCompCoreGPU: enumValue(desc.enableCompCoreGPU),
-        compCoreSupport: enumValue(desc.compCoreSupport),
-        compCoreGPUSupport: enumValue(desc.compCoreGPUSupport),
     };
+    if (desc.enableCompCore)
+        target.compositorUsed.enableCompCore = enumValue(desc.enableCompCore);
+    if (desc.enableCompCoreGPU)
+        target.compositorUsed.enableCompCoreGPU = enumValue(desc.enableCompCoreGPU);
+    if (desc.compCoreSupport)
+        target.compositorUsed.compCoreSupport = enumValue(desc.compCoreSupport);
+    if (desc.compCoreGPUSupport)
+        target.compositorUsed.compCoreGPUSupport = enumValue(desc.compCoreGPUSupport);
     (0, psdReader_1.skipBytes)(reader, left());
 }, function (writer, target) {
     var cinf = target.compositorUsed;
@@ -2976,12 +3019,16 @@ addHandler('cinf', hasKey('compositorUsed'), function (reader, target, left) {
         description: cinf.description,
         reason: cinf.reason,
         Engn: "Engn.".concat(cinf.engine),
-        enableCompCore: "enable.".concat(cinf.enableCompCore),
-        enableCompCoreGPU: "enable.".concat(cinf.enableCompCoreGPU),
-        // enableCompCoreThreads: `enable.feature`, // TESTING
-        compCoreSupport: "reason.".concat(cinf.compCoreSupport),
-        compCoreGPUSupport: "reason.".concat(cinf.compCoreGPUSupport),
     };
+    if (cinf.enableCompCore)
+        desc.enableCompCore = "enable.".concat(cinf.enableCompCore);
+    if (cinf.enableCompCoreGPU)
+        desc.enableCompCoreGPU = "enable.".concat(cinf.enableCompCoreGPU);
+    // desc.enableCompCoreThreads = `enable.feature`; // TESTING
+    if (cinf.compCoreSupport)
+        desc.compCoreSupport = "reason.".concat(cinf.compCoreSupport);
+    if (cinf.compCoreGPUSupport)
+        desc.compCoreGPUSupport = "reason.".concat(cinf.compCoreGPUSupport);
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
 // extension settings ?, ignore it