ag-psd 28.1.1 → 28.2.1

package/dist-es/psd.d.ts

@@ -1147,7 +1147,7 @@ type FilterVariant = {
     type: 'curves';
     filter: {
         presetKind: 'custom' | 'default';
-        adjustments: ({
+        adjustments?: ({
             channels: ('composite' | 'red' | 'green' | 'blue')[];
             curve: {
                 x: number;
@@ -1159,6 +1159,15 @@ type FilterVariant = {
             values: number[];
         })[];
     };
+} | {
+    type: 'invert';
+} | {
+    type: 'brightness/contrast';
+    filter: {
+        brightness: number;
+        contrast: number;
+        useLegacy: boolean;
+    };
 };
 export type Filter = FilterVariant & {
     name: string;

package/dist-es/psd.js.map

@@ -1 +1 @@
-{"version":3,"file":"psd.js","sourceRoot":"../src/","sources":["psd.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAkB,SASjB;AATD,WAAkB,SAAS;IAC1B,6CAAU,CAAA;IACV,mDAAa,CAAA;IACb,+CAAW,CAAA;IACX,uCAAO,CAAA;IACP,yCAAQ,CAAA;IACR,yDAAgB,CAAA;IAChB,+CAAW,CAAA;IACX,uCAAO,CAAA;AACR,CAAC,EATiB,SAAS,KAAT,SAAS,QAS1B;AAED,MAAM,CAAN,IAAkB,kBAKjB;AALD,WAAkB,kBAAkB;IACnC,6DAAS,CAAA;IACT,uEAAc,CAAA;IACd,2EAAgB,CAAA;IAChB,+FAA0B,CAAA;AAC3B,CAAC,EALiB,kBAAkB,KAAlB,kBAAkB,QAKnC;AAy7CD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAChC,iEAAQ,CAAA;IACR,6EAAc,CAAA;IACd,yEAAY,CAAA;IACZ,6EAAc,CAAA;AACf,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC"}
+{"version":3,"file":"psd.js","sourceRoot":"../src/","sources":["psd.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAkB,SASjB;AATD,WAAkB,SAAS;IAC1B,6CAAU,CAAA;IACV,mDAAa,CAAA;IACb,+CAAW,CAAA;IACX,uCAAO,CAAA;IACP,yCAAQ,CAAA;IACR,yDAAgB,CAAA;IAChB,+CAAW,CAAA;IACX,uCAAO,CAAA;AACR,CAAC,EATiB,SAAS,KAAT,SAAS,QAS1B;AAED,MAAM,CAAN,IAAkB,kBAKjB;AALD,WAAkB,kBAAkB;IACnC,6DAAS,CAAA;IACT,uEAAc,CAAA;IACd,2EAAgB,CAAA;IAChB,+FAA0B,CAAA;AAC3B,CAAC,EALiB,kBAAkB,KAAlB,kBAAkB,QAKnC;AAk8CD,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAChC,iEAAQ,CAAA;IACR,6EAAc,CAAA;IACd,yEAAY,CAAA;IACZ,6EAAc,CAAA;AACf,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC"}

package/package.json

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

package/src/additionalInfo.ts

@@ -1939,7 +1939,7 @@ type SoLdDescriptorFilterItem = {
 		_name: 'Curves';
 		_classID: 'Crvs';
 		presetKind: string; // 'presetKindType.presetKindCustom';
-		Adjs: {
+		Adjs?: {
 			_name: '';
 			_classID: 'CrvA';
 			Chnl: string[]; // 'Chnl.Cmps' | 'Chnl.Rd  ' | 'Chnl.Grn ' | 'Chnl.Bl  '
@@ -1947,6 +1947,17 @@ type SoLdDescriptorFilterItem = {
 			Mpng?: number[];
 		}[];
 	};
+} | {
+	filterID: 1231976050;
+} | {
+	filterID: 1114793795;
+	Fltr: {
+		_name: 'Brightness/Contrast';
+		_classID: 'BrgC';
+		Brgh: number;
+		Cntr: number;
+		useLegacy: boolean;
+	};
 });
 
 interface FilterCurvesCurvePoint {
@@ -2205,7 +2216,7 @@ function parseFilterFXItem(f: SoLdDescriptorFilterItem, options: ReadOptions): F
 					reduceColorNoise: parsePercent(f.Fltr.ClNs),
 					sharpenDetails: parsePercent(f.Fltr.Shrp),
 					channelDenoise: f.Fltr.channelDenoise.map(c => ({
-						channels: c.Chnl.map(i => Chnl.decode(i)),
+						channels: c.Chnl.map(Chnl.decode),
 						amount: c.Amnt,
 						...(c.EdgF ? { preserveDetails: c.EdgF } : {}),
 					})),
@@ -2554,29 +2565,42 @@ function parseFilterFXItem(f: SoLdDescriptorFilterItem, options: ReadOptions): F
 					type: 'curves',
 					filter: {
 						presetKind: presetKindType.decode(f.Fltr.presetKind),
-						adjustments: f.Fltr.Adjs.map(a => {
-							const channels = a.Chnl.map(c => Chnl.decode(c));
-
-							if (a['Crv ']) {
-								return {
-									channels,
-									curve: a['Crv '].map(c => {
-										const point: { x: number; y: number; curved?: boolean; } = { x: c.Hrzn, y: c.Vrtc };
-										if (c.Cnty) point.curved = true;
-										return point;
-									}),
-								};
-							} else if (a.Mpng) {
-								return { channels, values: a.Mpng };
-							} else {
-								throw new Error(`Unknown curve adjustment`);
-							}
-						}),
+						...(f.Fltr.Adjs ? {
+							adjustments: f.Fltr.Adjs.map(a => {
+								const channels = a.Chnl.map(Chnl.decode);
+								if (a['Crv ']) {
+									return {
+										channels,
+										curve: a['Crv '].map(c => {
+											const point: { x: number; y: number; curved?: boolean; } = { x: c.Hrzn, y: c.Vrtc };
+											if (c.Cnty) point.curved = true;
+											return point;
+										}),
+									};
+								} else if (a.Mpng) {
+									return { channels, values: a.Mpng };
+								} else {
+									throw new Error(`Unknown curve adjustment`);
+								}
+							})
+						} : {}),
+					},
+				};
+			};
+			case 'BrgC': {
+				return {
+					...base,
+					type: 'brightness/contrast',
+					filter: {
+						brightness: f.Fltr.Brgh,
+						contrast: f.Fltr.Cntr,
+						useLegacy: !!f.Fltr.useLegacy,
 					},
 				};
 			};
 			default:
 				if (options.throwForMissingFeatures) {
+					console.log('FILTER', require('util').inspect(f, false, 99, true));
 					throw new Error(`Unknown filter classId: ${(f as any).Fltr._classID}`);
 				}
 				return undefined;
@@ -2595,9 +2619,10 @@ function parseFilterFXItem(f: SoLdDescriptorFilterItem, options: ReadOptions): F
 			case 1181639749: return { ...base, type: 'find edges' };
 			case 1399616122: return { ...base, type: 'solarize' };
 			case 1314149187: return { ...base, type: 'ntsc colors' };
+			case 1231976050: return { ...base, type: 'invert' }
 			default:
 				if (options.throwForMissingFeatures) {
-					// console.log('FILTER', require('util').inspect(f, false, 99, true));
+					console.log('FILTER', require('util').inspect(f, false, 99, true));
 					throw new Error(`Unknown filterID: ${(f as any).filterID}`);
 				}
 		}
@@ -3095,6 +3120,7 @@ function serializeFilterFXItem(f: Filter): SoLdDescriptorFilterItem {
 			filterID: 1148089458,
 		};
 		case 'ntsc colors': return { ...base, filterID: 1314149187 };
+		case 'invert': return { ...base, filterID: 1231976050 };
 		case 'custom': return {
 			...base,
 			Fltr: {
@@ -3272,26 +3298,39 @@ function serializeFilterFXItem(f: Filter): SoLdDescriptorFilterItem {
 				_name: 'Curves',
 				_classID: 'Crvs',
 				presetKind: presetKindType.encode(f.filter.presetKind),
-				Adjs: f.filter.adjustments.map(a => 'curve' in a ? {
-					_name: '',
-					_classID: 'CrvA',
-					Chnl: a.channels.map(c => Chnl.encode(c)),
-					'Crv ': a.curve.map(c => ({
+				...(f.filter.adjustments ? {
+					Adjs: f.filter.adjustments.map(a => 'curve' in a ? {
 						_name: '',
-						_classID: 'Pnt ',
-						Hrzn: c.x,
-						Vrtc: c.y,
-						...(c.curved ? { Cnty: true } : {}),
-					}) as FilterCurvesCurvePoint),
-				} : {
-					_name: '',
-					_classID: 'CrvA',
-					Chnl: a.channels.map(c => Chnl.encode(c)),
-					Mpng: a.values,
-				}),
+						_classID: 'CrvA',
+						Chnl: a.channels.map(Chnl.encode),
+						'Crv ': a.curve.map(c => ({
+							_name: '',
+							_classID: 'Pnt ',
+							Hrzn: c.x,
+							Vrtc: c.y,
+							...(c.curved ? { Cnty: true } : {}),
+						}) as FilterCurvesCurvePoint),
+					} : {
+						_name: '',
+						_classID: 'CrvA',
+						Chnl: a.channels.map(Chnl.encode),
+						Mpng: a.values,
+					})
+				} : {}),
 			},
 			filterID: 1131574899,
 		};
+		case 'brightness/contrast': return {
+			...base,
+			Fltr: {
+				_name: 'Brightness/Contrast',
+				_classID: 'BrgC',
+				Brgh: f.filter.brightness,
+				Cntr: f.filter.contrast,
+				useLegacy: !!f.filter.useLegacy,
+			},
+			filterID: 1114793795,
+		};
 		// case 'hsb/hsl': return {
 		// TODO: ...
 		// };

package/src/psd.ts

@@ -1161,7 +1161,7 @@ type FilterVariant = {
 	type: 'curves';
 	filter: {
 		presetKind: 'custom' | 'default';
-		adjustments: ({
+		adjustments?: ({
 			channels: ('composite' | 'red' | 'green' | 'blue')[];
 			curve: { x: number; y: number; curved?: boolean; }[];
 		} | {
@@ -1169,6 +1169,15 @@ type FilterVariant = {
 			values: number[];
 		})[];
 	};
+} | {
+	type: 'invert';
+} | {
+	type: 'brightness/contrast';
+	filter: {
+		brightness: number;
+		contrast: number;
+		useLegacy: boolean;
+	};
 };
 
 /*