ziku 0.21.3 → 0.22.0

package/dist/hash-BeQ4-IoO.mjs

@@ -0,0 +1,3 @@
+import { d as hashFiles, u as hashContent } from "./index.mjs";
+
+export { hashFiles };

package/dist/index.mjs

@@ -5,6 +5,7 @@ import { defineCommand, runMain } from "citty";
 import { copyFileSync, existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { dirname, join, resolve } from "pathe";
+import * as YAML from "yaml";
 import { parse, stringify } from "yaml";
 import { z } from "zod";
 import { downloadTemplate } from "giget";
@@ -17,6 +18,7 @@ import { match } from "ts-pattern";
 import { execFileSync } from "node:child_process";
 import { Octokit } from "@octokit/rest";
 import { createHash } from "node:crypto";
+import * as TOML from "smol-toml";
 import { z as z$1 } from "zod/v4";
 
 //#region rolldown:runtime
@@ -24,7 +26,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version$2 = "0.21.3";
+var version$2 = "0.22.0";
 
 //#endregion
 //#region src/modules/schemas.ts
@@ -870,7 +872,7 @@ function getEffectivePatterns(_moduleId, modulePatterns, config) {
 *
 * 削除条件: ziku が別の UI フレームワーク（ink 等）に移行する場合。
 */
-const version$1 = "0.21.3";
+const version$1 = "0.22.0";
 /** CLI の開始表示 */
 function intro(command) {
 	const title = command ? `ziku ${command}` : "ziku";
@@ -2038,7 +2040,7 @@ async function hashFiles(dir, patterns) {
 
 //#endregion
 //#region src/commands/init.ts
-const version = "0.21.3";
+const version = "0.22.0";
 const initCommand = defineCommand({
 	meta: {
 		name: "ziku",
@@ -2396,7 +2398,15 @@ function threeWayMerge({ base, local, template, filePath }) {
 		const jsonResult = mergeJsonContent(base, local, template);
 		if (jsonResult !== null) return jsonResult;
 	}
-	return textThreeWayMerge(base, local, template);
+	if (filePath && isTomlFile(filePath)) {
+		const tomlResult = mergeTomlContent(base, local, template);
+		if (tomlResult !== null) return tomlResult;
+	}
+	if (filePath && isYamlFile(filePath)) {
+		const yamlResult = mergeYamlContent(base, local, template);
+		if (yamlResult !== null) return yamlResult;
+	}
+	return textThreeWayMerge(base, local, template, filePath);
 }
 /**
 * JSON/JSONC ファイルをキーレベルで 3-way マージする。
@@ -2528,10 +2538,164 @@ function deepEqual(a, b) {
 	if (aKeys.length !== bKeys.length) return false;
 	return aKeys.every((key) => key in bObj && deepEqual(aObj[key], bObj[key]));
 }
+/**
+* TOML ファイルをキーレベルで 3-way マージする。
+*
+* 背景: TOML ファイルにコンフリクトマーカーを挿入するとパーサーが壊れるため、
+* JSON マージと同様にキーレベルで変更を検出し、非コンフリクト部分を自動マージする。
+* コンフリクトがあるキーはローカル値を採用し、conflictDetails で報告する。
+*
+* 制約: smol-toml の stringify はコメントを保持しないため、マージ結果では
+* ローカルのコメントが失われる。ただし、壊れた TOML を出力するよりも
+* 正しい TOML を出力することを優先する。
+*
+* @returns マージ結果。TOML パースに失敗した場合は null（テキストマージにフォールバック）。
+*/
+function mergeTomlContent(base, local, template) {
+	let baseObj;
+	let localObj;
+	let templateObj;
+	try {
+		baseObj = TOML.parse(base);
+		localObj = TOML.parse(local);
+		templateObj = TOML.parse(template);
+	} catch {
+		return null;
+	}
+	const templateDiffs = getJsonDiffs(baseObj, templateObj);
+	const localDiffs = getJsonDiffs(baseObj, localObj);
+	const mergedObj = structuredClone(localObj);
+	const conflictDetails = [];
+	for (const diff of templateDiffs) {
+		if (localDiffs.some((ld) => pathsOverlap(ld.path, diff.path))) {
+			const localVal = getValueAtPath(localObj, diff.path);
+			const templateVal = diff.type === "remove" ? void 0 : diff.value;
+			if (deepEqual(localVal, templateVal)) continue;
+			conflictDetails.push({
+				path: diff.path,
+				localValue: localVal,
+				templateValue: templateVal
+			});
+			continue;
+		}
+		if (diff.type === "remove") deleteAtPath(mergedObj, diff.path);
+		else setAtPath(mergedObj, diff.path, diff.value);
+	}
+	return {
+		content: TOML.stringify(mergedObj),
+		hasConflicts: conflictDetails.length > 0,
+		conflictDetails
+	};
+}
+/**
+* YAML ファイルをキーレベルで 3-way マージする。
+*
+* 背景: YAML ファイルもインデントベースの構造を持ち、テキストマージで
+* 壊れることがある。JSON/TOML と同様にキーレベルでマージする。
+*
+* @returns マージ結果。YAML パースに失敗した場合は null（テキストマージにフォールバック）。
+*/
+function mergeYamlContent(base, local, template) {
+	let baseObj;
+	let localObj;
+	let templateObj;
+	try {
+		baseObj = YAML.parse(base);
+		localObj = YAML.parse(local);
+		templateObj = YAML.parse(template);
+	} catch {
+		return null;
+	}
+	if (baseObj == null || localObj == null || templateObj == null) return null;
+	if (typeof baseObj !== "object" || typeof localObj !== "object" || typeof templateObj !== "object") return null;
+	const templateDiffs = getJsonDiffs(baseObj, templateObj);
+	const localDiffs = getJsonDiffs(baseObj, localObj);
+	const mergedObj = structuredClone(localObj);
+	const conflictDetails = [];
+	for (const diff of templateDiffs) {
+		if (localDiffs.some((ld) => pathsOverlap(ld.path, diff.path))) {
+			const localVal = getValueAtPath(localObj, diff.path);
+			const templateVal = diff.type === "remove" ? void 0 : diff.value;
+			if (deepEqual(localVal, templateVal)) continue;
+			conflictDetails.push({
+				path: diff.path,
+				localValue: localVal,
+				templateValue: templateVal
+			});
+			continue;
+		}
+		if (diff.type === "remove") deleteAtPath(mergedObj, diff.path);
+		else setAtPath(mergedObj, diff.path, diff.value);
+	}
+	return {
+		content: YAML.stringify(mergedObj),
+		hasConflicts: conflictDetails.length > 0,
+		conflictDetails
+	};
+}
+/**
+* ネストされたオブジェクトのパスに値を設定する。
+* 中間オブジェクトが存在しない場合は自動的に作成する。
+*/
+function setAtPath(obj, path, value) {
+	let current = obj;
+	for (let i = 0; i < path.length - 1; i++) {
+		const key = path[i];
+		if (current == null || typeof current !== "object") return;
+		const record = current;
+		if (!(key in record) || record[key] == null || typeof record[key] !== "object") record[key] = {};
+		current = record[key];
+	}
+	if (current != null && typeof current === "object") current[path[path.length - 1]] = value;
+}
+/**
+* ネストされたオブジェクトのパスにあるキーを削除する。
+*/
+function deleteAtPath(obj, path) {
+	let current = obj;
+	for (let i = 0; i < path.length - 1; i++) {
+		const key = path[i];
+		if (current == null || typeof current !== "object") return;
+		current = current[key];
+	}
+	if (current != null && typeof current === "object") delete current[path[path.length - 1]];
+}
 function isJsonFile(filePath) {
 	const lower = filePath.toLowerCase();
 	return lower.endsWith(".json") || lower.endsWith(".jsonc");
 }
+function isTomlFile(filePath) {
+	return filePath.toLowerCase().endsWith(".toml");
+}
+function isYamlFile(filePath) {
+	const lower = filePath.toLowerCase();
+	return lower.endsWith(".yml") || lower.endsWith(".yaml");
+}
+/**
+* 構造ファイル（TOML/YAML）のマージ結果をパースして妥当性を検証する。
+*
+* 背景: テキストベースの diff/patch は行レベルでマージするため、
+* fuzz factor でパッチが「成功」しても、TOML のセクション重複や
+* YAML のインデント崩れ等、構造的に壊れた出力を生むことがある。
+* git の merge がこのような破損を出さないのに対し、patch ベースの
+* マージはこの検証が必要。パース失敗時はコンフリクトマーカーに
+* フォールバックすることで、壊れたファイルの生成を防ぐ。
+*/
+function validateStructuredContent(content, filePath) {
+	if (isTomlFile(filePath)) try {
+		TOML.parse(content);
+		return true;
+	} catch {
+		return false;
+	}
+	if (isYamlFile(filePath)) try {
+		YAML.parse(content);
+		return true;
+	} catch {
+		return false;
+	}
+	return true;
+}
 /**
 * テキストファイルの 3-way マージ。fuzz factor によるパッチ適用と
 * hunk 単位のコンフリクトマーカーで、従来のファイル全体マーカーを改善。
@@ -2539,25 +2703,36 @@ function isJsonFile(filePath) {
 * 背景: TOML 等の構造ファイルにファイル全体のコンフリクトマーカーを入れると
 * パーサーが壊れる。hunk 単位にすることで影響範囲を最小化する。
 *
+* filePath が渡された場合、パッチ適用後に構造ファイルの妥当性を検証する。
+* fuzz factor でパッチが「成功」しても、TOML のセクション重複等で
+* 壊れたファイルが生成されることがあるため、パース検証で検出して
+* コンフリクトマーカーにフォールバックする。
+*
 * 戦略:
-* 1. 標準パッチ適用（fuzz=0）
-* 2. fuzz factor を上げてリトライ（fuzz=2）
+* 1. 標準パッチ適用（fuzz=0）+ 構造検証
+* 2. fuzz factor を上げてリトライ（fuzz=2）+ 構造検証
 * 3. 失敗時: hunk 単位で適用を試み、失敗した hunk のみにマーカーを付与
 */
-function textThreeWayMerge(base, local, template) {
+function textThreeWayMerge(base, local, template, filePath) {
 	const patch = createPatch("file", base, template);
 	const result = applyPatch(local, patch);
-	if (typeof result === "string") return {
-		content: result,
-		hasConflicts: false,
-		conflictDetails: []
-	};
+	if (typeof result === "string") {
+		if (filePath && !validateStructuredContent(result, filePath)) return mergeWithPerHunkMarkers(base, local, template);
+		return {
+			content: result,
+			hasConflicts: false,
+			conflictDetails: []
+		};
+	}
 	const resultFuzzy = applyPatch(local, patch, { fuzzFactor: 2 });
-	if (typeof resultFuzzy === "string") return {
-		content: resultFuzzy,
-		hasConflicts: false,
-		conflictDetails: []
-	};
+	if (typeof resultFuzzy === "string") {
+		if (filePath && !validateStructuredContent(resultFuzzy, filePath)) return mergeWithPerHunkMarkers(base, local, template);
+		return {
+			content: resultFuzzy,
+			hasConflicts: false,
+			conflictDetails: []
+		};
+	}
 	return mergeWithPerHunkMarkers(base, local, template);
 }
 /**
@@ -3364,10 +3539,10 @@ const pushCommand = defineCommand({
 			const mergedContents = /* @__PURE__ */ new Map();
 			let pushableFilePaths = /* @__PURE__ */ new Set();
 			{
-				const { hashFiles: hashFiles$1 } = await import("./hash-CjblHutQ.mjs");
-				const { classifyFiles: classifyFiles$1 } = await import("./merge-CPx9nRrL.mjs");
-				const { getModuleById: getModuleById$1 } = await import("./modules-DlNMFNLz.mjs");
-				const { getEffectivePatterns: getEffectivePatterns$1 } = await import("./patterns-CxgZLnrY.mjs");
+				const { hashFiles: hashFiles$1 } = await import("./hash-BeQ4-IoO.mjs");
+				const { classifyFiles: classifyFiles$1 } = await import("./merge-DtLUiQDW.mjs");
+				const { getModuleById: getModuleById$1 } = await import("./modules-BN0Qb_wy.mjs");
+				const { getEffectivePatterns: getEffectivePatterns$1 } = await import("./patterns-BKEQ73qt.mjs");
 				const allPatterns = [];
 				for (const moduleId of effectiveModuleIds) {
 					const mod = getModuleById$1(moduleId, moduleList);
@@ -3390,14 +3565,14 @@ const pushCommand = defineCommand({
 					for (const file of classification.autoUpdate) log.message(`  ${pc$1.dim("↓")} ${pc$1.dim(file)}`);
 				}
 				if (classification.conflicts.length > 0) {
-					const { threeWayMerge: threeWayMerge$1, asBaseContent: asBaseContent$1, asLocalContent: asLocalContent$1, asTemplateContent: asTemplateContent$1 } = await import("./merge-CPx9nRrL.mjs");
+					const { threeWayMerge: threeWayMerge$1, asBaseContent: asBaseContent$1, asLocalContent: asLocalContent$1, asTemplateContent: asTemplateContent$1 } = await import("./merge-DtLUiQDW.mjs");
 					const baseInfo = config.baseRef ? `since ${pc$1.bold(config.baseRef.slice(0, 7))} (your last sync)` : "since your last pull/init";
 					log.warn(`Template updated ${baseInfo} — ${classification.conflicts.length} conflict(s) detected, attempting auto-merge...`);
 					let baseTemplateDir;
 					let baseCleanup;
 					if (config.baseRef) try {
 						log.info(`Downloading base version (${config.baseRef.slice(0, 7)}...) for merge...`);
-						const { downloadTemplateToTemp: downloadBase } = await import("./template-CPgSJ67F.mjs");
+						const { downloadTemplateToTemp: downloadBase } = await import("./template-BmUA_WdM.mjs");
 						const baseResult = await downloadBase(targetDir, `gh:${config.source.owner}/${config.source.repo}#${config.baseRef}`);
 						baseTemplateDir = baseResult.templateDir;
 						baseCleanup = baseResult.cleanup;
@@ -3822,4 +3997,4 @@ async function run() {
 run();
 
 //#endregion
-export { addPatternToModulesFileWithCreate as C, saveModulesFile as D, modulesFileExists as E, addPatternToModulesFile as S, loadModulesFile as T, matchesPatterns as _, hasConflictMarkers as a, getModuleById as b, hashContent as c, buildTemplateSource as d, copyFile as f, getEffectivePatterns as g, writeFileWithStrategy as h, classifyFiles as i, hashFiles as l, fetchTemplates as m, asLocalContent as n, mergeJsonContent as o, downloadTemplateToTemp as p, asTemplateContent as r, threeWayMerge as s, asBaseContent as t, TEMPLATE_SOURCE as u, resolvePatterns as v, getModulesFilePath as w, getPatternsByModuleIds as x, defaultModules as y };
+export { getPatternsByModuleIds as C, loadModulesFile as D, getModulesFilePath as E, modulesFileExists as O, getModuleById as S, addPatternToModulesFileWithCreate as T, writeFileWithStrategy as _, hasConflictMarkers as a, resolvePatterns as b, mergeYamlContent as c, hashFiles as d, TEMPLATE_SOURCE as f, fetchTemplates as g, downloadTemplateToTemp as h, classifyFiles as i, saveModulesFile as k, threeWayMerge as l, copyFile as m, asLocalContent as n, mergeJsonContent as o, buildTemplateSource as p, asTemplateContent as r, mergeTomlContent as s, asBaseContent as t, hashContent as u, getEffectivePatterns as v, addPatternToModulesFile as w, defaultModules as x, matchesPatterns as y };

package/dist/merge-DtLUiQDW.mjs

@@ -0,0 +1,3 @@
+import { a as hasConflictMarkers, c as mergeYamlContent, i as classifyFiles, l as threeWayMerge, n as asLocalContent, o as mergeJsonContent, r as asTemplateContent, s as mergeTomlContent, t as asBaseContent } from "./index.mjs";
+
+export { asBaseContent, asLocalContent, asTemplateContent, classifyFiles, threeWayMerge };

package/dist/modules-BN0Qb_wy.mjs

@@ -0,0 +1,3 @@
+import { C as getPatternsByModuleIds, D as loadModulesFile, E as getModulesFilePath, O as modulesFileExists, S as getModuleById, T as addPatternToModulesFileWithCreate, k as saveModulesFile, w as addPatternToModulesFile, x as defaultModules } from "./index.mjs";
+
+export { getModuleById };

package/dist/patterns-BKEQ73qt.mjs

@@ -0,0 +1,3 @@
+import { b as resolvePatterns, v as getEffectivePatterns, y as matchesPatterns } from "./index.mjs";
+
+export { getEffectivePatterns };

package/dist/template-BmUA_WdM.mjs

@@ -0,0 +1,3 @@
+import { _ as writeFileWithStrategy, f as TEMPLATE_SOURCE, g as fetchTemplates, h as downloadTemplateToTemp, m as copyFile, p as buildTemplateSource } from "./index.mjs";
+
+export { downloadTemplateToTemp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ziku",
-  "version": "0.21.3",
+  "version": "0.22.0",
   "description": "Interactive CLI to scaffold development environment templates",
   "repository": {
     "type": "git",
@@ -30,6 +30,7 @@
     "jsonc-parser": "^3.3.1",
     "pathe": "^2.0.3",
     "picocolors": "^1.1.1",
+    "smol-toml": "^1.6.0",
     "tinyglobby": "^0.2.15",
     "ts-pattern": "^5.9.0",
     "yaml": "^2.8.2",

package/dist/hash-CjblHutQ.mjs

@@ -1,3 +0,0 @@
-import { c as hashContent, l as hashFiles } from "./index.mjs";
-
-export { hashFiles };

package/dist/merge-CPx9nRrL.mjs

@@ -1,3 +0,0 @@
-import { a as hasConflictMarkers, i as classifyFiles, n as asLocalContent, o as mergeJsonContent, r as asTemplateContent, s as threeWayMerge, t as asBaseContent } from "./index.mjs";
-
-export { asBaseContent, asLocalContent, asTemplateContent, classifyFiles, threeWayMerge };

package/dist/modules-DlNMFNLz.mjs

@@ -1,3 +0,0 @@
-import { C as addPatternToModulesFileWithCreate, D as saveModulesFile, E as modulesFileExists, S as addPatternToModulesFile, T as loadModulesFile, b as getModuleById, w as getModulesFilePath, x as getPatternsByModuleIds, y as defaultModules } from "./index.mjs";
-
-export { getModuleById };

package/dist/patterns-CxgZLnrY.mjs

@@ -1,3 +0,0 @@
-import { _ as matchesPatterns, g as getEffectivePatterns, v as resolvePatterns } from "./index.mjs";
-
-export { getEffectivePatterns };

package/dist/template-CPgSJ67F.mjs

@@ -1,3 +0,0 @@
-import { d as buildTemplateSource, f as copyFile, h as writeFileWithStrategy, m as fetchTemplates, p as downloadTemplateToTemp, u as TEMPLATE_SOURCE } from "./index.mjs";
-
-export { downloadTemplateToTemp };