@enslo/sd-metadata 2.0.0 → 2.0.1

package/README.ja.md

@@ -11,7 +11,7 @@ AI生成画像に埋め込まれたメタデータを読み書きするための
 ## 特徴
 
 - **マルチフォーマット対応**: PNG (tEXt / iTXt)、JPEG (COM / Exif)、WebP (Exif)
-- **統一API**: シンプルな `read()` と `write()` 関数で全フォーマットに対応
+- **シンプルAPI**: `read()`、`write()`、`embed()`、`stringify()` — 4つの関数で全ユースケースをカバー
 - **TypeScriptネイティブ**: TypeScriptで書かれており、型定義を完全同梱
 - **ゼロ依存**: Node.jsとブラウザで外部依存なしで動作
 - **フォーマット変換**: PNG、JPEG、WebP間でメタデータをシームレスに変換
@@ -95,10 +95,9 @@ const { read } = require('@enslo/sd-metadata');
 ### Node.jsでの使用
 
 ```typescript
-import { read, write } from '@enslo/sd-metadata';
-import { readFileSync, writeFileSync } from 'fs';
+import { read, stringify } from '@enslo/sd-metadata';
+import { readFileSync } from 'fs';
 
-// サポートされている任意のフォーマットからメタデータを読み込み
 const imageData = readFileSync('image.png');
 const result = read(imageData);
 
@@ -108,24 +107,30 @@ if (result.status === 'success') {
   console.log('Model:', result.metadata.model?.name);
   console.log('Size:', result.metadata.width, 'x', result.metadata.height);
 }
+
+// 読みやすいテキストにフォーマット（任意のstatusで動作）
+const text = stringify(result);
+if (text) {
+  console.log(text);
+}
 ```
 
 ### ブラウザでの使用
 
 ```typescript
-import { read } from '@enslo/sd-metadata';
+import { read, softwareLabels } from '@enslo/sd-metadata';
 
 // ファイル入力を処理
 const fileInput = document.querySelector('input[type="file"]');
 fileInput.addEventListener('change', async (e) => {
   const file = e.target.files[0];
   if (!file) return;
-  
+
   const arrayBuffer = await file.arrayBuffer();
   const result = read(arrayBuffer);
-  
+
   if (result.status === 'success') {
-    document.getElementById('tool').textContent = result.metadata.software;
+    document.getElementById('tool').textContent = softwareLabels[result.metadata.software];
     document.getElementById('prompt').textContent = result.metadata.prompt;
     document.getElementById('model').textContent = result.metadata.model?.name || 'N/A';
   }
@@ -154,7 +159,7 @@ if (result.status === 'success') {
 > 本番環境では `@latest` の代わりに特定のバージョンを指定してください：
 >
 > ```text
-> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@2.0.0/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@2.0.1/dist/index.js
 > ```
 
 ### 応用例
@@ -185,8 +190,7 @@ if (parseResult.status === 'success') {
 }
 ```
 
