ag-psd 15.0.5 → 15.2.0

package/src/additionalInfo.ts

@@ -110,15 +110,17 @@ addHandler(
 		};
 
 		if (text.EngineData) {
-			const engineData = decodeEngineData(parseEngineData(text.EngineData));
+			const engineData = parseEngineData(text.EngineData);
+			const textData = decodeEngineData(engineData);
 
+			// require('fs').writeFileSync(`layer-${target.name}.txt`, require('util').inspect(engineData, false, 99, false), 'utf8');
 			// const before = parseEngineData(text.EngineData);
 			// const after = encodeEngineData(engineData);
 			// require('fs').writeFileSync('before.txt', require('util').inspect(before, false, 99, false), 'utf8');
 			// require('fs').writeFileSync('after.txt', require('util').inspect(after, false, 99, false), 'utf8');
 
 			// console.log(require('util').inspect(parseEngineData(text.EngineData), false, 99, true));
-			target.text = { ...target.text, ...engineData };
+			target.text = { ...target.text, ...textData };
 			// console.log(require('util').inspect(target.text, false, 99, true));
 		}
 
@@ -1175,7 +1177,8 @@ addHandler(
 	hasKey('placedLayer'),
 	(reader, target, left) => {
 		if (readSignature(reader) !== 'soLD') throw new Error(`Invalid SoLd type`);
-		if (readInt32(reader) !== 4) throw new Error(`Invalid SoLd version`);
+		const version = readInt32(reader);
+		if (version !== 4 && version !== 5) throw new Error(`Invalid SoLd version`);
 		const desc: SoLdDescriptor = readVersionAndDescriptor(reader);
 		// console.log('SoLd', require('util').inspect(desc, false, 99, true));
 		// console.log('SoLd.warp', require('util').inspect(desc.warp, false, 99, true));
@@ -1258,6 +1261,8 @@ addHandler(
 	},
 );
 
+addHandlerAlias('SoLE', 'SoLd');
+
 addHandler(
 	'fxrp',
 	hasKey('referencePoint'),
@@ -1422,7 +1427,7 @@ addHandler(
 	(target: any) => !!(target as Psd).linkedFiles && (target as Psd).linkedFiles!.length > 0,
 	(reader, target, left, _, options) => {
 		const psd = target as Psd;
-		psd.linkedFiles = [];
+		psd.linkedFiles = psd.linkedFiles || [];
 
 		while (left() > 8) {
 			let size = readLength64(reader); // size
@@ -1452,7 +1457,7 @@ addHandler(
 				const seconds = readFloat64(reader);
 				const wholeSeconds = Math.floor(seconds);
 				const ms = (seconds - wholeSeconds) * 1000;
-				file.time = new Date(year, month, day, hour, minute, wholeSeconds, ms);
+				file.time = (new Date(year, month, day, hour, minute, wholeSeconds, ms)).toISOString();
 			}
 
 			const fileSize = type === 'liFE' ? readLength64(reader) : 0;
@@ -1523,24 +1528,10 @@ addHandler(
 		}
 	},
 );
+
 addHandlerAlias('lnkD', 'lnk2');
 addHandlerAlias('lnk3', 'lnk2');
-
-// this seems to just be zero size block, ignore it
-addHandler(
-	'lnkE',
-	target => (target as any)._lnkE !== undefined,
-	(reader, target, left, _psds, options) => {
-		if (options.logMissingFeatures && left()) {
-			console.log(`Non-empty lnkE layer info (${left()} bytes)`);
-		}
-
-		if (MOCK_HANDLERS) {
-			(target as any)._lnkE = readBytes(reader, left());
-		}
-	},
-	(writer, target) => MOCK_HANDLERS && writeBytes(writer, (target as any)._lnkE),
-);
+addHandlerAlias('lnkE', 'lnk2');
 
 interface ExtensionDesc {
 	generatorSettings: {
@@ -2508,7 +2499,7 @@ interface ArtdDescriptor {
 	autoExpandEnabled: boolean;
 	autoNestEnabled: boolean;
 	autoPositionEnabled: boolean;
-	shrinkwrapOnSaveEnabled: boolean;
+	shrinkwrapOnSaveEnabled?: boolean;
 	docDefaultNewArtboardBackgroundColor: DescriptorColor;
 	docDefaultNewArtboardBackgroundType: number;
 }
@@ -2525,7 +2516,7 @@ addHandler(
 			autoExpandEnabled: desc.autoExpandEnabled,
 			autoNestEnabled: desc.autoNestEnabled,
 			autoPositionEnabled: desc.autoPositionEnabled,
-			shrinkwrapOnSaveEnabled: desc.shrinkwrapOnSaveEnabled,
+			shrinkwrapOnSaveEnabled: !!desc.shrinkwrapOnSaveEnabled,
 			docDefaultNewArtboardBackgroundColor: parseColor(desc.docDefaultNewArtboardBackgroundColor),
 			docDefaultNewArtboardBackgroundType: desc.docDefaultNewArtboardBackgroundType,
 		};

package/src/descriptor.ts

@@ -190,7 +190,7 @@ const typeToField: { [key: string]: string[]; } = {
 		'warpValue', 'warpPerspective', 'warpPerspectiveOther', 'Intr', 'Wdth', 'Hght',
 		'strokeStyleMiterLimit', 'strokeStyleResolution', 'layerTime', 'keyOriginResolution',
 		'xx', 'xy', 'yx', 'yy', 'tx', 'ty', 'FrGA', 'frameRate', 'audioLevel', 'rotation',
-		'X   ', 'Y   ',
+		'X   ', 'Y   ', 'redFloat', 'greenFloat', 'blueFloat',
 	],
 	'UntF': [
 		'Scl ', 'sdwO', 'hglO', 'lagl', 'Lald', 'srgR', 'blur', 'Sftn', 'Opct', 'Dstn', 'Angl',
@@ -708,6 +708,10 @@ export type DescriptorColor = {
 	Lmnc: number;
 	'A   ': number;
 	'B   ': number;
+} | {
+	redFloat: number;
+	greenFloat: number;
+	blueFloat: number;
 };
 
 export interface DesciptorPattern {
@@ -1520,6 +1524,8 @@ export function parseColor(color: DescriptorColor): Color {
 		return { k: color['Gry '] };
 	} else if ('Lmnc' in color) {
 		return { l: color.Lmnc, a: color['A   '], b: color['B   '] };
+	} else if ('redFloat' in color) {
+		return { fr: color.redFloat, fg: color.greenFloat, fb: color.blueFloat };
 	} else {
 		throw new Error('Unsupported color descriptor');
 	}
@@ -1530,6 +1536,8 @@ export function serializeColor(color: Color | undefined): DescriptorColor {
 		return { 'Rd  ': 0, 'Grn ': 0, 'Bl  ': 0 };
 	} else if ('r' in color) {
 		return { 'Rd  ': color.r || 0, 'Grn ': color.g || 0, 'Bl  ': color.b || 0 };
+	} else if ('fr' in color) {
+		return { redFloat: color.fr, greenFloat: color.fg, blueFloat: color.fb };
 	} else if ('h' in color) {
 		return { 'H   ': unitsAngle(color.h * 360), Strt: color.s || 0, Brgh: color.b || 0 };
 	} else if ('c' in color) {

package/src/psd.ts

@@ -24,11 +24,12 @@ export const enum SectionDividerType {
 
 export type RGBA = { r: number; g: number; b: number; a: number; }; // values from 0 to 255
 export type RGB = { r: number; g: number; b: number; }; // values from 0 to 255
+export type FRGB = { fr: number; fg: number; fb: number; }; // values from 0 to 1 (can be above 1)
 export type HSB = { h: number; s: number; b: number; }; // values from 0 to 1
 export type CMYK = { c: number; m: number; y: number; k: number; }; // values from 0 to 255
 export type LAB = { l: number; a: number; b: number; }; // values `l` from 0 to 1; `a` and `b` from -1 to 1
 export type Grayscale = { k: number }; // values from 0 to 255
-export type Color = RGBA | RGB | HSB | CMYK | LAB | Grayscale;
+export type Color = RGBA | RGB | FRGB | HSB | CMYK | LAB | Grayscale;
 
 export interface EffectContour {
 	name: string;
@@ -664,7 +665,7 @@ export interface LinkedFile {
 	type?: string;
 	creator?: string;
 	data?: Uint8Array;
-	time?: Date; // for external files
+	time?: string; // for external files
 	descriptor?: {
 		compInfo: { compID: number; originalCompID: number; };
 	};

package/src/psdWriter.ts

@@ -728,6 +728,12 @@ export function writeColor(writer: PsdWriter, color: Color | undefined) {
 		writeUint16(writer, Math.round(color.g * 257));
 		writeUint16(writer, Math.round(color.b * 257));
 		writeUint16(writer, 0);
+	} else if ('fr' in color) {
+		writeUint16(writer, ColorSpace.RGB);
+		writeUint16(writer, Math.round(color.fr * 255 * 257));
+		writeUint16(writer, Math.round(color.fg * 255 * 257));
+		writeUint16(writer, Math.round(color.fb * 255 * 257));
+		writeUint16(writer, 0);
 	} else if ('l' in color) {
 		writeUint16(writer, ColorSpace.Lab);
 		writeInt16(writer, Math.round(color.l * 10000));

package/src/text.ts

@@ -498,6 +498,7 @@ export function decodeEngineData(engineData: EngineData) {
 	for (let i = 0; i < styleRun.RunArray.length; i++) {
 		const length = styleRun.RunLengthArray[i];
 		const style = decodeStyle(styleRun.RunArray[i].StyleSheet.StyleSheetData, fonts);
+		if (!style.font) style.font = fonts[0];
 		result.styleRuns.push({ length, style });
 	}