npm - @einja/dev-cli - Versions diffs - 0.1.13 → 0.1.14 - Mend

@einja/dev-cli 0.1.13 → 0.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/README.md +27 -0
package/dist/commands/sync.d.ts.map +1 -1
package/dist/commands/sync.js +91 -11
package/dist/commands/sync.js.map +1 -1
package/dist/lib/sync/json-processor.d.ts +80 -0
package/dist/lib/sync/json-processor.d.ts.map +1 -0
package/dist/lib/sync/json-processor.js +167 -0
package/dist/lib/sync/json-processor.js.map +1 -0
package/dist/types/sync.d.ts +17 -0
package/dist/types/sync.d.ts.map +1 -1
package/dist/types/sync.js +10 -0
package/dist/types/sync.js.map +1 -1
package/package.json +1 -1
package/presets/default/.claude/commands/einja/sync-cursor-commands.md +118 -43
package/scaffolds/steering/development/api-development.md +57 -11
package/scaffolds/steering/development/frontend-development.md +251 -104

package/README.md CHANGED Viewed

@@ -92,6 +92,33 @@ npx @einja/dev-cli sync --only hooks
 詳細は [マーカー仕様書](docs/MARKER_SPECIFICATION.md) を参照してください。
+**JSONマージ設定:**
+`.einja-sync.json`に`jsonPaths`を設定することで、JSONファイルのマージ動作を制御できます：
+```json
+{
+  "version": "1.0.0",
+  "lastSync": "2024-01-11T00:00:00Z",
+  "templateVersion": "1.0.0",
+  "files": {},
+  "jsonPaths": {
+    "managed": {
+      "package.json": ["scripts.dev", "scripts.build", "scripts.lint"]
+    },
+    "seed": {
+      "package.json": ["scripts.custom"]
+    }
+  }
+}
+```
+- **managed パス**: 常にテンプレート値で上書き
+- **seed パス**: ローカルに存在しない場合のみテンプレート値をコピー
+- **その他**: ローカル優先（ユーザー追加分を保持）
+**注意**: `jsonPaths`設定は`create-einja-app add`コマンドと共通です。
 ### `task:loop`
 GitHub Issueのタスクを自動実行します（Claude Code経由）。

