exiftool-vendored 36.1.0 → 37.0.0

package/dist/ExifToolOptions.d.ts

@@ -288,6 +288,17 @@ export interface ExifToolOptions extends bc.BatchClusterOptions, bc.BatchProcess
      * library rejects any entry containing `\r`, `\n`, or `\0` as a
      * defense-in-depth measure, but provides no other sanitization.
      *
+     * JSON reads repair malformed UTF-8 with U+FFFD (`�`) independently of this
+     * array and preserve the original string bytes in
+     * `Tags.invalidUtf8Bytes`. If these arguments contain an explicit,
+     * non-empty ExifTool `-api Filter=...` option, that custom filter owns the
+     * complete output filtering pipeline and must perform any desired UTF-8
+     * repair and byte capture itself.
+     *
+     * The marker appears only in string values; to render it as the pre-v37 `?`,
+     * post-process with
+     * `typeof value === "string" ? value.replace(/\uFFFD/g, "?") : value`.
+     *
      * @default `["-fast"]`
      */
     readArgs: string[];
@@ -347,14 +358,16 @@ export interface ExifToolOptions extends bc.BatchClusterOptions, bc.BatchProcess
     keepUTCTime: boolean;
     /**
      * Timeout in milliseconds for synchronous disposal (using Symbol.dispose).
-     * If graceful cleanup takes longer than this, forceful cleanup is attempted.
+     * If graceful cleanup takes longer than this, forceful cleanup is requested.
+     * This is not a hard completion deadline.
      *
      * @default 1000 (1 second)
      */
     disposalTimeoutMs?: number;
     /**
      * Timeout in milliseconds for asynchronous disposal (using Symbol.asyncDispose).
-     * If graceful cleanup takes longer than this, forceful cleanup is attempted.
+     * If graceful cleanup takes longer than this, forceful cleanup is requested.
+     * This is not a hard completion deadline.
      *
      * @default 5000 (5 seconds)
      */

package/dist/ExifToolOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExifToolOptions.js","sourceRoot":"","sources":["../src/ExifToolOptions.ts"],"names":[],"mappings":";;;AAyZA,0DASC;AA/ZD,uCAA0D;AAG7C,QAAA,cAAc,GAAG,IAAA,iBAAO,EACnC,KAAK,EACL,QAAQ,EACR,QAAQ,CACsC,CAAC;AA+YjD,SAAgB,uBAAuB,CAIrC,OAAU;IACV,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,IAAI,OAAO,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;QACzE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IACtE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"ExifToolOptions.js","sourceRoot":"","sources":["../src/ExifToolOptions.ts"],"names":[],"mappings":";;;AAsaA,0DASC;AA5aD,uCAA0D;AAG7C,QAAA,cAAc,GAAG,IAAA,iBAAO,EACnC,KAAK,EACL,QAAQ,EACR,QAAQ,CACsC,CAAC;AA4ZjD,SAAgB,uBAAuB,CAIrC,OAAU;IACV,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,IAAI,OAAO,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAC;QACzE,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;IACtE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/ExifToolVendoredTags.d.ts

@@ -1,9 +1,19 @@
 import { ErrorsAndWarnings } from "./ErrorsAndWarnings";
+import { InvalidUtf8Bytes } from "./InvalidUtf8Bytes";
 import { StrEnum, StrEnumKeys } from "./StrEnum";
 /**
  * This tags are added to {@link Tags} from this library.
  */
 export interface ExifToolVendoredTags extends ErrorsAndWarnings {
+    /**
+     * Original bytes for metadata strings that contained malformed UTF-8.
+     *
+     * This sparse object mirrors the returned tag paths. It is absent when all
+     * strings were valid UTF-8 or when a custom ExifTool `Filter` handled them.
+     * Each damaged string is a `Uint8Array` leaf; narrow a dynamic lookup with
+     * `value instanceof Uint8Array` before decoding it.
+     */
+    invalidUtf8Bytes?: InvalidUtf8Bytes;
     /**
      * Either an offset, like `UTC-7`, or an actual IANA timezone, like
      * `America/Los_Angeles`.
@@ -28,5 +38,5 @@ export interface ExifToolVendoredTags extends ErrorsAndWarnings {
      */
     zoneSource?: string;
 }
