ag-psd 31.0.2 → 31.0.3

package/src/additionalInfo.ts

@@ -3708,7 +3708,7 @@ interface CAIDesc {
 }
 
 addHandler(
-	'CAI ', // content credentials ? something to do with generative tech
+	'CAI ', // Content Authenticity Initiative
 	() => false,
 	(reader, _target, left) => {
 		const version = readUint32(reader); // 3
@@ -3724,7 +3724,7 @@ addHandler(
 
 if (MOCK_HANDLERS) {
 	addHandler(
-		'CAI ',
+		'CAI ', // Content Authenticity Initiative / C2PA provenance metadata
 		target => (target as any)._CAI_ !== undefined,
 		(reader, target, left) => {
 			(target as any)._CAI_ = readBytes(reader, left());
@@ -3749,7 +3749,7 @@ if (MOCK_HANDLERS) {
 
 if (MOCK_HANDLERS) {
 	addHandler(
-		'OCIO', // document color management info
+		'OCIO', // Document color management info
 		target => (target as any)._OCIO !== undefined,
 		(reader, target, left) => {
 			// const desc = readVersionAndDescriptor(reader, true) as OCIODescriptor;
@@ -3771,7 +3771,7 @@ if (MOCK_HANDLERS) {
 
 if (MOCK_HANDLERS) {
 	addHandler(
-		'GenI', // generative tech
+		'GenI', // Generative Fill / generative AI (Firefly) features
 		target => (target as any)._GenI !== undefined,
 		(reader, target, left) => {
 			// const desc = readVersionAndDescriptor(reader, true); // as GenIDescriptor;
@@ -4197,15 +4197,34 @@ addHandler(
 	(reader, target, left) => {
 		if (readUint16(reader) !== 2) throw new Error('Invalid levl version');
 
+		const levels: LevelsAdjustmentChannel[] = [];
+
+		for (let i = 0; i < 29 && left(); i++) {
+			levels.push(readLevelsChannel(reader));
+		}
+
+		const [rgb, red, green, blue] = levels;
+
 		target.adjustment = {
 			...target.adjustment as PresetInfo,
 			type: 'levels',
-			rgb: readLevelsChannel(reader),
-			red: readLevelsChannel(reader),
-			green: readLevelsChannel(reader),
-			blue: readLevelsChannel(reader),
+			rgb,
+			red,
+			green,
+			blue,
 		};
 
+		if (left()) {
+			if (readSignature(reader) !== 'Lvls') throw new Error(`Invalid levl signature`);
+			if (readUint16(reader) !== 3) throw new Error(`Invalid levl version`);
+
+			const totalChannelRecords = readUint16(reader);
+
+			for (let i = 0; i < (totalChannelRecords - levels.length) && left(); i++) {
+				levels.push(readLevelsChannel(reader));
+			}
+		}
+
 		skipBytes(reader, left());
 	},
 	(writer, target) => {
@@ -4223,7 +4242,18 @@ addHandler(
 		writeLevelsChannel(writer, info.red || defaultChannel);
 		writeLevelsChannel(writer, info.green || defaultChannel);
 		writeLevelsChannel(writer, info.blue || defaultChannel);
-		for (let i = 0; i < 59; i++) writeLevelsChannel(writer, defaultChannel);
+
+		for (let i = 0; i < (29 - 4); i++) {
+			writeLevelsChannel(writer, defaultChannel);
+		}
+
+		writeSignature(writer, 'Lvls');
+		writeUint16(writer, 3); // version
+		writeUint16(writer, 62); // total count
+
+		for (let i = 0; i < (62 - 29); i++) {
+			writeLevelsChannel(writer, defaultChannel);
+		}
 	},
 );
 

package/src/engineData.ts

@@ -37,9 +37,14 @@ export function parseEngineData(data: number[] | Uint8Array) {
 			return result;
 		}
 
-		// Strings start with utf-16 BOM
+		// Strings usually start with utf-16 BOM, strings without it are single-byte (e.g. "(01110)" in Txt2)
 		if (data[index] !== 0xFE || data[index + 1] !== 0xFF) {
-			throw new Error('Invalid utf-16 BOM');
+			while (index < data.length && data[index] !== 41) { // )
+				result += String.fromCharCode(getTextByte());
+			}
+
+			index++;
+			return result;
 		}
 
 		index += 2;

package/src/imageResources.ts

@@ -403,7 +403,7 @@ addHandler(
 addHandler(
 	1011,
 	target => target.printFlags !== undefined,
-	(reader, target) => {
+	(reader, target, left) => {
 		target.printFlags = {
 			labels: !!readUint8(reader),
 			cropMarks: !!readUint8(reader),
@@ -413,7 +413,7 @@ addHandler(
 			flip: !!readUint8(reader),
 			interpolate: !!readUint8(reader),
 			caption: !!readUint8(reader),
-			printFlags: !!readUint8(reader),
+			printFlags: left() ? !!readUint8(reader) : false,
 		};
 	},
 	(writer, target) => {
@@ -1024,7 +1024,7 @@ const sliceAlignments: ('default')[] = ['default'];
 addHandler(
 	1050, // Slices
 	target => target.slices ? target.slices.length : 0,
-	(reader, target) => {
+	(reader, target, leftBytes) => {
 		const version = readUint32(reader);
 
 		if (version === 6) {
@@ -1070,16 +1070,18 @@ addHandler(
 					backgroundColorType, backgroundColor: { r, g, b, a },
 				});
 			}
-			const desc = readVersionAndDescriptor(reader) as SlicesDesc;
-			desc.slices.forEach(d => {
-				const slice = slices.find(s => d.sliceID == s.id);
-				if (slice) {
-					slice.topOutset = d.topOutset;
-					slice.leftOutset = d.leftOutset;
-					slice.bottomOutset = d.bottomOutset;
-					slice.rightOutset = d.rightOutset;
-				}
-			});
+			if (leftBytes()) {
+				const desc = readVersionAndDescriptor(reader) as SlicesDesc;
+				desc.slices.forEach(d => {
+					const slice = slices.find(s => d.sliceID == s.id);
+					if (slice) {
+						slice.topOutset = d.topOutset;
+						slice.leftOutset = d.leftOutset;
+						slice.bottomOutset = d.bottomOutset;
+						slice.rightOutset = d.rightOutset;
+					}
+				});
+			}
 		} else if (version === 7 || version === 8) {
 			const desc = readVersionAndDescriptor(reader) as SlicesDesc7;
 

package/src/psd.ts

@@ -538,6 +538,7 @@ export interface PresetInfo {
 
 export interface LevelsAdjustment extends PresetInfo {
 	type: 'levels';
+	// TODO: change to generic array of channels (because of other document type CMYK, Lab, etc)
 	rgb?: LevelsAdjustmentChannel;
 	red?: LevelsAdjustmentChannel;
 	green?: LevelsAdjustmentChannel;
@@ -548,6 +549,7 @@ export type CurvesAdjustmentChannel = { input: number; output: number; }[];
 
 export interface CurvesAdjustment extends PresetInfo {
 	type: 'curves';
+	// TODO: change to generic array of channels (because of other document type CMYK, Lab, etc)
 	rgb?: CurvesAdjustmentChannel;
 	red?: CurvesAdjustmentChannel;
 	green?: CurvesAdjustmentChannel;

package/src/psdWriter.ts

@@ -497,7 +497,7 @@ function writeAdditionalLayerInfo(writer: PsdWriter, target: LayerAdditionalInfo
 		if (handler.has(target)) {
 			const large = options.psb && largeAdditionalInfoKeys.indexOf(key) !== -1;
 			const writeTotalLength = key !== 'Txt2' && key !== 'cinf' && key !== 'extn' && key !== 'CAI ' && key !== 'OCIO';
-			const fourBytes = key === 'Txt2' || key === 'luni' || key === 'vmsk' || key === 'artb' || key === 'artd' ||
+			const fourBytes = key === 'levl' || key === 'Txt2' || key === 'luni' || key === 'vmsk' || key === 'artb' || key === 'artd' ||
 				key === 'vogk' || key === 'SoLd' || key === 'lnk2' || key === 'vscg' || key === 'vsms' || key === 'GdFl' ||
 				key === 'lmfx' || key === 'lrFX' || key === 'cinf' || key === 'PlLd' || key === 'Anno' || key === 'CAI ' || key === 'OCIO' || key === 'GenI' || key === 'FEid' || key === 'curv' || key === 'CgEd' || key === 'vibA' || key === 'blwh' || key === 'grdm';