firebase-dataconnect-bootstrap 1.2.0 → 1.2.1

package/README.md

@@ -20,7 +20,28 @@ npx firebase-dataconnect-bootstrap
 ```
 
 対話モードは日本語で質問が表示されます。  
-同じリポジトリで再実行すると、保存済み設定を初期値として設定変更できます。
+同じリポジトリで再実行すると、保存済み設定を初期値として設定変更できます。  
+既存設定がある場合は、対話中に「新しいコレクション設定を追加するか」を選べます。
+
+## 追加コレクションを非対話で追加する例
+
+```bash
+npx firebase-dataconnect-bootstrap \
+  --yes \
+  --add-collection \
+  --target . \
+  --project your-firebase-project-id \
+  --document 'articles/{articleId}' \
+  --function onArticlesWritten \
+  --vector-search \
+  --vector-collection 'articles' \
+  --source-text-field 'body' \
+  --vector-field 'embedding' \
+  --search-fields 'title,body,updatedAt' \
+  --search-function 'searchArticlesByVector' \
+  --top-k 8 \
+  --no-install
+```
 
 ## 非対話モード例
 
@@ -47,6 +68,7 @@ npx firebase-dataconnect-bootstrap \
 ## 主なオプション
 
 - `--config <name>`: 設定保存ファイル名（既定: `.firebase-dataconnect-bootstrap.json`）
+- `--add-collection`: 再実行時に既存設定へ新しいコレクション設定を追加
 - `--vector-search` / `--no-vector-search`: ベクトル検索 scaffold の有効/無効
 - `--vector-collection <path>`: 検索対象コレクション
 - `--source-text-field <name>`: 埋め込み更新対象のテキストフィールド
@@ -55,13 +77,13 @@ npx firebase-dataconnect-bootstrap \
 - `--search-function <name>`: 生成する `onRequest` 関数名
 - `--top-k <number>`: 検索時のデフォルト上位件数
 
-## 生成される主な関数
+## 生成される主な関数（コレクションごと）
 
-- `firestoreOnDocumentWritten.*`
+- `onDocumentWritten_<functionName>.*`
   - `sourceTextField` の内容を `embedText` に渡し、`vectorField` へ保存
-- `vectorSearchOnRequest.*`
+- `vectorSearchOnRequest_<searchFunctionName>.*`
   - HTTP リクエストの `vector`（または `query`）でコサイン類似度検索
-- `vectorSearchEmbedding.*`
+- `vectorSearchEmbedding_<functionName>.*`
   - `embedText` を実装する差し替えポイント（デフォルトは `null` を返す）
 
 ## npm モジュールとして検索クライアントを使う

package/dist/cli.js

@@ -15,6 +15,7 @@ Options:
   --document <path>          Firestore document path (default: meetingSummaries/{summaryId})
   --function <name>          Function export name (default: onMeetingSummaryWritten)
   --config <name>            Saved config filename (default: .firebase-dataconnect-bootstrap.json)
+  --add-collection           Add a new collection setting on re-run
   --install                  Run npm install in functions directory
   --no-install               Skip npm install in functions directory
   --vector-search            Enable vector search scaffolding
@@ -40,6 +41,7 @@ function parseArgs(argv) {
         installDependencies: undefined,
         configFileName: undefined,
         vectorSearch: {},
+        addCollection: undefined,
         yes: false,
         help: false
     };
@@ -69,6 +71,10 @@ function parseArgs(argv) {
             args.vectorSearch = { ...(args.vectorSearch ?? {}), enabled: false };
             continue;
         }
+        if (token === "--add-collection") {
+            args.addCollection = true;
+            continue;
+        }
         if (token.startsWith("--target=")) {
             args.targetDir = token.slice("--target=".length);
             continue;

package/dist/index.d.ts

@@ -2,5 +2,5 @@ export { run } from "./main.js";
 export { runCli } from "./cli.js";
 export { collectConfig } from "./prompt.js";
 export { createVectorSearchClient, searchByVector } from "./search-client.js";
-export type { CliArgs, RunResult, SetupConfig, VectorSearchConfig } from "./types.js";
+export type { CliArgs, PersistedBootstrapConfig, RunResult, SetupConfig, SetupTargetConfig, VectorSearchConfig } from "./types.js";
 export type { SearchByVectorInput, VectorSearchClientOptions, VectorSearchHit, VectorSearchResponse } from "./search-client.js";

package/dist/main.js

@@ -73,6 +73,10 @@ function buildGeneratedImportPath(moduleStyle, extension, moduleBaseName) {
     }
     return `./${moduleBaseName}${extension}`;
 }
+function toSafeFileSegment(value) {
+    const normalized = value.replace(/[^A-Za-z0-9_-]/g, "_");
+    return normalized || "generated";
+}
 function buildDataconnectYaml(config) {
     return `specVersion: "v1alpha"
 serviceId: "${config.serviceId}"