-export declare const ExifToolVendoredTagNames: StrEnum<"zone" | "tz" | "tzSource" | "zoneSource" | "errors" | "warnings">;
+export declare const ExifToolVendoredTagNames: StrEnum<"zone" | "invalidUtf8Bytes" | "tz" | "tzSource" | "zoneSource" | "errors" | "warnings">;
 export type ExifToolVendoredTagName = StrEnumKeys<typeof ExifToolVendoredTagNames>;

package/dist/ExifToolVendoredTags.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExifToolVendoredTagNames = void 0;
 const StrEnum_1 = require("./StrEnum");
-exports.ExifToolVendoredTagNames = (0, StrEnum_1.strEnum)("tz", "zone", "tzSource", "zoneSource", "errors", "warnings");
+exports.ExifToolVendoredTagNames = (0, StrEnum_1.strEnum)("invalidUtf8Bytes", "tz", "zone", "tzSource", "zoneSource", "errors", "warnings");
 //# sourceMappingURL=ExifToolVendoredTags.js.map

package/dist/ExifToolVendoredTags.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExifToolVendoredTags.js","sourceRoot":"","sources":["../src/ExifToolVendoredTags.ts"],"names":[],"mappings":";;;AAGA,uCAA0D;AAkC7C,QAAA,wBAAwB,GAAG,IAAA,iBAAO,EAC7C,IAAI,EACJ,MAAM,EACN,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,UAAU,CACmC,CAAC"}
+{"version":3,"file":"ExifToolVendoredTags.js","sourceRoot":"","sources":["../src/ExifToolVendoredTags.ts"],"names":[],"mappings":";;;AAIA,uCAA0D;AA4C7C,QAAA,wBAAwB,GAAG,IAAA,iBAAO,EAC7C,kBAAkB,EAClB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,UAAU,CACmC,CAAC"}

package/dist/ExiftoolPath.js

