@enslo/sd-metadata 1.4.0 → 1.4.1

package/README.ja.md

@@ -153,7 +153,7 @@ if (result.status === 'success') {
 > 本番環境では `@latest` の代わりに特定のバージョンを指定してください：
 >
 > ```text
-> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.4.0/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.4.1/dist/index.js
 > ```
 
 ### 応用例

package/README.md

@@ -153,7 +153,7 @@ if (result.status === 'success') {
 > For production use, pin to a specific version instead of `@latest`:
 >
 > ```text
-> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.4.0/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.4.1/dist/index.js
 > ```
 
 ### Advanced Examples

package/dist/index.d.ts

@@ -14,6 +14,10 @@ type MetadataSegmentSource = {
 } | {
     type: 'exifMake';
     prefix?: string;
+} | {
+    type: 'exifSoftware';
+} | {
+    type: 'exifDocumentName';
 } | {
     type: 'jpegCom';
 };

package/dist/index.js

@@ -314,7 +314,7 @@ function detectSoftware(entries) {
   return null;
 }
 function detectUniqueKeywords(entryRecord) {
-  if (entryRecord.Software === "NovelAI") {
+  if (entryRecord.Software?.startsWith("NovelAI")) {
     return "novelai";
   }
   if ("invokeai_metadata" in entryRecord) {
@@ -671,7 +671,7 @@ function parseInvokeAI(entries) {
 // src/parsers/novelai.ts
 function parseNovelAI(entries) {
   const entryRecord = buildEntryRecord(entries);
-  if (entryRecord.Software !== "NovelAI") {
+  if (!entryRecord.Software?.startsWith("NovelAI")) {
     return Result.error({ type: "unsupportedFormat" });
   }
   const commentText = entryRecord.Comment;
@@ -1092,7 +1092,9 @@ function detectFormat(data) {
 // src/utils/exif-constants.ts
 var USER_COMMENT_TAG = 37510;
 var IMAGE_DESCRIPTION_TAG = 270;
+var DOCUMENT_NAME_TAG = 269;
 var MAKE_TAG = 271;
+var SOFTWARE_TAG = 305;
 var EXIF_IFD_POINTER_TAG = 34665;
 
 // src/readers/exif.ts
@@ -1150,6 +1152,22 @@ function extractTagsFromIfd(data, ifdOffset, isLittleEndian) {
           data: prefix ? text.slice(prefix.length + 2) : text
         });
       }
+    } else if (tag === SOFTWARE_TAG) {
+      const text = decodeAsciiString(tagData);
+      if (text) {
+        segments.push({
+          source: { type: "exifSoftware" },
+          data: text
+        });
+      }
+    } else if (tag === DOCUMENT_NAME_TAG) {
+      const text = decodeAsciiString(tagData);
+      if (text) {
+        segments.push({
+          source: { type: "exifDocumentName" },
+          data: text
+        });
+      }
     } else if (tag === USER_COMMENT_TAG) {
       const text = decodeUserComment(tagData);
       if (text) {
@@ -1580,7 +1598,7 @@ function tryExpandNovelAIWebpFormat(text) {
     return null;
   }
   const outer = outerParsed.value;
-  if (typeof outer !== "object" || outer === null || outer.Software !== "NovelAI" || typeof outer.Comment !== "string") {
+  if (typeof outer !== "object" || outer === null || typeof outer.Software === "string" && !outer.Software.startsWith("NovelAI") || typeof outer.Comment !== "string") {
     return null;
   }
   const entries = [{ keyword: "Software", text: "NovelAI" }];
@@ -1600,6 +1618,10 @@ function sourceToKeyword(source) {
       return source.prefix ?? "Description";
     case "exifMake":
       return source.prefix ?? "Make";
+    case "exifSoftware":
+      return "Software";
+    case "exifDocumentName":
+      return "Title";
   }
 }
 
@@ -1758,29 +1780,6 @@ var stringify = (value) => {
 };
 
 // src/converters/chunk-encoding.ts
-var CHUNK_ENCODING_STRATEGIES = {
-  // Dynamic selection tools
-  a1111: "dynamic",
-  forge: "dynamic",
-  "forge-neo": "dynamic",
-  "sd-webui": "dynamic",
-  invokeai: "dynamic",
-  novelai: "dynamic",
-  "sd-next": "dynamic",
-  easydiffusion: "dynamic",
-  // Unicode escape tools (spec-compliant)
-  comfyui: "text-unicode-escape",
-  swarmui: "text-unicode-escape",
-  fooocus: "text-unicode-escape",
-  "ruined-fooocus": "text-unicode-escape",
-  "hf-space": "text-unicode-escape",
-  // Raw UTF-8 tools (non-compliant but compatible)
-  "stability-matrix": "text-utf8-raw",
-  tensorart: "text-utf8-raw"
-};
-function getEncodingStrategy(tool) {
-  return CHUNK_ENCODING_STRATEGIES[tool] ?? "text-unicode-escape";
-}
 function escapeUnicode(text) {
   return text.replace(/[\u0100-\uffff]/g, (char) => {
     const code = char.charCodeAt(0).toString(16).padStart(4, "0");
@@ -1813,27 +1812,74 @@ function convertA1111PngToSegments(chunks) {
   if (!parameters) {
     return [];
   }
-  return [
+  const segments = [
     {
       source: { type: "exifUserComment" },
       data: parameters.text
     }
   ];
+  const software = chunks.find((c) => c.keyword === "Software");
+  if (software) {
+    segments.push({
+      source: { type: "exifSoftware" },
+      data: software.text
+    });
+  }
+  const title = chunks.find((c) => c.keyword === "Title");
+  if (title) {
+    segments.push({
+      source: { type: "exifDocumentName" },
+      data: title.text
+    });
+  }
+  const description = chunks.find((c) => c.keyword === "Description");
+  if (description) {
+    segments.push({
+      source: { type: "exifImageDescription" },
+      data: description.text
+    });
+  }
+  const make = chunks.find((c) => c.keyword === "Make");
+  if (make) {
+    segments.push({
+      source: { type: "exifMake" },
+      data: make.text
+    });
+  }
+  return segments;
 }
 function convertA1111SegmentsToPng(segments) {
   const userComment = segments.find((s) => s.source.type === "exifUserComment");
   if (!userComment) {
     return [];
   }
-  return createEncodedChunk(
+  const parametersChunks = createEncodedChunk(
     "parameters",
     userComment.data,
-    getEncodingStrategy("a1111")
+    "dynamic"
   );
+  const chunks = [...parametersChunks];
+  const software = findSegment(segments, "exifSoftware");
+  if (software) {
+    chunks.push(...createTextChunk("Software", software.data));
+  }
+  const title = findSegment(segments, "exifDocumentName");
+  if (title) {
+    chunks.push(...createTextChunk("Title", title.data));
+  }
+  const description = findSegment(segments, "exifImageDescription");
+  if (description) {
+    chunks.push(...createTextChunk("Description", description.data));
+  }
+  const make = findSegment(segments, "exifMake");
+  if (make) {
+    chunks.push(...createTextChunk("Make", make.data));
+  }
+  return chunks;
 }
 
-// src/converters/comfyui.ts
-function convertComfyUIPngToSegments(chunks) {
+// src/converters/base-json.ts
+function convertKvPngToSegments(chunks) {
   const data = {};
   for (const chunk of chunks) {
     const parsed = parseJson(chunk.text);
@@ -1850,6 +1896,24 @@ function convertComfyUIPngToSegments(chunks) {
     }
   ];
 }
+function convertKvSegmentsToPng(segments, encodingStrategy) {
+  const userComment = findSegment(segments, "exifUserComment");
+  if (!userComment) {
+    return [];
+  }
+  const parsed = parseJson(userComment.data);
+  if (!parsed.ok) {
+    return [];
+  }
+  return Object.entries(parsed.value).flatMap(
+    ([keyword, value]) => createEncodedChunk(keyword, stringify(value), encodingStrategy)
+  );
+}
+
+// src/converters/comfyui.ts
+function convertComfyUIPngToSegments(chunks) {
+  return convertKvPngToSegments(chunks);
+}
 var tryParseExtendedFormat = (segments) => {
   const imageDescription = findSegment(segments, "exifImageDescription");
   const make = findSegment(segments, "exifMake");
@@ -1857,34 +1921,17 @@ var tryParseExtendedFormat = (segments) => {
     return null;
   }
   return [
-    ...createEncodedChunk("prompt", make?.data, getEncodingStrategy("comfyui")),
+    ...createEncodedChunk("prompt", make?.data, "text-unicode-escape"),
     ...createEncodedChunk(
       "workflow",
       imageDescription?.data,
-      getEncodingStrategy("comfyui")
+      "text-unicode-escape"
     )
   ];
 };
 var tryParseSaveImagePlusFormat = (segments) => {
-  const userComment = findSegment(segments, "exifUserComment");
-  if (!userComment) {
-    return null;
-  }
-  const parsed = parseJson(userComment.data);
-  if (!parsed.ok) {
-    return createEncodedChunk(
-      "prompt",
-      userComment.data,
-      getEncodingStrategy("comfyui")
-    );
-  }
-  return Object.entries(parsed.value).flatMap(
-    ([keyword, value]) => createEncodedChunk(
-      keyword,
-      stringify(value),
-      getEncodingStrategy("comfyui")
-    )
-  );
+  const chunks = convertKvSegmentsToPng(segments, "text-unicode-escape");
+  return chunks.length > 0 ? chunks : null;
 };
 function convertComfyUISegmentsToPng(segments) {
   return tryParseExtendedFormat(segments) ?? tryParseSaveImagePlusFormat(segments) ?? [];
@@ -1911,93 +1958,49 @@ function convertEasyDiffusionSegmentsToPng(segments) {
   if (!parsed.ok) {
     return [];
   }
-  return Object.entries(parsed.value).flatMap(([keyword, value]) => {
-    const text = value != null ? typeof value === "string" ? value : String(value) : void 0;
-    if (!text) return [];
-    return createEncodedChunk(
-      keyword,
-      text,
-      getEncodingStrategy("easydiffusion")
-    );
-  });
+  return Object.entries(parsed.value).flatMap(
+    ([keyword, value]) => createEncodedChunk(keyword, stringify(value), "dynamic")
+  );
 }
 
 // src/converters/invokeai.ts
 function convertInvokeAIPngToSegments(chunks) {
-  const data = {};
-  for (const chunk of chunks) {
-    const parsed = parseJson(chunk.text);
-    if (parsed.ok) {
-      data[chunk.keyword] = parsed.value;
-    } else {
-      data[chunk.keyword] = chunk.text;
-    }
-  }
-  return [
-    {
-      source: { type: "exifUserComment" },
-      data: JSON.stringify(data)
-    }
-  ];
+  return convertKvPngToSegments(chunks);
 }
 function convertInvokeAISegmentsToPng(segments) {
-  const userComment = findSegment(segments, "exifUserComment");
-  if (!userComment) {
-    return [];
-  }
-  const parsed = parseJson(userComment.data);
-  if (!parsed.ok) {
-    return createEncodedChunk(
-      "invokeai_metadata",
-      userComment.data,
-      getEncodingStrategy("invokeai")
-    );
-  }
-  const metadataText = stringify(parsed.value.invokeai_metadata);
-  const graphText = stringify(parsed.value.invokeai_graph);
-  const chunks = [
-    ...createEncodedChunk(
-      "invokeai_metadata",
-      metadataText,
-      getEncodingStrategy("invokeai")
-    ),
-    ...createEncodedChunk(
-      "invokeai_graph",
-      graphText,
-      getEncodingStrategy("invokeai")
-    )
-  ];
-  if (chunks.length > 0) {
-    return chunks;
-  }
-  return createEncodedChunk(
-    "invokeai_metadata",
-    userComment.data,
-    getEncodingStrategy("invokeai")
-  );
+  return convertKvSegmentsToPng(segments, "dynamic");
 }
 
 // src/converters/novelai.ts
-var NOVELAI_TITLE = "NovelAI generated image";
 var NOVELAI_SOFTWARE = "NovelAI";
+var NOVELAI_TITLE = "NovelAI generated image";
 function convertNovelaiPngToSegments(chunks) {
-  const comment = chunks.find((c) => c.keyword === "Comment");
-  if (!comment) {
-    return [];
-  }
-  const description = chunks.find((c) => c.keyword === "Description");
   const data = buildUserCommentJson(chunks);
-  const descriptionSegment = description ? [
-    {
-      source: { type: "exifImageDescription" },
-      data: `\0\0\0\0${description.text}`
-    }
-  ] : [];
   const userCommentSegment = {
     source: { type: "exifUserComment" },
     data: JSON.stringify(data)
   };
-  return [...descriptionSegment, userCommentSegment];
+  const description = chunks.find((c) => c.keyword === "Description");
+  const descriptionSegment = description && {
+    source: { type: "exifImageDescription" },
+    data: `\0\0\0\0${description.text}`
+  };
+  const software = chunks.find((c) => c.keyword === "Software");
+  const softwareSegment = software && {
+    source: { type: "exifSoftware" },
+    data: software.text
+  };
+  const title = chunks.find((c) => c.keyword === "Title");
+  const titleSegment = title && {
+    source: { type: "exifDocumentName" },
+    data: title.text
+  };
+  return [
+    userCommentSegment,
+    descriptionSegment,
+    softwareSegment,
+    titleSegment
+  ].filter((segment) => Boolean(segment));
 }
 function buildUserCommentJson(chunks) {
   return NOVELAI_KEY_ORDER.map((key) => {
@@ -2019,9 +2022,11 @@ var NOVELAI_KEY_ORDER = [
 function convertNovelaiSegmentsToPng(segments) {
   const userCommentSeg = findSegment(segments, "exifUserComment");
   const descriptionSeg = findSegment(segments, "exifImageDescription");
-  return parseSegments(userCommentSeg, descriptionSeg);
+  const softwareSeg = findSegment(segments, "exifSoftware");
+  const titleSeg = findSegment(segments, "exifDocumentName");
+  return parseSegments(userCommentSeg, descriptionSeg, softwareSeg, titleSeg);
 }
-function parseSegments(userCommentSeg, descriptionSeg) {
+function parseSegments(userCommentSeg, descriptionSeg, softwareSeg, titleSeg) {
   if (!userCommentSeg || !descriptionSeg) {
     return [];
   }
@@ -2034,20 +2039,18 @@ function parseSegments(userCommentSeg, descriptionSeg) {
     descriptionSeg,
     stringify(jsonData.Description)
   );
-  const descriptionChunks = descriptionText ? createEncodedChunk(
-    "Description",
-    descriptionText,
-    getEncodingStrategy("novelai")
-  ) : [];
   return [
     // Title (required, use default if missing)
-    createTextChunk("Title", stringify(jsonData.Title) ?? NOVELAI_TITLE),
+    createTextChunk(
+      "Title",
+      titleSeg?.data ?? stringify(jsonData.Title) ?? NOVELAI_TITLE
+    ),
     // Description (optional, prefer exifImageDescription over JSON)
-    ...descriptionChunks,
+    createEncodedChunk("Description", descriptionText, "dynamic"),
     // Software (required, use default if missing)
     createTextChunk(
       "Software",
-      stringify(jsonData.Software) ?? NOVELAI_SOFTWARE
+      softwareSeg?.data ?? stringify(jsonData.Software) ?? NOVELAI_SOFTWARE
     ),
     // Source (optional)
     createTextChunk("Source", stringify(jsonData.Source)),
@@ -2075,17 +2078,13 @@ function createPngToSegments(keyword) {
     return !chunk ? [] : [{ source: { type: "exifUserComment" }, data: chunk.text }];
   };
 }
-function createSegmentsToPng(keyword) {
+function createSegmentsToPng(keyword, encodingStrategy) {
   return (segments) => {
     const userComment = segments.find(
       (s) => s.source.type === "exifUserComment"
     );
     if (!userComment) return [];
-    return createEncodedChunk(
-      keyword,
-      userComment.data,
-      getEncodingStrategy(keyword)
-    );
+    return createEncodedChunk(keyword, userComment.data, encodingStrategy);
   };
 }
 
@@ -2096,11 +2095,10 @@ function convertSwarmUIPngToSegments(chunks) {
     return [];
   }
   const parsed = parseJson(parametersChunk.text);
-  const data = parsed.ok ? parsed.value : parametersChunk.text;
   const segments = [
     {
       source: { type: "exifUserComment" },
-      data: typeof data === "string" ? data : JSON.stringify(data)
+      data: parsed.ok ? JSON.stringify(parsed.value) : parametersChunk.text
     }
   ];
   const promptChunk = chunks.find((c) => c.keyword === "prompt");
@@ -2114,27 +2112,13 @@ function convertSwarmUIPngToSegments(chunks) {
 }
 function convertSwarmUISegmentsToPng(segments) {
   const userComment = findSegment(segments, "exifUserComment");
-  if (!userComment) {
-    return [];
-  }
-  const chunks = [];
   const make = findSegment(segments, "exifMake");
-  if (make) {
-    chunks.push(
-      ...createEncodedChunk(
-        "prompt",
-        make.data,
-        getEncodingStrategy("swarmui")
-      )
-    );
-  }
-  chunks.push(
-    ...createEncodedChunk(
-      "parameters",
-      userComment.data,
-      getEncodingStrategy("swarmui")
-    )
-  );
+  const chunks = [
+    // Restore node graph first if present (extended format)
+    createEncodedChunk("prompt", make?.data, "text-unicode-escape"),
+    // Add parameters chunk second (always present)
+    createEncodedChunk("parameters", userComment?.data, "text-unicode-escape")
+  ].flat();
   return chunks;
 }
 
@@ -2203,11 +2187,11 @@ var convertEasyDiffusion = createFormatConverter(
 );
 var convertFooocus = createFormatConverter(
   createPngToSegments("Comment"),
-  createSegmentsToPng("Comment")
+  createSegmentsToPng("Comment", "text-unicode-escape")
 );
 var convertRuinedFooocus = createFormatConverter(
   createPngToSegments("parameters"),
-  createSegmentsToPng("parameters")
+  createSegmentsToPng("parameters", "text-unicode-escape")
 );
 var convertSwarmUI = createFormatConverter(
   convertSwarmUIPngToSegments,
@@ -2219,7 +2203,7 @@ var convertInvokeAI = createFormatConverter(
 );
 var convertHfSpace = createFormatConverter(
   createPngToSegments("parameters"),
-  createSegmentsToPng("parameters")
+  createSegmentsToPng("parameters", "text-unicode-escape")
 );
 var softwareConverters = {
   // NovelAI
@@ -2250,7 +2234,7 @@ var softwareConverters = {
 // src/writers/exif.ts
 function buildExifTiffData(segments) {
   const ifd0Segments = segments.filter(
-    (s) => s.source.type === "exifImageDescription" || s.source.type === "exifMake"
+    (s) => s.source.type === "exifImageDescription" || s.source.type === "exifMake" || s.source.type === "exifSoftware" || s.source.type === "exifDocumentName"
   );
   const exifIfdSegments = segments.filter(
     (s) => s.source.type === "exifUserComment"
@@ -2268,6 +2252,12 @@ function buildExifTiffData(segments) {
     } else if (seg.source.type === "exifMake") {
       const data = encodeAsciiTag(seg.data, seg.source.prefix);
       ifd0Tags.push({ tag: MAKE_TAG, type: 2, data });
+    } else if (seg.source.type === "exifSoftware") {
+      const data = encodeAsciiTag(seg.data);
+      ifd0Tags.push({ tag: SOFTWARE_TAG, type: 2, data });
+    } else if (seg.source.type === "exifDocumentName") {
+      const data = encodeAsciiTag(seg.data);
+      ifd0Tags.push({ tag: DOCUMENT_NAME_TAG, type: 2, data });
     }
   }
   for (const seg of exifIfdSegments) {
@@ -2395,7 +2385,7 @@ function writeJpegMetadata(data, segments) {
   }
   const comSegments = segments.filter((s) => s.source.type === "jpegCom");
   const exifSegments = segments.filter(
-    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake"
+    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake" || s.source.type === "exifSoftware" || s.source.type === "exifDocumentName"
   );
   const collectResult = collectNonMetadataSegments(data);
   if (!collectResult.ok) {
@@ -2755,7 +2745,7 @@ function collectNonExifChunks(data) {
 }
 function buildExifChunk(segments) {
   const exifSegments = segments.filter(
-    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake"
+    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake" || s.source.type === "exifSoftware" || s.source.type === "exifDocumentName"
   );
   if (exifSegments.length === 0) {
     return null;
@@ -3002,8 +2992,7 @@ function writeAsWebUI(data, metadata) {
   return Result.ok(writeResult.value);
 }
 function createPngChunks(text) {
-  const strategy = getEncodingStrategy("a1111");
-  return createEncodedChunk("parameters", text, strategy);
+  return createEncodedChunk("parameters", text, "dynamic");
 }
 function createExifSegments(text) {
   return [