@@ -155,7 +159,7 @@ export async function embedText(_text) {
 }
 `;
 }
-function buildFunctionModule({ style, config }) {
+function buildFunctionModule({ style, config, embeddingImportPath }) {
     if (style === "cjs") {
         if (!config.vectorSearch.enabled) {
             return `const { onDocumentWritten } = require("firebase-functions/v2/firestore");
@@ -179,7 +183,7 @@ module.exports = { ${config.functionName} };
         }
         return `const { onDocumentWritten } = require("firebase-functions/v2/firestore");
 const logger = require("firebase-functions/logger");
-const { embedText } = require("./vectorSearchEmbedding");
+const { embedText } = require("${embeddingImportPath}");
 
 const SOURCE_TEXT_FIELD = ${JSON.stringify(config.vectorSearch.sourceTextField)};
 const VECTOR_FIELD = ${JSON.stringify(config.vectorSearch.vectorField)};
@@ -243,7 +247,7 @@ export const ${config.functionName} = onDocumentWritten(
     }
     return `import { onDocumentWritten } from "firebase-functions/v2/firestore";
 import * as logger from "firebase-functions/logger";
-import { embedText } from "./vectorSearchEmbedding.js";
+import { embedText } from "${embeddingImportPath}";
 
 const SOURCE_TEXT_FIELD = ${JSON.stringify(config.vectorSearch.sourceTextField)};
 const VECTOR_FIELD = ${JSON.stringify(config.vectorSearch.vectorField)};
@@ -285,9 +289,8 @@ export const ${config.functionName} = onDocumentWritten(
 );
 `;
 }
-function buildVectorSearchOnRequestModule(style, config, extension) {
+function buildVectorSearchOnRequestModule(style, config, embeddingImportPath) {
     const returnFields = JSON.stringify(config.vectorSearch.returnFields);
-    const embeddingImportPath = buildGeneratedImportPath(style, extension, "vectorSearchEmbedding");
     if (style === "cjs") {
         return `const { onRequest } = require("firebase-functions/v2/https");
 const logger = require("firebase-functions/logger");