@@ -44,7 +44,7 @@ function vendorPackage() {
 async function tryImport({ prefix = "", logger, } = {}) {
     const id = prefix + vendorPackage();
     try {
-        const module = await Promise.resolve(`${id}`).then(s => __importStar(require(s)));
+        const module = await import(id);
         return module.default ?? module;
     }
     catch (error) {

package/dist/ExiftoolPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExiftoolPath.js","sourceRoot":"","sources":["../src/ExiftoolPath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmDA,oCAkDC;AApGD,6CAA+B;AAC/B,iDAAmC;AACnC,uCAAoC;AAEpC,mCAAgC;AAEhC,SAAS,aAAa;IACpB,OAAO,oBAAoB,GAAG,CAAC,IAAA,iBAAO,GAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,EACvB,MAAM,GAAG,EAAE,EACX,MAAM,MACyC,EAAE;IACjD,MAAM,EAAE,GAAG,MAAM,GAAG,aAAa,EAAE,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,yBAAa,EAAE,uCAAC,CAAC;QAChC,OAAO,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,cAAc,EAAE,KAAK,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,YAAY,CAAC,MAAe;IAChD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,2EAA2E;IAC3E,iEAAiE;IAEjE,MAAM,gBAAgB,GAAG,IAAI;QAC3B,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;SACjB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC3D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEnB,uEAAuE;IACvE,yEAAyE;IACzE,IAAI,gBAAgB,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjE,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,IAAI,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,IAAI,CAAC,8BAA8B,GAAG,aAAa,EAAE,CAAC,CAAC;IAE/D,kDAAkD;IAClD,MAAM,oBAAoB,GAAI,OAAsC;SACjE,aAAa,CAAC;IACjB,IAAI,oBAAoB,IAAI,IAAI,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAC1B,oBAAoB,EACpB,aAAa,EAAE,EACf,KAAK,EACL,UAAU,GAAG,CAAC,IAAA,iBAAO,GAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CACvC,CAAC;QACF,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,IAAI,CACV,4DAA4D;gBAC1D,SAAS,CACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAK,EAAC,UAAU,CAAC,CAAC;IACzC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACrB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ExiftoolPath.js","sourceRoot":"","sources":["../src/ExiftoolPath.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmDA,oCAkDC;AApGD,6CAA+B;AAC/B,iDAAmC;AACnC,uCAAoC;AAEpC,mCAAgC;AAEhC,SAAS,aAAa;IACpB,OAAO,oBAAoB,GAAG,CAAC,IAAA,iBAAO,GAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,EACvB,MAAM,GAAG,EAAE,EACX,MAAM,MACyC,EAAE;IACjD,MAAM,EAAE,GAAG,MAAM,GAAG,aAAa,EAAE,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,CAAC;QAChC,OAAO,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,cAAc,EAAE,KAAK,CAAC,CAAC;QACzC,OAAO;IACT,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,YAAY,CAAC,MAAe;IAChD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,2EAA2E;IAC3E,iEAAiE;IAEjE,MAAM,gBAAgB,GAAG,IAAI;QAC3B,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;SACjB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC3D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEnB,uEAAuE;IACvE,yEAAyE;IACzE,IAAI,gBAAgB,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjE,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,IAAI,IAAI,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,IAAI,CAAC,8BAA8B,GAAG,aAAa,EAAE,CAAC,CAAC;IAE/D,kDAAkD;IAClD,MAAM,oBAAoB,GAAI,OAAsC;SACjE,aAAa,CAAC;IACjB,IAAI,oBAAoB,IAAI,IAAI,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAC1B,oBAAoB,EACpB,aAAa,EAAE,EACf,KAAK,EACL,UAAU,GAAG,CAAC,IAAA,iBAAO,GAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CACvC,CAAC;QACF,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,EAAE,IAAI,CACV,4DAA4D;gBAC1D,SAAS,CACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kEAAkE;IAClE,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAK,EAAC,UAAU,CAAC,CAAC;IACzC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACrB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;AACJ,CAAC"}

package/dist/InvalidUtf8Bytes.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Original bytes for metadata strings that contained malformed UTF-8.
+ *
+ * Keys mirror the returned tag value. List indexes are represented as numeric
+ * object keys, and branches without malformed strings are omitted. Each leaf
+ * is a `Uint8Array`; intermediate values are nested `InvalidUtf8Bytes` objects.
+ * Narrow a dynamic lookup with `value instanceof Uint8Array` before decoding
+ * it.
+ */
+export interface InvalidUtf8Bytes {
+    [tagOrIndex: string]: Uint8Array | InvalidUtf8Bytes;
+}
+export declare const InvalidUtf8Marker = "__etvInvalidUtf8V1";
+/** Restore byte arrays after callers serialize tags with `JSON.stringify()`. */
+export declare function reviveInvalidUtf8Bytes(value: unknown): unknown;
+/** Decode the private ExifTool filter wrapper before returning public tags. */
+export declare function unwrapInvalidUtf8Tags(tags: Record<string, unknown>): {
+    tags: Record<string, unknown>;
+    invalidUtf8Bytes?: InvalidUtf8Bytes;
+};

package/dist/InvalidUtf8Bytes.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvalidUtf8Marker = void 0;
+exports.reviveInvalidUtf8Bytes = reviveInvalidUtf8Bytes;
+exports.unwrapInvalidUtf8Tags = unwrapInvalidUtf8Tags;
+exports.InvalidUtf8Marker = "__etvInvalidUtf8V1";
+const StringPrefix = "s:";
+const Base64Prefix = "b64:";
+function wireValue(value) {
+    if (value == null || typeof value !== "object" || Array.isArray(value)) {
+        return;
+    }
+    const outerEntries = Object.entries(value);
+    if (outerEntries.length !== 1 || outerEntries[0]?.[0] !== exports.InvalidUtf8Marker) {
+        return;
+    }
+    const payload = outerEntries[0][1];
+    if (payload == null ||
+        typeof payload !== "object" ||
+        Array.isArray(payload)) {
+        return;
+    }
+    const payloadEntries = Object.entries(payload);
+    if (payloadEntries.length !== 2 ||
+        typeof payload.replacement !==
+            "string" ||
+        typeof payload.rawBase64 !== "string") {
+        return;
+    }
+    const result = payload;
+    return result.replacement.startsWith(StringPrefix) &&
+        result.rawBase64.startsWith(Base64Prefix)
+        ? result
+        : undefined;
+}
+function unwrap(value) {
+    const wire = wireValue(value);
+    if (wire != null) {
+        return {
+            value: wire.replacement.slice(StringPrefix.length),
+            bytes: new Uint8Array(Buffer.from(wire.rawBase64.slice(Base64Prefix.length), "base64")),
+        };
+    }
+    if (value == null || typeof value !== "object")
+        return { value };
+    const result = value;
+    let bytes;
+    for (const [key, child] of Object.entries(value)) {
+        const unwrapped = unwrap(child);
+        if (unwrapped.value !== child) {
+            Object.defineProperty(result, key, {
+                configurable: true,
+                enumerable: true,
+                value: unwrapped.value,
+                writable: true,
+            });
+        }
+        if (unwrapped.bytes != null) {
+            bytes ??= {};
+            // Assignment would invoke Object.prototype.__proto__'s setter.
+            Object.defineProperty(bytes, key, {
+                configurable: true,
+                enumerable: true,
+                value: unwrapped.bytes,
+                writable: true,
+            });
+        }
+    }
+    return bytes == null ? { value: result } : { value: result, bytes };
+}
+/** Restore byte arrays after callers serialize tags with `JSON.stringify()`. */
+function reviveInvalidUtf8Bytes(value) {
+    if (value == null || typeof value !== "object" || Array.isArray(value)) {
+        return value;
+    }
+    const entries = Object.entries(value);
+    if (entries.length > 0 &&
+        entries.every(([key, byte], index) => key === String(index) &&
+            typeof byte === "number" &&
+            Number.isInteger(byte) &&
+            byte >= 0 &&
+            byte <= 0xff)) {
+        return Uint8Array.from(entries.map(([, byte]) => byte));
+    }
+    for (const [key, child] of entries) {
+        const revived = reviveInvalidUtf8Bytes(child);
+        if (revived !== child) {
+            Object.defineProperty(value, key, {
+                configurable: true,
+                enumerable: true,
+                value: revived,
+                writable: true,
+            });
+        }
+    }
+    return value;
+}
+/** Decode the private ExifTool filter wrapper before returning public tags. */
+function unwrapInvalidUtf8Tags(tags) {
+    const result = unwrap(tags);
+    const decodedTags = { tags: result.value };
+    return result.bytes == null || result.bytes instanceof Uint8Array
+        ? decodedTags
+        : { ...decodedTags, invalidUtf8Bytes: result.bytes };
+}
+//# sourceMappingURL=InvalidUtf8Bytes.js.map

package/dist/InvalidUtf8Bytes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InvalidUtf8Bytes.js","sourceRoot":"","sources":["../src/InvalidUtf8Bytes.ts"],"names":[],"mappings":"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"}

package/dist/InvalidUtf8Bytes.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/InvalidUtf8Bytes.spec.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const _chai_spec_1 = require("./_chai.spec");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
+const JSON_1 = require("./JSON");
+function wrapped(replacement, bytes) {
+    return {
+        [InvalidUtf8Bytes_1.InvalidUtf8Marker]: {
+            replacement: "s:" + replacement,
+            rawBase64: "b64:" + Buffer.from(bytes).toString("base64"),
+        },
+    };
+}
+describe("unwrapInvalidUtf8Tags", () => {
+    it("unwraps nested object and list leaves into a sparse byte sidecar", () => {
+        const collision = {
+            [InvalidUtf8Bytes_1.InvalidUtf8Marker]: {
+                replacement: "missing the required prefix",
+                rawBase64: "b64:3Es=",
+            },
+        };
+        const decoded = (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)({
+            Description: wrapped("G�teborg", [0x47, 0x9a, 0x74]),
+            Nested: {
+                Subjects: ["valid", wrapped("�K", [0xdc, 0x4b])],
+            },
+            Collision: collision,
+        });
+        (0, _chai_spec_1.expect)(decoded.tags).to.deep.equal({
+            Description: "G�teborg",
+            Nested: { Subjects: ["valid", "�K"] },
+            Collision: collision,
+        });
+        (0, _chai_spec_1.expect)(decoded.invalidUtf8Bytes).to.deep.equal({
+            Description: new Uint8Array([0x47, 0x9a, 0x74]),
+            Nested: {
+                Subjects: { 1: new Uint8Array([0xdc, 0x4b]) },
+            },
+        });
+    });
+    it("does not add a sidecar when no private wrapper is present", () => {
+        const tags = { Title: "Authored? 世界" };
+        const decoded = (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)(tags);
+        (0, _chai_spec_1.expect)(decoded.tags).to.equal(tags);
+        (0, _chai_spec_1.expect)(decoded).to.deep.equal({
+            tags: { Title: "Authored? 世界" },
+        });
+    });
+    it("preserves wrapped bytes under an own __proto__ key", () => {
+        const input = JSON.parse(`{"__proto__":${JSON.stringify(wrapped("�K", [0xdc, 0x4b]))}}`);
+        const decoded = (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)(input);
+        (0, _chai_spec_1.expect)(Object.hasOwn(decoded.tags, "__proto__")).to.equal(true);
+        (0, _chai_spec_1.expect)(decoded.tags.__proto__).to.equal("�K");
+        (0, _chai_spec_1.expect)(Object.hasOwn(decoded.invalidUtf8Bytes, "__proto__")).to.equal(true);
+        (0, _chai_spec_1.expect)(decoded.invalidUtf8Bytes?.__proto__).to.deep.equal(new Uint8Array([0xdc, 0x4b]));
+    });
+    it("preserves __proto__ as an ordinary metadata key", () => {
+        const input = JSON.parse('{"__proto__":"metadata"}');
+        const decoded = (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)(input);
+        (0, _chai_spec_1.expect)(Object.hasOwn(decoded.tags, "__proto__")).to.equal(true);
+        (0, _chai_spec_1.expect)(decoded.tags.__proto__).to.equal("metadata");
+        (0, _chai_spec_1.expect)(Object.getPrototypeOf(decoded.tags)).to.equal(Object.prototype);
+    });
+    it("round-trips byte arrays through the public parseJSON helper", () => {
+        const value = {
+            City: "�K",
+            invalidUtf8Bytes: {
+                City: new Uint8Array([0xdc, 0x4b]),
+                Subject: { 1: new Uint8Array([0xdd, 0x4c]) },
+            },
+        };
+        (0, _chai_spec_1.expect)((0, JSON_1.parseJSON)(JSON.stringify(value))).to.deep.equal(value);
+    });
+});
+//# sourceMappingURL=InvalidUtf8Bytes.spec.js.map

package/dist/InvalidUtf8Bytes.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InvalidUtf8Bytes.spec.js","sourceRoot":"","sources":["../src/InvalidUtf8Bytes.spec.ts"],"names":[],"mappings":"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"}

package/dist/InvalidUtf8Xml.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/InvalidUtf8Xml.spec.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+const ExifTool_1 = require("./ExifTool");
+const _chai_spec_1 = require("./_chai.spec");
+const InvalidMarker = "{{INVALID_UTF8}}";
+const InvalidByte = 0xdc;
+function withInvalidUtf8(template) {
+    const parts = template.split(InvalidMarker);
+    const chunks = [];
+    parts.forEach((part, index) => {
+        chunks.push(Buffer.from(part));
+        if (index < parts.length - 1)
+            chunks.push(Buffer.from([InvalidByte]));
+    });
+    return Buffer.concat(chunks);
+}
+function expectedBytes(before, after) {
+    return Uint8Array.from([
+        ...Buffer.from(before),
+        InvalidByte,
+        ...Buffer.from(after),
+    ]);
+}
+async function writeMalformedXml(template) {
+    const filename = (0, _chai_spec_1.tmpname)("malformed-utf8-") + ".xml";
+    await (0, promises_1.writeFile)(filename, withInvalidUtf8(template));
+    return filename;
+}
+async function writeMalformedXmpJpeg() {
+    const source = await (0, promises_1.readFile)((0, node_path_1.join)(_chai_spec_1.testDir, "with_faces.jpg"));
+    const needle = Buffer.from("<mwg-rs:Name>Alice Smith</mwg-rs:Name>");
+    const offset = source.indexOf(needle);
+    (0, _chai_spec_1.expect)(offset).to.be.greaterThan(-1);
+    const result = Buffer.from(source);
+    const damagedByte = offset + Buffer.byteLength("<mwg-rs:Name>A");
+    (0, _chai_spec_1.expect)(result[damagedByte]).to.equal("l".charCodeAt(0));
+    result[damagedByte] = InvalidByte;
+    const filename = (0, _chai_spec_1.tmpname)("malformed-utf8-struct-") + ".jpg";
+    await (0, promises_1.writeFile)(filename, result);
+    return filename;
+}
+async function writeXmpWithEmbeddedXmlPacket() {
+    const packet = withInvalidUtf8(`<x:xmpmeta xmlns:x="adobe:ns:meta/">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/">
+      <dc:description>packet A${InvalidMarker}ice</dc:description>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>`);
+    const outer = `<x:xmpmeta xmlns:x="adobe:ns:meta/">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description
+      xmlns:ast="http://ns.nikon.com/asteroid/1.0/"
+      ast:XMLPackets="${packet.toString("base64")}"/>
+  </rdf:RDF>
+</x:xmpmeta>`;
+    const filename = (0, _chai_spec_1.tmpname)("malformed-utf8-packet-") + ".xmp";
+    await (0, promises_1.writeFile)(filename, outer);
+    return { filename, packet };
+}
+describe("malformed UTF-8 in XML and nested structures", () => {
+    let exiftool;
+    before(() => (exiftool = new ExifTool_1.ExifTool()));
+    after(() => (0, _chai_spec_1.end)(exiftool));
+    const genericXml = `<?xml version="1.0" encoding="UTF-8"?>
+<root attribute="attribute A${InvalidMarker}ice">
+  <nested>
+    <name>text &amp; A${InvalidMarker}ice</name>
+    <document><![CDATA[<doc>opaque A${InvalidMarker}ice</doc>]]></document>
+  </nested>
+</root>`;
+    const expectedGenericValue = {
+        Attribute: "attribute A�ice",
+        Nested: {
+            Document: "<doc>opaque A�ice</doc>",
+            Name: "text & A�ice",
+        },
+    };
+    const expectedGenericBytes = {
+        Attribute: expectedBytes("attribute A", "ice"),
+        Nested: {
+            Document: expectedBytes("<doc>opaque A", "ice</doc>"),
+            Name: expectedBytes("text & A", "ice"),
+        },
+    };
+    it("captures nested generic XML values through read()", async () => {
+        const filename = await writeMalformedXml(genericXml);
+        const tags = await exiftool.read(filename, { struct: 1 });
+        (0, _chai_spec_1.expect)(tags.Root).to.deep.equal(expectedGenericValue);
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.Root).to.deep.equal(expectedGenericBytes);
+    });
+    it("captures nested generic XML values through readRaw()", async () => {
+        const filename = await writeMalformedXml(genericXml);
+        const tags = await exiftool.readRaw(filename, { readArgs: ["-struct"] });
+        (0, _chai_spec_1.expect)(tags.Root).to.deep.equal(expectedGenericValue);
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.Root).to.deep.equal(expectedGenericBytes);
+    });
+    for (const struct of [0, 1, 2]) {
+        it(`mirrors embedded XMP paths with struct=${struct}`, async () => {
+            const filename = await writeMalformedXmpJpeg();
+            const tags = await exiftool.read(filename, { struct });
+            const rawName = expectedBytes("A", "ice Smith");
+            if (struct !== 1) {
+                (0, _chai_spec_1.expect)(tags.RegionName).to.deep.equal([
+                    "A�ice Smith",
+                    "Bob Jones",
+                ]);
+                (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes?.RegionName).to.deep.equal({
+                    0: rawName,
+                });
+            }
+            if (struct !== 0) {
+                (0, _chai_spec_1.expect)(tags.RegionInfo.RegionList[0].Name).to.equal("A�ice Smith");
+                (0, _chai_spec_1.expect)((tags.invalidUtf8Bytes?.RegionInfo).RegionList[0].Name).to.deep.equal(rawName);
+            }
+        });
+    }
+    it("parses embedded binary XML while preserving its binary value", async () => {
+        const { filename, packet } = await writeXmpWithEmbeddedXmlPacket();
+        const tags = await exiftool.readRaw(filename, {
+            readArgs: ["-G1", "-struct", "-XMLPackets", "-Description"],
+        });
+        (0, _chai_spec_1.expect)(tags["XMP-ast:XMLPackets"]).to.match(/^\(Binary data \d+ bytes, use -b option to extract\)$/);
+        (0, _chai_spec_1.expect)(tags["XMP-dc:Description"]).to.equal("packet A�ice");
+        const descriptionBytes = expectedBytes("packet A", "ice");
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.deep.equal({
+            "MWG:Description": descriptionBytes,
+            "XMP-dc:Description": descriptionBytes,
+        });
+        const extracted = await exiftool.readRaw(filename, {
+            readArgs: ["-G1", "-b", "-XMLPackets"],
+        });
+        (0, _chai_spec_1.expect)(extracted["XMP-ast:XMLPackets"]).to.equal(packet.toString("base64"));
+        (0, _chai_spec_1.expect)(extracted.invalidUtf8Bytes).to.equal(undefined);
+    });
+    it("cannot capture malformed XML element or attribute-name bytes", async () => {
+        const filename = await writeMalformedXml(`<?xml version="1.0"?>
+<root at${InvalidMarker}tribute="attribute value">
+  <na${InvalidMarker}me>element value</na${InvalidMarker}me>
+  <ok>fine</ok>
+</root>`);
+        const tags = await exiftool.readRaw(filename, { readArgs: ["-struct"] });
+        // Value filters never receive names, and ExifTool's JSON writer renders
+        // these malformed generic-XML name bytes as "?". A separate non-JSON
+        // extraction path would be needed to preserve the original names.
+        (0, _chai_spec_1.expect)(tags.Root).to.deep.equal({
+            "At?tribute": "attribute value",
+            "Na?me": "element value",
+            Ok: "fine",
+        });
+        (0, _chai_spec_1.expect)(tags.invalidUtf8Bytes).to.equal(undefined);
+    });
+});
+//# sourceMappingURL=InvalidUtf8Xml.spec.js.map

package/dist/InvalidUtf8Xml.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"InvalidUtf8Xml.spec.js","sourceRoot":"","sources":["../src/InvalidUtf8Xml.spec.ts"],"names":[],"mappings":"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"}

