ag-psd 20.1.0 → 20.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-psd",
-  "version": "20.1.0",
+  "version": "20.1.2",
   "description": "Library for reading and writing PSD files",
   "main": "dist/index.js",
   "module": "dist-es/index.js",
@@ -36,6 +36,7 @@
   "devDependencies": {
     "@types/mocha": "^10.0.6",
     "@types/node": "^18.11.18",
+    "@types/pako": "^2.0.3",
     "browserify": "^17.0.0",
     "canvas": "^2.11.0",
     "chai": "^4.3.7",
@@ -47,6 +48,6 @@
   "dependencies": {
     "@types/base64-js": "^1.3.0",
     "base64-js": "^1.5.1",
-    "zlib": "^1.0.5"
+    "pako": "^2.1.0"
   }
 }

package/perf.js

@@ -0,0 +1,12 @@
+require('ts-node').register({});
+const { readPsd } = require('./src/index.ts');
+require('./src/initializeCanvas.ts');
+const { readFileSync } = require('fs');
+
+const buffer = readFileSync('D:\\Downloads\\8K Painting.psd');
+
+const start = performance.now();
+const psd = readPsd(buffer);
+const end = performance.now();
+
+console.log('time', end - start, 'ms', psd.width, psd.height);

package/src/additionalInfo.ts

@@ -3596,6 +3596,7 @@ addHandler(
 			const version = readInt32(reader);
 			const id = readPascalString(reader, 1);
 			const name = readUnicodeString(reader);
+
 			const fileType = readSignature(reader).trim(); // '    ' if empty
 			const fileCreator = readSignature(reader).trim(); // '    ' or '\0\0\0\0' if empty
 			const dataSize = readLength64(reader);

package/src/helpers.ts

@@ -1,5 +1,5 @@
 import { fromByteArray } from 'base64-js';
-import { deflateSync } from 'zlib';
+import { deflate as deflateSync } from 'pako';
 import { Layer, BlendMode, LayerColor, PixelData, PixelArray } from './psd';
 
 export const MOCK_HANDLERS = false;

package/src/imageResources.ts

@@ -275,7 +275,7 @@ addHandler(
 	(reader, target, left) => {
 		target.alphaChannelNames = [];
 
-		while (left()) {
+		while (left() > 0) {
 			const value = readPascalString(reader, 1);
 			target.alphaChannelNames.push(value);
 		}
@@ -293,7 +293,7 @@ addHandler(
 	(reader, target, left) => {
 		target.alphaChannelNames = [];
 
-		while (left()) {
+		while (left() > 0) {
 			target.alphaChannelNames.push(readUnicodeString(reader));
 		}
 	},
@@ -482,7 +482,7 @@ addHandler(
 	(reader, target, left) => {
 		target.layersGroup = [];
 
-		while (left()) {
+		while (left() > 0) {
 			target.layersGroup.push(readUint16(reader));
 		}
 	},
@@ -499,7 +499,7 @@ addHandler(
 	(reader, target, left) => {
 		target.layerGroupsEnabledId = [];
 
-		while (left()) {
+		while (left() > 0) {
 			target.layerGroupsEnabledId.push(readUint8(reader));
 		}
 	},
@@ -1368,7 +1368,7 @@ addHandler(
 		if (key === 'mani') {
 			checkSignature(reader, 'IRFR');
 			readSection(reader, 1, left => {
-				while (left()) {
+				while (left() > 0) {
 					checkSignature(reader, '8BIM');
 					const key = readSignature(reader);
 

package/src/initializeCanvas.ts

@@ -7,7 +7,7 @@ function createCanvasFromData(data: Uint8Array) {
 
 	try {
 		const context = canvas.getContext('2d')!;
-		const imageData = decodeJpeg(data, (w, h) => context.createImageData(w, h));
+		const imageData = decodeJpeg(data, (w, h) => context.createImageData(w, h) as any);
 		canvas.width = imageData.width;
 		canvas.height = imageData.height;
 		context.putImageData(imageData, 0, 0);
@@ -18,8 +18,8 @@ function createCanvasFromData(data: Uint8Array) {
 	return canvas;
 }
 
-initializeCanvas(createCanvas, createCanvasFromData);
+initializeCanvas(createCanvas as any, createCanvasFromData as any);
 
 export function initialize() {
-	initializeCanvas(createCanvas, createCanvasFromData);
+	initializeCanvas(createCanvas as any, createCanvasFromData as any);
 }

package/src/psdReader.ts

@@ -1,4 +1,4 @@
-import { inflateSync } from 'zlib';
+import { inflate as inflateSync } from 'pako';
 import { Psd, Layer, ColorMode, SectionDividerType, LayerAdditionalInfo, ReadOptions, LayerMaskData, Color, PatternInfo, GlobalLayerMaskInfo, RGB, PixelData, PixelArray } from './psd';
 import { resetImageData, offsetForChannel, decodeBitmap, createImageData, toBlendMode, ChannelID, Compression, LayerMaskFlags, MaskParams, ColorSpace, RAW_IMAGE_DATA, largeAdditionalInfoKeys, imageDataToCanvas } from './helpers';
 import { infoHandlersMap } from './additionalInfo';
@@ -234,7 +234,7 @@ export function readPsd(reader: PsdReader, readOptions: ReadOptions = {}) {
 
 		// const numbers: number[] = [];
 		// console.log('color mode', left());
-		// while (left()) {
+		// while (left() > 0) {
 		// 	numbers.push(readUint32(reader));
 		// }
 		// console.log('color mode', numbers);
@@ -245,7 +245,7 @@ export function readPsd(reader: PsdReader, readOptions: ReadOptions = {}) {
 
 	// image resources
 	readSection(reader, 1, left => {
-		while (left()) {
+		while (left() > 0) {
 			const sigOffset = reader.offset;
 			let sig = '';
 
@@ -431,7 +431,7 @@ function readLayerRecord(reader: PsdReader, psd: Psd, options: ReadOptionsExt) {
 		/*const blendingRanges =*/ readLayerBlendingRanges(reader);
 		layer.name = readPascalString(reader, 4);
 
-		while (left()) {
+		while (left() > 0) {
 			readAdditionalLayerInfo(reader, layer, psd, options);
 		}
 	});
@@ -485,7 +485,7 @@ function readLayerBlendingRanges(reader: PsdReader) {
 		const compositeGraphBlendDestinationRange = readUint32(reader);
 		const ranges = [];
 
-		while (left()) {
+		while (left() > 0) {
 			const sourceRange = readUint32(reader);
 			const destRange = readUint32(reader);
 			ranges.push({ sourceRange, destRange });