create-better-t-stack 3.11.0-pr750.6c25d46 → 3.11.1

package/src/helpers/core/command-handlers.ts

@@ -1,354 +0,0 @@
-import path from "node:path";
-import { intro, log, outro } from "@clack/prompts";
-import consola from "consola";
-import fs from "fs-extra";
-import pc from "picocolors";
-import { getDefaultConfig } from "../../constants";
-import { getAddonsToAdd } from "../../prompts/addons";
-import { gatherConfig } from "../../prompts/config-prompts";
-import { getProjectName } from "../../prompts/project-name";
-import { getServerDeploymentToAdd } from "../../prompts/server-deploy";
-import { getDeploymentToAdd } from "../../prompts/web-deploy";
-import type { AddInput, CreateInput, DirectoryConflict, ProjectConfig } from "../../types";
-import { trackProjectCreation } from "../../utils/analytics";
-
-import { displayConfig } from "../../utils/display-config";
-import { exitWithError, handleError } from "../../utils/errors";
-import { generateReproducibleCommand } from "../../utils/generate-reproducible-command";
-import { handleDirectoryConflict, setupProjectDirectory } from "../../utils/project-directory";
-import { renderTitle } from "../../utils/render-title";
-import { getTemplateConfig, getTemplateDescription } from "../../utils/templates";
-import {
-  getProvidedFlags,
-  processAndValidateFlags,
-  processProvidedFlagsWithoutValidation,
-  validateConfigCompatibility,
-} from "../../validation";
-import { addAddonsToProject } from "./add-addons";
-import { addDeploymentToProject } from "./add-deployment";
-import { createProject } from "./create-project";
-import { detectProjectConfig } from "./detect-project-config";
-import { installDependencies } from "./install-dependencies";
-
-export async function createProjectHandler(input: CreateInput & { projectName?: string }) {
-  const startTime = Date.now();
-  const timeScaffolded = new Date().toISOString();
-
-  if (input.renderTitle !== false) {
-    renderTitle();
-  }
-  intro(pc.magenta("Creating a new Better-T-Stack project"));
-
-  if (input.yolo) {
-    consola.fatal("YOLO mode enabled - skipping checks. Things may break!");
-  }
-
-  let currentPathInput: string;
-  if (input.yes && input.projectName) {
-    currentPathInput = input.projectName;
-  } else if (input.yes) {
-    const defaultConfig = getDefaultConfig();
-    let defaultName: string = defaultConfig.relativePath;
-    let counter = 1;
-    while (
-      (await fs.pathExists(path.resolve(process.cwd(), defaultName))) &&
-      (await fs.readdir(path.resolve(process.cwd(), defaultName))).length > 0
-    ) {
-      defaultName = `${defaultConfig.projectName}-${counter}`;
-      counter++;
-    }
-    currentPathInput = defaultName;
-  } else {
-    currentPathInput = await getProjectName(input.projectName);
-  }
-
-  let finalPathInput: string;
-  let shouldClearDirectory: boolean;
-
-  try {
-    if (input.directoryConflict) {
-      const result = await handleDirectoryConflictProgrammatically(
-        currentPathInput,
-        input.directoryConflict,
-      );
-      finalPathInput = result.finalPathInput;
-      shouldClearDirectory = result.shouldClearDirectory;
-    } else {
-      const result = await handleDirectoryConflict(currentPathInput);
-      finalPathInput = result.finalPathInput;
-      shouldClearDirectory = result.shouldClearDirectory;
-    }
-  } catch (error) {
-    const elapsedTimeMs = Date.now() - startTime;
-    return {
-      success: false,
-      projectConfig: {
-        projectName: "",
-        projectDir: "",
-        relativePath: "",
-        database: "none",
-        orm: "none",
-        backend: "none",
-        runtime: "none",
-        frontend: [],
-        addons: [],
-        examples: [],
-        auth: "none",
-        payments: "none",
-        git: false,
-        packageManager: "npm",
-        install: false,
-        dbSetup: "none",
-        api: "none",
-        webDeploy: "none",
-        serverDeploy: "none",
-      } satisfies ProjectConfig,
-      reproducibleCommand: "",
-      timeScaffolded,
-      elapsedTimeMs,
-      projectDirectory: "",
-      relativePath: "",
-      error: error instanceof Error ? error.message : String(error),
-    };
-  }
-
-  const { finalResolvedPath, finalBaseName } = await setupProjectDirectory(
-    finalPathInput,
-    shouldClearDirectory,
-  );
-
-  const originalInput = {
-    ...input,
-    projectDirectory: input.projectName,
-  };
-
-  const providedFlags = getProvidedFlags(originalInput);
-
-  let cliInput = originalInput;
-
-  if (input.template && input.template !== "none") {
-    const templateConfig = getTemplateConfig(input.template);
-    if (templateConfig) {
-      const templateName = input.template.toUpperCase();
-      const templateDescription = getTemplateDescription(input.template);
-      log.message(pc.bold(pc.cyan(`Using template: ${pc.white(templateName)}`)));
-      log.message(pc.dim(`   ${templateDescription}`));
-      const userOverrides: Record<string, unknown> = {};
-      for (const [key, value] of Object.entries(originalInput)) {
-        if (value !== undefined) {
-          userOverrides[key] = value;
-        }
-      }
-      cliInput = {
-        ...templateConfig,
-        ...userOverrides,
-        template: input.template,
-        projectDirectory: originalInput.projectDirectory,
-      };
-    }
-  }
-
-  let config: ProjectConfig;
-  if (cliInput.yes) {
-    const flagConfig = processProvidedFlagsWithoutValidation(cliInput, finalBaseName);
-
-    config = {
-      ...getDefaultConfig(),
-      ...flagConfig,
-      projectName: finalBaseName,
-      projectDir: finalResolvedPath,
-      relativePath: finalPathInput,
-    };
-
-    validateConfigCompatibility(config, providedFlags, cliInput);
-
-    log.info(pc.yellow("Using default/flag options (config prompts skipped):"));
-    log.message(displayConfig(config));
-  } else {
-    const flagConfig = processAndValidateFlags(cliInput, providedFlags, finalBaseName);
-    const { projectName: _projectNameFromFlags, ...otherFlags } = flagConfig;
-
-    if (Object.keys(otherFlags).length > 0) {
-      log.info(pc.yellow("Using these pre-selected options:"));
-      log.message(displayConfig(otherFlags));
-      log.message("");
-    }
-
-    config = await gatherConfig(flagConfig, finalBaseName, finalResolvedPath, finalPathInput);
-  }
-
-  await createProject(config, {
-    manualDb: cliInput.manualDb ?? input.manualDb,
-  });
-
-  const reproducibleCommand = generateReproducibleCommand(config);
-  log.success(
-    pc.blue(`You can reproduce this setup with the following command:\n${reproducibleCommand}`),
-  );
-
-  await trackProjectCreation(config, input.disableAnalytics);
-
-  const elapsedTimeMs = Date.now() - startTime;
-  const elapsedTimeInSeconds = (elapsedTimeMs / 1000).toFixed(2);
-  outro(pc.magenta(`Project created successfully in ${pc.bold(elapsedTimeInSeconds)} seconds!`));
-
-  return {
-    success: true,
-    projectConfig: config,
-    reproducibleCommand,
-    timeScaffolded,
-    elapsedTimeMs,
-    projectDirectory: config.projectDir,
-    relativePath: config.relativePath,
-  };
-}
-
-async function handleDirectoryConflictProgrammatically(
-  currentPathInput: string,
-  strategy: DirectoryConflict,
-) {
-  const currentPath = path.resolve(process.cwd(), currentPathInput);
-
-  if (!(await fs.pathExists(currentPath))) {
-    return { finalPathInput: currentPathInput, shouldClearDirectory: false };
-  }
-
-  const dirContents = await fs.readdir(currentPath);
-  const isNotEmpty = dirContents.length > 0;
-
-  if (!isNotEmpty) {
-    return { finalPathInput: currentPathInput, shouldClearDirectory: false };
-  }
-
-  switch (strategy) {
-    case "overwrite":
-      return { finalPathInput: currentPathInput, shouldClearDirectory: true };
-
-    case "merge":
-      return { finalPathInput: currentPathInput, shouldClearDirectory: false };
-
-    case "increment": {
-      let counter = 1;
-      const baseName = currentPathInput;
-      let finalPathInput = `${baseName}-${counter}`;
-
-      while (
-        (await fs.pathExists(path.resolve(process.cwd(), finalPathInput))) &&
-        (await fs.readdir(path.resolve(process.cwd(), finalPathInput))).length > 0
-      ) {
-        counter++;
-        finalPathInput = `${baseName}-${counter}`;
-      }
-
-      return { finalPathInput, shouldClearDirectory: false };
-    }
-
-    case "error":
-      throw new Error(
-        `Directory "${currentPathInput}" already exists and is not empty. Use directoryConflict: "overwrite", "merge", or "increment" to handle this.`,
-      );
-
-    default:
-      throw new Error(`Unknown directory conflict strategy: ${strategy}`);
-  }
-}
-
-export async function addAddonsHandler(input: AddInput) {
-  try {
-    const projectDir = input.projectDir || process.cwd();
-    const detectedConfig = await detectProjectConfig(projectDir);
-
-    if (!detectedConfig) {
-      exitWithError(
-        "Could not detect project configuration. Please ensure this is a valid Better-T-Stack project.",
-      );
-    }
-
-    if (!input.addons || input.addons.length === 0) {
-      const addonsPrompt = await getAddonsToAdd(
-        detectedConfig.frontend || [],
-        detectedConfig.addons || [],
-        detectedConfig.auth,
-      );
-
-      if (addonsPrompt.length > 0) {
-        input.addons = addonsPrompt;
-      }
-    }
-
-    if (!input.webDeploy) {
-      const deploymentPrompt = await getDeploymentToAdd(
-        detectedConfig.frontend || [],
-        detectedConfig.webDeploy,
-      );
-
-      if (deploymentPrompt !== "none") {
-        input.webDeploy = deploymentPrompt;
-      }
-    }
-
-    if (!input.serverDeploy) {
-      const serverDeploymentPrompt = await getServerDeploymentToAdd(
-        detectedConfig.runtime,
-        detectedConfig.serverDeploy,
-        detectedConfig.backend,
-      );
-
-      if (serverDeploymentPrompt !== "none") {
-        input.serverDeploy = serverDeploymentPrompt;
-      }
-    }
-
-    const packageManager = input.packageManager || detectedConfig.packageManager || "npm";
-
-    let somethingAdded = false;
-
-    if (input.addons && input.addons.length > 0) {
-      await addAddonsToProject({
-        ...input,
-        install: false,
-        suppressInstallMessage: true,
-        addons: input.addons,
-      });
-      somethingAdded = true;
-    }
-
-    if (input.webDeploy && input.webDeploy !== "none") {
-      await addDeploymentToProject({
-        ...input,
-        install: false,
-        suppressInstallMessage: true,
-        webDeploy: input.webDeploy,
-      });
-      somethingAdded = true;
-    }
-
-    if (input.serverDeploy && input.serverDeploy !== "none") {
-      await addDeploymentToProject({
-        ...input,
-        install: false,
-        suppressInstallMessage: true,
-        serverDeploy: input.serverDeploy,
-      });
-      somethingAdded = true;
-    }
-
-    if (!somethingAdded) {
-      outro(pc.yellow("No addons or deployment configurations to add."));
-      return;
-    }
-
-    if (input.install) {
-      await installDependencies({
-        projectDir,
-        packageManager,
-      });
-    } else {
-      log.info(`Run ${pc.bold(`${packageManager} install`)} to install dependencies`);
-    }
-
-    outro("Add command completed successfully!");
-  } catch (error) {
-    handleError(error, "Failed to add addons or deployment");
-  }
-}