package/dist/JSON.d.ts

@@ -9,5 +9,6 @@ export type Literal = string | number | boolean | bigint | null;
  * - {@link ExifDateTime} is revived using {@link ExifDateTime.fromJSON}
  * - {@link ExifDate} is revived using {@link ExifDate.fromJSON}
  * - {@link ExifTime} is revived using {@link ExifTime.fromJSON}
+ * - `invalidUtf8Bytes` sidecars are revived as nested `Uint8Array` values
  */
 export declare function parseJSON(s: string): any;

package/dist/JSON.js

@@ -5,6 +5,7 @@ const BinaryField_1 = require("./BinaryField");
 const ExifDate_1 = require("./ExifDate");
 const ExifDateTime_1 = require("./ExifDateTime");
 const ExifTime_1 = require("./ExifTime");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
 const Revivers = {
     BinaryField: (ea) => BinaryField_1.BinaryField.fromJSON(ea),
     ExifDateTime: (ea) => ExifDateTime_1.ExifDateTime.fromJSON(ea),
@@ -18,15 +19,19 @@ const Revivers = {
  * - {@link ExifDateTime} is revived using {@link ExifDateTime.fromJSON}
  * - {@link ExifDate} is revived using {@link ExifDate.fromJSON}
  * - {@link ExifTime} is revived using {@link ExifTime.fromJSON}
+ * - `invalidUtf8Bytes` sidecars are revived as nested `Uint8Array` values
  */
 function parseJSON(s) {
-    return JSON.parse(s, (_key, value) => {
+    return JSON.parse(s, (key, value) => {
         if (typeof value === "object" &&
             value !== null &&
             "_ctor" in value &&
             typeof value._ctor === "string") {
             return Revivers[value._ctor]?.(value) ?? value;
         }
+        if (key === "invalidUtf8Bytes") {
+            return (0, InvalidUtf8Bytes_1.reviveInvalidUtf8Bytes)(value);
+        }
         return value;
     });
 }

package/dist/JSON.js.map

@@ -1 +1 @@
-{"version":3,"file":"JSON.js","sourceRoot":"","sources":["../src/JSON.ts"],"names":[],"mappings":";;AAoCA,8BAYC;AAhDD,+CAA4C;AAC5C,yCAAsC;AACtC,iDAA8C;AAC9C,yCAAsC;AAetC,MAAM,QAAQ,GAAmD;IAC/D,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAClB,yBAAW,CAAC,QAAQ,CAAC,EAAkD,CAAC;IAC1E,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,CACnB,2BAAY,CAAC,QAAQ,CAAC,EAAmD,CAAC;IAC5E,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;IACpE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;CACrE,CAAC;AACF;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,KAAW,EAAE,EAAE;QACzC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAO,IAAI,KAAK;YAChB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAC/B,CAAC;YACD,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAmB,CAAC,IAAI,KAAK,CAAC;QAC/D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"JSON.js","sourceRoot":"","sources":["../src/JSON.ts"],"names":[],"mappings":";;AAsCA,8BAeC;AArDD,+CAA4C;AAC5C,yCAAsC;AACtC,iDAA8C;AAC9C,yCAAsC;AACtC,yDAA4D;AAe5D,MAAM,QAAQ,GAAmD;IAC/D,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAClB,yBAAW,CAAC,QAAQ,CAAC,EAAkD,CAAC;IAC1E,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,CACnB,2BAAY,CAAC,QAAQ,CAAC,EAAmD,CAAC;IAC5E,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;IACpE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CACf,mBAAQ,CAAC,QAAQ,CAAC,EAA+C,CAAC;CACrE,CAAC;AACF;;;;;;;;GAQG;AACH,SAAgB,SAAS,CAAC,CAAS;IACjC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,KAAW,EAAE,EAAE;QACxC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,OAAO,IAAI,KAAK;YAChB,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAC/B,CAAC;YACD,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAmB,CAAC,IAAI,KAAK,CAAC;QAC/D,CAAC;QACD,IAAI,GAAG,KAAK,kBAAkB,EAAE,CAAC;YAC/B,OAAO,IAAA,yCAAsB,EAAC,KAAK,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/RawTags.d.ts

@@ -1,8 +1,15 @@
 import { ErrorsAndWarnings } from "./ErrorsAndWarnings";
+import { InvalidUtf8Bytes } from "./InvalidUtf8Bytes";
 import { Json } from "./JSON";
 /**
- * Loosely typed raw result from ExifTool
+ * Loosely typed raw result from ExifTool.
+ *
+ * `readRaw()` skips the rich parsing that `read()` performs, so this omits the
+ * timezone fields (`tz`, `zone`, ...) from {@link ExifToolVendoredTags}: only
+ * `errors`, `warnings`, and `invalidUtf8Bytes` are ever set here.
  *
  * @see https://github.com/photostructure/exiftool-vendored.js/issues/138
  */
-export type RawTags = Record<string, Json> & ErrorsAndWarnings;
+export type RawTags = Record<string, Json | InvalidUtf8Bytes> & ErrorsAndWarnings & {
+    invalidUtf8Bytes?: InvalidUtf8Bytes;
+};

package/dist/ReadRawTask.d.ts

@@ -8,6 +8,7 @@ export declare const DefaultReadRawTaskOptions: {
 };
 export type ReadRawTaskOptions = Partial<typeof DefaultReadRawTaskOptions>;
 export declare class ReadRawTask extends ExifToolTask<RawTags> {
+    #private;
     readonly sourceFile: string;
     readonly args: string[];
     static for(filename: string, options?: ReadRawTaskOptions): ReadRawTask;

package/dist/ReadRawTask.js

@@ -40,7 +40,9 @@ const DefaultExifToolOptions_1 = require("./DefaultExifToolOptions");
 const ErrorsAndWarnings_1 = require("./ErrorsAndWarnings");
 const ExifToolTask_1 = require("./ExifToolTask");
 const FilenameCharsetArgs_1 = require("./FilenameCharsetArgs");
+const InvalidUtf8Bytes_1 = require("./InvalidUtf8Bytes");
 const Pick_1 = require("./Pick");
+const Utf8JsonFilter_1 = require("./Utf8JsonFilter");
 exports.ReadRawTaskOptionFields = [
     "readArgs",
     "ignoreMinorErrors",
@@ -52,10 +54,13 @@ exports.DefaultReadRawTaskOptions = {
 class ReadRawTask extends ExifToolTask_1.ExifToolTask {
     sourceFile;
     args;
+    #unwrapInvalidUtf8;
     static for(filename, options) {
+        const readArgs = options?.readArgs ?? [];
         const args = [
             ...FilenameCharsetArgs_1.Utf8FilenameCharsetArgs,
-            ...(options?.readArgs ?? []),
+            ...readArgs,
+            ...(0, Utf8JsonFilter_1.utf8JsonFilterArgs)(readArgs),
         ];
         const opts = { ...exports.DefaultReadRawTaskOptions, ...options };
         if (!args.includes("-json"))
@@ -71,16 +76,24 @@ class ReadRawTask extends ExifToolTask_1.ExifToolTask {
         super(args, options);
         this.sourceFile = sourceFile;
         this.args = args;
+        this.#unwrapInvalidUtf8 = (0, Utf8JsonFilter_1.hasBuiltInUtf8Filter)(args);
     }
     toString() {
         return "ReadRawTask(" + this.sourceFile + ")";
     }
     parse(data, err) {
         try {
-            const tags = JSON.parse(data)[0];
-            const { errors, warnings } = (0, ErrorsAndWarnings_1.errorsAndWarnings)(this, tags);
+            const parsed = JSON.parse(data)[0];
+            const decoded = this.#unwrapInvalidUtf8
+                ? (0, InvalidUtf8Bytes_1.unwrapInvalidUtf8Tags)(parsed)
+                : { tags: parsed };
+            const tags = decoded.tags;
+            const { errors, warnings } = (0, ErrorsAndWarnings_1.errorsAndWarnings)(this, decoded.tags);
             tags.errors = errors;
             tags.warnings = warnings;
+            if (decoded.invalidUtf8Bytes != null) {
+                tags.invalidUtf8Bytes = decoded.invalidUtf8Bytes;
+            }
             return tags;
         }
         catch (jsonError) {