package/dist/commands/sync.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"~~AAkBA~~,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAmDrD;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,~~CAuXrE~~"}
1	+ {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAmDrD;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAmdrE"}

package/dist/commands/sync.js CHANGED Viewed

@@ -10,6 +10,7 @@ import { createValidationErrorMessage, validateCategories, } from "../lib/sync/c
 import { ConflictReporter } from "../lib/sync/conflict-reporter.js";
 import { DiffEngine } from "../lib/sync/diff-engine.js";
 import { FileFilter } from "../lib/sync/file-filter.js";
+import { JsonProcessor } from "../lib/sync/json-processor.js";
 import { MarkerProcessor } from "../lib/sync/marker-processor.js";
 import { MetadataManager } from "../lib/sync/metadata-manager.js";
 import { SeedSynchronizer } from "../lib/sync/seed-synchronizer.js";
@@ -85,6 +86,7 @@ export async function syncCommand(options) {
     const batchProcessor = new BatchProcessor(10); // バッチサイズ: 10ファイル
     const markerProcessor = new MarkerProcessor();
     const seedSynchronizer = new SeedSynchronizer();
+    const jsonProcessor = new JsonProcessor();
     // 3. メタデータ読み込み
     spinner.start("メタデータを読み込み中...");
     const metadata = await metadataManager.load();
@@ -145,19 +147,57 @@ export async function syncCommand(options) {
                 // 既存ファイル：マージシミュレーション
                 const projectPath = path.join(cwd, target.path);
                 const localContent = await fs.readFile(projectPath, "utf-8");
-                const fileMetadata = metadata.files[target.path];
-                const baseContent = fileMetadata
-                    ? (await metadataManager.getBaseContent(target.templatePath)).content
-                    : "";
-                const mergeResult = diffEngine.merge3Way(baseContent, localContent, templateContent);
-                if (mergeResult.success) {
-                    dryRunStats.updated++;
-                    log(chalk.cyan(`  📝 更新: ${target.path}`), options);
+                // JSONファイルの場合はJsonProcessorを使用
+                if (target.path.endsWith(".json")) {
+                    try {
+                        const templateJson = JSON.parse(templateContent);
+                        const localJson = JSON.parse(localContent);
+                        // jsonPathsの取得（メタデータに存在しない場合はデフォルト値）
+                        const jsonPaths = metadata.jsonPaths || {
+                            managed: {},
+                            seed: {},
+                        };
+                        // ファイル名のみを抽出（create-einja-appの登録形式に合わせる）
+                        const fileName = target.path.split("/").pop() || target.path;
+                        jsonProcessor.mergeJson(templateJson, localJson, jsonPaths, fileName);
+                        // JSONマージは基本的に成功扱い
+                        dryRunStats.updated++;
+                        log(chalk.cyan(`  📝 更新: ${target.path}`), options);
+                    }
+                    catch (error) {
+                        // JSONのパースエラーの場合は3方向マージにフォールバック
+                        const fileMetadata = metadata.files[target.path];
+                        const baseContent = fileMetadata
+                            ? (await metadataManager.getBaseContent(target.templatePath)).content
+                            : "";
+                        const mergeResult = diffEngine.merge3Way(baseContent, localContent, templateContent);
+                        if (mergeResult.success) {
+                            dryRunStats.updated++;
+                            log(chalk.cyan(`  📝 更新: ${target.path}`), options);
+                        }
+                        else {
+                            dryRunStats.conflicts++;
+                            dryRunConflicts.set(target.path, mergeResult.conflicts);
+                            log(chalk.yellow(`  ⚠️  コンフリクト: ${target.path}`), options);
+                        }
+                    }
                 }
                 else {
-                    dryRunStats.conflicts++;
-                    dryRunConflicts.set(target.path, mergeResult.conflicts);
-                    log(chalk.yellow(`  ⚠️  コンフリクト: ${target.path}`), options);
+                    // 非JSONファイルの場合
+                    const fileMetadata = metadata.files[target.path];
+                    const baseContent = fileMetadata
+                        ? (await metadataManager.getBaseContent(target.templatePath)).content
+                        : "";
+                    const mergeResult = diffEngine.merge3Way(baseContent, localContent, templateContent);
+                    if (mergeResult.success) {
+                        dryRunStats.updated++;
+                        log(chalk.cyan(`  📝 更新: ${target.path}`), options);
+                    }
+                    else {
+                        dryRunStats.conflicts++;
+                        dryRunConflicts.set(target.path, mergeResult.conflicts);
+                        log(chalk.yellow(`  ⚠️  コンフリクト: ${target.path}`), options);
+                    }
                 }
             }
         }
@@ -227,6 +267,46 @@ export async function syncCommand(options) {
         }
         // 既存ファイルの内容を読み込み
         const localContent = await fs.readFile(projectPath, "utf-8");
+        // JSONファイルの場合はJsonProcessorを使用
+        if (target.path.endsWith(".json")) {
+            try {
+                const templateJson = JSON.parse(templateContent);
+                const localJson = JSON.parse(localContent);
+                // jsonPathsの取得（メタデータに存在しない場合はデフォルト値）
+                const jsonPaths = metadata.jsonPaths || {
+                    managed: {},
+                    seed: {},
+                };
+                // ファイル名のみを抽出（create-einja-appの登録形式に合わせる）
+                const fileName = target.path.split("/").pop() || target.path;
+                const mergedJson = jsonProcessor.mergeJson(templateJson, localJson, jsonPaths, fileName);
+                const mergedContent = `${JSON.stringify(mergedJson, null, 2)}\n`;
+                return {
+                    target,
+                    templateContent,
+                    mergeContent: mergedContent,
+                    success: true,
+                    conflicts: [],
+                    action: "merged",
+                };
+            }
+            catch (error) {
+                // JSONのパースエラーの場合は3方向マージにフォールバック
+                const fileMetadata = metadata.files[target.path];
+                const baseContent = fileMetadata
+                    ? (await metadataManager.getBaseContent(target.templatePath)).content
+                    : "";
+                const mergeResult = diffEngine.merge3Way(baseContent, localContent, templateContent);
+                return {
+                    target,
+                    templateContent,
+                    mergeContent: mergeResult.content,
+                    success: mergeResult.success,
+                    conflicts: mergeResult.conflicts,
+                    action: "merged",
+                };
+            }
+        }
         // マーカーの有無をチェック（テンプレートまたはローカルにマーカーがある場合）
         const templateHasMarkers = hasMarkers(templateContent);
         const localHasMarkers = hasMarkers(localContent);

package/dist/commands/sync.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"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"}

package/dist/lib/sync/json-processor.d.ts ADDED Viewed

@@ -0,0 +1,80 @@
+import type { JsonPathsConfig } from "../../types/sync.js";
+/**
+ * JSONファイルのマージ処理を行うクラス
+ * marker-processor.tsのパターンに従い、パス指定によるマージを実装します。
+ */
+export declare class JsonProcessor {
+    /**
+     * JSONをマージする
+     * - managed パス: テンプレート値で上書き
+     * - seed パス: ローカル優先（キーが存在しない場合のみコピー）
+     * - その他: ディープマージ（テンプレートの新規キーも追加）
+     *
+     * @param templateJson - テンプレート版のJSON
+     * @param localJson - ローカル版のJSON（nullの場合はテンプレート版をそのまま返す）
+     * @param jsonPaths - JSONパス設定
+     * @param filePath - 対象ファイルパス
+     * @returns マージ後のJSON
+     */
+    mergeJson(templateJson: Record<string, unknown>, localJson: Record<string, unknown> | null, jsonPaths: JsonPathsConfig, filePath: string): Record<string, unknown>;
+    /**
+     * 指定されたパスの値を取得
+     *
+     * @param obj - 対象オブジェクト
+     * @param path - ドット区切りのパス (例: "scripts.build")
+     * @returns パスに対応する値（存在しない場合はundefined）
+     */
+    private getValueAtPath;
+    /**
+     * 指定されたパスに値を設定
+     *
+     * @param obj - 対象オブジェクト
+     * @param path - ドット区切りのパス (例: "scripts.build")
+     * @param value - 設定する値
+     */
+    private setValueAtPath;
+    /**
+     * オブジェクトのディープクローンを作成
+     *
+     * @param obj - クローン対象のオブジェクト
+     * @returns クローンされたオブジェクト
+     */
+    private deepClone;
+    /**
+     * パス設定を考慮したディープマージ
+     *
+     * @param template - テンプレートオブジェクト
+     * @param existing - 既存オブジェクト
+     * @param jsonPaths - JSONパス設定
+     * @param filePath - ファイルパス
+     * @param currentPath - 現在のパス（再帰用）
+     * @returns マージ後のオブジェクト
+     */
+    private deepMergeWithPaths;
+    /**
+     * パスがmanagedかどうか判定
+     *
+     * @param filePath - ファイルパス
+     * @param keyPath - JSONパス
+     * @param jsonPaths - JSONパス設定
+     * @returns managedの場合true
+     */
+    private isPathManaged;
+    /**
+     * パスがseedかどうか判定
+     *
+     * @param filePath - ファイルパス
+     * @param keyPath - JSONパス
+     * @param jsonPaths - JSONパス設定
+     * @returns seedの場合true
+     */
+    private isPathSeed;
+    /**
+     * オブジェクトかどうか判定
+     *
+     * @param value - 判定対象
+     * @returns オブジェクトの場合true
+     */
+    private isObject;
+}
+//# sourceMappingURL=json-processor.d.ts.map

package/dist/lib/sync/json-processor.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"json-processor.d.ts","sourceRoot":"","sources":["../../../src/lib/sync/json-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D;;;GAGG;AACH,qBAAa,aAAa;IACxB;;;;;;;;;;;OAWG;IACH,SAAS,CACP,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EACzC,SAAS,EAAE,eAAe,EAC1B,QAAQ,EAAE,MAAM,GACf,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAU1B;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAiBtB;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAgBtB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAkBjB;;;;;;;;;OASG;IACH,OAAO,CAAC,kBAAkB;IAkD1B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IAMlB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;CAGjB"}

package/dist/lib/sync/json-processor.js ADDED Viewed

@@ -0,0 +1,167 @@
+/**
+ * JSONファイルのマージ処理を行うクラス
+ * marker-processor.tsのパターンに従い、パス指定によるマージを実装します。
+ */
+export class JsonProcessor {
+    /**
+     * JSONをマージする
+     * - managed パス: テンプレート値で上書き
+     * - seed パス: ローカル優先（キーが存在しない場合のみコピー）
+     * - その他: ディープマージ（テンプレートの新規キーも追加）
+     *
+     * @param templateJson - テンプレート版のJSON
+     * @param localJson - ローカル版のJSON（nullの場合はテンプレート版をそのまま返す）
+     * @param jsonPaths - JSONパス設定
+     * @param filePath - 対象ファイルパス
+     * @returns マージ後のJSON
+     */
+    mergeJson(templateJson, localJson, jsonPaths, filePath) {
+        // ローカルファイルが存在しない場合はテンプレート版をそのまま返す
+        if (!localJson) {
+            return this.deepClone(templateJson);
+        }
+        // ディープマージ（パス設定を考慮）
+        return this.deepMergeWithPaths(templateJson, localJson, jsonPaths, filePath, "");
+    }
+    /**
+     * 指定されたパスの値を取得
+     *
+     * @param obj - 対象オブジェクト
+     * @param path - ドット区切りのパス (例: "scripts.build")
+     * @returns パスに対応する値（存在しない場合はundefined）
+     */
+    getValueAtPath(obj, path) {
+        const keys = path.split(".");
+        let current = obj;
+        for (const key of keys) {
+            if (current === null || current === undefined) {
+                return undefined;
+            }
+            if (typeof current !== "object") {
+                return undefined;
+            }
+            current = current[key];
+        }
+        return current;
+    }
+    /**
+     * 指定されたパスに値を設定
+     *
+     * @param obj - 対象オブジェクト
+     * @param path - ドット区切りのパス (例: "scripts.build")
+     * @param value - 設定する値
+     */
+    setValueAtPath(obj, path, value) {
+        const keys = path.split(".");
+        let current = obj;
+        for (let i = 0; i < keys.length - 1; i++) {
+            const key = keys[i];
+            if (!(key in current) || typeof current[key] !== "object" || current[key] === null) {
+                current[key] = {};
+            }
+            current = current[key];
+        }
+        const lastKey = keys[keys.length - 1];
+        current[lastKey] = value;
+    }
+    /**
+     * オブジェクトのディープクローンを作成
+     *
+     * @param obj - クローン対象のオブジェクト
+     * @returns クローンされたオブジェクト
+     */
+    deepClone(obj) {
+        if (obj === null || typeof obj !== "object") {
+            return obj;
+        }
+        if (Array.isArray(obj)) {
+            return obj.map((item) => this.deepClone(item));
+        }
+        const cloned = {};
+        for (const key in obj) {
+            if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                cloned[key] = this.deepClone(obj[key]);
+            }
+        }
+        return cloned;
+    }
+    /**
+     * パス設定を考慮したディープマージ
+     *
+     * @param template - テンプレートオブジェクト
+     * @param existing - 既存オブジェクト
+     * @param jsonPaths - JSONパス設定
+     * @param filePath - ファイルパス
+     * @param currentPath - 現在のパス（再帰用）
+     * @returns マージ後のオブジェクト
+     */
+    deepMergeWithPaths(template, existing, jsonPaths, filePath, currentPath) {
+        const result = this.deepClone(existing);
+        for (const [key, templateValue] of Object.entries(template)) {
+            const keyPath = currentPath ? `${currentPath}.${key}` : key;
+            if (this.isPathManaged(filePath, keyPath, jsonPaths)) {
+                // managed: テンプレートで上書き
+                result[key] = this.deepClone(templateValue);
+            }
+            else if (this.isPathSeed(filePath, keyPath, jsonPaths)) {
+                // seed: オブジェクトの場合はディープマージ（既存にないキーのみ追加）
+                if (this.isObject(templateValue) && this.isObject(existing[key])) {
+                    // seedパス内でもディープマージ（既存にないキーのみ追加）
+                    result[key] = this.deepMergeWithPaths(templateValue, existing[key], jsonPaths, filePath, keyPath);
+                }
+                else if (!(key in existing)) {
+                    // seedパスはローカル優先（キーが存在しない場合のみ追加）
+                    result[key] = this.deepClone(templateValue);
+                }
+                // 既存値がある場合は何もしない（既存値を保持）
+            }
+            else if (this.isObject(templateValue) && this.isObject(existing[key])) {
+                // 両方オブジェクト: 再帰的にマージ
+                result[key] = this.deepMergeWithPaths(templateValue, existing[key], jsonPaths, filePath, keyPath);
+            }
+            else if (!(key in existing)) {
+                // 既存にないキー: 追加（これが重要！）
+                result[key] = this.deepClone(templateValue);
+            }
+            // 既存にあるキー: 保持（何もしない）
+        }
+        return result;
+    }
+    /**
+     * パスがmanagedかどうか判定
+     *
+     * @param filePath - ファイルパス
+     * @param keyPath - JSONパス
+     * @param jsonPaths - JSONパス設定
+     * @returns managedの場合true
+     */
+    isPathManaged(filePath, keyPath, jsonPaths) {
+        const managedPaths = jsonPaths.managed[filePath] || [];
+        // keyPath が managedPaths のいずれかで始まるかチェック
+        // 例: keyPath="scripts.dev" が managedPaths=["scripts"] にマッチ
+        return managedPaths.some((p) => keyPath === p || keyPath.startsWith(`${p}.`));
+    }
+    /**
+     * パスがseedかどうか判定
+     *
+     * @param filePath - ファイルパス
+     * @param keyPath - JSONパス
+     * @param jsonPaths - JSONパス設定
+     * @returns seedの場合true
+     */
+    isPathSeed(filePath, keyPath, jsonPaths) {
+        const seedPaths = jsonPaths.seed[filePath] || [];
+        // keyPath が seedPaths のいずれかで始まるかチェック
+        return seedPaths.some((p) => keyPath === p || keyPath.startsWith(`${p}.`));
+    }
+    /**
+     * オブジェクトかどうか判定
+     *
+     * @param value - 判定対象
+     * @returns オブジェクトの場合true
+     */
+    isObject(value) {
+        return value !== null && typeof value === "object" && !Array.isArray(value);
+    }
+}
+//# sourceMappingURL=json-processor.js.map

