@donotdev/cli 0.0.16 → 0.0.18

package/dist/bin/commands/create-app.js

@@ -8394,7 +8394,11 @@ function getMatrixPath(mode) {
   const executionMode = mode || detectExecutionMode();
   if (executionMode === "development") {
     const templatesRoot = getTemplatesRoot();
-    const devPath = normalizePath(templatesRoot, "..", "dependencies-matrix.json");
+    const devPath = normalizePath(
+      templatesRoot,
+      "..",
+      "dependencies-matrix.json"
+    );
     if (pathExists(devPath)) {
       return devPath;
     }
@@ -8471,34 +8475,67 @@ var APP_QUESTIONNAIRE = [
     ]
   },
   {
-    id: "needsBackend",
-    question: "Include backend functions?",
-    type: "confirm",
-    defaultValue: false
+    id: "host",
+    question: "Where will you host?",
+    type: "select",
+    condition: (answers) => answers.framework !== "expo",
+    defaultValue: (answers) => {
+      return answers.framework === "nextjs" ? "vercel" : "none";
+    },
+    choices: [
+      { title: "None \u2014 no hosting config", value: "none" },
+      { title: "Vercel \u2014 edge CDN + serverless", value: "vercel" },
+      { title: "Firebase Hosting \u2014 Google CDN", value: "firebase" }
+    ]
+  },
+  {
+    id: "functions",
+    question: "Serverless functions?",
+    type: "select",
+    defaultValue: "none",
+    // Choices filtered dynamically based on host
+    choices: [
+      { title: "None", value: "none" },
+      { title: "Vercel Functions \u2014 edge + node.js", value: "vercel" },
+      { title: "Firebase Functions \u2014 Google Cloud", value: "firebase" },
+      { title: "Supabase Edge Functions \u2014 Deno", value: "supabase" }
+    ],
+    choicesFilter: (answers) => {
+      const host = answers.host ?? "none";
+      const framework = answers.framework;
+      if (framework === "expo") return ["none", "firebase", "supabase"];
+      if (host === "firebase") return ["none", "firebase"];
+      if (host === "vercel") return ["none", "vercel", "supabase"];
+      return ["none", "vercel", "firebase", "supabase"];
+    }
   },
   {
-    id: "backendPlatform",
-    question: "Which backend platform?",
+    id: "backend",
+    question: "Backend / BaaS provider?",
     type: "select",
-    dependsOn: "needsBackend",
-    condition: (answers) => answers.needsBackend === true,
     defaultValue: (answers) => {
-      return answers.framework === "nextjs" ? "vercel" : "firebase";
+      if (answers.functions === "firebase") return "firebase";
+      if (answers.functions === "supabase") return "supabase";
+      return "none";
     },
     choices: [
+      { title: "None \u2014 frontend only", value: "none" },
       {
-        title: "Firebase \u2014 Full-stack platform (hosting + functions + auth + firestore)",
+        title: "Firebase \u2014 Auth + Firestore + Storage",
         value: "firebase"
       },
-      {
-        title: "Vercel \u2014 Serverless functions (edge + node.js)",
-        value: "vercel"
-      },
       {
         title: "Supabase \u2014 Postgres + Auth + Storage",
         value: "supabase"
       }
-    ]
+    ],
+    choicesFilter: (answers) => {
+      const functions = answers.functions ?? "none";
+      if (functions === "firebase") return ["none", "firebase"];
+      if (functions === "supabase") return ["none", "supabase"];
+      if (functions === "vercel") return ["none"];
+      return ["none", "firebase", "supabase"];
+    }
   }
 ];
 var PROJECT_QUESTIONNAIRE = [
@@ -8516,12 +8553,13 @@ var PROJECT_QUESTIONNAIRE = [
   }
 ];
 function aggregateRequirements(answers) {
+  const hasBackend = answers.backend && answers.backend !== "none" || answers.functions && answers.functions !== "none";
   const requirements = {
     entities: [],
     // Entities created in apps/<app>/entities/ (v1), root entities/ for v2
     billing: true,
     // Always on (useStripeBillingSafe handles missing package)
-    backend: answers.needsBackend || false,
+    backend: hasBackend,
     features: [],
     template: "vite",
     // Only Vite for now
@@ -8545,6 +8583,10 @@ async function runQuestionnaire(questions, initialAnswers, showWIP, askFor) {
         if (!showWIP) {
           choices = choices.filter((choice) => !choice.wip);
         }
+        if (question.choicesFilter) {
+          const allowed = question.choicesFilter(answers);
+          choices = choices.filter((c) => allowed.includes(c.value));
+        }
         if (choices.length === 0) continue;
         answer = await askFor.selection(question.question, choices);
         break;
@@ -8745,34 +8787,22 @@ init_pathResolver();
 
 // packages/tooling/src/scaffolding/scaffold-matrix.ts
 init_utils();
-var MATRIX = [
-  { builder: "vite", backend: "none", baseTemplate: "app-vite", overlay: null, deployConfig: null, functionsTemplate: null },
-  { builder: "vite", backend: "firebase", baseTemplate: "app-vite", overlay: "overlay-firebase", deployConfig: "firebase", functionsTemplate: "functions-firebase" },
-  { builder: "vite", backend: "supabase", baseTemplate: "app-vite", overlay: "overlay-supabase", deployConfig: "vercel-supabase", functionsTemplate: "functions-supabase" },
-  { builder: "vite", backend: "vercel", baseTemplate: "app-vite", overlay: "overlay-vercel", deployConfig: "vercel-vercel", functionsTemplate: "functions-vercel" },
-  { builder: "nextjs", backend: "none", baseTemplate: "app-next", overlay: null, deployConfig: null, functionsTemplate: null },
-  { builder: "nextjs", backend: "firebase", baseTemplate: "app-next", overlay: "overlay-firebase", deployConfig: "firebase", functionsTemplate: "functions-firebase" },
-  { builder: "nextjs", backend: "supabase", baseTemplate: "app-next", overlay: "overlay-supabase", deployConfig: "vercel-supabase", functionsTemplate: "functions-supabase" },
-  { builder: "nextjs", backend: "vercel", baseTemplate: "app-next", overlay: "overlay-vercel", deployConfig: "vercel-vercel", functionsTemplate: "functions-vercel" },
-  { builder: "expo", backend: "none", baseTemplate: "app-expo", overlay: null, deployConfig: null, functionsTemplate: null },
-  { builder: "expo", backend: "firebase", baseTemplate: "app-expo", overlay: "overlay-firebase", deployConfig: null, functionsTemplate: "functions-firebase" },
-  { builder: "expo", backend: "supabase", baseTemplate: "app-expo", overlay: "overlay-supabase", deployConfig: null, functionsTemplate: "functions-supabase" },
-  { builder: "demo", backend: "none", baseTemplate: "app-demo", overlay: null, deployConfig: null, functionsTemplate: null }
-];
-function comboKey(builder, backend) {
-  return `${builder}-${backend}`;
-}
-var ROWS_BY_KEY = /* @__PURE__ */ new Map();
-for (const row of MATRIX) {
-  ROWS_BY_KEY.set(comboKey(row.builder, row.backend), row);
+function resolveDeployConfig(host, backend) {
+  if (host === "none") return null;
+  if (host === "firebase") return "firebase";
+  if (backend === "supabase") return "vercel-supabase";
+  return "vercel-vercel";
 }
-function getScaffoldRow(builder, backend) {
-  const key = comboKey(builder, backend);
-  const row = ROWS_BY_KEY.get(key);
-  if (!row) {
-    throw new Error(`Unsupported scaffold combo: ${key}. Supported: ${[...ROWS_BY_KEY.keys()].join(", ")}`);
-  }
-  return row;
+function getScaffoldParts(builder, host, functions, backend) {
+  const baseTemplate = builder === "nextjs" ? "app-next" : builder === "demo" ? "app-demo" : `app-${builder}`;
+  return {
+    builder,
+    backend,
+    baseTemplate,
+    overlay: backend !== "none" ? `overlay-${backend}` : null,
+    deployConfig: resolveDeployConfig(host, backend),
+    functionsTemplate: functions !== "none" ? `functions-${functions}` : null
+  };
 }
 
 // packages/tooling/src/scaffolding/create-app.ts
@@ -8812,11 +8842,15 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       input: askForInput
     });
     const requirements = aggregateRequirements(answers);
-    const defaultPlatform = answers.framework === "nextjs" ? "vercel" : "firebase";
+    const framework = answers.framework || "vite";
+    const host2 = answers.host || "none";
+    const functions2 = answers.functions || "none";
+    const backend2 = answers.backend || "none";
     appConfig = {
-      template: answers.framework || "vite",
-      needsBackend: answers.needsBackend || false,
-      backendPlatform: answers.needsBackend ? answers.backendPlatform || defaultPlatform : void 0,
+      template: framework,
+      host: host2,
+      functions: functions2,
+      backend: backend2,
       needsCRUD: true,
       // Always on
       selectedEntities: [],
@@ -8862,12 +8896,14 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   s.start(`Creating app: ${appName}`);
   await ensureDir(appDir);
   const builder = appTemplate;
-  const backend = appConfig.needsBackend && appConfig.backendPlatform ? appConfig.backendPlatform : "none";
-  const row = getScaffoldRow(builder, backend);
+  const host = appConfig.host ?? "none";
+  const functions = appConfig.functions ?? "none";
+  const backend = appConfig.backend ?? "none";
+  const row = getScaffoldParts(builder, host, functions, backend);
   const templateDir = row.baseTemplate;
   const firebaseProjectId = (appConfig?.firebaseProjectId ?? "").trim() || appName.toLowerCase().replace(/\s+/g, "-");
   const firebaseRegion = appConfig?.firebaseRegion ?? "europe-west1";
-  const backendPlatform = appConfig.backendPlatform ?? "firebase";
+  const backendPlatform = backend !== "none" ? backend : "firebase";
   const deployConfig = row.deployConfig;
   const replacements = {
     projectName: appName,
@@ -8926,13 +8962,16 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
           const variantFile = `src/config/providers.${appTemplate}.ts.example`;
           if (overlayFiles.includes(variantFile)) continue;
         }
-        const providersVariant = file.match(/^src\/config\/providers\.(\w+)\.ts\.example$/);
+        const providersVariant = file.match(
+          /^src\/config\/providers\.(\w+)\.ts\.example$/
+        );
         if (providersVariant) {
           if (providersVariant[1] !== appTemplate) continue;
           const destPath2 = joinPath(appDir, "src/config/providers.ts");
           await ensureDir(getDirname(destPath2));
           await copy(joinPath(overlayDir, file), destPath2, { overwrite: true });
-          if (await isTextFile(destPath2)) await replacePlaceholders(destPath2, replacements);
+          if (await isTextFile(destPath2))
+            await replacePlaceholders(destPath2, replacements);
           continue;
         }
         const sourcePath = joinPath(overlayDir, file);
@@ -8957,16 +8996,28 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
       }
       if (deployConfig === "vercel-supabase") {
         const vercelPath = joinPath(appDir, "vercel.json");
-        const headersFragmentPath = joinPath(overlayDir, "vercel.headers.example");
+        const headersFragmentPath = joinPath(
+          overlayDir,
+          "vercel.headers.example"
+        );
         const fullVercelPath = joinPath(overlayDir, "vercel.json.example");
         if (pathExists(vercelPath) && pathExists(headersFragmentPath)) {
           const vercelJson = readSync(vercelPath, { format: "json" });
-          const headersFragment = readSync(headersFragmentPath, { format: "json" });
-          vercelJson.headers = [...vercelJson.headers ?? [], ...headersFragment];
-          await write(vercelPath, vercelJson, { format: "json", overwrite: true });
+          const headersFragment = readSync(headersFragmentPath, {
+            format: "json"
+          });
+          vercelJson.headers = [
+            ...vercelJson.headers ?? [],
+            ...headersFragment
+          ];
+          await write(vercelPath, vercelJson, {
+            format: "json",
+            overwrite: true
+          });
         } else if (pathExists(fullVercelPath)) {
           await copy(fullVercelPath, vercelPath);
-          if (await isTextFile(vercelPath)) await replacePlaceholders(vercelPath, replacements);
+          if (await isTextFile(vercelPath))
+            await replacePlaceholders(vercelPath, replacements);
         }
       }
     }
@@ -8986,9 +9037,13 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   });
   if (row.functionsTemplate) {
     const functionsTemplateName = row.functionsTemplate;
-    const functionsTemplateExists = pathExists(joinPath(templatesRoot, functionsTemplateName));
+    const functionsTemplateExists = pathExists(
+      joinPath(templatesRoot, functionsTemplateName)
+    );
     if (!functionsTemplateExists) {
-      log.warn(`Functions template "${functionsTemplateName}" not found \u2014 skipping functions scaffolding.`);
+      log.warn(
+        `Functions template "${functionsTemplateName}" not found \u2014 skipping functions scaffolding.`
+      );
     } else {
       const isSupabaseFunctions = functionsTemplateName === "functions-supabase";
       const functionsRootDir = isSupabaseFunctions ? appDir : joinPath(appDir, "functions");
@@ -8996,7 +9051,10 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
         const functionsPackageJson = generatePackageJson(
           functionsTemplateName,
           executionMode,
-          { appName, platform: row.functionsTemplate.replace("functions-", "") }
+          {
+            appName,
+            platform: row.functionsTemplate.replace("functions-", "")
+          }
         );
         const packageJsonPath2 = joinPath(functionsRootDir, "package.json");
         await ensureDir(functionsRootDir);
@@ -9032,13 +9090,19 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
   }
   const deploymentTemplateDir = joinPath(templatesRoot, "root-consumer");
   if (deployConfig === "firebase") {
-    const firebaseJsonSource = joinPath(deploymentTemplateDir, "firebase.json.example");
+    const firebaseJsonSource = joinPath(
+      deploymentTemplateDir,
+      "firebase.json.example"
+    );
     if (pathExists(firebaseJsonSource)) {
       await copy(firebaseJsonSource, joinPath(appDir, "firebase.json"));
       const firebaseJsonDest = joinPath(appDir, "firebase.json");
-      if (await isTextFile(firebaseJsonDest)) await replacePlaceholders(firebaseJsonDest, replacements);
+      if (await isTextFile(firebaseJsonDest))
+        await replacePlaceholders(firebaseJsonDest, replacements);
       if (appTemplate === "nextjs") {
-        const firebaseJson = readSync(firebaseJsonDest, { format: "json" });
+        const firebaseJson = readSync(firebaseJsonDest, {
+          format: "json"
+        });
         if (firebaseJson.hosting?.rewrites) {
           firebaseJson.hosting.rewrites = firebaseJson.hosting.rewrites.filter(
             (r2) => r2.destination !== "/index.html"
@@ -9047,17 +9111,28 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
         if (firebaseJson.hosting) {
           firebaseJson.hosting.public = "out";
         }
-        await write(firebaseJsonDest, firebaseJson, { format: "json", overwrite: true });
+        await write(firebaseJsonDest, firebaseJson, {
+          format: "json",
+          overwrite: true
+        });
       }
     }
-    const firebasercSource = joinPath(deploymentTemplateDir, ".firebaserc.example");
+    const firebasercSource = joinPath(
+      deploymentTemplateDir,
+      ".firebaserc.example"
+    );
     if (pathExists(firebasercSource)) {
       await copy(firebasercSource, joinPath(appDir, ".firebaserc"));
       const firebasercDest = joinPath(appDir, ".firebaserc");
-      if (await isTextFile(firebasercDest)) await replacePlaceholders(firebasercDest, replacements);
+      if (await isTextFile(firebasercDest))
+        await replacePlaceholders(firebasercDest, replacements);
     }
     if (row.functionsTemplate === "functions-firebase") {
-      for (const example of ["firestore.rules.example", "firestore.indexes.json.example", "storage.rules.example"]) {
+      for (const example of [
+        "firestore.rules.example",
+        "firestore.indexes.json.example",
+        "storage.rules.example"
+      ]) {
         const src = joinPath(deploymentTemplateDir, example);
         if (pathExists(src)) {
           await copy(src, joinPath(appDir, example.replace(".example", "")));
@@ -9073,11 +9148,22 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
           {
             source: "functions",
             codebase: "default",
-            ignore: ["node_modules", ".git", "firebase-debug.log", "firebase-debug.*.log", "**/.*", "**/*.test.ts", "**/__tests__/**"],
+            ignore: [
+              "node_modules",
+              ".git",
+              "firebase-debug.log",
+              "firebase-debug.*.log",
+              "**/.*",
+              "**/*.test.ts",
+              "**/__tests__/**"
+            ],
             runtime: "nodejs22"
           }
         ],
-        firestore: { rules: "firestore.rules", indexes: "firestore.indexes.json" },
+        firestore: {
+          rules: "firestore.rules",
+          indexes: "firestore.indexes.json"
+        },
         storage: { rules: "storage.rules" },
         emulators: {
           auth: { port: 9099 },
@@ -9087,15 +9173,26 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
           ui: { enabled: true, port: 4e3 }
         }
       };
-      await write(firebaseJsonPath, expoFirebaseJson, { format: "json", overwrite: true });
+      await write(firebaseJsonPath, expoFirebaseJson, {
+        format: "json",
+        overwrite: true
+      });
     }
-    const firebasercSource = joinPath(deploymentTemplateDir, ".firebaserc.example");
+    const firebasercSource = joinPath(
+      deploymentTemplateDir,
+      ".firebaserc.example"
+    );
     const firebasercDest = joinPath(appDir, ".firebaserc");
     if (pathExists(firebasercSource) && !pathExists(firebasercDest)) {
       await copy(firebasercSource, firebasercDest);
-      if (await isTextFile(firebasercDest)) await replacePlaceholders(firebasercDest, replacements);
-    }
-    for (const example of ["firestore.rules.example", "firestore.indexes.json.example", "storage.rules.example"]) {
+      if (await isTextFile(firebasercDest))
+        await replacePlaceholders(firebasercDest, replacements);
+    }
+    for (const example of [
+      "firestore.rules.example",
+      "firestore.indexes.json.example",
+      "storage.rules.example"
+    ]) {
       const src = joinPath(deploymentTemplateDir, example);
       const dest = joinPath(appDir, example.replace(".example", ""));
       if (pathExists(src) && !pathExists(dest)) {
@@ -9104,11 +9201,15 @@ async function createApp(appName, appConfig, workspaceRoot, templatesRoot) {
     }
   }
   if (deployConfig === "vercel-vercel") {
-    const vercelJsonSource = joinPath(deploymentTemplateDir, "vercel.json.example");
+    const vercelJsonSource = joinPath(
+      deploymentTemplateDir,
+      "vercel.json.example"
+    );
     if (pathExists(vercelJsonSource)) {
       await copy(vercelJsonSource, joinPath(appDir, "vercel.json"));
       const vercelJsonDest = joinPath(appDir, "vercel.json");
-      if (await isTextFile(vercelJsonDest)) await replacePlaceholders(vercelJsonDest, replacements);
+      if (await isTextFile(vercelJsonDest))
+        await replacePlaceholders(vercelJsonDest, replacements);
     }
   }
   const backendInfo = row.functionsTemplate ? ` with ${row.functionsTemplate.replace("functions-", "")} functions` : "";
@@ -9140,11 +9241,13 @@ Happy coding!`,
 }
 async function main(options) {
   try {
-    const hasExplicitFlags = options?.builder !== void 0 || options?.functions !== void 0;
+    const hasExplicitFlags = options?.builder !== void 0 || options?.host !== void 0 || options?.functions !== void 0 || options?.backend !== void 0;
     if (hasExplicitFlags && options?.name) {
       const appName = options.name;
       const builder = options.builder || "vite";
-      const includeFunctions = options.functions ?? false;
+      const hostOpt = options.host ?? "none";
+      const functionsOpt = options.functions ?? "none";
+      const backendOpt = options.backend ?? "none";
       if (!isValidFileName(appName)) {
         throw new Error(
           `Invalid app name "${appName}". Use only letters, numbers, dashes (-), and underscores (_).`
@@ -9157,8 +9260,9 @@ async function main(options) {
       }
       const appConfig = {
         template: builder === "next" ? "nextjs" : builder === "expo" ? "expo" : "vite",
-        needsBackend: includeFunctions,
-        backendPlatform: includeFunctions ? "firebase" : void 0,
+        host: hostOpt,
+        functions: functionsOpt,
+        backend: backendOpt,
         needsCRUD: true,
         selectedEntities: [],
         userAuth: "social",