exifreader 4.33.1 → 4.34.0

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.
package/exif-reader.d.ts CHANGED
@@ -138,19 +138,20 @@ interface NumberArrayFileTag {
138
138
  value: Array<number>
139
139
  }
140
140
 
141
- type TypedTag<V> = {
141
+ type TypedTag<V, C = V> = {
142
142
  id: number,
143
143
  description: string,
144
+ computed?: C,
144
145
  value: V
145
146
  }
146
147
 
147
- type RationalTag = TypedTag<[number, number]>
148
+ type RationalTag = TypedTag<[number, number], number | null>
148
149
 
149
150
  type NumberTag = TypedTag<number>;
150
151
 
151
152
  type NumberArrayTag = TypedTag<number[]>
152
153
 
153
- type StringArrayTag = TypedTag<string[]>
154
+ type StringArrayTag = TypedTag<string[], string | string[]>
154
155
 
155
156
  type StringTag = TypedTag<string>;
156
157
 
@@ -310,6 +311,7 @@ interface XmlDomParser {
310
311
 
311
312
  type CommonOptions = {
312
313
  includeUnknown?: boolean,
314
+ computed?: boolean,
313
315
  domParser?: XmlDomParser
314
316
  };
315
317
 
@@ -445,9 +447,15 @@ interface ExifTags {
445
447
  // GPS tags
446
448
  'GPSVersionID'?: NumberTag,
447
449
  'GPSLatitudeRef'?: StringArrayTag,
448
- 'GPSLatitude'?: TypedTag<[[number, number], [number, number], [number, number]]>,
450
+ 'GPSLatitude'?: TypedTag<
451
+ [[number, number], [number, number], [number, number]],
452
+ [number | null, number | null, number | null]
453
+ >,
449
454
  'GPSLongitudeRef'?: StringArrayTag,
450
- 'GPSLongitude'?: TypedTag<[[number, number], [number, number], [number, number]]>,
455
+ 'GPSLongitude'?: TypedTag<
456
+ [[number, number], [number, number], [number, number]],
457
+ [number | null, number | null, number | null]
458
+ >,
451
459
  'GPSAltitudeRef'?: NumberTag,
452
460
  'GPSAltitude'?: RationalTag,
453
461
  'GPSTimeStamp'?: NumberArrayTag,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "exifreader",
3
- "version": "4.33.1",
3
+ "version": "4.34.0",
4
4
  "description": "Library that parses Exif metadata in images.",
5
5
  "author": "Mattias Wallander <mattias@wallander.eu>",
6
6
  "repository": {
@@ -28,7 +28,7 @@
28
28
  "@babel/core": "^7.25.2",
29
29
  "@babel/preset-env": "^7.25.4",
30
30
  "@babel/register": "^7.24.6",
31
- "@types/node": "^24.0.3",
31
+ "@types/node": "^25.0.1",
32
32
  "babel-loader": "^10.0.0",
33
33
  "babel-plugin-rewire": "^1.2.0",
34
34
  "chai": "^4.3.10",
@@ -45,7 +45,7 @@
45
45
  "string-replace-loader": "^3.1.0",
46
46
  "terser-webpack-plugin": "^5.3.10",
47
47
  "typescript": "^5.6.2",
48
- "webpack": "5.103.0",
48
+ "webpack": "5.104.1",
49
49
  "webpack-cli": "^5.1.4",
50
50
  "webpack-dev-server": "^5.0.4"
51
51
  },
@@ -70,7 +70,7 @@
70
70
  "nyc": {
71
71
  "check-coverage": true,
72
72
  "statements": 93,
73
- "branches": 88,
73
+ "branches": 87,
74
74
  "functions": 97,
75
75
  "lines": 93,
76
76
  "reporter": [
package/src/canon-tags.js CHANGED
@@ -20,8 +20,8 @@ export default {
20
20
  SHOT_INFO_AUTO_ROTATE
21
21
  };
22
22
 
23
- function read(dataView, tiffHeaderOffset, offset, byteOrder, includeUnknown) {
24
- let tags = readIfd(dataView, IFD_TYPE_CANON, tiffHeaderOffset, tiffHeaderOffset + offset, byteOrder, includeUnknown);
23
+ function read(dataView, tiffHeaderOffset, offset, byteOrder, includeUnknown, computed = false) {
24
+ let tags = readIfd(dataView, IFD_TYPE_CANON, tiffHeaderOffset, tiffHeaderOffset + offset, byteOrder, includeUnknown, computed);
25
25
 
26
26
  if (tags['ShotInfo']) {
27
27
  tags = objectAssign({}, tags, parseShotInfo(tags['ShotInfo'].value));
@@ -209,11 +209,13 @@ export function loadView(
209
209
  {
210
210
  expanded = false,
211
211
  async = false,
212
+ computed = false,
212
213
  includeUnknown = false,
213
214
  domParser = undefined,
214
215
  } = {
215
216
  expanded: false,
216
217
  async: false,
218
+ computed: false,
217
219
  includeUnknown: false,
218
220
  domParser: undefined,
219
221
  }
@@ -260,7 +262,12 @@ export function loadView(
260
262
 
261
263
  if (Constants.USE_EXIF && hasExifData(tiffHeaderOffset)) {
262
264
  foundMetaData = true;
263
- const {tags: readTags, byteOrder} = Tags.read(dataView, tiffHeaderOffset, includeUnknown);
265
+ const {tags: readTags, byteOrder} = Tags.read(
266
+ dataView,
267
+ tiffHeaderOffset,
268
+ includeUnknown,
269
+ computed
270
+ );
264
271
  if (readTags.Thumbnail) {
265
272
  tags.Thumbnail = readTags.Thumbnail;
266
273
  delete readTags.Thumbnail;
@@ -320,14 +327,27 @@ export function loadView(
320
327
 
321
328
  if (Constants.USE_MAKER_NOTES && readTags['MakerNote']) {
322
329
  if (hasCanonData(readTags)) {
323
- const readCanonTags = CanonTags.read(dataView, tiffHeaderOffset, readTags['MakerNote'].__offset, byteOrder, includeUnknown);
330
+ const readCanonTags = CanonTags.read(
331
+ dataView,
332
+ tiffHeaderOffset,
333
+ readTags['MakerNote'].__offset,
334
+ byteOrder,
335
+ includeUnknown,
336
+ computed
337
+ );
324
338
  if (expanded) {
325
339
  tags.makerNotes = readCanonTags;
326
340
  } else {
327
341
  tags = objectAssign({}, tags, readCanonTags);
328
342
  }
329
343
  } else if (hasPentaxType1Data(readTags)) {
330
- const readPentaxTags = PentaxTags.read(dataView, tiffHeaderOffset, readTags['MakerNote'].__offset, includeUnknown);
344
+ const readPentaxTags = PentaxTags.read(
345
+ dataView,
346
+ tiffHeaderOffset,
347
+ readTags['MakerNote'].__offset,
348
+ includeUnknown,
349
+ computed
350
+ );
331
351
  if (expanded) {
332
352
  tags.makerNotes = readPentaxTags;
333
353
  } else {
@@ -374,7 +394,7 @@ export function loadView(
374
394
 
375
395
  if (Constants.USE_MPF && hasMpfData(mpfDataOffset)) {
376
396
  foundMetaData = true;
377
- const readMpfTags = MpfTags.read(dataView, mpfDataOffset, includeUnknown);
397
+ const readMpfTags = MpfTags.read(dataView, mpfDataOffset, includeUnknown, computed);
378
398
  if (expanded) {
379
399
  tags.mpf = readMpfTags;
380
400
  } else {
@@ -395,7 +415,7 @@ export function loadView(
395
415
 
396
416
  if (Constants.USE_PNG && hasPngTextData(pngTextChunks)) {
397
417
  foundMetaData = true;
398
- const {readTags, readTagsPromise} = PngTextTags.read(dataView, pngTextChunks, async, includeUnknown);
418
+ const {readTags, readTagsPromise} = PngTextTags.read(dataView, pngTextChunks, async, includeUnknown, computed);
399
419
  addPngTextTags(readTags);
400
420
  if (readTagsPromise) {
401
421
  tagsPromises.push(readTagsPromise.then((tagList) => tagList.forEach(addPngTextTags)));
package/src/mpf-tags.js CHANGED
@@ -14,9 +14,17 @@ export default {
14
14
 
15
15
  const ENTRY_SIZE = 16;
16
16
 
17
- function read(dataView, dataOffset, includeUnknown) {
17
+ function read(dataView, dataOffset, includeUnknown, computed = false) {
18
18
  const byteOrder = ByteOrder.getByteOrder(dataView, dataOffset);
19
- const tags = readIfd(dataView, IFD_TYPE_MPF, dataOffset, get0thIfdOffset(dataView, dataOffset, byteOrder), byteOrder, includeUnknown);
19
+ const tags = readIfd(
20
+ dataView,
21
+ IFD_TYPE_MPF,
22
+ dataOffset,
23
+ get0thIfdOffset(dataView, dataOffset, byteOrder),
24
+ byteOrder,
25
+ includeUnknown,
26
+ computed
27
+ );
20
28
  return addMpfImages(dataView, dataOffset, tags, byteOrder);
21
29
  }
22
30
 
@@ -31,13 +31,21 @@ export default {
31
31
  LIK3III
32
32
  };
33
33
 
34
- function read(dataView, tiffHeaderOffset, offset, includeUnknown) {
34
+ function read(dataView, tiffHeaderOffset, offset, includeUnknown, computed = false) {
35
35
  // Pentax does not use the standard TIFF header offset as base for tag
36
36
  // offsets but instead uses the start of the IFD, i.e. directly after the
37
37
  // two byte order bytes. originOffset below is this offset.
38
38
  const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset + offset + BYTE_ORDER_OFFSET);
39
39
  const originOffset = tiffHeaderOffset + offset;
40
- let tags = readIfd(dataView, IFD_TYPE_PENTAX, originOffset, originOffset + PENTAX_IFD_OFFSET, byteOrder, includeUnknown, true);
40
+ let tags = readIfd(
41
+ dataView,
42
+ IFD_TYPE_PENTAX,
43
+ originOffset,
44
+ originOffset + PENTAX_IFD_OFFSET,
45
+ byteOrder,
46
+ includeUnknown,
47
+ computed
48
+ );
41
49
 
42
50
  if (hasLevelInfoK3III(tags)) {
43
51
  tags = objectAssign({}, tags, parseLevelInfoK3III(dataView, originOffset + tags['LevelInfo'].__offset, byteOrder));
@@ -24,7 +24,7 @@ const COMPRESSION_SECTION_ITXT_EXTRA_BYTE = 1;
24
24
  const COMPRESSION_FLAG_COMPRESSED = 1;
25
25
  const EXIF_OFFSET = 6;
26
26
 
27
- function read(dataView, pngTextChunks, async, includeUnknown) {
27
+ function read(dataView, pngTextChunks, async, includeUnknown, computed = false) {
28
28
  const tags = {};
29
29
  const tagsPromises = [];
30
30
  for (let i = 0; i < pngTextChunks.length; i++) {
@@ -35,7 +35,12 @@ function read(dataView, pngTextChunks, async, includeUnknown) {
35
35
  try {
36
36
  if (Constants.USE_EXIF && isExifGroupTag(name, value)) {
37
37
  return {
38
- __exif: Tags.read(decodeRawData(value), EXIF_OFFSET, includeUnknown).tags
38
+ __exif: Tags.read(
39
+ decodeRawData(value),
40
+ EXIF_OFFSET,
41
+ includeUnknown,
42
+ computed
43
+ ).tags
39
44
  };
40
45
  } else if (Constants.USE_IPTC && isIptcGroupTag(name, value)) {
41
46
  return {
@@ -151,6 +156,7 @@ function getEncodingFromType(type) {
151
156
 
152
157
  function constructTag(valueChars, type, langChars, keywordChars) {
153
158
  const value = getValue(valueChars);
159
+
154
160
  return {
155
161
  name: getName(type, langChars, keywordChars),
156
162
  value,
@@ -22,7 +22,7 @@ export function get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder) {
22
22
  return tiffHeaderOffset + Types.getLongAt(dataView, tiffHeaderOffset + 4, byteOrder);
23
23
  }
24
24
 
25
- export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown) {
25
+ export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnknown, computed = false) {
26
26
  const FIELD_COUNT_SIZE = Types.getTypeSize('SHORT');
27
27
  const FIELD_SIZE = 12;
28
28
 
@@ -42,6 +42,9 @@ export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, incl
42
42
  'value': tag.value,
43
43
  'description': tag.description
44
44
  };
45
+ if (computed) {
46
+ tags[tag.name].computed = getComputedTagValue(tag.tagType, tag.value);
47
+ }
45
48
  if (tag.name === 'MakerNote' || (ifdType === IFD_TYPE_PENTAX && tag.name === 'LevelInfo')) {
46
49
  tags[tag.name].__offset = tag.__offset;
47
50
  }
@@ -53,7 +56,15 @@ export function readIfd(dataView, ifdType, offsetOrigin, offset, byteOrder, incl
53
56
  if (Constants.USE_THUMBNAIL && (offset < dataView.byteLength - Types.getTypeSize('LONG'))) {
54
57
  const nextIfdOffset = Types.getLongAt(dataView, offset, byteOrder);
55
58
  if (nextIfdOffset !== 0 && ifdType === IFD_TYPE_0TH) {
56
- tags['Thumbnail'] = readIfd(dataView, IFD_TYPE_1ST, offsetOrigin, offsetOrigin + nextIfdOffset, byteOrder, includeUnknown);
59
+ tags['Thumbnail'] = readIfd(
60
+ dataView,
61
+ IFD_TYPE_1ST,
62
+ offsetOrigin,
63
+ offsetOrigin + nextIfdOffset,
64
+ byteOrder,
65
+ includeUnknown,
66
+ computed
67
+ );
57
68
  }
58
69
  }
59
70
 
@@ -126,6 +137,7 @@ function readTag(dataView, ifdType, offsetOrigin, offset, byteOrder, includeUnkn
126
137
  name: tagName,
127
138
  value: tagValue,
128
139
  description: tagDescription,
140
+ tagType,
129
141
  __offset: tagValueOffset
130
142
  };
131
143
  }
@@ -191,3 +203,53 @@ function getDescriptionFromTagValue(tagValue) {
191
203
  }
192
204
  return tagValue;
193
205
  }
206
+
207
+ function getComputedTagValue(tagType, value) {
208
+ if (tagType === Types.tagTypes['ASCII']) {
209
+ if (Array.isArray(value) && value.length === 1) {
210
+ return value[0];
211
+ }
212
+
213
+ return value;
214
+ }
215
+
216
+ if (tagType === Types.tagTypes['RATIONAL'] || tagType === Types.tagTypes['SRATIONAL']) {
217
+ if (isSingleRationalValue(value)) {
218
+ return getComputedRationalValue(value);
219
+ }
220
+
221
+ if (Array.isArray(value)) {
222
+ return value.map((rational) => getComputedRationalValue(rational));
223
+ }
224
+
225
+ return value;
226
+ }
227
+
228
+ return value;
229
+ }
230
+
231
+ function isSingleRationalValue(value) {
232
+ if (!Array.isArray(value) || value.length !== 2) {
233
+ return false;
234
+ }
235
+
236
+ return typeof value[0] === 'number' && typeof value[1] === 'number';
237
+ }
238
+
239
+ function getComputedRationalValue(rational) {
240
+ if (!Array.isArray(rational) || rational.length !== 2) {
241
+ return rational;
242
+ }
243
+
244
+ const numerator = rational[0];
245
+ const denominator = rational[1];
246
+ if (!Number.isFinite(numerator) || !Number.isFinite(denominator)) {
247
+ return rational;
248
+ }
249
+
250
+ if (denominator === 0) {
251
+ return null;
252
+ }
253
+
254
+ return numerator / denominator;
255
+ }
package/src/tags.js CHANGED
@@ -15,39 +15,72 @@ export default {
15
15
  read,
16
16
  };
17
17
 
18
- function read(dataView, tiffHeaderOffset, includeUnknown) {
18
+ function read(dataView, tiffHeaderOffset, includeUnknown, computed = false) {
19
19
  const byteOrder = ByteOrder.getByteOrder(dataView, tiffHeaderOffset);
20
- let tags = read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown);
21
- tags = readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown);
22
- tags = readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown);
23
- tags = readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown);
20
+ let tags = read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
21
+ tags = readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
22
+ tags = readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
23
+ tags = readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed);
24
24
 
25
25
  return {tags, byteOrder};
26
26
  }
27
27
 
28
- function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
29
- return readIfd(dataView, IFD_TYPE_0TH, tiffHeaderOffset, get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder), byteOrder, includeUnknown);
28
+ function read0thIfd(dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
29
+ return readIfd(dataView, IFD_TYPE_0TH, tiffHeaderOffset, get0thIfdOffset(dataView, tiffHeaderOffset, byteOrder), byteOrder, includeUnknown, computed);
30
30
  }
31
31
 
32
- function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
32
+ function readExifIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
33
33
  if (tags[EXIF_IFD_POINTER_KEY] !== undefined) {
34
- return objectAssign(tags, readIfd(dataView, IFD_TYPE_EXIF, tiffHeaderOffset, tiffHeaderOffset + tags[EXIF_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
34
+ return objectAssign(
35
+ tags,
36
+ readIfd(
37
+ dataView,
38
+ IFD_TYPE_EXIF,
39
+ tiffHeaderOffset,
40
+ tiffHeaderOffset + tags[EXIF_IFD_POINTER_KEY].value,
41
+ byteOrder,
42
+ includeUnknown,
43
+ computed
44
+ )
45
+ );
35
46
  }
36
47
 
37
48
  return tags;
38
49
  }
39
50
 
40
- function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
51
+ function readGpsIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
41
52
  if (tags[GPS_INFO_IFD_POINTER_KEY] !== undefined) {
42
- return objectAssign(tags, readIfd(dataView, IFD_TYPE_GPS, tiffHeaderOffset, tiffHeaderOffset + tags[GPS_INFO_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
53
+ return objectAssign(
54
+ tags,
55
+ readIfd(
56
+ dataView,
57
+ IFD_TYPE_GPS,
58
+ tiffHeaderOffset,
59
+ tiffHeaderOffset + tags[GPS_INFO_IFD_POINTER_KEY].value,
60
+ byteOrder,
61
+ includeUnknown,
62
+ computed
63
+ )
64
+ );
43
65
  }
44
66
 
45
67
  return tags;
46
68
  }
47
69
 
48
- function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown) {
70
+ function readInteroperabilityIfd(tags, dataView, tiffHeaderOffset, byteOrder, includeUnknown, computed) {
49
71
  if (tags[INTEROPERABILITY_IFD_POINTER_KEY] !== undefined) {
50
- return objectAssign(tags, readIfd(dataView, IFD_TYPE_INTEROPERABILITY, tiffHeaderOffset, tiffHeaderOffset + tags[INTEROPERABILITY_IFD_POINTER_KEY].value, byteOrder, includeUnknown));
72
+ return objectAssign(
73
+ tags,
74
+ readIfd(
75
+ dataView,
76
+ IFD_TYPE_INTEROPERABILITY,
77
+ tiffHeaderOffset,
78
+ tiffHeaderOffset + tags[INTEROPERABILITY_IFD_POINTER_KEY].value,
79
+ byteOrder,
80
+ includeUnknown,
81
+ computed
82
+ )
83
+ );
51
84
  }
52
85
 
53
86
  return tags;