Merge branch 'main' of github.com:photostructure/exiftool-vendored.js

package.json

@@ -17,6 +17,7 @@
     "premktags": "npm run compile",
     "mktags": "node dist/update/mktags.js",
     "prelint": "npm run compile",
+    "prepare": "npm run compile",
     "lint": "eslint src --ext .ts",
     "prettier": "prettier --write src/*.ts src/**/*.ts **/*.yml **/*.json **/*.md",
     "pretest": "npm run compile",

src/Struct.ts

@@ -1,7 +1,7 @@
 import { isDateOrTime } from "./DateTime"
 
 export type Struct = {
-  [k: string]: number | string | Struct
+  [k: string]: number | string | Struct | Array<Struct|number|string>
 }
 
 export function isStruct(o: any): o is Struct {
@@ -10,7 +10,7 @@ export function isStruct(o: any): o is Struct {
     o.constructor?.name === "Object" &&
     Object.values(o).every((v) => {
       const t = typeof v
-      return t === "string" || t === "number" || isDateOrTime(v) || isStruct(v)
+      return t === "string" || t === "number" || isDateOrTime(v) || isStruct(v) || Array.isArray(v)
     })
   )
 }

src/WriteTask.spec.ts

@@ -836,5 +836,32 @@ describe("WriteTask", function () {
       // const missing = Object.keys(before).filter((k) => !(k in after))
       // console.log({ missing })
     })
+
+    it("supports creating arrays in structs", async () => {
+      const f = await testImg()
+      const regionData = {
+        RegionInfo: {
+          AppliedToDimensions: { W: 10, H: 10, Unit: "pixel" },
+          RegionList: [
+            {
+              Area: { X: 0.5, Y: 0.5, W: 0.1, H: 0.1, Unit: "normalized" },
+              Rotation: 0,
+              Type: "Face",
+              Name: "randomName1",
+            },
+            {
+              Area: { X: 0.5, Y: 0.5, W: 0.1, H: 0.1, Unit: "normalized" },
+              Rotation: 0,
+              Type: "Face",
+              Name: "randomName2",
+            },
+          ],
+        },
+      }
+
+      await exiftool.write(f, regionData)
+      const after = await exiftool.read(f)
+      expect(after).to.containSubset(regionData)
+    })
   })
 })