ag-psd 32.0.0 → 33.0.0

package/dist/ase.d.ts

@@ -29,4 +29,9 @@ export interface AseGroup {
 export interface Ase {
     colors: (AseGroup | AseColor)[];
 }
-export declare function readAse(buffer: ArrayBufferView): Ase;
+export interface ReadAseOptions {
+    logMissingFeatures?: boolean;
+    /** Throw on unsupported or invalid blocks instead of skipping them */
+    throwForMissingFeatures?: boolean;
+}
+export declare function readAse(buffer: ArrayBufferView, options?: ReadAseOptions): Ase;

package/dist/ase.js

@@ -2,83 +2,83 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readAse = readAse;
 const psdReader_1 = require("./psdReader");
-function readAse(buffer) {
+function readAse(buffer, options = {}) {
     const reader = (0, psdReader_1.createReader)(buffer.buffer, buffer.byteOffset, buffer.byteLength);
     const signature = (0, psdReader_1.readSignature)(reader); // ASEF
     if (signature !== 'ASEF')
         throw new Error('Invalid signature');
     const versionMajor = (0, psdReader_1.readUint16)(reader); // 1
-    const versionMinor = (0, psdReader_1.readUint16)(reader); // 0
-    if (versionMajor !== 1 || versionMinor !== 0)
+    (0, psdReader_1.readUint16)(reader); // minor version: 0
+    if (versionMajor !== 1)
         throw new Error('Invalid version');
     const blocksCount = (0, psdReader_1.readUint32)(reader);
-    const colorTypes = ['global', 'spot', 'normal'];
     const ase = { colors: [] };
     let group = ase;
-    for (let i = 0; i < blocksCount; i++) {
+    for (let i = 0; i < blocksCount && reader.offset + 6 <= reader.view.byteLength; i++) {
         const type = (0, psdReader_1.readUint16)(reader);
         const length = (0, psdReader_1.readUint32)(reader);
-        const end = reader.offset + length;
-        switch (type) {
-            case 0x0001: { // color
-                const nameLength = (0, psdReader_1.readUint16)(reader);
-                const name = (0, psdReader_1.readUnicodeStringWithLength)(reader, nameLength);
-                const colorMode = (0, psdReader_1.readSignature)(reader);
-                let color;
-                switch (colorMode) {
-                    case 'RGB ':
-                        color = {
-                            r: (0, psdReader_1.readFloat32)(reader),
-                            g: (0, psdReader_1.readFloat32)(reader),
-                            b: (0, psdReader_1.readFloat32)(reader),
-                            type: colorTypes[(0, psdReader_1.readUint16)(reader)],
-                        };
-                        break;
-                    case 'CMYK':
-                        color = {
-                            c: (0, psdReader_1.readFloat32)(reader),
-                            m: (0, psdReader_1.readFloat32)(reader),
-                            y: (0, psdReader_1.readFloat32)(reader),
-                            k: (0, psdReader_1.readFloat32)(reader),
-                            type: colorTypes[(0, psdReader_1.readUint16)(reader)],
-                        };
-                        break;
-                    case 'Gray':
-                        color = {
-                            k: (0, psdReader_1.readFloat32)(reader),
-                            type: colorTypes[(0, psdReader_1.readUint16)(reader)],
-                        };
-                        break;
-                    case 'LAB ':
-                        color = {
-                            l: (0, psdReader_1.readFloat32)(reader),
-                            a: (0, psdReader_1.readFloat32)(reader),
-                            b: (0, psdReader_1.readFloat32)(reader),
-                            type: colorTypes[(0, psdReader_1.readUint16)(reader)],
-                        };
-                        break;
-                    default:
-                        throw new Error('Invalid color mode');
+        const end = Math.min(reader.offset + length, reader.view.byteLength);
+        // block reader, so invalid lengths can't make us read data of following blocks
+        const block = (0, psdReader_1.createReader)(reader.view.buffer, reader.view.byteOffset + reader.offset, end - reader.offset);
+        try {
+            switch (type) {
+                case 0x0001: { // color
+                    const color = readAseColor(block);
+                    if (color) {
+                        group.colors.push(color);
+                    }
+                    else {
+                        if (options.throwForMissingFeatures)
+                            throw new Error('Unsupported color mode');
+                        options.logMissingFeatures && reader.log('Skipped color with unsupported color mode');
+                    }
+                    break;
                 }
-                if (!color.type)
-                    throw new Error('Invalid color type');
-                group.colors.push({ name, color });
-                break;
-            }
-            case 0xC001: { // group start
-                const nameLength = (0, psdReader_1.readUint16)(reader);
-                const name = (0, psdReader_1.readUnicodeStringWithLength)(reader, nameLength);
-                ase.colors.push(group = { name, colors: [] });
-                break;
+                case 0xC001: { // group start
+                    const nameLength = (0, psdReader_1.readUint16)(block);
+                    const name = (0, psdReader_1.readUnicodeStringWithLength)(block, nameLength);
+                    ase.colors.push(group = { name, colors: [] });
+                    break;
+                }
+                case 0xC002: // group end
+                    group = ase;
+                    break;
+                default:
+                    if (options.throwForMissingFeatures)
+                        throw new Error(`Invalid block type: ${type}`);
+                    options.logMissingFeatures && reader.log(`Skipped unknown block type: ${type}`);
             }
-            case 0xC002: // group end
-                group = ase;
-                break;
-            default:
-                throw new Error('Invalid block type');
+        }
+        catch (e) {
+            if (options.throwForMissingFeatures)
+                throw e;
+            options.logMissingFeatures && reader.log(`Skipped invalid block: ${e.message}`);
         }
         reader.offset = end;
     }
     return ase;
 }
+function readAseColor(reader) {
+    const nameLength = (0, psdReader_1.readUint16)(reader);
+    const name = (0, psdReader_1.readUnicodeStringWithLength)(reader, nameLength);
+    const colorMode = (0, psdReader_1.readSignature)(reader);
+    // NaN and infinite values are replaced with 0
+    const value = () => {
+        const v = (0, psdReader_1.readFloat32)(reader);
+        return isFinite(v) ? v : 0;
+    };
+    // color type is sometimes missing, unknown types are treated as process (normal) colors
+    const colorType = () => {
+        const index = reader.offset + 2 <= reader.view.byteLength ? (0, psdReader_1.readUint16)(reader) : 2;
+        return colorTypes[index] || 'normal';
+    };
+    switch (colorMode) {
+        case 'RGB ': return { name, color: { r: value(), g: value(), b: value(), type: colorType() } };
+        case 'CMYK': return { name, color: { c: value(), m: value(), y: value(), k: value(), type: colorType() } };
+        case 'Gray': return { name, color: { k: value(), type: colorType() } };
+        case 'LAB ': return { name, color: { l: value(), a: value(), b: value(), type: colorType() } };
+        default: return undefined;
+    }
+}
+const colorTypes = ['global', 'spot', 'normal'];
 //# sourceMappingURL=ase.js.map

package/dist/ase.js.map

@@ -1 +1 @@
-{"version":3,"file":"ase.js","sourceRoot":"../src/","sources":["ase.ts"],"names":[],"mappings":";;AAqCA,0BA+EC;AApHD,2CAA4H;AAqC5H,SAAgB,OAAO,CAAC,MAAuB;IAC7C,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACjF,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,MAAM,CAAC,CAAC,CAAC,OAAO;IAChD,IAAI,SAAS,KAAK,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,IAAI;IAC7C,MAAM,YAAY,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,IAAI;IAC7C,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjF,MAAM,WAAW,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,UAAU,GAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChE,MAAM,GAAG,GAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAChC,IAAI,KAAK,GAAmB,GAAG,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAEnC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ;gBACrB,MAAM,UAAU,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;gBACtC,MAAM,IAAI,GAAG,IAAA,uCAA2B,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBAC7D,MAAM,SAAS,GAAG,IAAA,yBAAa,EAAC,MAAM,CAAC,CAAC;gBACxC,IAAI,KAAwB,CAAC;gBAC7B,QAAQ,SAAS,EAAE,CAAC;oBAClB,KAAK,MAAM;wBACT,KAAK,GAAG;4BACN,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,IAAI,EAAE,UAAU,CAAC,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;yBACrC,CAAC;wBACF,MAAM;oBACR,KAAK,MAAM;wBACT,KAAK,GAAG;4BACN,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,IAAI,EAAE,UAAU,CAAC,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;yBACrC,CAAC;wBACF,MAAM;oBACR,KAAK,MAAM;wBACT,KAAK,GAAG;4BACN,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,IAAI,EAAE,UAAU,CAAC,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;yBACrC,CAAC;wBACF,MAAM;oBACR,KAAK,MAAM;wBACT,KAAK,GAAG;4BACN,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,CAAC,EAAE,IAAA,uBAAW,EAAC,MAAM,CAAC;4BACtB,IAAI,EAAE,UAAU,CAAC,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;yBACrC,CAAC;wBACF,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBAC1C,CAAC;gBACD,IAAI,CAAC,KAAK,CAAC,IAAI;oBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBACvD,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;gBACnC,MAAM;YACR,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,cAAc;gBAC3B,MAAM,UAAU,GAAG,IAAA,sBAAU,EAAC,MAAM,CAAC,CAAC;gBACtC,MAAM,IAAI,GAAG,IAAA,uCAA2B,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;gBAC7D,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC9C,MAAM;YACR,CAAC;YACD,KAAK,MAAM,EAAE,YAAY;gBACvB,KAAK,GAAG,GAAG,CAAC;gBACZ,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;IACtB,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"ase.js","sourceRoot":"../src/","sources":["ase.ts"],"names":[],"mappings":"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"}