package/src/helpers/core/convex-codegen.ts

@@ -1,14 +0,0 @@
-import path from "node:path";
-import { $ } from "bun";
-import type { PackageManager } from "../../types";
-import { getPackageExecutionCommand } from "../../utils/package-runner";
-
-// having problems running this in convex + better-auth
-export async function runConvexCodegen(
-  projectDir: string,
-  packageManager: PackageManager | null | undefined,
-) {
-  const backendDir = path.join(projectDir, "packages/backend");
-  const cmd = getPackageExecutionCommand(packageManager, "convex codegen");
-  await $`${{ raw: cmd }}`.cwd(backendDir);
-}

package/src/helpers/core/create-project.ts

@@ -1,134 +0,0 @@
-import { log } from "@clack/prompts";
-import fs from "fs-extra";
-import type { ProjectConfig } from "../../types";
-import { writeBtsConfig } from "../../utils/bts-config";
-import { exitWithError } from "../../utils/errors";
-import { setupCatalogs } from "../../utils/setup-catalogs";
-import { setupAddons } from "../addons/addons-setup";
-import { setupExamples } from "../addons/examples-setup";
-import { setupApi } from "../core/api-setup";
-import { setupBackendDependencies } from "../core/backend-setup";
-import { setupDatabase } from "../core/db-setup";
-import { setupRuntime } from "../core/runtime-setup";
-import { setupServerDeploy } from "../deployment/server-deploy-setup";
-import { setupWebDeploy } from "../deployment/web-deploy-setup";
-import { setupAuth } from "./auth-setup";
-import { createReadme } from "./create-readme";
-import { setupEnvironmentVariables } from "./env-setup";
-import { initializeGit } from "./git";
-import { installDependencies } from "./install-dependencies";
-import { setupPayments } from "./payments-setup";
-import { displayPostInstallInstructions } from "./post-installation";
-import { updatePackageConfigurations } from "./project-config";
-import {
-  copyBaseTemplate,
-  handleExtras,
-  setupAddonsTemplate,
-  setupAuthTemplate,
-  setupBackendFramework,
-  setupDeploymentTemplates,
-  setupDockerComposeTemplates,
-  setupExamplesTemplate,
-  setupFrontendTemplates,
-  setupPaymentsTemplate,
-} from "./template-manager";
-
-export async function createProject(options: ProjectConfig, cliInput?: { manualDb?: boolean }) {
-  const projectDir = options.projectDir;
-  const isConvex = options.backend === "convex";
-  const isSelfBackend = options.backend === "self";
-  const needsServerSetup = !isConvex && !isSelfBackend;
-
-  try {
-    await fs.ensureDir(projectDir);
-
-    await copyBaseTemplate(projectDir, options);
-    await setupFrontendTemplates(projectDir, options);
-
-    await setupBackendFramework(projectDir, options);
-
-    if (needsServerSetup || (isSelfBackend && options.dbSetup === "docker")) {
-      await setupDockerComposeTemplates(projectDir, options);
-    }
-
-    await setupAuthTemplate(projectDir, options);
-    if (options.payments && options.payments !== "none") {
-      await setupPaymentsTemplate(projectDir, options);
-    }
-    if (options.examples.length > 0 && options.examples[0] !== "none") {
-      await setupExamplesTemplate(projectDir, options);
-    }
-    await setupAddonsTemplate(projectDir, options);
-
-    await setupDeploymentTemplates(projectDir, options);
-
-    await setupApi(options);
-
-    if (isConvex || needsServerSetup) {
-      await setupBackendDependencies(options);
-    }
-
-    if (!isConvex) {
-      if (needsServerSetup) {
-        await setupRuntime(options);
-      }
-      await setupDatabase(options, cliInput);
-    }
-
-    if (options.examples.length > 0 && options.examples[0] !== "none") {
-      await setupExamples(options);
-    }
-
-    if (options.addons.length > 0 && options.addons[0] !== "none") {
-      await setupAddons(options);
-    }
-
-    if (options.auth && options.auth !== "none") {
-      await setupAuth(options);
-    }
-
-    if (options.payments && options.payments !== "none") {
-      await setupPayments(options);
-    }
-
-    await handleExtras(projectDir, options);
-
-    await setupEnvironmentVariables(options);
-    await updatePackageConfigurations(projectDir, options);
-
-    await setupWebDeploy(options);
-    await setupServerDeploy(options);
-
-    await setupCatalogs(projectDir, options);
-
-    await createReadme(projectDir, options);
-
-    await writeBtsConfig(options);
-
-    log.success("Project template successfully scaffolded!");
-
-    if (options.install) {
-      await installDependencies({
-        projectDir,
-        packageManager: options.packageManager,
-      });
-    }
-
-    await initializeGit(projectDir, options.git);
-
-    await displayPostInstallInstructions({
-      ...options,
-      depsInstalled: options.install,
-    });
-
-    return projectDir;
-  } catch (error) {
-    if (error instanceof Error) {
-      console.error(error.stack);
-      exitWithError(`Error during project creation: ${error.message}`);
-    } else {
-      console.error(error);
-      exitWithError(`An unexpected error occurred: ${String(error)}`);
-    }
-  }
-}