clawfire 0.6.18 → 0.6.20

package/templates/starter/functions/store.ts

@@ -1,9 +1,12 @@
 /**
  * Todo Store — Dual Mode (In-Memory + Firestore)
  *
- * Mode is auto-detected from process.env.CLAWFIRE_FIREBASE_CONFIG.
- * If the env var contains valid Firebase config, Firestore mode is used.
- * Otherwise, falls back to in-memory mode (no setup needed).
+ * Two explicit stores are available:
+ *   - memoryTodoStore: Pure in-memory Map, always works
+ *   - firestoreTodoStore: Client Firebase SDK via CLAWFIRE_FIREBASE_CONFIG
+ *
+ * Use getStore("memory" | "firestore") to select at runtime.
+ * Legacy todoStore is kept for backward compatibility (auto-detect).
  */
 
 export interface Todo {
@@ -13,26 +16,76 @@ export interface Todo {
   createdAt: string;
 }
 
+export interface TodoStore {
+  list(): Promise<Todo[]>;
+  create(title: string): Promise<Todo>;
+  update(
+    id: string,
+    data: Partial<Pick<Todo, "title" | "completed">>,
+  ): Promise<Todo | null>;
+  delete(id: string): Promise<boolean>;
+}
+
 // ─── In-Memory Store ──────────────────────────────────────────
-const memoryStore = new Map<string, Todo>();
+const memoryMap = new Map<string, Todo>();
 let idCounter = 0;
 
-// ─── Firestore State (lazy-initialized) ──────────────────────
-let initialized = false;
-let useFirestore = false;
-let firestoreDb: any = null;
-let firestoreMethods: any = null;
+export const memoryTodoStore: TodoStore = {
+  async list() {
+    return Array.from(memoryMap.values()).sort(
+      (a, b) =>
+        new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+    );
+  },
+
+  async create(title) {
+    const todo: Todo = {
+      id: `todo_${++idCounter}_${Date.now()}`,
+      title,
+      completed: false,
+      createdAt: new Date().toISOString(),
+    };
+    memoryMap.set(todo.id, todo);
+    return todo;
+  },
+
+  async update(id, data) {
+    const todo = memoryMap.get(id);
+    if (!todo) return null;
+    if (data.title !== undefined) todo.title = data.title;
+    if (data.completed !== undefined) todo.completed = data.completed;
+    memoryMap.set(id, todo);
+    return todo;
+  },
+
+  async delete(id) {
+    return memoryMap.delete(id);
+  },
+};
+
+// ─── Firestore Store (lazy-initialized) ──────────────────────
+let fsInitialized = false;
+let fsAvailable = false;
+let fsDb: any = null;
+let fsMethods: any = null;
+let fsError: string | null = null;
 
-async function ensureInit(): Promise<void> {
-  if (initialized) return;
-  initialized = true;
+async function ensureFirestore(): Promise<void> {
+  if (fsInitialized) return;
+  fsInitialized = true;
 
   const configJson = process.env.CLAWFIRE_FIREBASE_CONFIG;
-  if (!configJson) return;
+  if (!configJson) {
+    fsError = "Firestore not configured: CLAWFIRE_FIREBASE_CONFIG env var is not set.";
+    return;
+  }
 
   try {
     const config = JSON.parse(configJson);
-    if (!config.apiKey || config.apiKey.startsWith("YOUR_")) return;
+    if (!config.apiKey || config.apiKey.startsWith("YOUR_")) {
+      fsError = "Firestore not configured: Firebase API key is missing or placeholder.";
+      return;
+    }
 
     const firebaseApp = await import("firebase/app");
     const firebaseFirestore = await import("firebase/firestore");
@@ -42,89 +95,117 @@ async function ensureInit(): Promise<void> {
         ? firebaseApp.initializeApp(config)
         : firebaseApp.getApps()[0];
 
-    firestoreDb = firebaseFirestore.getFirestore(app);
-    firestoreMethods = firebaseFirestore;
-    useFirestore = true;
-    console.log("  [store] Firestore mode enabled");
+    fsDb = firebaseFirestore.getFirestore(app);
+    fsMethods = firebaseFirestore;
+    fsAvailable = true;
+    console.log("  [store] Firestore mode available");
   } catch (err) {
-    console.warn("  [store] Firestore init failed, using in-memory:", err);
+    fsError = `Firestore init failed: ${err instanceof Error ? err.message : String(err)}`;
+    console.warn("  [store]", fsError);
   }
 }
 
-// ─── Exported Store (async methods) ──────────────────────────
-export const todoStore = {
-  async list(): Promise<Todo[]> {
-    await ensureInit();
-    if (useFirestore) {
-      const { collection, getDocs, query, orderBy } = firestoreMethods;
-      const q = query(
-        collection(firestoreDb, "todos"),
-        orderBy("createdAt", "desc"),
-      );
-      const snap = await getDocs(q);
-      return snap.docs.map((d: any) => ({ id: d.id, ...d.data() }) as Todo);
-    }
-    return Array.from(memoryStore.values()).sort(
-      (a, b) =>
-        new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+function requireFirestore() {
+  if (!fsAvailable) {
+    throw new Error(fsError || "Firestore is not available.");
+  }
+}
+
+export const firestoreTodoStore: TodoStore = {
+  async list() {
+    await ensureFirestore();
+    requireFirestore();
+    const { collection, getDocs, query, orderBy } = fsMethods;
+    const q = query(
+      collection(fsDb, "todos"),
+      orderBy("createdAt", "desc"),
     );
+    const snap = await getDocs(q);
+    return snap.docs.map((d: any) => ({ id: d.id, ...d.data() }) as Todo);
   },
 
-  async create(title: string): Promise<Todo> {
-    await ensureInit();
+  async create(title) {
+    await ensureFirestore();
+    requireFirestore();
+    const { collection, addDoc } = fsMethods;
     const todo: Todo = {
       id: "",
       title,
       completed: false,
       createdAt: new Date().toISOString(),
     };
-    if (useFirestore) {
-      const { collection, addDoc } = firestoreMethods;
-      const ref = await addDoc(collection(firestoreDb, "todos"), {
-        title: todo.title,
-        completed: todo.completed,
-        createdAt: todo.createdAt,
-      });
-      todo.id = ref.id;
-    } else {
-      todo.id = `todo_${++idCounter}_${Date.now()}`;
-      memoryStore.set(todo.id, todo);
-    }
+    const ref = await addDoc(collection(fsDb, "todos"), {
+      title: todo.title,
+      completed: todo.completed,
+      createdAt: todo.createdAt,
+    });
+    todo.id = ref.id;
     return todo;
   },
 
-  async update(
-    id: string,
-    data: Partial<Pick<Todo, "title" | "completed">>,
-  ): Promise<Todo | null> {
-    await ensureInit();
-    if (useFirestore) {
-      const { doc, updateDoc, getDoc } = firestoreMethods;
-      const ref = doc(firestoreDb, "todos", id);
-      const updateData: Record<string, any> = {};
-      if (data.title !== undefined) updateData.title = data.title;
-      if (data.completed !== undefined) updateData.completed = data.completed;
-      await updateDoc(ref, updateData);
-      const snap = await getDoc(ref);
-      return snap.exists()
-        ? ({ id: snap.id, ...snap.data() } as Todo)
-        : null;
-    }
-    const todo = memoryStore.get(id);
-    if (!todo) return null;
-    if (data.title !== undefined) todo.title = data.title;
-    if (data.completed !== undefined) todo.completed = data.completed;
-    memoryStore.set(id, todo);
-    return todo;
+  async update(id, data) {
+    await ensureFirestore();
+    requireFirestore();
+    const { doc, updateDoc, getDoc } = fsMethods;
+    const ref = doc(fsDb, "todos", id);
+    const updateData: Record<string, any> = {};
+    if (data.title !== undefined) updateData.title = data.title;
+    if (data.completed !== undefined) updateData.completed = data.completed;
+    await updateDoc(ref, updateData);
+    const snap = await getDoc(ref);
+    return snap.exists()
+      ? ({ id: snap.id, ...snap.data() } as Todo)
+      : null;
   },
 
-  async delete(id: string): Promise<boolean> {
-    await ensureInit();
-    if (useFirestore) {
-      const { doc, deleteDoc } = firestoreMethods;
-      await deleteDoc(doc(firestoreDb, "todos", id));
-      return true;
-    }
-    return memoryStore.delete(id);
+  async delete(id) {
+    await ensureFirestore();
+    requireFirestore();
+    const { doc, deleteDoc } = fsMethods;
+    await deleteDoc(doc(fsDb, "todos", id));
+    return true;
+  },
+};
+
+// ─── Store Selector ──────────────────────────────────────────
+export function getStore(mode?: string): TodoStore {
+  return mode === "firestore" ? firestoreTodoStore : memoryTodoStore;
+}
+
+// ─── Legacy Export (auto-detect, backward compatible) ────────
+let legacyInitialized = false;
+let legacyUseFirestore = false;
+
+async function ensureLegacyInit(): Promise<void> {
+  if (legacyInitialized) return;
+  legacyInitialized = true;
+  await ensureFirestore();
+  legacyUseFirestore = fsAvailable;
+}
+
+export const todoStore: TodoStore = {
+  async list() {
+    await ensureLegacyInit();
+    return legacyUseFirestore
+      ? firestoreTodoStore.list()
+      : memoryTodoStore.list();
+  },
+  async create(title) {
+    await ensureLegacyInit();
+    return legacyUseFirestore
+      ? firestoreTodoStore.create(title)
+      : memoryTodoStore.create(title);
+  },
+  async update(id, data) {
+    await ensureLegacyInit();
+    return legacyUseFirestore
+      ? firestoreTodoStore.update(id, data)
+      : memoryTodoStore.update(id, data);
+  },
+  async delete(id) {
+    await ensureLegacyInit();
+    return legacyUseFirestore
+      ? firestoreTodoStore.delete(id)
+      : memoryTodoStore.delete(id);
   },
 };

package/templates/starter/functions/tsconfig.json

@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2022",
-    "module": "CommonJS",
-    "moduleResolution": "node",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "esModuleInterop": true,
     "strict": true,
     "skipLibCheck": true,