@donotdev/cli 0.0.17 → 0.0.18

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

@@ -8475,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 = [
@@ -8520,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
@@ -8549,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;
@@ -8749,120 +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}`;
+function resolveDeployConfig(host, backend) {
+  if (host === "none") return null;
+  if (host === "firebase") return "firebase";
+  if (backend === "supabase") return "vercel-supabase";
+  return "vercel-vercel";
 }
-var ROWS_BY_KEY = /* @__PURE__ */ new Map();
-for (const row of MATRIX) {
-  ROWS_BY_KEY.set(comboKey(row.builder, row.backend), row);
-}
-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
@@ -8902,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: [],
@@ -8952,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,
@@ -9295,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 (_).`
@@ -9312,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",

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

@@ -8795,34 +8795,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 = [
@@ -8840,12 +8873,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
@@ -8869,6 +8903,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;
@@ -9069,120 +9107,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
@@ -9222,11 +9162,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: [],
@@ -9272,12 +9216,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,
@@ -9627,12 +9573,11 @@ async function collectAppConfig(appName) {
     input: askForInput
   });
   const framework = answers.framework || "vite";
-  const needsBackend = answers.needsBackend || false;
-  const defaultPlatform = framework === "nextjs" ? "vercel" : "firebase";
   return {
     template: framework,
-    needsBackend,
-    backendPlatform: needsBackend ? answers.backendPlatform || defaultPlatform : void 0,
+    host: answers.host || "none",
+    functions: answers.functions || "none",
+    backend: answers.backend || "none",
     needsCRUD: false,
     selectedEntities: [],
     userAuth: "none",
@@ -9779,7 +9724,7 @@ async function main(options) {
       Me(`Configuring "${trimmedName}"...`, "\u2699\uFE0F");
       const config = await collectAppConfig(trimmedName);
       appConfigs[trimmedName] = config;
-      if (config.needsBackend) anyAppNeedsBackend = true;
+      if (config.backend !== "none" || config.functions !== "none") anyAppNeedsBackend = true;
     }
     let installDemoApp = await askForConfirmation(
       "Would you like to install the demo app? (component showcase)",
@@ -9855,8 +9800,9 @@ async function main(options) {
         log.warn(`Missing config for app "${appName}", using defaults`);
         appConfigs[appName] = {
           template: "vite",
-          needsBackend: false,
-          backendPlatform: void 0,
+          host: "none",
+          functions: "none",
+          backend: "none",
           needsCRUD: false,
           selectedEntities: [],
           userAuth: "none",
@@ -9904,7 +9850,7 @@ async function main(options) {
         overwrite: true
       });
       const relativeMonorepoPath = executionMode === "development" ? calculateRelativePath(projectDirNormalized, monorepoRoot) : "";
-      const primaryPlatform = Object.values(appConfigs).find((c) => c.backendPlatform)?.backendPlatform ?? "firebase";
+      const primaryPlatform = Object.values(appConfigs).find((c) => c.backend !== "none")?.backend ?? "firebase";
       const rootPackageJson = generatePackageJson(
         "consumer-root",
         executionMode,