@@ -619,13 +622,17 @@ async function resolveEntryContext(targetDir, entryRelativePath) {
     };
 }
 async function ensureFunctionExport(targetDir, config, context) {
-    const generatedFileName = `firestoreOnDocumentWritten${context.extension}`;
+    const onWriteModuleBaseName = `onDocumentWritten_${toSafeFileSegment(config.functionName)}`;
+    const generatedFileName = `${onWriteModuleBaseName}${context.extension}`;
     const generatedRelativePath = path.join(path.dirname(context.entryRelativePath), generatedFileName);
-    const generatedImportPath = buildGeneratedImportPath(context.moduleStyle, context.extension, "firestoreOnDocumentWritten");
+    const generatedImportPath = buildGeneratedImportPath(context.moduleStyle, context.extension, onWriteModuleBaseName);
+    const embeddingModuleBaseName = `vectorSearchEmbedding_${toSafeFileSegment(config.functionName)}`;
+    const embeddingImportPath = buildGeneratedImportPath(context.moduleStyle, context.extension, embeddingModuleBaseName);
     const generatedFullPath = path.join(targetDir, generatedRelativePath);
     const functionModuleText = buildFunctionModule({
         style: context.moduleStyle,
-        config
+        config,
+        embeddingImportPath
     });
     await writeFile(generatedFullPath, functionModuleText, "utf8");
     const entryText = (await readFile(context.entryFullPath, "utf8")).trimEnd();
@@ -647,14 +654,17 @@ async function ensureVectorSearchScaffold(targetDir, config, context) {
         return null;
     }
     const folder = path.dirname(context.entryRelativePath);
-    const onRequestFileName = `vectorSearchOnRequest${context.extension}`;
-    const embeddingFileName = `vectorSearchEmbedding${context.extension}`;
+    const onRequestModuleBaseName = `vectorSearchOnRequest_${toSafeFileSegment(config.vectorSearch.functionName)}`;
+    const embeddingModuleBaseName = `vectorSearchEmbedding_${toSafeFileSegment(config.functionName)}`;
+    const onRequestFileName = `${onRequestModuleBaseName}${context.extension}`;
+    const embeddingFileName = `${embeddingModuleBaseName}${context.extension}`;
     const onRequestRelativePath = path.join(folder, onRequestFileName);
     const embeddingRelativePath = path.join(folder, embeddingFileName);
     const onRequestFullPath = path.join(targetDir, onRequestRelativePath);
     const embeddingFullPath = path.join(targetDir, embeddingRelativePath);
-    const onRequestImportPath = buildGeneratedImportPath(context.moduleStyle, context.extension, "vectorSearchOnRequest");
-    await writeFile(onRequestFullPath, buildVectorSearchOnRequestModule(context.moduleStyle, config, context.extension), "utf8");
+    const embeddingImportPath = buildGeneratedImportPath(context.moduleStyle, context.extension, embeddingModuleBaseName);
+    const onRequestImportPath = buildGeneratedImportPath(context.moduleStyle, context.extension, onRequestModuleBaseName);
+    await writeFile(onRequestFullPath, buildVectorSearchOnRequestModule(context.moduleStyle, config, embeddingImportPath), "utf8");
     const embeddingCreated = await writeTextIfMissing(embeddingFullPath, buildEmbeddingModule(context.moduleStyle));
     const entryText = (await readFile(context.entryFullPath, "utf8")).trimEnd();
     const exportLine = context.moduleStyle === "cjs"
@@ -674,16 +684,28 @@ async function ensureVectorSearchScaffold(targetDir, config, context) {
 }
 async function persistBootstrapConfig(targetDir, config) {
     const filePath = path.join(targetDir, config.configFileName);
+    const currentTarget = {
+        documentPath: config.documentPath,
+        functionName: config.functionName,
+        vectorSearch: config.vectorSearch
+    };
+    const mergedTargets = [...config.existingTargets];
+    const existingIndex = mergedTargets.findIndex((target) => target.functionName === currentTarget.functionName);
+    if (existingIndex >= 0) {
+        mergedTargets[existingIndex] = currentTarget;
+    }
+    else {
+        mergedTargets.push(currentTarget);
+    }
     const persisted = {
         projectId: config.projectId,
         region: config.region,
         serviceId: config.serviceId,
         location: config.location,
-        documentPath: config.documentPath,
-        functionName: config.functionName,
         installDependencies: config.installDependencies,
         configFileName: config.configFileName,
-        vectorSearch: config.vectorSearch
+        targets: mergedTargets,
+        lastTargetFunctionName: currentTarget.functionName
     };
     await writeJson(filePath, persisted);
     return toPosixPath(config.configFileName);

package/dist/prompt.js

@@ -4,6 +4,8 @@ import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 const DEFAULT_CONFIG_FILE = ".firebase-dataconnect-bootstrap.json";
 const DEFAULT_RETURN_FIELDS = ["title", "summary", "createdAt"];
+const DEFAULT_DOCUMENT_PATH = "meetingSummaries/{summaryId}";
+const NEW_COLLECTION_DOCUMENT_PATH = "newCollection/{docId}";
 function normalizeFunctionName(name) {
     const cleaned = name.replace(/[^A-Za-z0-9_$]/g, "_");
     if (!cleaned) {
@@ -37,13 +39,31 @@ function deriveCollectionPath(documentPath) {
     }
     return segments.join("/");
 }
+function toPascalCase(input) {
+    const tokens = input
+        .split(/[^A-Za-z0-9]+/)
+        .map((token) => token.trim())
+        .filter(Boolean);
+    if (tokens.length === 0) {
+        return "Collection";
+    }
+    return tokens.map((token) => `${token[0].toUpperCase()}${token.slice(1)}`).join("");
+}
+function deriveWriteFunctionName(documentPath) {
+    const collection = deriveCollectionPath(documentPath);
+    return normalizeFunctionName(`on${toPascalCase(collection)}Written`);
+}
+function deriveSearchFunctionName(documentPath) {
+    const collection = deriveCollectionPath(documentPath);
+    return normalizeFunctionName(`search${toPascalCase(collection)}ByVector`);
+}
 function normalizeVectorSearch(partialVectorSearch, documentPath) {
     const source = partialVectorSearch ?? {};
     const collectionPath = source.collectionPath?.trim() || deriveCollectionPath(documentPath);
     const sourceTextField = source.sourceTextField?.trim() || "summary";
     const vectorField = source.vectorField?.trim() || "embedding";
-    const returnFields = source.returnFields?.length ? source.returnFields : DEFAULT_RETURN_FIELDS;
-    const functionName = normalizeFunctionName(source.functionName?.trim() || "searchByVector");
+    const returnFields = source.returnFields?.length ? source.returnFields : [...DEFAULT_RETURN_FIELDS];
+    const functionName = normalizeFunctionName(source.functionName?.trim() || deriveSearchFunctionName(documentPath));
     const rawTopK = typeof source.defaultTopK === "number" && Number.isFinite(source.defaultTopK)
         ? Math.floor(source.defaultTopK)
         : 5;
@@ -59,76 +79,145 @@ function normalizeVectorSearch(partialVectorSearch, documentPath) {
         defaultTopK
     };
 }
-function normalizeConfig(partial) {
-    const targetDir = resolve(partial.targetDir ?? process.cwd());
-    const projectId = partial.projectId?.trim() || "";
-    const region = partial.region?.trim() || "us-central1";
-    const serviceId = partial.serviceId?.trim() || `${projectId || "my-project"}-service`;
-    const location = partial.location?.trim() || region;
-    const documentPath = partial.documentPath?.trim() || "meetingSummaries/{summaryId}";
-    const functionName = normalizeFunctionName(partial.functionName?.trim() || "onMeetingSummaryWritten");
-    const configFileName = partial.configFileName?.trim() || DEFAULT_CONFIG_FILE;
-    const installDependencies = typeof partial.installDependencies === "boolean"
-        ? partial.installDependencies
-        : true;
-    const vectorSearch = normalizeVectorSearch(partial.vectorSearch, documentPath);
+function normalizeTarget(partialTarget) {
+    const documentPath = partialTarget.documentPath?.trim() || DEFAULT_DOCUMENT_PATH;
+    const functionName = normalizeFunctionName(partialTarget.functionName?.trim() || deriveWriteFunctionName(documentPath));
+    const vectorSearch = normalizeVectorSearch(partialTarget.vectorSearch, documentPath);
     return {
-        targetDir,
-        projectId,
-        region,
-        serviceId,
-        location,
         documentPath,
         functionName,
-        installDependencies,
-        configFileName,
         vectorSearch
     };
 }
+function normalizeSavedConfig(raw, configFileName) {
+    const source = typeof raw === "object" && raw !== null ? raw : {};
+    const rawTargets = Array.isArray(source.targets)
+        ? source.targets
+        : source.documentPath
+            ? [
+                {
+                    documentPath: source.documentPath,
+                    functionName: source.functionName,
+                    vectorSearch: source.vectorSearch
+                }
+            ]
+            : [];
+    const targets = rawTargets
+        .filter((entry) => typeof entry === "object" && entry !== null)
+        .map((entry) => normalizeTarget(entry));
+    return {
+        projectId: typeof source.projectId === "string" ? source.projectId : "",
+        region: typeof source.region === "string" ? source.region : "us-central1",
+        serviceId: typeof source.serviceId === "string" ? source.serviceId : "",
+        location: typeof source.location === "string" ? source.location : "",
+        installDependencies: typeof source.installDependencies === "boolean" ? source.installDependencies : true,
+        configFileName: typeof source.configFileName === "string" && source.configFileName
+            ? source.configFileName
+            : configFileName,
+        targets,
+        lastTargetFunctionName: typeof source.lastTargetFunctionName === "string" ? source.lastTargetFunctionName : undefined
+    };
+}
 async function loadSavedConfig(targetDir, configFileName) {
     try {
         const filePath = resolve(targetDir, configFileName);
-        const raw = await readFile(filePath, "utf8");
-        const parsed = JSON.parse(raw);
-        if (typeof parsed !== "object" || parsed === null) {
-            return {};
-        }
-        return parsed;
+        const rawText = await readFile(filePath, "utf8");
+        const parsed = JSON.parse(rawText);
+        return normalizeSavedConfig(parsed, configFileName);
     }
     catch {
-        return {};
+        return normalizeSavedConfig({}, configFileName);
     }
 }
-function mergeConfig(parsed, saved, targetDir) {
-    return {
-        ...saved,
-        targetDir,
-        projectId: parsed.projectId ?? saved.projectId,
-        region: parsed.region ?? saved.region,
-        serviceId: parsed.serviceId ?? saved.serviceId,
-        location: parsed.location ?? saved.location,
-        documentPath: parsed.documentPath ?? saved.documentPath,
-        functionName: parsed.functionName ?? saved.functionName,
-        installDependencies: typeof parsed.installDependencies === "boolean"
-            ? parsed.installDependencies
-            : saved.installDependencies,
-        configFileName: parsed.configFileName ?? saved.configFileName ?? DEFAULT_CONFIG_FILE,
+function pickDefaultTarget(saved) {
+    if (saved.targets.length === 0) {
+        return normalizeTarget({});
+    }
+    if (saved.lastTargetFunctionName) {
+        const last = saved.targets.find((target) => target.functionName === saved.lastTargetFunctionName);
+        if (last) {
+            return last;
+        }
+    }
+    return saved.targets[0];
+}
+function hasTargetOverrides(parsed) {
+    if (parsed.documentPath || parsed.functionName) {
+        return true;
+    }
+    if (!parsed.vectorSearch) {
+        return false;
+    }
+    const vector = parsed.vectorSearch;
+    return Boolean(vector.enabled !== undefined ||
+        vector.collectionPath ||
+        vector.sourceTextField ||
+        vector.vectorField ||
+        vector.returnFields?.length ||
+        vector.functionName ||
+        vector.defaultTopK !== undefined);
+}
+function mergeTarget(base, parsed) {
+    return normalizeTarget({
+        ...base,
+        documentPath: parsed.documentPath ?? base.documentPath,
+        functionName: parsed.functionName ?? base.functionName,
         vectorSearch: {
-            ...(saved.vectorSearch ?? {}),
+            ...base.vectorSearch,
             ...(parsed.vectorSearch ?? {})
         }
-    };
+    });
+}
+function buildAddTargetDefaults(parsed) {
+    const documentPath = parsed.documentPath ?? NEW_COLLECTION_DOCUMENT_PATH;
+    return normalizeTarget({
+        documentPath,
+        functionName: parsed.functionName ?? deriveWriteFunctionName(documentPath),
+        vectorSearch: {
+            enabled: parsed.vectorSearch?.enabled ?? false,
+            collectionPath: parsed.vectorSearch?.collectionPath ?? deriveCollectionPath(documentPath),
+            sourceTextField: parsed.vectorSearch?.sourceTextField ?? "summary",
+            vectorField: parsed.vectorSearch?.vectorField ?? "embedding",
+            returnFields: parsed.vectorSearch?.returnFields ?? [...DEFAULT_RETURN_FIELDS],
+            functionName: parsed.vectorSearch?.functionName ?? deriveSearchFunctionName(documentPath),
+            defaultTopK: parsed.vectorSearch?.defaultTopK ?? 5
+        }
+    });
 }
 export async function collectConfig(parsed) {
     const targetDir = resolve(parsed.targetDir ?? process.cwd());
     const configFileName = parsed.configFileName?.trim() || DEFAULT_CONFIG_FILE;
     const saved = await loadSavedConfig(targetDir, configFileName);
-    const defaults = normalizeConfig(mergeConfig({ ...parsed, targetDir, configFileName }, { ...saved, targetDir, configFileName: saved.configFileName ?? configFileName }, targetDir));
+    const projectId = parsed.projectId?.trim() || saved.projectId || "";
+    const region = parsed.region?.trim() || saved.region || "us-central1";
+    const serviceId = parsed.serviceId?.trim() || saved.serviceId || `${projectId || "my-project"}-service`;
+    const location = parsed.location?.trim() || saved.location || region;
+    const installDependencies = typeof parsed.installDependencies === "boolean" ? parsed.installDependencies : saved.installDependencies;
+    const defaultTarget = pickDefaultTarget(saved);
+    const addCollectionDefault = parsed.addCollection ?? false;
     if (parsed.yes) {
-        if (!defaults.projectId) {
+        if (!projectId) {
             throw new Error("`--yes` を使う場合は `--project` が必須です。");
         }
-        return defaults;
+        if (parsed.addCollection && !hasTargetOverrides(parsed)) {
+            throw new Error("`--add-collection --yes` を使う場合は --document など追加ターゲットの情報を指定してください。");
+        }
+        const resolvedTarget = parsed.addCollection
+            ? mergeTarget(buildAddTargetDefaults(parsed), parsed)
+            : mergeTarget(defaultTarget, parsed);
+        return {
+            targetDir,
+            projectId,
+            region,
+            serviceId,
+            location,
+            documentPath: resolvedTarget.documentPath,
+            functionName: resolvedTarget.functionName,
+            installDependencies,
+            configFileName,
+            vectorSearch: resolvedTarget.vectorSearch,
+            existingTargets: saved.targets
+        };
     }
     const rl = createInterface({ input, output });
     try {
@@ -153,46 +242,66 @@ export async function collectConfig(parsed) {
         };
         console.log("Firebase Data Connect / Cloud Functions セットアップ");
         console.log("");
-        const targetDir = resolve(await ask("対象リポジトリのパス", defaults.targetDir, true));
-        const projectId = await ask("Firebase プロジェクトID", defaults.projectId || "my-project", true);
-        const region = await ask("Functions のリージョン", defaults.region, true);
-        const serviceId = await ask("Data Connect サービスID", `${projectId}-service`, true);
-        const location = await ask("Data Connect ロケーション", defaults.location || region, true);
-        const documentPath = await ask("Firestore ドキュメントパス", defaults.documentPath, true);
-        const rawFunctionName = await ask("関数のエクスポート名", defaults.functionName, true);
-        const functionName = normalizeFunctionName(rawFunctionName);
-        const installRaw = await ask("functions ディレクトリで npm install を実行しますか？ (y/n)", defaults.installDependencies ? "y" : "n", true);
-        const installDependencies = installRaw.toLowerCase().startsWith("y");
-        const vectorEnabled = await askBoolean("ベクトル検索と onRequest 検索関数を有効化しますか？ (y/n)", defaults.vectorSearch.enabled);
-        let vectorCollectionPath = defaults.vectorSearch.collectionPath;
-        let sourceTextField = defaults.vectorSearch.sourceTextField;
-        let vectorField = defaults.vectorSearch.vectorField;
-        let returnFields = defaults.vectorSearch.returnFields;
-        let searchFunctionName = defaults.vectorSearch.functionName;
-        let defaultTopK = defaults.vectorSearch.defaultTopK;
+        const selectedTargetDir = resolve(await ask("対象リポジトリのパス", targetDir, true));
+        const selectedProjectId = await ask("Firebase プロジェクトID", projectId || "my-project", true);
+        const selectedRegion = await ask("Functions のリージョン", region, true);
+        const selectedServiceId = await ask("Data Connect サービスID", serviceId || `${selectedProjectId}-service`, true);
+        const selectedLocation = await ask("Data Connect ロケーション", location || selectedRegion, true);
+        const selectedInstallDependencies = await askBoolean("functions ディレクトリで npm install を実行しますか？ (y/n)", installDependencies);
+        let addCollection = addCollectionDefault;
+        if (saved.targets.length > 0 && parsed.addCollection !== true) {
+            addCollection = await askBoolean("既存設定に新しいコレクション設定を追加しますか？ (y/n)", true);
+        }
+        let targetDefaults = defaultTarget;
+        if (addCollection) {
+            targetDefaults = buildAddTargetDefaults(parsed);
+        }
+        else if (saved.targets.length > 1) {
+            console.log("");
+            console.log("既存ターゲット:");
+            saved.targets.forEach((target, index) => {
+                console.log(`  ${index + 1}. ${target.functionName} (${target.documentPath})`);
+            });
+            const defaultIndex = Math.max(0, saved.targets.findIndex((target) => target.functionName === saved.lastTargetFunctionName));
+            const selectedIndexRaw = await ask("編集するターゲット番号", String(defaultIndex + 1), true);
+            const selectedIndex = Number.parseInt(selectedIndexRaw, 10);
+            if (!Number.isInteger(selectedIndex) || selectedIndex < 1 || selectedIndex > saved.targets.length) {
+                throw new Error("ターゲット番号が不正です。");
+            }
+            targetDefaults = saved.targets[selectedIndex - 1];
+        }
+        const baseTarget = mergeTarget(targetDefaults, parsed);
+        const documentPath = await ask("Firestore ドキュメントパス", baseTarget.documentPath, true);
+        const functionName = normalizeFunctionName(await ask("onDocumentWritten 関数のエクスポート名", baseTarget.functionName, true));
+        const vectorEnabled = await askBoolean("ベクトル検索と onRequest 検索関数を有効化しますか？ (y/n)", baseTarget.vectorSearch.enabled);
+        let vectorCollectionPath = baseTarget.vectorSearch.collectionPath;
+        let sourceTextField = baseTarget.vectorSearch.sourceTextField;
+        let vectorField = baseTarget.vectorSearch.vectorField;
+        let returnFields = baseTarget.vectorSearch.returnFields;
+        let searchFunctionName = baseTarget.vectorSearch.functionName;
+        let defaultTopK = baseTarget.vectorSearch.defaultTopK;
         if (vectorEnabled) {
-            vectorCollectionPath = await ask("ベクトル検索対象のコレクションパス", defaults.vectorSearch.collectionPath, true);
-            sourceTextField = await ask("埋め込み作成対象のテキストフィールド", defaults.vectorSearch.sourceTextField, true);
-            vectorField = await ask("ベクトル保存先フィールド名", defaults.vectorSearch.vectorField, true);
-            const returnFieldsCsv = await ask("検索結果に返すフィールド（カンマ区切り）", toCsv(defaults.vectorSearch.returnFields), true);
-            returnFields = parseCsvFields(returnFieldsCsv);
-            searchFunctionName = normalizeFunctionName(await ask("onRequest 検索関数名", defaults.vectorSearch.functionName, true));
-            const defaultTopKText = await ask("ベクトル検索のデフォルト topK", String(defaults.vectorSearch.defaultTopK), true);
+            vectorCollectionPath = await ask("ベクトル検索対象のコレクションパス", baseTarget.vectorSearch.collectionPath, true);
+            sourceTextField = await ask("埋め込み作成対象のテキストフィールド", baseTarget.vectorSearch.sourceTextField, true);
+            vectorField = await ask("ベクトル保存先フィールド名", baseTarget.vectorSearch.vectorField, true);
+            returnFields = parseCsvFields(await ask("検索結果に返すフィールド（カンマ区切り）", toCsv(baseTarget.vectorSearch.returnFields), true));
+            searchFunctionName = normalizeFunctionName(await ask("onRequest 検索関数名", baseTarget.vectorSearch.functionName, true));
+            const defaultTopKText = await ask("ベクトル検索のデフォルト topK", String(baseTarget.vectorSearch.defaultTopK), true);
             defaultTopK = Number.parseInt(defaultTopKText, 10);
             if (Number.isNaN(defaultTopK) || defaultTopK <= 0) {
                 throw new Error("topK は 1 以上の整数で入力してください。");
             }
         }
         return {
-            targetDir,
-            projectId,
-            region,
-            serviceId,
-            location,
+            targetDir: selectedTargetDir,
+            projectId: selectedProjectId,
+            region: selectedRegion,
+            serviceId: selectedServiceId,
+            location: selectedLocation,
             documentPath,
             functionName,
-            installDependencies,
-            configFileName: defaults.configFileName,
+            installDependencies: selectedInstallDependencies,
+            configFileName,
             vectorSearch: {
                 enabled: vectorEnabled,
                 collectionPath: vectorCollectionPath,
@@ -201,7 +310,8 @@ export async function collectConfig(parsed) {
                 returnFields,
                 functionName: searchFunctionName,
                 defaultTopK
-            }
+            },
+            existingTargets: selectedTargetDir === targetDir ? saved.targets : []
         };
     }
     finally {

package/dist/types.d.ts

@@ -9,6 +9,7 @@ export interface CliArgs {
     installDependencies?: boolean;
     configFileName?: string;
     vectorSearch?: Partial<VectorSearchConfig>;
+    addCollection?: boolean;
     yes: boolean;
     help: boolean;
 }
@@ -32,8 +33,24 @@ export interface SetupConfig {
     installDependencies: boolean;
     configFileName: string;
     vectorSearch: VectorSearchConfig;
+    existingTargets: SetupTargetConfig[];
 }
 export interface RunResult {
     targetDir: string;
     summaryLines: string[];
 }
+export interface SetupTargetConfig {
+    documentPath: string;
+    functionName: string;
+    vectorSearch: VectorSearchConfig;
+}
+export interface PersistedBootstrapConfig {
+    projectId: string;
+    region: string;
+    serviceId: string;
+    location: string;
+    installDependencies: boolean;
+    configFileName: string;
+    targets: SetupTargetConfig[];
+    lastTargetFunctionName?: string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-dataconnect-bootstrap",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Bootstrap Firebase Data Connect and Firestore onDocumentWritten function setup in any repository.",
   "type": "module",
   "bin": {