@enslo/sd-metadata 1.4.1 → 1.4.2

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.1/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@1.4.2/dist/index.js
 > ```
 
 ### Advanced Examples

package/dist/index.d.ts

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

package/dist/index.js

@@ -345,6 +345,12 @@ function detectFromCommentJson(comment) {
     if ("invokeai_metadata" in parsed) {
       return "invokeai";
     }
+    if ("generation_data" in parsed) {
+      return "tensorart";
+    }
+    if ("smproj" in parsed) {
+      return "stability-matrix";
+    }
     if ("prompt" in parsed && "workflow" in parsed) {
       const workflow = parsed.workflow;
       const prompt = parsed.prompt;
@@ -574,7 +580,7 @@ function parseFooocus(entries) {
 // src/parsers/hf-space.ts
 function parseHfSpace(entries) {
   const entryRecord = buildEntryRecord(entries);
-  const parametersText = entryRecord.parameters;
+  const parametersText = entryRecord.parameters ?? entryRecord.Comment;
   if (!parametersText) {
     return Result.error({ type: "unsupportedFormat" });
   }
@@ -727,7 +733,7 @@ function parseNovelAI(entries) {
 // src/parsers/ruined-fooocus.ts
 function parseRuinedFooocus(entries) {
   const entryRecord = buildEntryRecord(entries);
-  const jsonText = entryRecord.parameters;
+  const jsonText = entryRecord.parameters ?? entryRecord.Comment;
   if (!jsonText || !jsonText.startsWith("{")) {
     return Result.error({ type: "unsupportedFormat" });
   }
@@ -775,7 +781,20 @@ function parseStabilityMatrix(entries) {
     ...comfyResult.value,
     software: "stability-matrix"
   };
-  const jsonText = entryRecord["parameters-json"];
+  let jsonText = entryRecord["parameters-json"];
+  if (!jsonText && entryRecord.Comment?.startsWith("{")) {
+    const commentParsed = parseJson(
+      entryRecord.Comment
+    );
+    if (commentParsed.ok) {
+      const commentData = commentParsed.value;
+      if (typeof commentData["parameters-json"] === "string") {
+        jsonText = commentData["parameters-json"];
+      } else if (typeof commentData["parameters-json"] === "object") {
+        jsonText = JSON.stringify(commentData["parameters-json"]);
+      }
+    }
+  }
   if (jsonText) {
     const parsed = parseJson(jsonText);
     if (parsed.ok) {
@@ -874,7 +893,26 @@ function parseSwarmUI(entries) {
 // src/parsers/tensorart.ts
 function parseTensorArt(entries) {
   const entryRecord = buildEntryRecord(entries);
-  const dataText = entryRecord.generation_data;
+  let dataText = entryRecord.generation_data;
+  let promptChunk = entryRecord.prompt;
+  if (!dataText && entryRecord.Comment?.startsWith("{")) {
+    const commentParsed = parseJson(
+      entryRecord.Comment
+    );
+    if (commentParsed.ok) {
+      const commentData = commentParsed.value;
+      if (typeof commentData.generation_data === "string") {
+        dataText = commentData.generation_data;
+      } else if (typeof commentData.generation_data === "object") {
+        dataText = JSON.stringify(commentData.generation_data);
+      }
+      if (typeof commentData.prompt === "string") {
+        promptChunk = commentData.prompt;
+      } else if (typeof commentData.prompt === "object") {
+        promptChunk = JSON.stringify(commentData.prompt);
+      }
+    }
+  }
   if (!dataText) {
     return Result.error({ type: "unsupportedFormat" });
   }
@@ -889,7 +927,6 @@ function parseTensorArt(entries) {
   const data = parsed.value;
   const width = data.width ?? 0;
   const height = data.height ?? 0;
-  const promptChunk = entryRecord.prompt;
   if (!promptChunk) {
     return Result.error({ type: "unsupportedFormat" });
   }
@@ -1092,9 +1129,7 @@ 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
@@ -1152,22 +1187,6 @@ 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) {
@@ -1618,10 +1637,6 @@ function sourceToKeyword(source) {
       return source.prefix ?? "Description";
     case "exifMake":
       return source.prefix ?? "Make";
-    case "exifSoftware":
-      return "Software";
-    case "exifDocumentName":
-      return "Title";
   }
 }
 
@@ -1786,6 +1801,12 @@ function escapeUnicode(text) {
     return `\\u${code}`;
   });
 }
+function unescapeUnicode(text) {
+  return text.replace(
+    /\\u([0-9a-fA-F]{4})/g,
+    (_, hex) => String.fromCharCode(Number.parseInt(hex, 16))
+  );
+}
 function hasNonLatin1(text) {
   return /[^\x00-\xFF]/.test(text);
 }
@@ -1812,70 +1833,19 @@ function convertA1111PngToSegments(chunks) {
   if (!parameters) {
     return [];
   }
-  const segments = [
+  return [
     {
       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 [];
   }
-  const parametersChunks = createEncodedChunk(
-    "parameters",
-    userComment.data,
-    "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;
+  return createEncodedChunk("parameters", userComment.data, "dynamic");
 }
 
 // src/converters/base-json.ts
@@ -1905,9 +1875,14 @@ function convertKvSegmentsToPng(segments, encodingStrategy) {
   if (!parsed.ok) {
     return [];
   }
-  return Object.entries(parsed.value).flatMap(
-    ([keyword, value]) => createEncodedChunk(keyword, stringify(value), encodingStrategy)
-  );
+  return Object.entries(parsed.value).flatMap(([keyword, value]) => {
+    const text = stringify(value);
+    return createEncodedChunk(
+      keyword,
+      text !== void 0 ? unescapeUnicode(text) : void 0,
+      encodingStrategy
+    );
+  });
 }
 
 // src/converters/comfyui.ts
@@ -1930,7 +1905,7 @@ var tryParseExtendedFormat = (segments) => {
   ];
 };
 var tryParseSaveImagePlusFormat = (segments) => {
-  const chunks = convertKvSegmentsToPng(segments, "text-unicode-escape");
+  const chunks = convertKvSegmentsToPng(segments, "text-utf8-raw");
   return chunks.length > 0 ? chunks : null;
 };
 function convertComfyUISegmentsToPng(segments) {
@@ -1972,35 +1947,22 @@ function convertInvokeAISegmentsToPng(segments) {
 }
 
 // src/converters/novelai.ts
-var NOVELAI_SOFTWARE = "NovelAI";
 var NOVELAI_TITLE = "NovelAI generated image";
+var NOVELAI_SOFTWARE = "NovelAI";
 function convertNovelaiPngToSegments(chunks) {
-  const data = buildUserCommentJson(chunks);
-  const userCommentSegment = {
-    source: { type: "exifUserComment" },
-    data: JSON.stringify(data)
-  };
   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
+  const data = buildUserCommentJson(chunks);
+  const userCommentSegment = {
+    source: { type: "exifUserComment" },
+    data: JSON.stringify(data)
   };
-  return [
-    userCommentSegment,
-    descriptionSegment,
-    softwareSegment,
-    titleSegment
-  ].filter((segment) => Boolean(segment));
+  return [descriptionSegment, userCommentSegment].filter(
+    (segment) => segment !== void 0
+  );
 }
 function buildUserCommentJson(chunks) {
   return NOVELAI_KEY_ORDER.map((key) => {
@@ -2022,11 +1984,9 @@ var NOVELAI_KEY_ORDER = [
 function convertNovelaiSegmentsToPng(segments) {
   const userCommentSeg = findSegment(segments, "exifUserComment");
   const descriptionSeg = findSegment(segments, "exifImageDescription");
-  const softwareSeg = findSegment(segments, "exifSoftware");
-  const titleSeg = findSegment(segments, "exifDocumentName");
-  return parseSegments(userCommentSeg, descriptionSeg, softwareSeg, titleSeg);
+  return parseSegments(userCommentSeg, descriptionSeg);
 }
-function parseSegments(userCommentSeg, descriptionSeg, softwareSeg, titleSeg) {
+function parseSegments(userCommentSeg, descriptionSeg) {
   if (!userCommentSeg || !descriptionSeg) {
     return [];
   }
@@ -2041,16 +2001,13 @@ function parseSegments(userCommentSeg, descriptionSeg, softwareSeg, titleSeg) {
   );
   return [
     // Title (required, use default if missing)
-    createTextChunk(
-      "Title",
-      titleSeg?.data ?? stringify(jsonData.Title) ?? NOVELAI_TITLE
-    ),
+    createTextChunk("Title", stringify(jsonData.Title) ?? NOVELAI_TITLE),
     // Description (optional, prefer exifImageDescription over JSON)
     createEncodedChunk("Description", descriptionText, "dynamic"),
     // Software (required, use default if missing)
     createTextChunk(
       "Software",
-      softwareSeg?.data ?? stringify(jsonData.Software) ?? NOVELAI_SOFTWARE
+      stringify(jsonData.Software) ?? NOVELAI_SOFTWARE
     ),
     // Source (optional)
     createTextChunk("Source", stringify(jsonData.Source)),
@@ -2234,7 +2191,7 @@ var softwareConverters = {
 // src/writers/exif.ts
 function buildExifTiffData(segments) {
   const ifd0Segments = segments.filter(
-    (s) => s.source.type === "exifImageDescription" || s.source.type === "exifMake" || s.source.type === "exifSoftware" || s.source.type === "exifDocumentName"
+    (s) => s.source.type === "exifImageDescription" || s.source.type === "exifMake"
   );
   const exifIfdSegments = segments.filter(
     (s) => s.source.type === "exifUserComment"
@@ -2252,12 +2209,6 @@ 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) {
@@ -2385,7 +2336,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.source.type === "exifSoftware" || s.source.type === "exifDocumentName"
+    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake"
   );
   const collectResult = collectNonMetadataSegments(data);
   if (!collectResult.ok) {
@@ -2745,7 +2696,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.source.type === "exifSoftware" || s.source.type === "exifDocumentName"
+    (s) => s.source.type === "exifUserComment" || s.source.type === "exifImageDescription" || s.source.type === "exifMake"
   );
   if (exifSegments.length === 0) {
     return null;