ag-psd 17.0.3 → 17.0.5

package/dist-es/psd.d.ts

@@ -1311,10 +1311,10 @@ export interface LayerAdditionalInfo {
         description: string;
         reason: string;
         engine: string;
-        enableCompCore: string;
-        enableCompCoreGPU: string;
-        compCoreSupport: string;
-        compCoreGPUSupport: string;
+        enableCompCore?: string;
+        enableCompCoreGPU?: string;
+        compCoreSupport?: string;
+        compCoreGPUSupport?: string;
     };
     artboard?: {
         rect: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-psd",
-  "version": "17.0.3",
+  "version": "17.0.5",
   "description": "Library for reading and writing PSD files",
   "main": "dist/index.js",
   "module": "dist-es/index.js",

package/src/additionalInfo.ts

@@ -9,7 +9,7 @@ import {
 	CurvesAdjustment, CurvesAdjustmentChannel, HueSaturationAdjustment, HueSaturationAdjustmentChannel,
 	PresetInfo, Color, ColorBalanceValues, WriteOptions, LinkedFile, PlacedLayerType, Warp, KeyDescriptorItem,
 	BooleanOperation, LayerEffectsInfo, Annotation, LayerVectorMask, AnimationFrame, Timeline, PlacedLayerFilter,
-	UnitsValue, Filter,
+	UnitsValue, Filter, PlacedLayer,
 } from './psd';
 import {
 	PsdReader, readSignature, readUnicodeString, skipBytes, readUint32, readUint8, readFloat64, readUint16,
@@ -1162,9 +1162,10 @@ addHandler(
 		writeInt32(writer, placedLayerTypes.indexOf(placed.type));
 		for (let i = 0; i < 8; i++) writeFloat64(writer, placed.transform[i]);
 		writeInt32(writer, 0); // warp version
-		const isQuilt = placed.warp && isQuiltWarp(placed.warp);
+		const warp = getWarpFromPlacedLayer(placed);
+		const isQuilt = isQuiltWarp(warp);
 		const type = isQuilt ? 'quiltWarp' : 'warp';
-		writeVersionAndDescriptor(writer, '', type, encodeWarp(placed.warp || {}), type);
+		writeVersionAndDescriptor(writer, '', type, encodeWarp(warp), type);
 	},
 );
 
@@ -3116,6 +3117,41 @@ interface SoLdDescriptor {
 
 // let t: any;
 
+function getWarpFromPlacedLayer(placed: PlacedLayer): Warp {
+	if (placed.warp) return placed.warp;
+
+	if (!placed.width || !placed.height) throw new Error('You must provide width and height of the linked image in placedLayer');
+
+	const w = placed.width;
+	const h = placed.height;
+	const x0 = 0, x1 = w / 3, x2 = w * 2 / 3, x3 = w;
+	const y0 = 0, y1 = h / 3, y2 = h * 2 / 3, y3 = h;
+
+	return {
+		style: 'custom',
+		value: 0,
+		perspective: 0,
+		perspectiveOther: 0,
+		rotate: 'horizontal',
+		bounds: {
+			top: { value: 0, units: 'Pixels' },
+			left: { value: 0, units: 'Pixels' },
+			bottom: { value: h, units: 'Pixels' },
+			right: { value: w, units: 'Pixels' },
+		},
+		uOrder: 4,
+		vOrder: 4,
+		customEnvelopeWarp: {
+			meshPoints: [
+				{ x: x0, y: y0 }, { x: x1, y: y0 }, { x: x2, y: y0 }, { x: x3, y: y0 },
+				{ x: x0, y: y1 }, { x: x1, y: y1 }, { x: x2, y: y1 }, { x: x3, y: y1 },
+				{ x: x0, y: y2 }, { x: x1, y: y2 }, { x: x2, y: y2 }, { x: x3, y: y2 },
+				{ x: x0, y: y3 }, { x: x1, y: y3 }, { x: x2, y: y3 }, { x: x3, y: y3 },
+			],
+		},
+	};
+}
+
 addHandler(
 	'SoLd',
 	hasKey('placedLayer'),
@@ -3171,38 +3207,6 @@ addHandler(
 		writeInt32(writer, 4); // version
 
 		const placed = target.placedLayer!;
-		let warp = placed.warp;
-
-		if (!warp) {
-			if (!placed.width || !placed.height) throw new Error('You must provide width and height of the linked image in placedLayer');
-			const w = placed.width;
-			const h = placed.height;
-			const x0 = 0, x1 = w / 3, x2 = w * 2 / 3, x3 = w;
-			const y0 = 0, y1 = h / 3, y2 = h * 2 / 3, y3 = h;
-			warp = {
-				style: 'custom',
-				value: 0,
-				perspective: 0,
-				perspectiveOther: 0,
-				rotate: 'horizontal',
-				bounds: {
-					top: { value: 0, units: 'Pixels' },
-					left: { value: 0, units: 'Pixels' },
-					bottom: { value: h, units: 'Pixels' },
-					right: { value: w, units: 'Pixels' },
-				},
-				uOrder: 4,
-				vOrder: 4,
-				customEnvelopeWarp: {
-					meshPoints: [
-						{ x: x0, y: y0 }, { x: x1, y: y0 }, { x: x2, y: y0 }, { x: x3, y: y0 },
-						{ x: x0, y: y1 }, { x: x1, y: y1 }, { x: x2, y: y1 }, { x: x3, y: y1 },
-						{ x: x0, y: y2 }, { x: x1, y: y2 }, { x: x2, y: y2 }, { x: x3, y: y2 },
-						{ x: x0, y: y3 }, { x: x1, y: y3 }, { x: x2, y: y3 }, { x: x3, y: y3 },
-					],
-				},
-			};
-		}
 
 		if (!placed.id || typeof placed.id !== 'string' || !/^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$/.test(placed.id)) {
 			throw new Error('Placed layer ID must be in a GUID format (example: 20953ddb-9391-11ec-b4f1-c15674f50bc4)');
@@ -3222,7 +3226,7 @@ addHandler(
 			Trnf: placed.transform,
 			nonAffineTransform: placed.nonAffineTransform ?? placed.transform,
 			// quiltWarp: {} as any,
-			warp: encodeWarp(warp || {}),
+			warp: encodeWarp(getWarpFromPlacedLayer(placed)),
 			'Sz  ': {
 				_name: '',
 				_classID: 'Pnt ',
@@ -3324,6 +3328,44 @@ if (MOCK_HANDLERS) {
 	);
 }
 
+/*
+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: PsdReader) {
 	const top = readInt32(reader);
 	const left = readInt32(reader);
@@ -3450,6 +3492,9 @@ addHandler(
 			let size = readLength64(reader); // size
 			const startOffset = reader.offset;
 			const type = readSignature(reader) as 'liFD' | 'liFE' | 'liFA';
+			// liFD - linked file data
+			// liFE - linked file external
+			// liFA - linked file alias
 			const version = readInt32(reader);
 			const id = readPascalString(reader, 1);
 			const name = readUnicodeString(reader);
@@ -3459,7 +3504,7 @@ addHandler(
 			const hasFileOpenDescriptor = readUint8(reader);
 			const fileOpenDescriptor = hasFileOpenDescriptor ? readVersionAndDescriptor(reader) as FileOpenDescriptor : undefined;
 			const linkedFileDescriptor = type === 'liFE' ? readVersionAndDescriptor(reader) : undefined;
-			const file: LinkedFile = { id, name, data: undefined };
+			const file: LinkedFile = { id, name };
 
 			if (fileType) file.type = fileType;
 			if (fileCreator) file.creator = fileCreator;
@@ -3487,11 +3532,11 @@ addHandler(
 
 			const fileSize = type === 'liFE' ? readLength64(reader) : 0;
 			if (type === 'liFA') skipBytes(reader, 8);
-			if (type === 'liFD') file.data = readBytes(reader, dataSize);
+			if (type === 'liFD') file.data = readBytes(reader, dataSize); // seems to be a typo in docs
 			if (version >= 5) file.childDocumentID = readUnicodeString(reader);
 			if (version >= 6) file.assetModTime = readFloat64(reader);
 			if (version >= 7) file.assetLockedState = readUint8(reader);
-			if (type === 'liFE') file.data = readBytes(reader, fileSize);
+			if (type === 'liFE' && version === 2) file.data = readBytes(reader, fileSize);
 
 			if (options.skipLinkedFilesData) file.data = undefined;
 
@@ -4703,11 +4748,11 @@ interface CinfDescriptor {
 	description: string;
 	reason: string;
 	Engn: string; // 'Engn.compCore';
-	enableCompCore: string; // 'enable.feature';
-	enableCompCoreGPU: string; // 'enable.feature';
+	enableCompCore?: string; // 'enable.feature';
+	enableCompCoreGPU?: string; // 'enable.feature';
 	enableCompCoreThreads?: string; // 'enable.feature';
-	compCoreSupport: string; // 'reason.supported';
-	compCoreGPUSupport: string; // 'reason.featureDisabled';
+	compCoreSupport?: string; // 'reason.supported';
+	compCoreGPUSupport?: string; // 'reason.featureDisabled';
 }
 
 addHandler(
@@ -4724,13 +4769,14 @@ addHandler(
 		target.compositorUsed = {
 			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),
+			engine: enumValue(desc.Engn)!,
 		};
 
+		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);
+
 		skipBytes(reader, left());
 	},
 	(writer, target) => {
@@ -4741,12 +4787,14 @@ addHandler(
 			description: cinf.description,
 			reason: cinf.reason,
 			Engn: `Engn.${cinf.engine}`,
-			enableCompCore: `enable.${cinf.enableCompCore}`,
-			enableCompCoreGPU: `enable.${cinf.enableCompCoreGPU}`,
-			// enableCompCoreThreads: `enable.feature`, // TESTING
-			compCoreSupport: `reason.${cinf.compCoreSupport}`,
-			compCoreGPUSupport: `reason.${cinf.compCoreGPUSupport}`,
 		};
+
+		if (cinf.enableCompCore) desc.enableCompCore = `enable.${cinf.enableCompCore}`;
+		if (cinf.enableCompCoreGPU) desc.enableCompCoreGPU = `enable.${cinf.enableCompCoreGPU}`;
+		// desc.enableCompCoreThreads = `enable.feature`; // TESTING
+		if (cinf.compCoreSupport) desc.compCoreSupport = `reason.${cinf.compCoreSupport}`;
+		if (cinf.compCoreGPUSupport) desc.compCoreGPUSupport = `reason.${cinf.compCoreGPUSupport}`;
+
 		writeVersionAndDescriptor(writer, '', 'null', desc);
 	},
 );

package/src/psd.ts

@@ -1345,10 +1345,10 @@ export interface LayerAdditionalInfo {
 		description: string;
 		reason: string;
 		engine: string;
-		enableCompCore: string;
-		enableCompCoreGPU: string;
-		compCoreSupport: string;
-		compCoreGPUSupport: string;
+		enableCompCore?: string;
+		enableCompCoreGPU?: string;
+		compCoreSupport?: string;
+		compCoreGPUSupport?: string;
 	};
 	artboard?: {
 		rect: { top: number; left: number; bottom: number; right: number; };