exiftool-vendored 36.0.0 → 37.0.0

package/CHANGELOG.md

@@ -35,6 +35,65 @@ vendored versions of ExifTool match the version that they vendor.
 
 ## History
 
+### v37.0.0
+
+- 💔 **BREAKING: malformed UTF-8 in ExifTool JSON output is now marked with
+  Unicode replacement character U+FFFD (`�`) instead of ASCII question mark
+  (`?`).** For example, malformed bytes `dc 4b` previously surfaced as `?K`
+  and now surface as `�K`. This applies to both `read()` and `readRaw()`,
+  including scalar and list values and calls that override `readArgs`. Valid
+  Unicode and authored question marks are unchanged.
+  - The original malformed string bytes are available without rereading the
+    media through an optional sparse `invalidUtf8Bytes` sidecar. It mirrors tag
+    paths, uses numeric object keys for damaged list items, stores each leaf as
+    a `Uint8Array`, and is absent when no malformed strings were found:
+
+    ```js
+    const tags = await exiftool.read(file);
+    tags.City; // "�K"
+    tags.invalidUtf8Bytes?.City; // Uint8Array([0xdc, 0x4b])
+    ```
+
+    `exiftool-vendored` does not guess a legacy charset. Consumers may decode
+    only these captured bytes using camera, tag, locale, or user-specific
+    evidence while retaining the U+FFFD value as a deterministic fallback.
+
+  - Nested structures mirror the paths ExifTool returns for the selected
+    `struct` mode. XML element text, attribute values, CDATA, opaque XML string
+    values, and leaves parsed from embedded binary XML packets are supported.
+    The captured bytes are the extracted value after XML parsing, not the
+    original XML token. Malformed XML element and attribute names are outside
+    this mechanism: value filters never receive names, and ExifTool's JSON
+    output repairs or canonicalizes them before the library sees them.
+
+  - The change affects new metadata reads only. Upgrading does not rewrite
+    values that applications have already persisted. Applications that use
+    extracted metadata as identifiers, facets, or tags may want to rescan or
+    reindex existing files.
+  - Consumers may replace ambiguous `?` corruption heuristics with explicit
+    U+FFFD checks where their data flow preserves the marker. Whether to
+    reject, display, or retain a marked value remains application policy.
+  - To restore the previous rendering, replace the marker in the string values
+    you consume (it never appears in numbers, dates, or binary fields). This is
+    a one-way transform — the reverse is impossible once malformed bytes have
+    collapsed to `?`, which is why the marker is preserved by default:
+
+    ```js
+    typeof value === "string" ? value.replace(/\uFFFD/g, "?") : value;
+    ```
+
+  - Advanced callers that provide their own non-empty ExifTool
+    `-api Filter=...` through `readArgs` retain ownership of the complete
+    filtering pipeline. A custom filter must perform its own UTF-8 repair and
+    byte capture if those behaviors are desired; `invalidUtf8Bytes` will be
+    absent.
+
+- 📦 Corrected resource-cleanup documentation to distinguish normal shutdown, non-blocking `using`, awaited `await using`, and best-effort disposal timeouts.
+
+### v36.1.0
+
+- ✨ Added `ExifTool.editTags()` for validated exact list-value additions/removals, MWG Collection additions/predicate removals, and audited scalar or flattened person-name removals without replacing unrelated metadata. See the [usage examples](docs/USAGE-EXAMPLES.md#editing-individual-tag-values).
+
 ### v36.0.0
 
 - 🏚️ **Dropped Node.js 20 from the supported engines and CI matrix.** Node.js 20 ("Iron") has reached [end-of-life](https://github.com/nodejs/release#release-schedule), so the minimum supported runtime is now Node.js 22 (`engines.node` is `>=22`). The CI test matrix is now Node.js 22, 24, and 26.
@@ -152,7 +211,7 @@ vendored versions of ExifTool match the version that they vendor.
 
   **Previously**, even though child processes were unreferenced, the stdio streams kept the parent Node.js process alive, requiring explicit `.end()` calls.
 
-  **Now**, stdio streams are unreferenced by default, so scripts can exit naturally without calling `.end()`. Child processes are cleaned up automatically when the parent exits.
+  **Now**, stdio streams are unreferenced by default, so scripts can exit naturally without calling `.end()`. During normal shutdown, child-process cleanup is attempted automatically. Exit cleanup was strengthened further in v35.2.0 and v35.10.1; abrupt termination such as `SIGKILL` cannot run cleanup handlers.
 
   To restore the previous behavior (parent process stays alive until `.end()` is called):
 
@@ -277,12 +336,12 @@ vendored versions of ExifTool match the version that they vendor.
 
 - ✨ Added **Disposable interface support** for automatic resource cleanup:
   - `ExifTool` now implements both `Disposable` and `AsyncDisposable` interfaces
-  - Use `using et = new ExifTool()` for automatic synchronous cleanup (TypeScript 5.2+)
-  - Use `await using et = new ExifTool()` for automatic asynchronous cleanup
+  - Use `using et = new ExifTool()` to initiate cleanup when a scope exits (TypeScript 5.2+)
+  - Use `await using et = new ExifTool()` to await asynchronous cleanup
   - Synchronous disposal initiates graceful cleanup with configurable timeout fallback
-  - Asynchronous disposal provides robust cleanup with timeout protection
+  - Asynchronous disposal requests forceful cleanup after its configured timeout; the timeout is not a hard completion deadline
   - New options: `disposalTimeoutMs` (default: 1000ms) and `asyncDisposalTimeoutMs` (default: 5000ms)
-  - Comprehensive error handling ensures disposal never throws or hangs
+  - Disposal errors are logged; asynchronous disposal may reject if cleanup fails
   - Maintains backward compatibility - existing `.end()` method unchanged
 
 - ✨ **Enhanced JSDoc annotations** for Tags interface with emoji-based visual hierarchy:

package/CLAUDE.md

@@ -53,7 +53,8 @@ npm run release     # Run release process (requires proper permissions)
 ## Important Notes
 
 - Always run `npm run compile` before testing
-- As of v35, `.end()` is optional for scripts (Node.js exits naturally), but recommended for long-running apps
+- With default settings, `.end()` is optional after awaited script work, but it
+  should be awaited when cleanup must finish before the application continues or exits
 - Tag interfaces not comprehensive - less common tags may exist in returned objects
 - Uses batch processing with automatic process pool management
 - TypeScript union type limits require careful tag selection

package/README.md

@@ -1,4 +1,4 @@
-# exiftool-vendored
+# 📸 exiftool-vendored
 
 **Fast, cross-platform [Node.js](https://nodejs.org/) access to [ExifTool](https://exiftool.org/). Built and supported by [PhotoStructure](https://photostructure.com).**
 
@@ -6,7 +6,7 @@
 [![Node.js CI](https://github.com/photostructure/exiftool-vendored.js/actions/workflows/build.yml/badge.svg)](https://github.com/photostructure/exiftool-vendored.js/actions/workflows/build.yml)
 [![GitHub issues](https://img.shields.io/github/issues/photostructure/exiftool-vendored.js.svg)](https://github.com/photostructure/exiftool-vendored.js/issues)
 
-## Installation & Quick Start
+## 🚀 Installation & Quick Start
 
 **Requirements**: Node.js Active LTS or Maintenance LTS versions only
 
@@ -35,7 +35,7 @@ await exiftool.extractThumbnail("photo.jpg", "thumb.jpg");
 await exiftool.end();
 ```
 
-## Why exiftool-vendored?
+## 🤔 Why exiftool-vendored?
 
 ### ⚡ **Performance**
 
@@ -53,7 +53,7 @@ Order of magnitude faster than other Node.js ExifTool modules. Powers [PhotoStru
 - **Smart dates**: Timezone-aware `ExifDateTime` classes
 - **Auto-generated tags**: Based on 10,000+ real camera samples
 
-## Core Features
+## ✨ Core Features
 
 ### Reading Metadata
 
@@ -96,6 +96,10 @@ await exiftool.write("photo.jpg", {
 });
 ```
 
+For targeted list-value and supported structured edits, use `editTags()`. See
+[Editing Individual Tag Values](docs/USAGE-EXAMPLES.md#editing-individual-tag-values)
+for examples, supported tags, and safety constraints.
+
 ### Extracting Images
 
 ```javascript
@@ -109,7 +113,7 @@ await exiftool.extractPreview("photo.jpg", "preview.jpg");
 await exiftool.extractJpgFromRaw("photo.cr2", "processed.jpg");
 ```
 
-## Understanding Tags
+## 🏷️ Understanding Tags
 
 The `Tags` interface contains **thousands of metadata fields** from an auto-generated TypeScript file. Each tag has JSDoc annotations:
 
@@ -135,17 +139,86 @@ LensSpec?: string;
 - **@groups** = Metadata categories (EXIF, GPS, IPTC, XMP, etc.)
 - **@example** = Representative values
 
-### Code defensively!
+## 🛡️ Code defensively!
+
+The generated `Tags` interface is a deliberately bounded, best-effort model of
+what ExifTool extracts.
+
+### Declared fields may be missing
+
+Formats, cameras, and editing software write different subsets of metadata,
+and later tools may strip fields. Treat every property as optional, even when
+it is common for the files you currently handle.
+
+### Undeclared fields may be included
+
+The interface favors the most common and useful fields. Without tag pruning,
+TypeScript fails with `TS2590: Expression produces a union type that is too
+complex to represent`.
 
-- No fields are guaranteed to be present.
-- Value types are not guaranteed -- assume strings may get in your numeric fields, and handle it gracefully.
-- There may very well be keys returned that are **not** in the `Tags` interface.
+Rare, vendor-specific, and custom tags may still appear at runtime. If your app
+needs arbitrary tags, intersect `Tags` with `Record<string, unknown>`; if a tag
+would be useful to others, please open a PR to add it to the generated
+interface.
+
+### Value types may vary
+
+ExifTool may return unexpected representations for malformed, ambiguous, or
+format-specific values. Validate values at runtime and handle strings in
+nominally numeric fields gracefully.
 
 📖 **[Complete Tags Documentation →](docs/TAGS.md)**
 
-## Important Notes
+## 🪤 Parsing gotchas
+
+### Timezones may be inferred
+
+Media metadata often omits its timezone, so this library uses several heuristics
+to infer one. See [Dates & Timezones](#timezones) for the inference order and
+configuration options.
+
+### Malformed UTF-8 is marked and preserved
+
+Malformed UTF-8 bytes are marked with the Unicode replacement character
+U+FFFD, not ASCII `?`, so byte corruption stays distinguishable from
+authored punctuation. The original bytes are preserved without another file
+read in the sparse `invalidUtf8Bytes` sidecar:
 
-### ⚙️ Configuration
+```ts
+const tags = await exiftool.read(file);
+tags.ImageDescription; // "Arch Enemy\rG�teborg, 19.07.2007"
+
+const bytes = tags.invalidUtf8Bytes?.ImageDescription;
+if (bytes instanceof Uint8Array) {
+  // Camera/tag-specific evidence identifies this Kodak value as MacRoman:
+  const recovered = new TextDecoder("macintosh").decode(bytes);
+  recovered; // "Arch Enemy\rGöteborg, 19.07.2007"
+}
+```
+
+The `macintosh` charset is justified by evidence for this specific Kodak
+value; it is not a default for every damaged field.
+
+Nested metadata mirrors the representation selected by ExifTool's `struct`
+option. Extracted XML element text, attribute values, CDATA, and parsed
+embedded XML values are captured at their returned paths. These are the
+bytes of ExifTool's extracted value after XML parsing, not the original XML
+token: entity spellings and CDATA delimiters are not retained. Value filters
+never receive XML element or attribute _names_, and ExifTool's JSON output
+repairs or canonicalizes malformed names before the library sees them, so
+their exact bytes cannot be exposed by this sidecar.
+
+The library deliberately does not guess a legacy charset: files assembled
+over many years may contain several encodings, and readable alternatives are
+not necessarily correct. Consumers can decode only the sidecar entries using
+their own camera/tag/user context. An explicit custom ExifTool `Filter`
+disables both built-in repair and byte capture. To restore the pre-v37
+display, guard on the value type first:
+`typeof value === "string" ? value.replace(/\uFFFD/g, "?") : value`.
+
+## ⚠️ Important Notes
+
+### Configuration
 
 exiftool-vendored provides two levels of configuration:
 
@@ -172,7 +245,9 @@ const exiftool = new ExifTool({
 
 📖 **[Complete Configuration Guide →](docs/CONFIGURATION.md)**
 
-### ⏰ Dates & Timezones
+<a id="timezones"></a>
+
+### Dates & Timezones
 
 Images rarely specify timezones. This library infers them using several heuristics:
 
@@ -190,53 +265,71 @@ if (dt instanceof ExifDateTime) {
 
 📖 **[Date & Timezone Guide →](docs/DATES.md)**
 
-### 🧹 Resource Cleanup
+### Resource Cleanup
 
-As of v35, **Node.js will exit naturally** without calling `.end()` — child processes are cleaned up automatically when the parent exits.
+With the default settings, ExifTool workers no longer keep Node.js alive after
+awaited work finishes. During normal shutdown, the library attempts to clean up
+workers automatically. Abrupt termination, such as `SIGKILL` or an operating-
+system crash, cannot run cleanup handlers.
 
-For **long-running applications** (servers, daemons), calling `.end()` is still recommended for graceful shutdown:
+Call and await `.end()` when cleanup must finish before your application
+continues or exits. For servers and daemons, make this one part of the
+application's complete shutdown procedure:
 
 ```javascript
 import { exiftool } from "exiftool-vendored";
 
-// For servers/daemons: graceful shutdown on termination signals
-process.on("SIGINT", () => exiftool.end());
-process.on("SIGTERM", () => exiftool.end());
+async function shutdown(signal) {
+  try {
+    await closeApplicationResources(); // Server, sockets, database, etc.
+    await exiftool.end();
+  } finally {
+    // A signal listener disables Node's default termination behavior. Re-send
+    // the signal after cleanup so the process terminates normally.
+    process.kill(process.pid, signal);
+  }
+}
+
+process.once("SIGINT", (signal) => void shutdown(signal));
+process.once("SIGTERM", (signal) => void shutdown(signal));
 ```
 
 #### Automatic Cleanup with Disposable Interfaces
 
-For **TypeScript 5.2+** projects, consider using automatic resource management:
+For **TypeScript 5.2+** projects configured for explicit resource management,
+you can bind an instance's lifecycle to a scope:
 
 ```javascript
 import { ExifTool } from "exiftool-vendored";
 
-// Automatic synchronous cleanup
+// Starts cleanup when the scope exits, but does not wait for it
 {
   using et = new ExifTool();
   const tags = await et.read("photo.jpg");
-  // ExifTool automatically cleaned up when block exits
+  // ExifTool cleanup is initiated when the block exits
 }
 
-// Automatic asynchronous cleanup (recommended)
+// Waits for cleanup when the scope exits (recommended)
 {
   await using et = new ExifTool();
   const tags = await et.read("photo.jpg");
-  // ExifTool gracefully cleaned up when block exits
+  // ExifTool cleanup is awaited when the block exits
 }
 ```
 
 **Benefits:**
 
-- **Guaranteed cleanup**: No leaked processes, even with exceptions
-- **Timeout protection**: Automatic forceful cleanup if graceful shutdown hangs
-- **Zero boilerplate**: No manual `.end()` calls needed
+- **Scope-bound disposal**: Disposal runs on ordinary scope exit, including exceptions
+- **Awaited cleanup**: `await using` waits for asynchronous disposal
+- **Less boilerplate**: No manual `try`/`finally` cleanup block
 
 **Caution:**
 
-- **Operating-system startup lag**: Linux costs ~50-500ms to launch a new ExifTool process, but macOS can take several seconds (presumably due to Gatekeeper), and **Windows can take tens of seconds** due to antivirus shenanigans. Don't dispose your instance unless you're **really** done with it!
+- **Operating-system startup lag**: Startup time varies widely with the OS,
+  hardware, and security software, and can take several seconds on some
+  systems. Don't dispose an instance until you're really done with it.
 
-### 🏷️ Tag Completeness
+### Tag Completeness
 
 The `Tags` interface shows the most common fields, but ExifTool can extract many more. Cast to access unlisted fields:
 
@@ -245,9 +338,9 @@ const tags = await exiftool.read("photo.jpg");
 const customField = (tags as any).UncommonTag;
 ```
 
-## Documentation
+## 📚 Documentation
 
-### 📚 **Guides**
+### **Guides**
 
 - **[Installation Guide](docs/INSTALLATION.md)** - Electron, Docker, platform setup
 - **[Usage Examples](docs/USAGE-EXAMPLES.md)** - Comprehensive API examples
@@ -255,16 +348,16 @@ const customField = (tags as any).UncommonTag;
 - **[Tags Reference](docs/TAGS.md)** - Understanding the 2,500+ metadata fields
 - **[Electron Integration](docs/ELECTRON.md)** - Electron-specific setup
 
-### 🔧 **Troubleshooting**
+### **Troubleshooting**
 
 - **[Debugging Guide](docs/DEBUGGING.md)** - Debug logging and common issues
 - **[Temporal Migration](docs/TEMPORAL-MIGRATION.md)** - Future JavaScript Temporal API
 
-### 📖 **API Reference**
+### **API Reference**
 
 - **[TypeDoc Documentation](https://photostructure.github.io/exiftool-vendored.js/)** - Complete API reference
 
-## Performance
+## ⚡ Performance
 
 The default singleton is throttled for stability. For high-throughput processing:
 
@@ -285,13 +378,13 @@ await exiftool.end();
 
 **Benchmarks**: 20+ files/second/thread, 500+ files/second using all CPU cores.
 
-## Support & Community
+## 🤝 Support & Community
 
 - **📋 Issues**: [GitHub Issues](https://github.com/photostructure/exiftool-vendored.js/issues)
 - **📖 Changelog**: [CHANGELOG.md](CHANGELOG.md)
 - **🔒 Security**: [SECURITY.md](SECURITY.md)
 - **📄 License**: [MIT](LICENSE)
 
-### Contributors 🎉
+### Contributors
 
 [Matthew McEachen](https://github.com/mceachen), [Joshua Harris](https://github.com/Circuit8), [Anton Mokrushin](https://github.com/amokrushin), [Luca Ban](https://github.com/mesqueeb), [Demiurga](https://github.com/apolkingg8), [David Randler](https://github.com/draity)

package/RELEASE.md

@@ -47,7 +47,7 @@ For development and testing:
 1. `git clone` this repo
 2. `npm install`
 3. `npm run mktags ../test-images` # < assumes `../test-images` has the full ExifTool sample image suite
-4. `npm run precommit` (look for lint or documentation generation issues)
+4. `npm run all` (look for lint or documentation generation issues)
 5. `npm run test`
 6. Verify diffs are reasonable, `git commit` and `git push`
 7. Follow the Automatic Release steps above

package/data/TagMetadata.json

@@ -7394,7 +7394,7 @@
   "FirmwareVersion": {
     "frequency": 0.07,
     "mainstream": true,
-    "groups": ["APP", "MakerNotes", "QuickTime"],
+    "groups": ["APP", "MakerNotes", "QuickTime", "RAF"],
     "type": "string",
     "typed": true
   },
@@ -11899,7 +11899,7 @@
   "Location": {
     "frequency": 0.02,
     "mainstream": true,
-    "groups": ["MakerNotes"],
+    "groups": ["Composite", "MakerNotes", "XMP"],
     "type": "string",
     "typed": true
   },
@@ -19753,7 +19753,7 @@
   },
   "Transform": {
     "frequency": 0.01,
-    "mainstream": false,
+    "mainstream": true,
     "groups": ["MakerNotes"],
     "type": "string",
     "typed": true
@@ -21006,6 +21006,13 @@
     "type": "string",
     "typed": true
   },
+  "invalidUtf8Bytes": {
+    "frequency": 0,
+    "mainstream": true,
+    "groups": ["Library"],
+    "type": "InvalidUtf8Bytes",
+    "typed": true
+  },
   "tz": {
     "frequency": 0,
     "mainstream": true,

package/dist/DateTime.d.ts

@@ -1,4 +1,4 @@
-import { DateTime } from "luxon";
+import { DateTime, DateTimeMaybeValid } from "luxon";
 import { ExifDate } from "./ExifDate";
 import { ExifDateTime } from "./ExifDateTime";
 import { ExifTime } from "./ExifTime";
@@ -8,7 +8,7 @@ export declare const SecondMs = 1000;
 export declare const MinuteMs: number;
 export declare const HourMs: number;
 export declare const DayMs: number;
-export type DateOrTime = ExifDateTime | ExifDate | ExifTime | DateTime;
+export type DateOrTime = ExifDateTime | ExifDate | ExifTime | DateTimeMaybeValid;
 export declare function isDateOrTime(o: unknown): o is DateOrTime;
 export declare function dateTimeToExif(d: DateTime, opts?: {
     includeOffset?: boolean;

package/dist/DateTime.js

@@ -33,7 +33,7 @@ function toExifString(d) {
         return dateTimeToExif(d);
     }
     else {
-        return d?.toExifString?.();
+        return d?.toExifString();
     }
 }
 function hms(d, opts) {

package/dist/DateTime.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../src/DateTime.ts"],"names":[],"mappings":";;;AAMA,sCAEC;AASD,oCAOC;AAED,wCASC;AAED,oCAMC;AAED,kBAOC;AApDD,iCAAiC;AACjC,yCAAsC;AACtC,iDAA8C;AAC9C,yCAAsC;AAGtC,SAAgB,aAAa,CAAC,EAAmB;IAC/C,OAAO,EAAE,EAAE,OAAO,KAAK,IAAI,CAAC;AAC9B,CAAC;AAEY,QAAA,QAAQ,GAAG,IAAI,CAAC;AAChB,QAAA,QAAQ,GAAG,EAAE,GAAG,gBAAQ,CAAC;AACzB,QAAA,MAAM,GAAG,EAAE,GAAG,gBAAQ,CAAC;AACvB,QAAA,KAAK,GAAG,EAAE,GAAG,cAAM,CAAC;AAIjC,SAAgB,YAAY,CAAC,CAAU;IACrC,OAAO,CACL,CAAC,YAAY,2BAAY;QACzB,CAAC,YAAY,mBAAQ;QACrB,CAAC,YAAY,mBAAQ;QACrB,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CACvB,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAC5B,CAAW,EACX,IAAiE;IAEjE,OAAO,CAAC,CAAC,QAAQ,CACf,kBAAkB;QAChB,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,CAAC,IAAI,EAAE,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC9C,CAAC;AACJ,CAAC;AAED,SAAgB,YAAY,CAAC,CAAa;IACxC,IAAI,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC;IAC7B,CAAC;AACH,CAAC;AAED,SAAgB,GAAG,CACjB,CAAW,EACX,IAAwC;IAExC,OAAO,CAAC,CAAC,QAAQ,CACf,UAAU,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAChE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"DateTime.js","sourceRoot":"","sources":["../src/DateTime.ts"],"names":[],"mappings":";;;AAMA,sCAEC;AAUD,oCAOC;AAED,wCASC;AAED,oCAMC;AAED,kBAOC;AArDD,iCAAqD;AACrD,yCAAsC;AACtC,iDAA8C;AAC9C,yCAAsC;AAGtC,SAAgB,aAAa,CAAC,EAAmB;IAC/C,OAAO,EAAE,EAAE,OAAO,KAAK,IAAI,CAAC;AAC9B,CAAC;AAEY,QAAA,QAAQ,GAAG,IAAI,CAAC;AAChB,QAAA,QAAQ,GAAG,EAAE,GAAG,gBAAQ,CAAC;AACzB,QAAA,MAAM,GAAG,EAAE,GAAG,gBAAQ,CAAC;AACvB,QAAA,KAAK,GAAG,EAAE,GAAG,cAAM,CAAC;AAKjC,SAAgB,YAAY,CAAC,CAAU;IACrC,OAAO,CACL,CAAC,YAAY,2BAAY;QACzB,CAAC,YAAY,mBAAQ;QACrB,CAAC,YAAY,mBAAQ;QACrB,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CACvB,CAAC;AACJ,CAAC;AAED,SAAgB,cAAc,CAC5B,CAAW,EACX,IAAiE;IAEjE,OAAO,CAAC,CAAC,QAAQ,CACf,kBAAkB;QAChB,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,CAAC,IAAI,EAAE,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC9C,CAAC;AACJ,CAAC;AAED,SAAgB,YAAY,CAAC,CAAa;IACxC,IAAI,gBAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3B,OAAO,cAAc,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAgB,GAAG,CACjB,CAAW,EACX,IAAwC;IAExC,OAAO,CAAC,CAAC,QAAQ,CACf,UAAU,GAAG,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAChE,CAAC;AACJ,CAAC"}

package/dist/ExifTool.d.ts

@@ -5,6 +5,7 @@ import { ExifToolTask, ExifToolTaskOptions } from "./ExifToolTask";
 import { PreviewTag } from "./PreviewTag";
 import { ReadRawTaskOptions } from "./ReadRawTask";
 import { ReadTaskOptions } from "./ReadTask";
+import { TagEdit } from "./TagEdit";
 import { Tags } from "./Tags";
 import { WriteTags } from "./WriteTags";
 import { WriteTaskOptions, WriteTaskResult } from "./WriteTask";
@@ -44,6 +45,7 @@ export type { GeolocationTags } from "./GeolocationTags";
 export type { ICCProfileTags } from "./ICCProfileTags";
 export type { IPTCApplicationRecordTags as ApplicationRecordTags, IPTCApplicationRecordTags, } from "./IPTCApplicationRecordTags";
 export type { ImageDataHashTag } from "./ImageDataHashTag";
+export type { InvalidUtf8Bytes } from "./InvalidUtf8Bytes";
 export type { Json, Literal } from "./JSON";
 export type { CollectionInfo, KeywordInfoStruct, KeywordStruct, MWGCollectionsTags, MWGKeywordTags, } from "./MWGTags";
 export type { Maybe, Nullable } from "./Maybe";
@@ -56,6 +58,8 @@ export type { UnsubscribeFunction } from "./Settings";
 export type { ShortcutTags } from "./ShortcutTags";
 export type { Struct } from "./Struct";
 export type { TagDescription, TagDescriptionsOptions } from "./TagDescriptions";
+export { CollectionEditTagName, RegionNameEditTagName, TagEditAddTagNames, TagEditRemoveOnlyTagNames, TagEditTagNames, TagEditValueTagNames, } from "./TagEdit";
+export type { AddCollectionEdit, AddTagEdit, CollectionPredicate, RemoveCollectionEdit, RemoveTagEdit, TagEdit, TagEditAddTagName, TagEditRemoveOnlyTagName, TagEditTagName, TagEditValueTagName, } from "./TagEdit";
 export type { APPTags, CompositeTags, EXIFTags, ExifToolTags, FileTags, FlashPixTags, IPTCTags, JFIFTags, MakerNotesTags, MetaTags, MPFTags, PanasonicRawTags, PhotoshopTags, PrintIMTags, QuickTimeTags, RAFTags, RIFFTags, Tags, XMPTags, } from "./Tags";
 export type { Version } from "./Version";
 export type { AdditionalWriteTags, EXIFStrictDateTags, ExpandedDateTags, GroupPrefixedTags, MutableTags, StructAppendTags, WritableGPSRefs, WriteTags, XMPPartialDateTags, } from "./WriteTags";
@@ -118,7 +122,9 @@ export declare class ExifTool {
      * use `readRaw`.** Note that the default is `["-fast"]`, so if you want
      * ExifTool to read the entire file for metadata, you should pass an empty
      * array as the second parameter. See https://exiftool.org/#performance for
-     * more information about `-fast` and `-fast2`.
+     * more information about `-fast` and `-fast2`. The wrapper still adds its
+     * malformed UTF-8 repair/byte-capture filter unless these arguments provide
+     * a custom ExifTool `Filter`, in which case that filter owns both behaviors.
      *
      * @param options overrides to the default ExifTool options provided to the
      * ExifTool constructor.
@@ -145,9 +151,12 @@ export declare class ExifTool {
      * worse if you don't include `-fast` or `-fast2` (as the most expensive bits
      * are the perl interpreter and scanning the file on disk).
      *
-     * @param options any additional arguments other than the file path. Note that
-     * "-json", and the Windows unicode filename handler flags, "-charset
-     * filename=utf8", will be added automatically.
+     * @param options read options, including any additional `readArgs` other than
+     * the file path. `-json`, the Windows Unicode filename handler flags,
+     * `-charset filename=utf8`, malformed UTF-8 repair with U+FFFD, and original
+     * malformed-string byte capture in `invalidUtf8Bytes` are added
+     * automatically. An explicit custom ExifTool `Filter` in `readArgs` replaces
+     * the wrapper's filter and owns both repair and byte capture.
      *
      * @return Note that the return value will be similar to `Tags`, but with no
      * date, time, or other rich type parsing that you get from `.read()`. The
@@ -210,6 +219,33 @@ export declare class ExifTool {
      * instead: move `writeArgs` into your `options` hash.
      */
     write(file: string, tags: WriteTags, writeArgs?: string[], options?: WriteTaskOptions): Promise<WriteTaskResult>;
+    /**
+     * Add or remove individual metadata values without replacing unrelated list
+     * items. Arguments are emitted in the provided order in one non-retriable
+     * ExifTool write command, but ExifTool applies removals before additions for
+     * the same tag.
+     *
+     * Tag names must be entries in {@link TagEditTagNames}. The primitive subset
+     * is {@link TagEditValueTagNames}; {@link TagEditAddTagNames} and
+     * {@link TagEditRemoveOnlyTagNames} distinguish add-capable lists from
+     * audited scalar and flattened structure fields. Structured values and
+     * predicates are supported only for the closed schemas explicitly typed by
+     * {@link TagEdit}. Each primitive operation accepts one non-empty, exactly
+     * preservable string value; repeat operations to preserve duplicate
+     * additions. A remove operation deletes every exact matching value. Values
+     * are literal text and HTML entity sequences are not decoded, unlike the
+     * legacy behavior of {@link ExifTool.write}.
+     *
+     * This API does not set, clear, or force-write empty tags. Continue using
+     * {@link ExifTool.write} for whole-tag writes and deletion with `null`.
+     *
+     * @param file an existing file or writable sidecar path
+     * @param edits one or more ordered add/remove operations
+     * @param options overrides to the configured write-task options. `-api` and
+     * `-sep`/`-separator` write arguments are rejected because they can alter
+     * edit semantics.
+     */
+    editTags(file: string, edits: readonly TagEdit[], options?: WriteTaskOptions): Promise<WriteTaskResult>;
     /**
      * This will strip `file` of all metadata tags. The original file (with the
      * name `${FILENAME}_original`) will be retained. Note that some tags, like
@@ -371,8 +407,8 @@ export declare class ExifTool {
      * This allows ExifTool instances to be automatically cleaned up when they go out of scope.
      *
      * Note: This is a synchronous disposal method that initiates graceful cleanup but doesn't
-     * wait for completion. If graceful cleanup times out, forceful cleanup is attempted.
-     * For guaranteed cleanup completion, use `await using` with the async disposal method instead.
+     * wait for completion. If graceful cleanup times out, forceful cleanup is requested.
+     * Use `await using` when the caller must wait for the cleanup attempt to settle.
      *
      * @example
      * ```typescript
@@ -388,8 +424,9 @@ export declare class ExifTool {
      * Implements the AsyncDisposable interface for automatic async cleanup with the `await using` keyword.
      * This allows ExifTool instances to be automatically cleaned up when they go out of scope.
      *
-     * This method provides robust cleanup with timeout protection to prevent hanging.
-     * If graceful cleanup times out, forceful cleanup is attempted automatically.
+     * This method waits for graceful cleanup. If the configured timeout elapses,
+     * forceful cleanup is requested. Cleanup is best-effort and the timeout is not
+     * a hard completion deadline.
      *
      * @example
      * ```typescript

package/dist/ExifTool.dispose.spec.js

@@ -83,7 +83,7 @@ describe("ExifTool disposal", () => {
         await et[Symbol.asyncDispose]();
         (0, chai_1.expect)(et.ended).to.be.true;
     });
-    it("should handle timeout in async disposal gracefully", async () => {
+    it("should request forceful cleanup after an async disposal timeout", async () => {
         const et = new ExifTool_1.ExifTool();
         // Mock a slow .end() method by stubbing it
         const originalEnd = et.end.bind(et);
@@ -98,11 +98,11 @@ describe("ExifTool disposal", () => {
             }
             else {
                 forcefulEndCalled = true;
-                // Forceful cleanup should work quickly
+                // Model a forceful cleanup request that settles quickly
                 return originalEnd(false);
             }
         };
-        // The async dispose should timeout and attempt forceful cleanup
+        // The async disposer should request forceful cleanup after its timeout
         await et[Symbol.asyncDispose]();
         (0, chai_1.expect)(endCalled).to.be.true;
         (0, chai_1.expect)(forcefulEndCalled).to.be.true;

package/dist/ExifTool.dispose.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExifTool.dispose.spec.js","sourceRoot":"","sources":["../src/ExifTool.dispose.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA8B;AAC9B,yCAAsC;AAEtC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACvC,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAC1B,IAAA,aAAM,EAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAC1B,IAAA,aAAM,EAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAC1B,IAAA,aAAM,EAAC,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAClD,6EAA6E;QAC7E,wDAAwD;QACxD,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAC1B,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACpC,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAC1B,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC5B,kCAAkC;QAClC,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAE1B,2CAA2C;QAC3C,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAE7B,EAAU,CAAC,GAAG,GAAG,KAAK,EAAE,QAAiB,EAAE,EAAE;YAC5C,IAAI,QAAQ,EAAE,CAAC;gBACb,SAAS,GAAG,IAAI,CAAC;gBACjB,gEAAgE;gBAChE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC1D,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,iBAAiB,GAAG,IAAI,CAAC;gBACzB,uCAAuC;gBACvC,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC;QAEF,gEAAgE;QAChE,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAEhC,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAC7B,IAAA,aAAM,EAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QACrC,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,EAAE,GAAG,IAAI,mBAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAEzC,uDAAuD;QACvD,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,mDAAmD;QAEvE,mCAAmC;QACnC,MAAM,kBAAkB,GAAG,EAAE,CAAC,IAAI,CAAC;QACnC,IAAA,aAAM,EAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAEvD,8CAA8C;QAC9C,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAEhC,MAAM,iBAAiB,GAAG,EAAE,CAAC,IAAI,CAAC;QAClC,IAAA,aAAM,EAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrC,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,EAAE,GAAG,IAAI,mBAAQ,EAAE,CAAC;QAC1B,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;QAE7B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAErB,sEAAsE;QACtE,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,IAAI,CAAM,CAAC,CAAC,0CAA0C;QACtD,CAAC;;;gBACC,MAAM,EAAE,kCAAG,IAAI,mBAAQ,EAAE,QAAA,CAAC;gBAC1B,CAAC,GAAG,EAAE,CAAC;gBACP,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;;;;;;;;;SAC9B;QACD,IAAA,aAAM,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,IAAI,CAAM,CAAC,CAAC,0CAA0C;QACtD,CAAC;;;gBACC,MAAY,EAAE,kCAAG,IAAI,mBAAQ,EAAE,OAAA,CAAC;gBAChC,CAAC,GAAG,EAAE,CAAC;gBACP,IAAA,aAAM,EAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;gBAC7B,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;gBACnC,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;;;;;;;;;;;SACvC;QACD,IAAA,aAAM,EAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ExifTool.dispose.spec.js","sourceRoot":"","sources":["../src/ExifTool.dispose.spec.ts"],"names":[],"mappings":"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"}