exifreader 4.11.1 → 4.12.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/exif-reader.d.ts +28 -31
  2. package/package.json +2 -2
package/exif-reader.d.ts CHANGED
@@ -91,37 +91,27 @@ interface NumberArrayFileTag {
91
91
  value: Array<number>
92
92
  }
93
93
 
94
- interface NumberTag {
94
+ type TypedTag<V> = {
95
95
  id: number,
96
96
  description: string,
97
- value: number
97
+ value: V
98
98
  }
99
99
 
100
- interface RationalTag {
101
- id: number,
102
- description: string,
103
- value: [number, number]
104
- }
100
+ type RationalTag = TypedTag<[number, number]>
105
101
 
106
- interface NumberArrayTag {
107
- id: number,
108
- description: string,
109
- value: Array<number>
110
- }
102
+ type NumberTag = TypedTag<number>;
111
103
 
112
- interface ValueTag {
113
- description: string,
114
- value: String
115
- }
104
+ type NumberArrayTag = TypedTag<number[]>
116
105
 
117
- interface StringArrayTag {
118
- id: number,
106
+ type StringArrayTag = TypedTag<string[]>
107
+
108
+ interface ValueTag {
119
109
  description: string,
120
- value: Array<string>
110
+ value: string
121
111
  }
122
112
 
123
113
  interface XmpTag {
124
- value: string | Array<XmpTag> | XmpTags,
114
+ value: string | XmpTag[] | XmpTags,
125
115
  attributes: {
126
116
  [name: string]: string
127
117
  },
@@ -159,8 +149,8 @@ interface ExpandedTags {
159
149
  pngFile?: PngFileTags,
160
150
  pngText?: PngTextTags,
161
151
  png?: PngTags,
162
- exif?: Tags,
163
- iptc?: Tags,
152
+ exif?: ExifTags,
153
+ iptc?: ExifTags,
164
154
  xmp?: { _raw: string } & XmpTags,
165
155
  icc?: IccTags,
166
156
  Thumbnail?: ThumbnailTags,
@@ -175,7 +165,7 @@ interface GpsTags {
175
165
 
176
166
  interface MPFImageTags {
177
167
  ImageFlags: {
178
- value: Array<number>,
168
+ value: number[],
179
169
  description: string
180
170
  },
181
171
  ImageFormat: {
@@ -206,21 +196,21 @@ interface MPFImageTags {
206
196
  base64: string
207
197
  }
208
198
 
209
- export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer): Tags & XmpTags & IccTags;
199
+ export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer): Tags;
210
200
  export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer, options: {expanded: true, includeUnknown?: boolean, length?: number}): ExpandedTags;
211
- export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer, options: {expanded?: false, includeUnknown?: boolean, length?: number}): Tags & XmpTags & IccTags;
212
- export function load(data: string | File): Promise<Tags & XmpTags & IccTags>;
201
+ export function load(data: ArrayBuffer | SharedArrayBuffer | Buffer, options: {expanded?: false, includeUnknown?: boolean, length?: number}): Tags;
202
+ export function load(data: string | File): Promise<Tags>;
213
203
  export function load(data: string | File, options: {expanded: true, includeUnknown?: boolean, length?: number}): Promise<ExpandedTags>;
214
- export function load(data: string | File, options: {expanded?: false, includeUnknown?: boolean, length?: number}): Promise<Tags & XmpTags & IccTags>;
215
- export function loadView(data: DataView): Tags & XmpTags & IccTags;
204
+ export function load(data: string | File, options: {expanded?: false, includeUnknown?: boolean, length?: number}): Promise<Tags>;
205
+ export function loadView(data: DataView): Tags;
216
206
  export function loadView(data: DataView, options: {expanded: true, includeUnknown?: boolean}): ExpandedTags;
217
- export function loadView(data: DataView, options: {expanded?: false, includeUnknown?: boolean}): Tags & XmpTags & IccTags;
207
+ export function loadView(data: DataView, options: {expanded?: false, includeUnknown?: boolean}): Tags;
218
208
 
219
209
  export namespace errors {
220
210
  export class MetadataMissingError extends Error {}
221
211
  }
222
212
 
223
- interface Tags {
213
+ interface ExifTags {
224
214
  // Interoperability tags
225
215
  'InteroperabilityIndex'?: StringArrayTag,
226
216
 
@@ -370,7 +360,7 @@ interface Tags {
370
360
  'MPEntry'?: NumberArrayTag,
371
361
  'ImageUIDList'?: NumberArrayTag,
372
362
  'TotalFrames'?: NumberTag,
373
- 'Images'?: Array<MPFImageTags>,
363
+ 'Images'?: MPFImageTags[],
374
364
 
375
365
  // IPTC tags
376
366
  // IPTC tags don't have explicit types. Therefore the raw value will always
@@ -462,3 +452,10 @@ interface Tags {
462
452
  interface IccTags {
463
453
  [name: string]: ValueTag;
464
454
  }
455
+
456
+ export type Tags = XmpTags & IccTags & PngTags & {
457
+ 'Thumbnail'?: ThumbnailTags;
458
+ 'Images'?: MPFImageTags[],
459
+ } & {
460
+ [K in keyof ExifTags]: ExifTags[K] | XmpTag;
461
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exifreader",
3
- "version": "4.11.1",
3
+ "version": "4.12.1",
4
4
  "description": "Library that parses Exif metadata in images.",
5
5
  "author": "Mattias Wallander <mattias@wallander.eu>",
6
6
  "repository": {
@@ -22,7 +22,7 @@
22
22
  ],
23
23
  "types": "./exif-reader.d.ts",
24
24
  "optionalDependencies": {
25
- "@xmldom/xmldom": "^0.7.8"
25
+ "@xmldom/xmldom": "^0.8.8"
26
26
  },
27
27
  "devDependencies": {
28
28
  "@babel/core": "^7.15.8",