From a0abce4a46a692cdf262384e14e0cb8fed185711 Mon Sep 17 00:00:00 2001
From: Jeremy Nguyen <nguyen.jeremyt@gmail.com>
Date: Tue, 26 May 2026 19:03:17 -0700
Subject: [PATCH] feat: add XP tags UTF16LE support to advanced, quick, and add
 editor

---
 .../entries/add/ExifEntryAddEditorFields.tsx  |  1 +
 .../entries/edit/ExifEntryByteEditor.tsx      |  3 ++
 .../entries/edit/ExifEntryEditor.tsx          |  1 +
 .../components/table/ValueCell.tsx            |  1 +
 .../editors/add/getExifAddEditor.ts           |  2 ++
 .../editors/add/resolvers/resolveXp.ts        | 33 +++++++++++++++++++
 .../features/exif-editor/editors/add/types.ts |  1 +
 .../editors/advanced/getExifAdvancedEditor.ts |  2 ++
 .../editors/advanced/resolvers/resolveXp.ts   | 23 +++++++++++++
 .../exif-editor/editors/advanced/types.ts     |  6 ++++
 .../editors/quick/getExifQuickEditor.ts       |  2 ++
 .../editors/quick/resolvers/resolveXp.ts      | 23 +++++++++++++
 .../exif-editor/editors/quick/types.ts        |  1 +
 apps/client/src/lib/exif/xp/constants.ts      | 11 +++++++
 apps/client/src/lib/exif/xp/formatXp.ts       | 11 +++++++
 apps/client/src/lib/exif/xp/parseXp.ts        | 13 ++++++++
 16 files changed, 134 insertions(+)
 create mode 100644 apps/client/src/features/exif-editor/editors/add/resolvers/resolveXp.ts
 create mode 100644 apps/client/src/features/exif-editor/editors/advanced/resolvers/resolveXp.ts
 create mode 100644 apps/client/src/features/exif-editor/editors/quick/resolvers/resolveXp.ts
 create mode 100644 apps/client/src/lib/exif/xp/constants.ts
 create mode 100644 apps/client/src/lib/exif/xp/formatXp.ts
 create mode 100644 apps/client/src/lib/exif/xp/parseXp.ts

