ag-psd 18.0.0 → 19.0.0

package/package.json

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

package/src/abr.ts

@@ -116,8 +116,12 @@ export interface Brush {
 	interpretation?: boolean; // ?
 	useBrushSize: boolean; // ?
 	toolOptions?: {
+		type: 'brush' | 'mixer brush' | 'smudge brush';
 		brushPreset: boolean;
 		flow: number; // 0-100
+		wetness?: number; // 0-100
+		dryness?: number; // 0-100
+		mix?: number; // 0-100
 		smooth: number; // ?
 		mode: BlendMode;
 		opacity: number; // 0-100
@@ -131,9 +135,16 @@ export interface Brush {
 		usePressureOverridesSize: boolean;
 		usePressureOverridesOpacity: boolean;
 		useLegacy: boolean;
+		autoFill?: boolean;
+		autoClean?: boolean;
+		loadSolidColorOnly?: boolean;
+		sampleAllLayers?: boolean;
 		flowDynamics?: BrushDynamics;
 		opacityDynamics?: BrushDynamics;
 		sizeDynamics?: BrushDynamics;
+		smudgeFingerPainting?: boolean;
+		smudgeSampleAllLayers?: boolean;
+		strength?: number; // 0-100
 	};
 }
 
@@ -241,8 +252,12 @@ interface DescDescriptor {
 		brushPoseTiltY?: number;
 		brushPoseAngle?: number;
 		toolOptions?: {
+			_classID: string;
 			brushPreset: boolean;
 			flow?: number;
+			wetness?: number;
+			dryness?: number;
+			mix?: number;
 			Smoo?: number;
 			'Md  ': string;
 			Opct?: number;
@@ -256,16 +271,30 @@ interface DescDescriptor {
 			usePressureOverridesSize?: boolean;
 			usePressureOverridesOpacity?: boolean;
 			useLegacy: boolean;
-			'Prs '?: number; // TODO: ???
+			autoFill?: boolean;
+			autoClean?: boolean;
+			loadSolidColorOnly?: boolean;
+			sampleAllLayers?: boolean;
+			'Prs '?: number;
 			MgcE?: boolean; // TODO: ???
 			ErsB?: number; // TODO: ???
 			prVr?: DynamicsDescriptor;
 			opVr?: DynamicsDescriptor;
 			szVr?: DynamicsDescriptor;
+			SmdF?: boolean;
+			SmdS?: boolean;
 		};
 	}[];
 }
 
+const toBrushType: { [key: string]: 'brush' | 'mixer brush' | 'smudge brush'; } = {
+	_: 'brush',
+	MixB: 'mixer brush',
+	SmTl: 'smudge brush',
+	// PbTl
+	// ErTl
+};
+
 function parseDynamics(desc: DynamicsDescriptor): BrushDynamics {
 	return {
 		control: dynamicsControl[desc.bVTy] as any,
@@ -363,7 +392,7 @@ export function readAbr(buffer: ArrayBufferView, options: { logMissingFeatures?:
 					break;
 				}
 				case 'desc': {
-					const desc: DescDescriptor = readVersionAndDescriptor(reader);
+					const desc: DescDescriptor = readVersionAndDescriptor(reader, true);
 					// console.log(require('util').inspect(desc, false, 99, true));
 
 					for (const brush of desc.Brsh) {
@@ -471,6 +500,7 @@ export function readAbr(buffer: ArrayBufferView, options: { logMissingFeatures?:
 						const to = brush.toolOptions;
 						if (to) {
 							b.toolOptions = {
+								type: toBrushType[to._classID] || 'brush',
 								brushPreset: to.brushPreset,
 								flow: to.flow ?? 100,
 								smooth: to.Smoo ?? 0,
@@ -488,17 +518,21 @@ export function readAbr(buffer: ArrayBufferView, options: { logMissingFeatures?:
 								useLegacy: !!to.useLegacy,
 							};
 
-							if (to.prVr) {
-								b.toolOptions.flowDynamics = parseDynamics(to.prVr);
-							}
-
-							if (to.opVr) {
-								b.toolOptions.opacityDynamics = parseDynamics(to.opVr);
-							}
-
-							if (to.szVr) {
-								b.toolOptions.sizeDynamics = parseDynamics(to.szVr);
-							}
+							if (to.prVr) b.toolOptions.flowDynamics = parseDynamics(to.prVr);
+							if (to.opVr) b.toolOptions.opacityDynamics = parseDynamics(to.opVr);
+							if (to.szVr) b.toolOptions.sizeDynamics = parseDynamics(to.szVr);
+							if ('wetness' in to) b.toolOptions.wetness = to.wetness;
+							if ('dryness' in to) b.toolOptions.dryness = to.dryness;
+							if ('mix' in to) b.toolOptions.mix = to.mix;
+							if ('autoFill' in to) b.toolOptions.autoFill = to.autoFill;
+							if ('autoClean' in to) b.toolOptions.autoClean = to.autoClean;
+							if ('loadSolidColorOnly' in to) b.toolOptions.loadSolidColorOnly = to.loadSolidColorOnly;
+							if ('sampleAllLayers' in to) b.toolOptions.sampleAllLayers = to.sampleAllLayers;
+							if ('SmdF' in to) b.toolOptions.smudgeFingerPainting = to.SmdF;
+							if ('SmdS' in to) b.toolOptions.smudgeSampleAllLayers = to.SmdS;
+							if ('Prs ' in to) b.toolOptions.strength = to['Prs '];
+							if ('SmdF' in to) b.toolOptions.smudgeFingerPainting = to.SmdF;
+							if ('SmdS' in to) b.toolOptions.smudgeSampleAllLayers = to.SmdS;
 						}
 
 						brushes.push(b);

package/src/additionalInfo.ts

@@ -273,7 +273,7 @@ export function readVectorMask(reader: PsdReader, vectorMask: LayerVectorMask, w
 					open: selector === 3,
 					operation: boolOp === -1 ? 'combine' : booleanOperations[boolOp],
 					knots: [],
-					fillRule: flags & 2 ? 'non-zero' : 'even-odd',
+					fillRule: flags === 2 ? 'non-zero' : 'even-odd',
 				};
 				paths.push(path);
 				break;
@@ -364,7 +364,7 @@ addHandler(
 			writeUint16(writer, path.open ? 3 : 0);
 			writeUint16(writer, path.knots.length);
 			writeUint16(writer, Math.abs(booleanOperations.indexOf(path.operation))); // default to 1 if not found
-			writeUint16(writer, 1 | (path.fillRule === 'non-zero' ? 2 : 0));
+			writeUint16(writer, path.fillRule === 'non-zero' ? 2 : 1);
 			writeZeros(writer, 18); // TODO: these are sometimes non-zero
 
 			const linkedKnot = path.open ? 4 : 1;

package/src/descriptor.ts

@@ -350,11 +350,9 @@ function writeAsciiStringOrClassId(writer: PsdWriter, value: string) {
 	}
 }
 
-export function readDescriptorStructure(reader: PsdReader) {
-	// const struct =
-	readClassStructure(reader);
-	// const object: any = { _name: struct.name, _classID: struct.classID };
-	const object: any = {};
+export function readDescriptorStructure(reader: PsdReader, includeClass: boolean) {
+	const struct = readClassStructure(reader);
+	const object: any = includeClass ? { _name: struct.name, _classID: struct.classID } : {};
 	// console.log('>> ', struct);
 	const itemsCount = readUint32(reader);
 
@@ -362,7 +360,7 @@ export function readDescriptorStructure(reader: PsdReader) {
 		const key = readAsciiStringOrClassId(reader);
 		const type = readSignature(reader);
 		// console.log(`> '${key}' '${type}'`);
-		const data = readOSType(reader, type);
+		const data = readOSType(reader, type, includeClass);
 		// if (!getTypeByKey(key, data)) console.log(`> '${key}' '${type}'`, data);
 		object[key] = data;
 	}
@@ -463,13 +461,13 @@ export function writeDescriptorStructure(writer: PsdWriter, name: string, classI
 	}
 }
 
-function readOSType(reader: PsdReader, type: string) {
+function readOSType(reader: PsdReader, type: string, includeClass: boolean) {
 	switch (type) {
 		case 'obj ': // Reference
 			return readReferenceStructure(reader);
 		case 'Objc': // Descriptor
 		case 'GlbO': // GlobalObject same as Descriptor
-			return readDescriptorStructure(reader);
+			return readDescriptorStructure(reader, includeClass);
 		case 'VlLs': { // List
 			const length = readInt32(reader);
 			const items: any[] = [];
@@ -477,7 +475,7 @@ function readOSType(reader: PsdReader, type: string) {
 			for (let i = 0; i < length; i++) {
 				const type = readSignature(reader);
 				// console.log('  >', type);
-				items.push(readOSType(reader, type));
+				items.push(readOSType(reader, type, includeClass));
 			}
 
 			return items;
@@ -770,10 +768,10 @@ function writeClassStructure(writer: PsdWriter, name: string, classID: string) {
 	writeAsciiStringOrClassId(writer, classID);
 }
 
-export function readVersionAndDescriptor(reader: PsdReader) {
+export function readVersionAndDescriptor(reader: PsdReader, includeClass = false) {
 	const version = readUint32(reader);
 	if (version !== 16) throw new Error(`Invalid descriptor version: ${version}`);
-	const desc = readDescriptorStructure(reader);
+	const desc = readDescriptorStructure(reader, includeClass);
 	// console.log(require('util').inspect(desc, false, 99, true));
 	return desc;
 }

package/src/psdWriter.ts

@@ -177,7 +177,7 @@ export function writeSection(writer: PsdWriter, round: number, func: () => void,
 	let length = writer.offset - offset - 4;
 	let len = length;
 
-	while ((len % round) !== 0) {
+	while ((writer.offset % round) !== 0) {
 		writeUint8(writer, 0);
 		len++;
 	}
@@ -356,11 +356,11 @@ function writeLayerMaskData(writer: PsdWriter, { mask }: Layer, layerData: Layer
 		if (!mask) return;
 
 		const m = layerData.mask || {} as Partial<Bounds>;
-		writeInt32(writer, m.top!);
-		writeInt32(writer, m.left!);
-		writeInt32(writer, m.bottom!);
-		writeInt32(writer, m.right!);
-		writeUint8(writer, mask.defaultColor!);
+		writeInt32(writer, m.top || 0);
+		writeInt32(writer, m.left || 0);
+		writeInt32(writer, m.bottom || 0);
+		writeInt32(writer, m.right || 0);
+		writeUint8(writer, mask.defaultColor || 0);
 
 		let params = 0;
 		if (mask.userMaskDensity !== undefined) params |= MaskParams.UserMaskDensity;
@@ -430,17 +430,16 @@ function writeAdditionalLayerInfo(writer: PsdWriter, target: LayerAdditionalInfo
 
 		if (handler.has(target)) {
 			const large = options.psb && largeAdditionalInfoKeys.indexOf(key) !== -1;
-
-			writeSignature(writer, large ? '8B64' : '8BIM');
-			writeSignature(writer, key);
-
+			const writeTotalLength = key !== 'Txt2' && key !== 'cinf' && key !== 'extn';
 			const fourBytes = 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';
 
+			writeSignature(writer, large ? '8B64' : '8BIM');
+			writeSignature(writer, key);
 			writeSection(writer, fourBytes ? 4 : 2, () => {
 				handler.write(writer, target, psd, options);
-			}, key !== 'Txt2' && key !== 'cinf' && key !== 'extn', large);
+			}, writeTotalLength, large);
 		}
 	}
 }
@@ -581,7 +580,6 @@ function getChannels(
 			layerData.channels.push({ channelId: ChannelID.UserMask, compression, buffer, length: 2 + buffer.length });
 		} else {
 			layerData.mask = { top: 0, left: 0, right: 0, bottom: 0 };
-			layerData.channels.push({ channelId: ChannelID.UserMask, compression: Compression.RawData, buffer: new Uint8Array(0), length: 0 });
 		}
 	}