-> [!TIP]
-> このライブラリはメタデータの読み書きのみを扱います。実際の画像フォーマット変換（ピクセルのデコード/エンコード）には、[sharp](https://www.npmjs.com/package/sharp)、[jimp](https://www.npmjs.com/package/jimp)、ブラウザCanvas APIなどの画像処理ライブラリを使用してください。
+> **Tip:** このライブラリはメタデータの読み書きのみを扱います。実際の画像フォーマット変換（ピクセルのデコード/エンコード）には、[sharp](https://www.npmjs.com/package/sharp)、[jimp](https://www.npmjs.com/package/jimp)、ブラウザCanvas APIなどの画像処理ライブラリを使用してください。
 
 </details>
 
@@ -309,8 +313,7 @@ const result = embed(imageData, {
 });
 ```
 
-> [!TIP]
-> extras のキーが構造化フィールド（例：`Steps`）と一致する場合、extras の値が元の位置で構造化フィールドを上書きします。新しいキーは末尾に追加されます。
+> **Tip:** extras のキーが構造化フィールド（例：`Steps`）と一致する場合、extras の値が元の位置で構造化フィールドを上書きします。新しいキーは末尾に追加されます。
 
 `EmbedMetadata` はすべての `GenerationMetadata` バリアントのサブセットなので、パース結果のメタデータをそのまま渡せます — `characterPrompts` を持つ NovelAI も含めて：
 
@@ -353,10 +356,15 @@ if (text) {
 
 ## APIリファレンス
 
-### `read(input: Uint8Array | ArrayBuffer): ParseResult`
+### `read(input: Uint8Array | ArrayBuffer, options?: ReadOptions): ParseResult`
 
 画像ファイルからメタデータを読み込み、パースします。
 
+**パラメータ:**
+
+- `input` - 画像ファイルデータ（PNG、JPEG、またはWebP）
+- `options` - オプションの読み込み設定（詳細は[型ドキュメント](./docs/types.ja.md)を参照）
+
 **戻り値:**
 
 - `{ status: 'success', metadata, raw }` - パース成功
@@ -575,45 +583,28 @@ type RawMetadata =
   | { format: 'webp'; segments: MetadataSegment[] };
 ```
 
-> [!TIP]
-> TypeScriptユーザー向け：全ての型はエクスポートされており、インポートして使用できます。
->
-> ```typescript
-> import type {
->   BaseMetadata,
->   EmbedMetadata,
->   ParseResult,
->   GenerationMetadata,
->   GenerationSoftware,
->   ModelSettings,
->   SamplingSettings
-> } from '@enslo/sd-metadata';
-> ```
->
-> IDEのIntelliSenseを使用して自動補完とインラインドキュメントを活用してください。
-
 `ModelSettings`、`SamplingSettings`、フォーマット固有の型を含む全てのエクスポート型の詳細なドキュメントについては、[型ドキュメント](./docs/types.ja.md)を参照してください。
 
 ## 開発
 
 ```bash
 # 依存関係をインストール
-npm install
+pnpm install
 
 # テストを実行
-npm test
-
-# ウォッチモード
-npm run test:watch
-
-# テストカバレッジ
-npm run test:coverage
+pnpm test
 
 # ビルド
-npm run build
+pnpm build
 
 # リント
-npm run lint
+pnpm lint
+
+# 型チェック
+pnpm typecheck
+
+# デモサイト起動
+pnpm demo
 ```
 
 ## ライセンス

package/README.md

@@ -11,7 +11,7 @@ A TypeScript library to read and write metadata embedded in AI-generated images.
 ## Features
 
 - **Multi-format Support**: PNG (tEXt / iTXt), JPEG (COM / Exif), WebP (Exif)
-- **Unified API**: Simple `read()` and `write()` functions work across all formats
+- **Simple API**: `read()`, `write()`, `embed()`, `stringify()` — four functions cover all use cases
 - **TypeScript Native**: Written in TypeScript with full type definitions included
 - **Zero Dependencies**: Works in Node.js and browsers without any external dependencies
 - **Format Conversion**: Seamlessly convert metadata between PNG, JPEG, and WebP
@@ -95,8 +95,8 @@ const { read } = require('@enslo/sd-metadata');
 ### Node.js Usage
 
 ```typescript
-import { read, write } from '@enslo/sd-metadata';
-import { readFileSync, writeFileSync } from 'fs';
+import { read, stringify } from '@enslo/sd-metadata';
+import { readFileSync } from 'fs';
 
 const imageData = readFileSync('image.png');
 const result = read(imageData);
@@ -107,24 +107,30 @@ if (result.status === 'success') {
   console.log('Model:', result.metadata.model?.name);
   console.log('Size:', result.metadata.width, 'x', result.metadata.height);
 }
+
+// Format as human-readable text (works with any status)
+const text = stringify(result);
+if (text) {
+  console.log(text);
+}
 ```
 
 ### Browser Usage
 
 ```typescript
-import { read } from '@enslo/sd-metadata';
+import { read, softwareLabels } from '@enslo/sd-metadata';
 
 // Handle file input
 const fileInput = document.querySelector('input[type="file"]');
 fileInput.addEventListener('change', async (e) => {
   const file = e.target.files[0];
   if (!file) return;
-  
+
   const arrayBuffer = await file.arrayBuffer();
   const result = read(arrayBuffer);
-  
+
   if (result.status === 'success') {
-    document.getElementById('tool').textContent = result.metadata.software;
+    document.getElementById('tool').textContent = softwareLabels[result.metadata.software];
     document.getElementById('prompt').textContent = result.metadata.prompt;
     document.getElementById('model').textContent = result.metadata.model?.name || 'N/A';
   }
@@ -153,7 +159,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@2.0.0/dist/index.js
+> https://cdn.jsdelivr.net/npm/@enslo/sd-metadata@2.0.1/dist/index.js
 > ```
 
 ### Advanced Examples
@@ -184,8 +190,7 @@ if (parseResult.status === 'success') {
 }
 ```
 
-> [!TIP]
-> This library handles metadata read/write only. For actual image format conversion (decoding/encoding pixels), use image processing libraries like [sharp](https://www.npmjs.com/package/sharp), [jimp](https://www.npmjs.com/package/jimp), or browser Canvas API.
+> **Tip:** This library handles metadata read/write only. For actual image format conversion (decoding/encoding pixels), use image processing libraries like [sharp](https://www.npmjs.com/package/sharp), [jimp](https://www.npmjs.com/package/jimp), or browser Canvas API.
 
 </details>
 
@@ -305,8 +310,7 @@ const result = embed(imageData, {
 });
 ```
 
-> [!TIP]
-> If an extras key matches a structured field (e.g., `Steps`), the extras value overrides the structured value at its original position. New keys are appended at the end.
+> **Tip:** If an extras key matches a structured field (e.g., `Steps`), the extras value overrides the structured value at its original position. New keys are appended at the end.
 
 Since `EmbedMetadata` is a subset of all `GenerationMetadata` variants, you can pass parsed metadata directly — including NovelAI with its `characterPrompts`:
 
@@ -349,10 +353,15 @@ if (text) {
 
 ## API Reference
 
-### `read(input: Uint8Array | ArrayBuffer): ParseResult`
+### `read(input: Uint8Array | ArrayBuffer, options?: ReadOptions): ParseResult`
 
 Reads and parses metadata from an image file.
 
+**Parameters:**
+
+- `input` - Image file data (PNG, JPEG, or WebP)
+- `options` - Optional read options (see [Type Documentation](./docs/types.md) for details)
+
 **Returns:**
 
 - `{ status: 'success', metadata, raw }` - Successfully parsed
@@ -574,45 +583,28 @@ type RawMetadata =
   | { format: 'webp'; segments: MetadataSegment[] };
 ```
 
-> [!TIP]
-> For TypeScript users: All types are exported and available for import.
->
-> ```typescript
-> import type {
->   BaseMetadata,
->   EmbedMetadata,
->   ParseResult,
->   GenerationMetadata,
->   GenerationSoftware,
->   ModelSettings,
->   SamplingSettings
-> } from '@enslo/sd-metadata';
-> ```
->
-> Use your IDE's IntelliSense for auto-completion and inline documentation.
-
 For detailed documentation of all exported types including `ModelSettings`, `SamplingSettings`, and format-specific types, see the [Type Documentation](./docs/types.md).
 
 ## Development
 
 ```bash
 # Install dependencies
-npm install
+pnpm install
 
 # Run tests
-npm test
-
-# Watch mode
-npm run test:watch
-
-# Test coverage
-npm run test:coverage
+pnpm test
 
 # Build
-npm run build
+pnpm build
 
 # Lint
-npm run lint
+pnpm lint
+
+# Type check
+pnpm typecheck
+
+# Start demo site
+pnpm demo
 ```
 
 ## License

package/dist/index.js

@@ -936,7 +936,13 @@ function toJsonResult(value) {
 }
 
 // src/parsers/comfyui-nodes.ts
-var SAMPLER_TYPES = ["KSampler", "KSamplerAdvanced", "SamplerCustomAdvanced"];
+var SAMPLER_TYPES = [
+  "KSampler",
+  "KSamplerAdvanced",
+  "SamplerCustomAdvanced",
+  "SamplerCustom",
+  "DetailerForEach"
+];
 var LATENT_IMAGE_TYPES = ["EmptyLatentImage"];
 var LATENT_IMAGE_RGTHREE_TYPES = ["SDXL Empty Latent Image (rgthree)"];
 var CHECKPOINT_TYPES = ["CheckpointLoaderSimple", "CheckpointLoader"];
@@ -1004,13 +1010,29 @@ function extractPromptTexts(nodes, sampler) {
     return { promptText: "", negativeText: "" };
   }
   const conditioningSource = resolveConditioningSource(nodes, sampler);
-  const positiveRef = conditioningSource.inputs.positive;
-  const negativeRef = conditioningSource.inputs.negative;
   return {
-    promptText: isNodeReference(positiveRef) ? extractText(nodes, String(positiveRef[0])) : "",
-    negativeText: isNodeReference(negativeRef) ? extractText(nodes, String(negativeRef[0])) : ""
+    promptText: extractTextFromConditioning(
+      nodes,
+      conditioningSource.inputs.positive,
+      "positive"
+    ),
+    negativeText: extractTextFromConditioning(
+      nodes,
+      conditioningSource.inputs.negative,
+      "negative"
+    )
   };
 }
+function extractTextFromConditioning(nodes, ref, condKey, maxDepth = 10) {
+  if (maxDepth <= 0 || !isNodeReference(ref)) return "";
+  const nodeId = String(ref[0]);
+  const text = extractText(nodes, nodeId);
+  if (text) return text;
+  const node = nodes[nodeId];
+  if (!node) return "";
+  const next = node.inputs[condKey];
+  return extractTextFromConditioning(nodes, next, condKey, maxDepth - 1);
+}
 function extractDimensions(latentImage, latentImageRgthree) {
   if (latentImage) {
     const width = Number(latentImage.inputs.width) || 0;
@@ -1033,20 +1055,21 @@ function extractSampling(nodes, sampler) {
   if (sampler.class_type === "SamplerCustomAdvanced") {
     return extractAdvancedSampling(nodes, sampler);
   }
+  if (sampler.class_type === "SamplerCustom") {
+    return extractCustomSampling(nodes, sampler);
+  }
   let seed = sampler.inputs.seed;
   if (isNodeReference(seed)) {
     const seedNode = nodes[String(seed[0])];
     seed = seedNode?.inputs.seed;
   }
-  const rawDenoise = sampler.inputs.denoise;
-  const denoise = typeof rawDenoise === "number" && rawDenoise < 1 ? rawDenoise : void 0;
   return {
     seed,
     steps: sampler.inputs.steps,
     cfg: sampler.inputs.cfg,
     sampler: sampler.inputs.sampler_name,
     scheduler: sampler.inputs.scheduler,
-    denoise
+    denoise: sampler.inputs.denoise
   };
 }
 function extractAdvancedSampling(nodes, sampler) {
@@ -1054,15 +1077,30 @@ function extractAdvancedSampling(nodes, sampler) {
   const guiderNode = resolveNode(nodes, sampler.inputs.guider);
   const samplerSelectNode = resolveNode(nodes, sampler.inputs.sampler);
   const schedulerNode = resolveNode(nodes, sampler.inputs.sigmas);
-  const rawDenoise = schedulerNode?.inputs.denoise;
-  const denoise = typeof rawDenoise === "number" && rawDenoise < 1 ? rawDenoise : void 0;
   return {
     seed: noiseNode?.inputs.noise_seed,
     steps: schedulerNode?.inputs.steps,
     cfg: guiderNode?.inputs.cfg,
     sampler: samplerSelectNode?.inputs.sampler_name,
     scheduler: schedulerNode?.inputs.scheduler,
-    denoise
+    denoise: schedulerNode?.inputs.denoise
+  };
+}
+function extractCustomSampling(nodes, sampler) {
+  const samplerSelectNode = resolveNode(nodes, sampler.inputs.sampler);
+  const schedulerNode = resolveNode(nodes, sampler.inputs.sigmas);
+  let seed = sampler.inputs.noise_seed;
+  if (isNodeReference(seed)) {
+    const seedNode = nodes[String(seed[0])];
+    seed = seedNode?.inputs.seed;
+  }
+  return {
+    seed,
+    steps: schedulerNode?.inputs.steps,
+    cfg: sampler.inputs.cfg,
+    sampler: samplerSelectNode?.inputs.sampler_name,
+    scheduler: schedulerNode?.inputs.scheduler,
+    denoise: schedulerNode?.inputs.denoise
   };
 }
 function extractModel(checkpoint, unetLoader) {
@@ -1192,6 +1230,14 @@ function parseComfyUI(entries) {
     ...merged
   });
 }
+function normalizeDenoise(sampling) {
+  if (!sampling || typeof sampling.denoise !== "number") return sampling;
+  if (sampling.denoise >= 1) {
+    const { denoise: _, ...rest } = sampling;
+    return rest;
+  }
+  return sampling;
+}
 function cleanJsonString(json) {
   return json.replace(/\0+$/, "").replace(/:\s*NaN\b/g, ": null");
 }
@@ -1233,10 +1279,12 @@ function extractComfyUIMetadata(nodes) {
     c.latentImageRgthree
   );
   const hiresSamplerNode = findHiresSampler(nodes);
-  const hiresSampling = hiresSamplerNode ? extractSampling(nodes, hiresSamplerNode) : void 0;
+  const hiresSampling = normalizeDenoise(
+    hiresSamplerNode ? extractSampling(nodes, hiresSamplerNode) : void 0
+  );
   const hiresScale = resolveHiresScale(nodes, c, width);
   const upscalerName = c.hiresModelUpscale?.inputs.model_name;
-  const rawSampling = extractSampling(nodes, c.sampler);
+  const rawSampling = normalizeDenoise(extractSampling(nodes, c.sampler));
   const clipSkip = extractClipSkip(c.clipSetLastLayer);
   return trimObject({
     prompt: promptText || void 0,