diff --git a/apps/client/src/features/exif-editor/components/entries/add/ExifEntryAddEditorFields.tsx b/apps/client/src/features/exif-editor/components/entries/add/ExifEntryAddEditorFields.tsx
index 6f070be..18779db 100644
--- a/apps/client/src/features/exif-editor/components/entries/add/ExifEntryAddEditorFields.tsx
+++ b/apps/client/src/features/exif-editor/components/entries/add/ExifEntryAddEditorFields.tsx
@@ -76,6 +76,7 @@ const ExifEntryAddEditorFields = ({
         />
       );
     case "ascii":
+    case "xp":
       return (
         <TextAreaField
           label="Value"
diff --git a/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryByteEditor.tsx b/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryByteEditor.tsx
index 888f634..b2af6fb 100644
--- a/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryByteEditor.tsx
+++ b/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryByteEditor.tsx
@@ -8,6 +8,7 @@ import {
 
 import { useExifEntryDraftContext } from "#features/exif-editor/contexts/ExifEntryDraftContext";
 import { EXIF_TAG_MAP } from "#lib/exif/exifTagMap";
+import { XP_TAGS } from "#lib/exif/xp/constants";
 import { Button } from "@exifi/ui/components/Button";
 import { NumberField } from "@exifi/ui/components/NumberField";
 
@@ -20,8 +21,10 @@ const ExifEntryByteEditor = (props: ExifEntryEditorProps) => {
     exifEntryObject.format === "SRATIONAL" ||
     exifEntryObject.format === "RATIONAL";
 
+  // TODO: Explicitly return null
   return (
     (exifEntryObject.format === "ASCII" ||
+      XP_TAGS.includes(exifEntryObject.tag) ||
       isRationalOrSRational ||
       exifEntryObject.tag === "USER_COMMENT") && (
       <Disclosure {...props}>
diff --git a/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryEditor.tsx b/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryEditor.tsx
index ecaad24..936d7ea 100644
--- a/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryEditor.tsx
+++ b/apps/client/src/features/exif-editor/components/entries/edit/ExifEntryEditor.tsx
@@ -33,6 +33,7 @@ const ExifEntryEditor = () => {
         />
       ));
     case "ascii":
+    case "xp":
       return (
         <TextAreaField
           aria-label={label}
diff --git a/apps/client/src/features/exif-editor/components/table/ValueCell.tsx b/apps/client/src/features/exif-editor/components/table/ValueCell.tsx
index 39f9709..d316c6d 100644
--- a/apps/client/src/features/exif-editor/components/table/ValueCell.tsx
+++ b/apps/client/src/features/exif-editor/components/table/ValueCell.tsx
@@ -89,6 +89,7 @@ const ValueCell = ({ row, getValue, table }: ValueCellProps) => {
         />
       );
     case "ascii":
+    case "xp":
       return (
         <TextField
           aria-label={label}
diff --git a/apps/client/src/features/exif-editor/editors/add/getExifAddEditor.ts b/apps/client/src/features/exif-editor/editors/add/getExifAddEditor.ts
index d760cba..58b9779 100644
--- a/apps/client/src/features/exif-editor/editors/add/getExifAddEditor.ts
+++ b/apps/client/src/features/exif-editor/editors/add/getExifAddEditor.ts
@@ -9,6 +9,7 @@ import { resolveRational } from "./resolvers/resolveRational";
 import { resolveTimeStamp } from "./resolvers/resolveTimeStamp";
 import { resolveUserComment } from "./resolvers/resolveUserComment";
 import { resolveVersionId } from "./resolvers/resolveVersionId";
+import { resolveXp } from "./resolvers/resolveXp";
 import type { AddEditorResolver } from "./types";
 
 const resolvers: AddEditorResolver[] = [
@@ -20,6 +21,7 @@ const resolvers: AddEditorResolver[] = [
   resolveVersionId, // tag === "VERSION_ID"
   resolveTimeStamp, // tag === "TIME_STAMP"
   resolveUserComment, // tag === "USER_COMMENT"
+  resolveXp, // tag is in XP_TAGS
   resolveAscii, // format === "ASCII"
   resolveNumeric, // format is numeric
   resolveRational, // format is rational
diff --git a/apps/client/src/features/exif-editor/editors/add/resolvers/resolveXp.ts b/apps/client/src/features/exif-editor/editors/add/resolvers/resolveXp.ts
new file mode 100644
index 0000000..ad744a6
--- /dev/null
+++ b/apps/client/src/features/exif-editor/editors/add/resolvers/resolveXp.ts
@@ -0,0 +1,33 @@
+import { XP_TAGS } from "#lib/exif/xp/constants";
+import { formatXp } from "#lib/exif/xp/formatXp";
+import { parseXp } from "#lib/exif/xp/parseXp";
+
+import type { AddEditorResolver } from "../types";
+
+const resolveXp: AddEditorResolver = (exifEntryObject, onValueChange) => {
+  if (
+    exifEntryObject.format === "BYTE" &&
+    exifEntryObject.tag !== undefined &&
+    XP_TAGS.includes(exifEntryObject.tag)
+  ) {
+    return {
+      kind: "xp",
+      exifEntryObject,
+      value:
+        exifEntryObject.value.length === 0 ?
+          undefined
+        : parseXp(new Uint8Array(exifEntryObject.value)),
+      onValueChange: (value) => {
+        if (value === "") {
+          onValueChange([]);
+        }
+
+        return onValueChange(Array.from(formatXp(value)));
+      },
+    };
+  }
+
+  return null;
+};
+
+export { resolveXp };
diff --git a/apps/client/src/features/exif-editor/editors/add/types.ts b/apps/client/src/features/exif-editor/editors/add/types.ts
index d74d6a4..c0fe878 100644
--- a/apps/client/src/features/exif-editor/editors/add/types.ts
+++ b/apps/client/src/features/exif-editor/editors/add/types.ts
@@ -29,6 +29,7 @@ type AddEditor = (
   | ({ kind: "versionId" } & ResolvedAddEditor<number[]>)
   | ({ kind: "datetime" } & ResolvedAddEditor<CalendarDateTime | undefined>)
   | ({ kind: "ascii" } & ResolvedAddEditor<string>)
+  | ({ kind: "xp" } & ResolvedAddEditor<string>)
   | ({ kind: "exifVersion" } & ResolvedAddEditor<ExifVersion>)
   | ({ kind: "timeStamp" } & ResolvedAddEditor<Time | undefined>)
   | {
diff --git a/apps/client/src/features/exif-editor/editors/advanced/getExifAdvancedEditor.ts b/apps/client/src/features/exif-editor/editors/advanced/getExifAdvancedEditor.ts
index 9e41d11..4570907 100644
--- a/apps/client/src/features/exif-editor/editors/advanced/getExifAdvancedEditor.ts
+++ b/apps/client/src/features/exif-editor/editors/advanced/getExifAdvancedEditor.ts
@@ -2,10 +2,12 @@ import { resolveAscii } from "./resolvers/resolveAscii";
 import { resolveNumeric } from "./resolvers/resolveNumeric";
 import { resolveRational } from "./resolvers/resolveRational";
 import { resolveUserComment } from "./resolvers/resolveUserComment";
+import { resolveXp } from "./resolvers/resolveXp";
 import type { AdvancedEditorResolver } from "./types";
 
 const resolvers: AdvancedEditorResolver[] = [
   resolveUserComment, // tag === "USER_COMMENT"
+  resolveXp,
   resolveAscii, // format === "ASCII"
   resolveNumeric, // format is numeric
   resolveRational, // format is rational
diff --git a/apps/client/src/features/exif-editor/editors/advanced/resolvers/resolveXp.ts b/apps/client/src/features/exif-editor/editors/advanced/resolvers/resolveXp.ts
new file mode 100644
index 0000000..c3e750d
--- /dev/null
+++ b/apps/client/src/features/exif-editor/editors/advanced/resolvers/resolveXp.ts
@@ -0,0 +1,23 @@
+import { XP_TAGS } from "#lib/exif/xp/constants";
+import { formatXp } from "#lib/exif/xp/formatXp";
+import { parseXp } from "#lib/exif/xp/parseXp";
+
+import type { AdvancedEditorResolver } from "../types";
+
+const resolveXp: AdvancedEditorResolver = (exifEntryObject, onValueChange) => {
+  if (
+    exifEntryObject.format === "BYTE" &&
+    XP_TAGS.includes(exifEntryObject.tag)
+  ) {
+    return {
+      kind: "xp",
+      exifEntryObject,
+      value: parseXp(new Uint8Array(exifEntryObject.value)),
+      onValueChange: (value) => onValueChange(Array.from(formatXp(value))),
+    };
+  }
+
+  return null;
+};
+
+export { resolveXp };
diff --git a/apps/client/src/features/exif-editor/editors/advanced/types.ts b/apps/client/src/features/exif-editor/editors/advanced/types.ts
index 85574fc..87cde68 100644
--- a/apps/client/src/features/exif-editor/editors/advanced/types.ts
+++ b/apps/client/src/features/exif-editor/editors/advanced/types.ts
@@ -21,6 +21,12 @@ type AdvancedEditor =
       value: UserComment;
       onValueChange: (value: UserComment) => void;
     }
+  | {
+      kind: "xp";
+      exifEntryObject: ExifEntryObject;
+      value: string;
+      onValueChange: (value: string) => void;
+    }
   | ({ kind: "rational" } & ResolvedAdvancedEditor<RationalObject>)
   | {
       kind: "ascii";
diff --git a/apps/client/src/features/exif-editor/editors/quick/getExifQuickEditor.ts b/apps/client/src/features/exif-editor/editors/quick/getExifQuickEditor.ts
index 6fffaa8..e840939 100644
--- a/apps/client/src/features/exif-editor/editors/quick/getExifQuickEditor.ts
+++ b/apps/client/src/features/exif-editor/editors/quick/getExifQuickEditor.ts
@@ -8,6 +8,7 @@ import { resolveSimpleNumeric } from "./resolvers/resolveSimpleNumeric";
 import { resolveSimpleRational } from "./resolvers/resolveSimpleRational";
 import { resolveTimeStamp } from "./resolvers/resolveTimeStamp";
 import { resolveVersionId } from "./resolvers/resolveVersionId";
+import { resolveXp } from "./resolvers/resolveXp";
 import type { QuickEditorResolver } from "./types";
 
 const resolvers: QuickEditorResolver[] = [
@@ -18,6 +19,7 @@ const resolvers: QuickEditorResolver[] = [
   resolveExifVersion, // tag === "EXIF_VERSION"
   resolveVersionId, // tag === "VERSION_ID"
   resolveTimeStamp, // tag === "TIME_STAMP"
+  resolveXp, // tag is in XP_TAGS
   resolveAscii, // format === "ASCII"
   resolveSimpleRational, // format === "RATIONAL" && denominator === 1
   resolveSimpleNumeric, // format is numeric && components === 1
diff --git a/apps/client/src/features/exif-editor/editors/quick/resolvers/resolveXp.ts b/apps/client/src/features/exif-editor/editors/quick/resolvers/resolveXp.ts
new file mode 100644
index 0000000..103b733
--- /dev/null
+++ b/apps/client/src/features/exif-editor/editors/quick/resolvers/resolveXp.ts
@@ -0,0 +1,23 @@
+import { XP_TAGS } from "#lib/exif/xp/constants";
+import { formatXp } from "#lib/exif/xp/formatXp";
+import { parseXp } from "#lib/exif/xp/parseXp";
+
+import type { QuickEditorResolver } from "../types";
+
+const resolveXp: QuickEditorResolver = (exifEntryObject, onValueChange) => {
+  if (
+    exifEntryObject.format === "BYTE" &&
+    XP_TAGS.includes(exifEntryObject.tag)
+  ) {
+    return {
+      kind: "xp",
+      exifEntryObject,
+      value: parseXp(new Uint8Array(exifEntryObject.value)),
+      onValueChange: (value) => onValueChange(formatXp(value)),
+    };
+  }
+
+  return null;
+};
+
+export { resolveXp };
diff --git a/apps/client/src/features/exif-editor/editors/quick/types.ts b/apps/client/src/features/exif-editor/editors/quick/types.ts
index c267fe7..a60717e 100644
--- a/apps/client/src/features/exif-editor/editors/quick/types.ts
+++ b/apps/client/src/features/exif-editor/editors/quick/types.ts
@@ -28,6 +28,7 @@ type QuickEditor =
   | ({ kind: "versionId" } & ResolvedQuickEditor<number[]>)
   | ({ kind: "datetime" } & ResolvedQuickEditor<CalendarDateTime>)
   | ({ kind: "ascii" } & ResolvedQuickEditor<string>)
+  | ({ kind: "xp" } & ResolvedQuickEditor<string>)
   | ({ kind: "exifVersion" } & ResolvedQuickEditor<ExifVersion>)
   | ({ kind: "simpleNumeric" } & ResolvedQuickEditor<number>)
   | ({ kind: "timeStamp" } & ResolvedQuickEditor<Time>);
diff --git a/apps/client/src/lib/exif/xp/constants.ts b/apps/client/src/lib/exif/xp/constants.ts
new file mode 100644
index 0000000..f84ce9e
--- /dev/null
+++ b/apps/client/src/lib/exif/xp/constants.ts
@@ -0,0 +1,11 @@
+import type { Tag } from "libexif-wasm";
+
+const XP_TAGS: Tag[] = [
+  "XP_TITLE",
+  "XP_COMMENT",
+  "XP_AUTHOR",
+  "XP_KEYWORDS",
+  "XP_SUBJECT",
+];
+
+export { XP_TAGS };
diff --git a/apps/client/src/lib/exif/xp/formatXp.ts b/apps/client/src/lib/exif/xp/formatXp.ts
new file mode 100644
index 0000000..77bb2f2
--- /dev/null
+++ b/apps/client/src/lib/exif/xp/formatXp.ts
@@ -0,0 +1,11 @@
+import { encode } from "iconv-lite";
+
+const formatXp = (input: string) => {
+  const inputWithNullTerminator =
+    input.endsWith("\u0000") ? input : input + "\u0000";
+  const buffer = encode(inputWithNullTerminator, "utf16le") as Uint8Array;
+
+  return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+};
+
+export { formatXp };
diff --git a/apps/client/src/lib/exif/xp/parseXp.ts b/apps/client/src/lib/exif/xp/parseXp.ts
new file mode 100644
index 0000000..25db42b
--- /dev/null
+++ b/apps/client/src/lib/exif/xp/parseXp.ts
@@ -0,0 +1,13 @@
+const textDecoder = new TextDecoder("utf-16le");
+
+const parseXp = (input: AllowSharedBufferSource) => {
+  const output = textDecoder.decode(input);
+
+  if (output.endsWith("\u0000")) {
+    return output.slice(0, -1);
+  }
+
+  return output;
+};
+
+export { parseXp };