ag-psd 15.3.1 → 17.0.0

package/src/psdWriter.ts

@@ -4,7 +4,7 @@ import {
 	offsetForChannel, createImageData, fromBlendMode, ChannelID, Compression, clamp,
 	LayerMaskFlags, MaskParams, ColorSpace, Bounds, largeAdditionalInfoKeys, RAW_IMAGE_DATA, writeDataZipWithoutPrediction
 } from './helpers';
-import { ExtendedWriteOptions, hasMultiEffects, infoHandlers } from './additionalInfo';
+import { ExtendedWriteOptions, infoHandlers } from './additionalInfo';
 import { resourceHandlers } from './imageResources';
 
 export interface PsdWriter {
@@ -43,11 +43,21 @@ export function writeUint16(writer: PsdWriter, value: number) {
 	writer.view.setUint16(offset, value, false);
 }
 
+export function writeUint16LE(writer: PsdWriter, value: number) {
+	const offset = addSize(writer, 2);
+	writer.view.setUint16(offset, value, true);
+}
+
 export function writeInt32(writer: PsdWriter, value: number) {
 	const offset = addSize(writer, 4);
 	writer.view.setInt32(offset, value, false);
 }
 
+export function writeInt32LE(writer: PsdWriter, value: number) {
+	const offset = addSize(writer, 4);
+	writer.view.setInt32(offset, value, true);
+}
+
 export function writeUint32(writer: PsdWriter, value: number) {
 	const offset = addSize(writer, 4);
 	writer.view.setUint32(offset, value, false);
@@ -110,14 +120,23 @@ export function writePascalString(writer: PsdWriter, text: string, padTo: number
 	}
 }
 
-export function writeUnicodeString(writer: PsdWriter, text: string) {
-	writeUint32(writer, text.length);
-
+export function writeUnicodeStringWithoutLength(writer: PsdWriter, text: string) {
 	for (let i = 0; i < text.length; i++) {
 		writeUint16(writer, text.charCodeAt(i));
 	}
 }
 
+export function writeUnicodeStringWithoutLengthLE(writer: PsdWriter, text: string) {
+	for (let i = 0; i < text.length; i++) {
+		writeUint16LE(writer, text.charCodeAt(i));
+	}
+}
+
+export function writeUnicodeString(writer: PsdWriter, text: string) {
+	writeUint32(writer, text.length);
+	writeUnicodeStringWithoutLength(writer, text);
+}
+
 export function writeUnicodeStringWithPadding(writer: PsdWriter, text: string) {
 	writeUint32(writer, text.length + 1);
 
@@ -304,10 +323,7 @@ function writeLayerInfo(tempBuffer: Uint8Array, writer: PsdWriter, psd: Psd, glo
 			if (layer.vectorMask || (layer.sectionDivider && layer.sectionDivider.type !== SectionDividerType.Other)) {
 				flags |= 0x10; // pixel data irrelevant to appearance of document
 			}
-			if (layer.effects && hasMultiEffects(layer.effects)) { // TODO: this is not correct
-				flags |= 0x20; // just guessing this one, might be completely incorrect
-			}
-			// if ('_2' in layer) flags |= 0x20; // TEMP!!!
+			if (layer.effectsOpen) flags |= 0x20;
 
 			writeUint8(writer, flags);
 			writeUint8(writer, 0); // filler

package/src/text.ts

@@ -263,24 +263,32 @@ const antialias: AntiAlias[] = ['none', 'crisp', 'strong', 'smooth', 'sharp'];
 const justification: Justification[] = ['left', 'right', 'center'];
 
 function upperFirst(value: string) {
-	return value.substr(0, 1).toUpperCase() + value.substr(1);
+	return value.substring(0, 1).toUpperCase() + value.substring(1);
 }
 
-function decodeColor(color: { Type: number; Values: number[]; }): Color {
+function decodeColor(color: TypeValues): Color {
 	const c = color.Values;
-
-	if (color.Type === 0) { // grayscale
-		return { r: c[1] * 255, g: c[1] * 255, b: c[1] * 255 }; // , c[0] * 255];
-	} else { // rgb
-		return { r: c[1] * 255, g: c[2] * 255, b: c[3] * 255, a: c[0] }; // , c[0] * 255];
+	switch (color.Type) {
+		case 0: return { k: c[1] * 255 }; // grayscale (alpha?)
+		case 1: return c[0] === 1 ?
+			{ r: c[1] * 255, g: c[2] * 255, b: c[3] * 255 } : // rgb
+			{ r: c[1] * 255, g: c[2] * 255, b: c[3] * 255, a: c[0] * 255 }; // rgba
+		case 2: return { c: c[1] * 255, m: c[2] * 255, y: c[3] * 255, k: c[4] * 255 }; // cmyk (alpha?)
+		default: throw new Error('Unknown color type in text layer');
 	}
 }
 
-function encodeColor(color: Color | undefined) {
-	if (color && 'r' in color) {
-		return ['a' in color ? color.a : 1, color.r / 255, color.g / 255, color.b / 255];
+function encodeColor(color: Color | undefined): TypeValues {
+	if (!color) {
+		return { Type: 1, Values: [0, 0, 0, 0] };
+	} else if ('r' in color) {
+		return { Type: 1, Values: ['a' in color ? color.a / 255 : 1, color.r / 255, color.g / 255, color.b / 255] };
+	} else if ('c' in color) {
+		return { Type: 2, Values: [1, color.c / 255, color.m / 255, color.y / 255, color.k / 255] };
+	} else if ('k' in color) {
+		return { Type: 0, Values: [1, color.k / 255] };
 	} else {
-		return [0, 0, 0, 0];
+		throw new Error('Invalid color type in text layer');
 	}
 }
 
@@ -342,7 +350,7 @@ function encodeObject(obj: any, keys: string[], fonts: Font[]) {
 		} else if (key === 'font') {
 			result[Key] = findOrAddFont(fonts, obj[key]);
 		} else if (key === 'fillColor' || key === 'strokeColor') {
-			result[Key] = { Type: 1, Values: encodeColor(obj[key]) } as TypeValues;
+			result[Key] = encodeColor(obj[key]);
 		} else {
 			result[Key] = obj[key];
 		}
@@ -722,8 +730,8 @@ export function encodeEngineData(data: LayerTextData) {
 				ShowGrid: !!gridInfo.show,
 				GridSize: gridInfo.size ?? 18,
 				GridLeading: gridInfo.leading ?? 22,
-				GridColor: { Type: 1, Values: encodeColor(gridInfo.color) },
-				GridLeadingFillColor: { Type: 1, Values: encodeColor(gridInfo.color) },
+				GridColor: encodeColor(gridInfo.color),
+				GridLeadingFillColor: encodeColor(gridInfo.color),
 				AlignLineHeightToGridFlags: !!gridInfo.alignLineHeightToGridFlags,
 			},
 			AntiAlias: antialias.indexOf(data.antiAlias ?? 'sharp'),