ag-psd 22.0.1 → 23.0.0

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v23.0.0
+- Fixed handling externally linked files in smart object layers
+
 ## v22.0.0
 - Fixed parsing path `smooth` gradient interpolation method
 - Changed `PsdReader` type

package/dist/additionalInfo.js

@@ -393,12 +393,13 @@ addHandler('lmfx', function (target) { return target.effects !== undefined && ha
     if (version !== 0)
         throw new Error('Invalid lmfx version');
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader);
-    // console.log(require('util').inspect(info, false, 99, true));
+    // console.log('READ', require('util').inspect(desc, false, 99, true));
     // discard if read in 'lrFX' or 'lfx2' section
     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);
+    // console.log('WRITE', require('util').inspect(desc, false, 99, true));
     (0, psdWriter_1.writeUint32)(writer, 0); // version
     (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
 });
@@ -2130,130 +2131,170 @@ addHandler('Anno', function (target) { return target.annotations !== undefined;
         writer.view.setUint32(dataOffset - 4, writer.offset - dataOffset, false);
     }
 });
-addHandler('lnk2', function (target) { return !!target.linkedFiles && target.linkedFiles.length > 0; }, function (reader, target, left) {
-    var psd = target;
-    psd.linkedFiles = psd.linkedFiles || [];
-    while (left() > 8) {
-        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);
-        var fileType = (0, psdReader_1.readSignature)(reader).trim(); // '    ' if empty
-        var fileCreator = (0, psdReader_1.readSignature)(reader).trim(); // '    ' or '\0\0\0\0' if empty
-        var dataSize = readLength64(reader);
-        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 };
-        if (fileType)
-            file.type = fileType;
-        if (fileCreator)
-            file.creator = fileCreator;
-        if (fileOpenDescriptor) {
-            file.descriptor = {
-                compInfo: {
-                    compID: fileOpenDescriptor.compInfo.compID,
-                    originalCompID: fileOpenDescriptor.compInfo.originalCompID,
-                }
-            };
-        }
-        if (type === 'liFE' && version > 3) {
-            var year = (0, psdReader_1.readInt32)(reader);
-            var month = (0, psdReader_1.readUint8)(reader);
-            var day = (0, psdReader_1.readUint8)(reader);
-            var hour = (0, psdReader_1.readUint8)(reader);
-            var minute = (0, psdReader_1.readUint8)(reader);
-            var seconds = (0, psdReader_1.readFloat64)(reader);
-            var wholeSeconds = Math.floor(seconds);
-            var ms = (seconds - wholeSeconds) * 1000;
-            file.time = (new Date(year, month, day, hour, minute, wholeSeconds, ms)).toISOString();
-        }
-        var fileSize = type === 'liFE' ? readLength64(reader) : 0;
-        if (type === 'liFA')
-            (0, psdReader_1.skipBytes)(reader, 8);
-        if (type === 'liFD')
-            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' && version === 2)
-            file.data = (0, psdReader_1.readBytes)(reader, fileSize);
-        if (reader.skipLinkedFilesData)
-            file.data = undefined;
-        psd.linkedFiles.push(file);
-        linkedFileDescriptor;
-        while (size % 4)
-            size++;
-        reader.offset = startOffset + size;
-    }
-    (0, psdReader_1.skipBytes)(reader, left()); // ?
-}, function (writer, target) {
-    var psd = target;
-    for (var _i = 0, _a = psd.linkedFiles; _i < _a.length; _i++) {
-        var file = _a[_i];
-        var version = 2;
-        if (file.assetLockedState != null)
-            version = 7;
-        else if (file.assetModTime != null)
-            version = 6;
-        else if (file.childDocumentID != null)
-            version = 5;
-        // TODO: else if (file.time != null) version = 3; (only for liFE)
-        (0, psdWriter_1.writeUint32)(writer, 0);
-        (0, psdWriter_1.writeUint32)(writer, 0); // size
-        var sizeOffset = writer.offset;
-        (0, psdWriter_1.writeSignature)(writer, file.data ? 'liFD' : 'liFA');
-        (0, psdWriter_1.writeInt32)(writer, version);
-        if (!file.id || typeof file.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(file.id)) {
-            throw new Error('Linked file ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
-        }
-        (0, psdWriter_1.writePascalString)(writer, file.id, 1);
-        (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.name || '');
-        (0, psdWriter_1.writeSignature)(writer, file.type ? "".concat(file.type, "    ").substring(0, 4) : '    ');
-        (0, psdWriter_1.writeSignature)(writer, file.creator ? "".concat(file.creator, "    ").substring(0, 4) : '\0\0\0\0');
-        writeLength64(writer, file.data ? file.data.byteLength : 0);
-        if (file.descriptor && file.descriptor.compInfo) {
-            var desc = {
-                compInfo: {
-                    compID: file.descriptor.compInfo.compID,
-                    originalCompID: file.descriptor.compInfo.originalCompID,
-                }
-            };
-            (0, psdWriter_1.writeUint8)(writer, 1);
-            (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
-        }
-        else {
-            (0, psdWriter_1.writeUint8)(writer, 0);
+function createLnkHandler(tag) {
+    addHandler(tag, function (target) {
+        var psd = target;
+        if (!psd.linkedFiles || !psd.linkedFiles.length)
+            return false;
+        if (tag === 'lnkE' && !psd.linkedFiles.some(function (f) { return f.linkedFile; }))
+            return false;
+        return true;
+    }, function (reader, target, left, _psd) {
+        var psd = target;
+        psd.linkedFiles = psd.linkedFiles || [];
+        while (left() > 8) {
+            var size = readLength64(reader);
+            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);
+            var fileType = (0, psdReader_1.readSignature)(reader).trim(); // '    ' if empty
+            var fileCreator = (0, psdReader_1.readSignature)(reader).trim(); // '    ' or '\0\0\0\0' if empty
+            var dataSize = readLength64(reader);
+            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 };
+            if (fileType)
+                file.type = fileType;
+            if (fileCreator)
+                file.creator = fileCreator;
+            if (fileOpenDescriptor) {
+                file.descriptor = {
+                    compInfo: {
+                        compID: fileOpenDescriptor.compInfo.compID,
+                        originalCompID: fileOpenDescriptor.compInfo.originalCompID,
+                    }
+                };
+            }
+            if (type === 'liFE' && version > 3) {
+                var year = (0, psdReader_1.readInt32)(reader);
+                var month = (0, psdReader_1.readUint8)(reader);
+                var day = (0, psdReader_1.readUint8)(reader);
+                var hour = (0, psdReader_1.readUint8)(reader);
+                var minute = (0, psdReader_1.readUint8)(reader);
+                var seconds = (0, psdReader_1.readFloat64)(reader);
+                var wholeSeconds = Math.floor(seconds);
+                var ms = (seconds - wholeSeconds) * 1000;
+                file.time = (new Date(Date.UTC(year, month, day, hour, minute, wholeSeconds, ms))).toISOString();
+            }
+            var fileSize = type === 'liFE' ? readLength64(reader) : 0;
+            if (type === 'liFA')
+                (0, psdReader_1.skipBytes)(reader, 8);
+            if (type === 'liFD')
+                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' && version === 2)
+                file.data = (0, psdReader_1.readBytes)(reader, fileSize);
+            if (reader.skipLinkedFilesData)
+                file.data = undefined;
+            if (tag === 'lnkE') {
+                file.linkedFile = {
+                    fileSize: fileSize,
+                    name: (linkedFileDescriptor === null || linkedFileDescriptor === void 0 ? void 0 : linkedFileDescriptor['Nm  ']) || '',
+                    fullPath: (linkedFileDescriptor === null || linkedFileDescriptor === void 0 ? void 0 : linkedFileDescriptor.fullPath) || '',
+                    originalPath: (linkedFileDescriptor === null || linkedFileDescriptor === void 0 ? void 0 : linkedFileDescriptor.originalPath) || '',
+                    relativePath: (linkedFileDescriptor === null || linkedFileDescriptor === void 0 ? void 0 : linkedFileDescriptor.relPath) || '',
+                };
+            }
+            psd.linkedFiles.push(file);
+            while (size % 4)
+                size++;
+            reader.offset = startOffset + size;
         }
-        if (file.data)
-            (0, psdWriter_1.writeBytes)(writer, file.data);
-        else
+        (0, psdReader_1.skipBytes)(reader, left()); // ?
+    }, function (writer, target) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var psd = target;
+        for (var _i = 0, _k = psd.linkedFiles; _i < _k.length; _i++) {
+            var file = _k[_i];
+            if ((tag === 'lnkE') !== !!file.linkedFile)
+                continue;
+            var version = 2;
+            if (file.assetLockedState != null)
+                version = 7;
+            else if (file.assetModTime != null)
+                version = 6;
+            else if (file.childDocumentID != null)
+                version = 5;
+            else if (tag == 'lnkE')
+                version = 3;
             writeLength64(writer, 0);
-        if (version >= 5)
-            (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.childDocumentID || '');
-        if (version >= 6)
-            (0, psdWriter_1.writeFloat64)(writer, file.assetModTime || 0);
-        if (version >= 7)
-            (0, psdWriter_1.writeUint8)(writer, file.assetLockedState || 0);
-        var size = writer.offset - sizeOffset;
-        writer.view.setUint32(sizeOffset - 4, size, false); // write size
-        while (size % 4) {
-            size++;
-            (0, psdWriter_1.writeUint8)(writer, 0);
+            var sizeOffset = writer.offset;
+            (0, psdWriter_1.writeSignature)(writer, (tag === 'lnkE') ? 'liFE' : (file.data ? 'liFD' : 'liFA'));
+            (0, psdWriter_1.writeInt32)(writer, version);
+            if (!file.id || typeof file.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(file.id)) {
+                throw new Error('Linked file ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
+            }
+            (0, psdWriter_1.writePascalString)(writer, file.id, 1);
+            (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.name || '');
+            (0, psdWriter_1.writeSignature)(writer, file.type ? "".concat(file.type, "    ").substring(0, 4) : '    ');
+            (0, psdWriter_1.writeSignature)(writer, file.creator ? "".concat(file.creator, "    ").substring(0, 4) : '\0\0\0\0');
+            writeLength64(writer, file.data ? file.data.byteLength : 0);
+            if (file.descriptor && file.descriptor.compInfo) {
+                var desc = {
+                    compInfo: {
+                        compID: file.descriptor.compInfo.compID,
+                        originalCompID: file.descriptor.compInfo.originalCompID,
+                    },
+                };
+                (0, psdWriter_1.writeUint8)(writer, 1);
+                (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'null', desc);
+            }
+            else {
+                (0, psdWriter_1.writeUint8)(writer, 0);
+            }
+            if (tag === 'lnkE') {
+                var desc = {
+                    descVersion: 2,
+                    'Nm  ': (_b = (_a = file.linkedFile) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : '',
+                    fullPath: (_d = (_c = file.linkedFile) === null || _c === void 0 ? void 0 : _c.fullPath) !== null && _d !== void 0 ? _d : '',
+                    originalPath: (_f = (_e = file.linkedFile) === null || _e === void 0 ? void 0 : _e.originalPath) !== null && _f !== void 0 ? _f : '',
+                    relPath: (_h = (_g = file.linkedFile) === null || _g === void 0 ? void 0 : _g.relativePath) !== null && _h !== void 0 ? _h : '',
+                };
+                (0, descriptor_1.writeVersionAndDescriptor)(writer, '', 'ExternalFileLink', desc);
+                var time = file.time ? new Date(file.time) : new Date();
+                (0, psdWriter_1.writeInt32)(writer, time.getUTCFullYear());
+                (0, psdWriter_1.writeUint8)(writer, time.getUTCMonth());
+                (0, psdWriter_1.writeUint8)(writer, time.getUTCDate());
+                (0, psdWriter_1.writeUint8)(writer, time.getUTCHours());
+                (0, psdWriter_1.writeUint8)(writer, time.getUTCMinutes());
+                (0, psdWriter_1.writeFloat64)(writer, time.getUTCSeconds() + time.getUTCMilliseconds() / 1000);
+            }
+            if (file.data) {
+                (0, psdWriter_1.writeBytes)(writer, file.data);
+            }
+            else {
+                writeLength64(writer, ((_j = file.linkedFile) === null || _j === void 0 ? void 0 : _j.fileSize) || 0);
+            }
+            if (version >= 5)
+                (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, file.childDocumentID || '');
+            if (version >= 6)
+                (0, psdWriter_1.writeFloat64)(writer, file.assetModTime || 0);
+            if (version >= 7)
+                (0, psdWriter_1.writeUint8)(writer, file.assetLockedState || 0);
+            var size = writer.offset - sizeOffset;
+            writer.view.setUint32(sizeOffset - 4, size, false); // write size
+            while (size % 4) {
+                size++;
+                (0, psdWriter_1.writeUint8)(writer, 0);
+            }
         }
-    }
-});
+    });
+}
+createLnkHandler('lnk2');
+createLnkHandler('lnkE');
 addHandlerAlias('lnkD', 'lnk2');
 addHandlerAlias('lnk3', 'lnk2');
-addHandlerAlias('lnkE', 'lnk2');
 addHandler('pths', hasKey('pathList'), function (reader, target) {
     var desc = (0, descriptor_1.readVersionAndDescriptor)(reader, true);
     // console.log(require('util').inspect(desc, false, 99, true));