package/dist/lib/sync/json-processor.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"json-processor.js","sourceRoot":"","sources":["../../../src/lib/sync/json-processor.ts"],"names":[],"mappings":"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"}

package/dist/types/sync.d.ts CHANGED Viewed

@@ -7,6 +7,15 @@ export declare const FileMetadataSchema: z.ZodObject<{
     syncedAt: z.ZodString;
     conflicts: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strip>;
+/**
+ * JSON パス設定の Zod スキーマ
+ * managed: テンプレート値で上書き
+ * seed: ローカル優先（キーが存在しない場合のみコピー）
+ */
+export declare const JsonPathsConfigSchema: z.ZodObject<{
+    managed: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString>>;
+    seed: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString>>;
+}, z.core.$strip>;
 /**
  * 同期メタデータのZodスキーマ
  */
@@ -19,11 +28,19 @@ export declare const SyncMetadataSchema: z.ZodObject<{
         syncedAt: z.ZodString;
         conflicts: z.ZodOptional<z.ZodArray<z.ZodString>>;
     }, z.core.$strip>>;
+    jsonPaths: z.ZodOptional<z.ZodObject<{
+        managed: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString>>;
+        seed: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodString>>;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 /**
  * ファイルメタデータの型定義
  */
 export type FileMetadata = z.infer<typeof FileMetadataSchema>;
+/**
+ * JSON パス設定の型定義
+ */
+export type JsonPathsConfig = z.infer<typeof JsonPathsConfigSchema>;
 /**
  * 同期メタデータの型定義
  */

package/dist/types/sync.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/types/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,eAAO,MAAM,kBAAkB;;;;iBAI7B,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,kBAAkB~~;;;;;;;;;iBAK7B~~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"}
1	+ {"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/types/sync.ts"],"names":[],"mappings":"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"}

package/dist/types/sync.js CHANGED Viewed

@@ -7,6 +7,15 @@ export const FileMetadataSchema = z.object({
     syncedAt: z.string(),
     conflicts: z.array(z.string()).optional(),
 });
+/**
+ * JSON パス設定の Zod スキーマ
+ * managed: テンプレート値で上書き
+ * seed: ローカル優先（キーが存在しない場合のみコピー）
+ */
+export const JsonPathsConfigSchema = z.object({
+    managed: z.record(z.string(), z.array(z.string())),
+    seed: z.record(z.string(), z.array(z.string())),
+});
 /**
  * 同期メタデータのZodスキーマ
  */
@@ -15,5 +24,6 @@ export const SyncMetadataSchema = z.object({
     lastSync: z.string(),
     templateVersion: z.string(),
     files: z.record(z.string(), FileMetadataSchema),
+    jsonPaths: JsonPathsConfigSchema.optional(),
 });
 //# sourceMappingURL=sync.js.map

package/dist/types/sync.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/types/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC;~~CAChD~~,CAAC,CAAC"}
1	+ {"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/types/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC1C,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;CAChD,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,CAAC;IAC/C,SAAS,EAAE,qBAAqB,CAAC,QAAQ,EAAE;CAC5C,CAAC,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@einja/dev-cli",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Einja CLI - .claude設定とテンプレート同期をnpxでインストール",
   "type": "module",
   "main": "./dist/index.js",