@tdk-landscape/tdk-cli-core 1.3.53 → 1.3.54

package/cli/src/commands/__tests__/resource.test.ts

@@ -1,226 +0,0 @@
-import { describe, expect, it } from "vitest";
-import {
-  BASE_TEMPLATE,
-  createPackageJson,
-  createServiceJson,
-  DOCKERFILE_TEMPLATE,
-  getBackendIndexTemplate,
-  getWorkerIndexTemplate,
-  TSCONFIG_TEMPLATE,
-  TYPE_SPECIFIC,
-} from "../../commands/resource.js";
-import { CREATABLE_RESOURCE_TYPES, isCreatableResourceType } from "../../types/index.js";
-import { KEBAB_CASE_REGEX } from "../../utils/validation.js";
-
-describe("resource command", () => {
-  describe("resource name validation", () => {
-    it("should accept valid kebab-case names using KEBAB_CASE_REGEX", () => {
-      const validNames = ["my-service", "service123", "api-gateway", "a", "test-123-abc"];
-
-      for (const name of validNames) {
-        expect(KEBAB_CASE_REGEX.test(name)).toBe(true);
-      }
-    });
-
-    it("should reject invalid names using KEBAB_CASE_REGEX", () => {
-      const invalidNames = [
-        "MyService", // camelCase
-        "my_service", // underscore
-        "my service", // space
-        "service.name", // dot
-        "Service-Name", // uppercase
-        "", // empty
-      ];
-
-      for (const name of invalidNames) {
-        expect(KEBAB_CASE_REGEX.test(name)).toBe(false);
-      }
-    });
-  });
-
-  describe("service.json template", () => {
-    it("should create valid backend service.json using createServiceJson", () => {
-      const name = "test-backend";
-      const type = "backend";
-      const stack = "main";
-      const port = 3001;
-
-      const serviceJson = createServiceJson(name, type, stack, port);
-
-      expect(serviceJson).toHaveProperty("name", name);
-      expect(serviceJson).toHaveProperty("type", type);
-      expect(serviceJson).toHaveProperty("port", port);
-      expect(serviceJson).toHaveProperty("stack", stack);
-      expect(serviceJson).toHaveProperty("healthCheck", "/health");
-      expect(serviceJson).toHaveProperty("dependencies");
-      expect(serviceJson).toHaveProperty("build");
-      expect(serviceJson).toHaveProperty("dev");
-    });
-
-    it("should create valid frontend service.json using createServiceJson", () => {
-      const name = "test-frontend";
-      const type = "frontend";
-      const stack = "main";
-      const port = 3002;
-
-      const serviceJson = createServiceJson(name, type, stack, port);
-
-      expect(serviceJson).toHaveProperty("name", name);
-      expect(serviceJson).toHaveProperty("type", type);
-      expect(serviceJson).toHaveProperty("port", port);
-      expect(serviceJson.dev.watch).toContain("public/**/*");
-    });
-
-    it("should create valid worker service.json using createServiceJson", () => {
-      const name = "test-worker";
-      const type = "worker";
-      const stack = "main";
-      const port = 0;
-
-      const serviceJson = createServiceJson(name, type, stack, port);
-
-      expect(serviceJson).toHaveProperty("name", name);
-      expect(serviceJson).toHaveProperty("type", type);
-      expect(serviceJson.port).toBe(0); // Workers may not need ports
-      expect(serviceJson.dev.command).toBe("bun run worker");
-    });
-
-    it("should have correct TYPE_SPECIFIC extensions for each resource type", () => {
-      expect(TYPE_SPECIFIC.backend).toHaveProperty("healthCheck", "/health");
-      expect(TYPE_SPECIFIC.frontend.dev?.watch).toContain("public/**/*");
-      expect(TYPE_SPECIFIC.worker.dev?.command).toBe("bun run worker");
-    });
-
-    it("should have correct BASE_TEMPLATE structure", () => {
-      expect(BASE_TEMPLATE).toHaveProperty("port", 0);
-      expect(BASE_TEMPLATE).toHaveProperty("dependencies");
-      expect(BASE_TEMPLATE).toHaveProperty("build");
-      expect(BASE_TEMPLATE).toHaveProperty("dev");
-      expect(BASE_TEMPLATE.build).toHaveProperty("dockerfile", "Dockerfile");
-    });
-  });
-
-  describe("package.json template", () => {
-    it("should create backend package.json with Hono using createPackageJson", () => {
-      const name = "test-backend";
-      const type = "backend";
-
-      const packageJson = createPackageJson(name, type);
-
-      expect(packageJson.name).toBe(`@project/${name}`);
-      expect(packageJson).toHaveProperty("dependencies");
-      expect(packageJson.dependencies).toHaveProperty("hono");
-      expect(packageJson.dependencies).not.toHaveProperty("vite");
-      expect(packageJson.scripts.dev).toBe("bun run --watch src/index.ts");
-    });
-
-    it("should create frontend package.json with Vite using createPackageJson", () => {
-      const name = "test-frontend";
-      const type = "frontend";
-
-      const packageJson = createPackageJson(name, type);
-
-      expect(packageJson.name).toBe(`@project/${name}`);
-      expect(packageJson.dependencies).not.toHaveProperty("hono");
-      expect(packageJson.devDependencies).toHaveProperty("vite");
-      expect(packageJson.scripts.dev).toBe("vite");
-    });
-
-    it("should create worker package.json using createPackageJson", () => {
-      const name = "test-worker";
-      const type = "worker";
-
-      const packageJson = createPackageJson(name, type);
-
-      expect(packageJson.name).toBe(`@project/${name}`);
-      expect(packageJson.dependencies).toHaveProperty("hono");
-      expect(packageJson.scripts.build).toBe("tsc");
-    });
-  });
-
-  describe("tsconfig template", () => {
-    it("should have correct TSCONFIG_TEMPLATE structure", () => {
-      expect(TSCONFIG_TEMPLATE).toHaveProperty("compilerOptions");
-      expect(TSCONFIG_TEMPLATE.compilerOptions).toHaveProperty("target", "ES2022");
-      expect(TSCONFIG_TEMPLATE.compilerOptions).toHaveProperty("module", "ESNext");
-      expect(TSCONFIG_TEMPLATE.compilerOptions).toHaveProperty("strict", true);
-      expect(TSCONFIG_TEMPLATE).toHaveProperty("include");
-      expect(TSCONFIG_TEMPLATE.include).toContain("src/**/*");
-    });
-  });
-
-  describe("dockerfile template", () => {
-    it("should have correct DOCKERFILE_TEMPLATE content", () => {
-      expect(DOCKERFILE_TEMPLATE).toContain("FROM oven/bun:1.2");
-      expect(DOCKERFILE_TEMPLATE).toContain("WORKDIR /app");
-      expect(DOCKERFILE_TEMPLATE).toContain("HEALTHCHECK");
-      expect(DOCKERFILE_TEMPLATE).toContain("EXPOSE 3000");
-      expect(DOCKERFILE_TEMPLATE).toContain("bun install --frozen-lockfile");
-    });
-  });
-
-  describe("backend index.ts template", () => {
-    it("should have health check endpoints via getBackendIndexTemplate", () => {
-      const name = "test-service";
-      const indexContent = getBackendIndexTemplate(name);
-
-      expect(indexContent).toContain("app.get('/health'");
-      expect(indexContent).toContain("app.get('/health/live'");
-      expect(indexContent).toContain("app.get('/health/ready'");
-      expect(indexContent).toContain("async (c)");
-      expect(indexContent).toContain(`service: '${name}'`);
-    });
-
-    it("should have root endpoint with service info", () => {
-      const name = "test-service";
-      const indexContent = getBackendIndexTemplate(name);
-
-      expect(indexContent).toContain("app.get('/',");
-      expect(indexContent).toContain("endpoints:");
-    });
-  });
-
-  describe("worker index.ts template", () => {
-    it("should have worker configuration via getWorkerIndexTemplate", () => {
-      const name = "test-worker";
-      const workerContent = getWorkerIndexTemplate(name);
-
-      expect(workerContent).toContain("WORKER_POLL_INTERVAL");
-      expect(workerContent).toContain("WORKER_MAX_RETRIES");
-      expect(workerContent).toContain("WORKER_BATCH_SIZE");
-      expect(workerContent).toContain("interface Job");
-      expect(workerContent).toContain("async function main()");
-    });
-
-    it("should have graceful shutdown handling", () => {
-      const name = "test-worker";
-      const workerContent = getWorkerIndexTemplate(name);
-
-      expect(workerContent).toContain("process.on('SIGTERM'");
-      expect(workerContent).toContain("process.on('SIGINT'");
-      expect(workerContent).toContain("shutting down gracefully");
-    });
-  });
-
-  describe("resource type validation", () => {
-    it("should only accept valid resource types via isCreatableResourceType", () => {
-      const validTypes = ["backend", "frontend", "worker"];
-      const invalidTypes = ["api", "microservice", "service", "app", "library", "sdk"];
-
-      for (const type of validTypes) {
-        expect(isCreatableResourceType(type)).toBe(true);
-      }
-
-      for (const type of invalidTypes) {
-        expect(isCreatableResourceType(type)).toBe(false);
-      }
-    });
-
-    it("should have correct CREATABLE_RESOURCE_TYPES", () => {
-      expect(CREATABLE_RESOURCE_TYPES).toContain("backend");
-      expect(CREATABLE_RESOURCE_TYPES).toContain("frontend");
-      expect(CREATABLE_RESOURCE_TYPES).toContain("worker");
-      expect(CREATABLE_RESOURCE_TYPES).toHaveLength(3);
-    });
-  });
-});

package/cli/src/commands/__tests__/saas-starter-integration.test.ts

@@ -1,194 +0,0 @@
-import { execSync } from "node:child_process";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
-
-// Get the CLI bin path dynamically
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const CLI_BIN_PATH = join(__dirname, "..", "..", "..", "bin", "tdk.js");
-
-// `tdk doctor` requires these (see REQUIRED_ENV_VARS in ../../utils/env-validator.ts);
-// an empty .env satisfies `tdk project`'s docker-compose validation but leaves doctor
-// reporting "Environment not ready". Use the same defaults env-validator would generate.
-function writeTestEnvFile(starterRoot: string) {
-  writeFileSync(
-    join(starterRoot, ".env"),
-    "VERDACCIO_URL_DOCKER=http://verdaccio:4873\nTILT_ENV=dev\nDB_PASSWORD=test-password\n",
-  );
-}
-
-// tdk-cli-extensions is a sibling checkout, not a dependency of this repo, so its
-// location varies per machine. Respect an explicit override, then fall back to the
-// conventional sibling-directory layout (both repos checked out next to each other),
-// instead of hardcoding one contributor's absolute path.
-const REPO_ROOT = join(__dirname, "..", "..", "..", "..");
-const EXTENSION_SOURCE =
-  process.env.TDK_EXTENSION_SOURCE ?? join(REPO_ROOT, "..", "tdk-cli-extensions");
-const EXTENSION_SOURCE_AVAILABLE = existsSync(EXTENSION_SOURCE);
-
-describe.skipIf(!EXTENSION_SOURCE_AVAILABLE)("saas-starter cloning and discovery", () => {
-  if (!EXTENSION_SOURCE_AVAILABLE) {
-    console.warn(
-      `Skipping saas-starter integration tests: tdk-cli-extensions not found at ${EXTENSION_SOURCE}. ` +
-        "Set TDK_EXTENSION_SOURCE to its checkout path to run these.",
-    );
-  }
-
-  let testDir: string;
-
-  beforeEach(() => {
-    testDir = join(tmpdir(), `tdk-saas-test-${Date.now()}`);
-  });
-
-  afterEach(() => {
-    try {
-      // Safety: only delete if path is under tmpdir and contains our test marker
-      if (
-        testDir?.startsWith(tmpdir()) &&
-        testDir.includes("tdk-saas-test-") &&
-        testDir.length > 20
-      ) {
-        execSync(`rm -rf "${testDir}"`, { stdio: "pipe" });
-      }
-    } catch {
-      // cleanup best-effort
-    }
-  });
-
-  /**
-   * Verifies that `tdk project saas` clones the repo correctly with required
-   * structure (services/stack/service/service.json files).
-   */
-  it("should clone saas-starter with valid file structure", () => {
-    const cwd = testDir;
-    execSync(`mkdir -p "${cwd}"`, { stdio: "pipe" });
-
-    const result = execSync(`cd "${cwd}" && bun "${CLI_BIN_PATH}" project saas --yes`, {
-      encoding: "utf-8",
-      stdio: "pipe",
-    });
-
-    expect(result).toContain("Cloned");
-    expect(existsSync(join(cwd, "tdk-saas-starter", "services"))).toBe(true);
-
-    // Verify all 4 saas services exist with valid service.json
-    const services = [
-      "services/app/dashboard-api/service.json",
-      "services/app/dashboard-app/service.json",
-      "services/billing/billing-api/service.json",
-      "services/billing/checkout-app/service.json",
-    ];
-
-    for (const svc of services) {
-      const path = join(cwd, "tdk-saas-starter", svc);
-      expect(existsSync(path)).toBe(true);
-      const content = readFileSync(path, "utf-8");
-      const manifest = JSON.parse(content);
-      expect(manifest).toHaveProperty("appName");
-      expect(manifest).toHaveProperty("stack");
-      expect(manifest.healthCheck).toBeDefined();
-    }
-  }, 30000); // 30s: clones the real saas-starter repo over the network
-
-  /**
-   * Verifies that `tdk project --yes` (after cloning) correctly discovers
-   * the existing service stacks (app, billing) from service.json files and
-   * auto-populates them in project.json's pre_alpha services, so that
-   * `tdk up` will enable them (before fix: they were silently filtered out
-   * in Tilt discovery).
-   */
-  it("should auto-populate discovered services in project.json", () => {
-    const cwd = testDir;
-    execSync(`mkdir -p "${cwd}"`, { stdio: "pipe" });
-
-    // Clone
-    execSync(`cd "${cwd}" && bun "${CLI_BIN_PATH}" project saas --yes`, {
-      stdio: "pipe",
-    });
-
-    const starterRoot = join(cwd, "tdk-saas-starter");
-    writeTestEnvFile(starterRoot);
-
-    // Generate project config
-    execSync(
-      `cd "${starterRoot}" && TDK_EXTENSION_SOURCE="${EXTENSION_SOURCE}" bun "${CLI_BIN_PATH}" project --yes`,
-      { stdio: "pipe" },
-    );
-
-    // Verify project.json has services populated
-    const projectJsonPath = join(starterRoot, ".tdk", "project.json");
-    expect(existsSync(projectJsonPath)).toBe(true);
-
-    const projectJson = JSON.parse(readFileSync(projectJsonPath, "utf-8"));
-    expect(projectJson.phases.pre_alpha.enabledStacks).toContain("app");
-    expect(projectJson.phases.pre_alpha.enabledStacks).toContain("billing");
-  }, 30000); // 30s: clones the real saas-starter repo over the network
-
-  /**
-   * Verifies that spec.master is generated with PRE_ALPHA_RESOURCES dict
-   * containing the discovered stacks, so that Tilt's should_enable() check
-   * will allow them to pass through (before fix: PRE_ALPHA_RESOURCES was empty,
-   * and only infra resources appeared in `tilt get uiresources`).
-   */
-  it("should generate spec.master with discovered services in PRE_ALPHA_RESOURCES", () => {
-    const cwd = testDir;
-    execSync(`mkdir -p "${cwd}"`, { stdio: "pipe" });
-
-    execSync(`cd "${cwd}" && bun ${CLI_BIN_PATH} project saas --yes`, {
-      stdio: "pipe",
-    });
-
-    const starterRoot = join(cwd, "tdk-saas-starter");
-    writeTestEnvFile(starterRoot);
-
-    execSync(
-      `cd "${starterRoot}" && TDK_EXTENSION_SOURCE="${EXTENSION_SOURCE}" bun ${CLI_BIN_PATH} project --yes`,
-      { stdio: "pipe" },
-    );
-
-    const specPath = join(starterRoot, ".tdk", ".tdk-out", "spec.master");
-    expect(existsSync(specPath)).toBe(true);
-
-    const specContent = readFileSync(specPath, "utf-8");
-
-    // Before fix: PRE_ALPHA_RESOURCES = { }
-    // After fix: PRE_ALPHA_RESOURCES = { "app": True, "billing": True, }
-    expect(specContent).toContain("PRE_ALPHA_RESOURCES = {");
-    expect(specContent).toMatch(/"app":\s*True/);
-    expect(specContent).toMatch(/"billing":\s*True/);
-    expect(specContent).toContain("FOCUS_PRE_ALPHA = list(PRE_ALPHA_RESOURCES.keys())");
-  });
-
-  /**
-   * Verifies that `tdk doctor` correctly reports master configs as present
-   * (they are in .tdk/.tdk-out/, not the project root).
-   */
-  it("should pass doctor check after project init", () => {
-    const cwd = testDir;
-    execSync(`mkdir -p "${cwd}"`, { stdio: "pipe" });
-
-    execSync(`cd "${cwd}" && bun ${CLI_BIN_PATH} project saas --yes`, {
-      stdio: "pipe",
-    });
-
-    const starterRoot = join(cwd, "tdk-saas-starter");
-    writeTestEnvFile(starterRoot);
-
-    execSync(
-      `cd "${starterRoot}" && TDK_EXTENSION_SOURCE="${EXTENSION_SOURCE}" bun ${CLI_BIN_PATH} project --yes`,
-      { stdio: "pipe" },
-    );
-
-    // Doctor should pass (all master configs present)
-    const doctorResult = execSync(`cd "${starterRoot}" && bun "${CLI_BIN_PATH}" doctor`, {
-      encoding: "utf-8",
-      stdio: "pipe",
-      timeout: 60_000,
-    });
-
-    expect(doctorResult).toContain("Environment ready");
-  });
-});

package/cli/src/commands/__tests__/stack-features-e2e.test.ts

@@ -1,135 +0,0 @@
-import { execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { afterEach, describe, expect, it } from "vitest";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const repoRoot = resolve(__dirname, "../../../..");
-const cliBin = join(repoRoot, "cli", "bin", "tdk.js");
-
-function runTdk(args: string[], cwd: string): string {
-  return execFileSync("bun", [cliBin, ...args], {
-    cwd,
-    encoding: "utf-8",
-    env: {
-      ...process.env,
-      TDK_EXTENSION_SOURCE: repoRoot,
-    },
-  });
-}
-
-describe("stack feature E2E", () => {
-  let projectRoot = "";
-
-  afterEach(() => {
-    if (projectRoot?.startsWith(tmpdir())) {
-      rmSync(projectRoot, { recursive: true, force: true });
-    }
-  });
-
-  it("generates database-management compose from pre_alpha services", () => {
-    projectRoot = mkdtempSync(join(tmpdir(), "tdk-stack-feature-"));
-
-    const output = runTdk(["project", "--yes"], projectRoot);
-    expect(output).toContain("Generated: services/platform/database-management/docker-compose.yml");
-
-    const projectJson = JSON.parse(
-      readFileSync(join(projectRoot, ".tdk", "project.json"), "utf-8"),
-    );
-    expect(projectJson.stack_features).toBeUndefined();
-    expect(projectJson.phases.pre_alpha.enabledStacks).toContain("database-management");
-
-    const composePath = join(
-      projectRoot,
-      "services",
-      "platform",
-      "database-management",
-      "docker-compose.yml",
-    );
-    expect(existsSync(composePath)).toBe(true);
-
-    const compose = readFileSync(composePath, "utf-8");
-    expect(compose).toContain("Stack feature: database-management");
-    expect(compose).toContain(
-      'Source: .tdk/project.json phases.*.enabledStacks includes "database-management"',
-    );
-    expect(compose).toContain("container_name: tdk_stack_feature_");
-    expect(compose).toContain("_postgres");
-    expect(compose).toContain("_database");
-
-    const spec = readFileSync(join(projectRoot, ".tdk", ".tdk-out", "spec.master"), "utf-8");
-    expect(spec).toMatch(/"database-management":\s*True/);
-    expect(spec).not.toContain("STACK_FEATURES");
-
-    const tiltignore = readFileSync(join(projectRoot, ".tiltignore"), "utf-8");
-    expect(tiltignore).toContain("**/.autogenerated/**");
-  });
-
-  it("does not keep database-management enabled after it leaves stack services", () => {
-    projectRoot = mkdtempSync(join(tmpdir(), "tdk-stack-feature-off-"));
-    runTdk(["project", "--yes"], projectRoot);
-
-    const projectJsonPath = join(projectRoot, ".tdk", "project.json");
-    const projectJson = JSON.parse(readFileSync(projectJsonPath, "utf-8"));
-    projectJson.phases.pre_alpha.enabledStacks = projectJson.phases.pre_alpha.enabledStacks.filter(
-      (service: string) => service !== "database-management",
-    );
-    writeFileSync(projectJsonPath, `${JSON.stringify(projectJson, null, 2)}\n`);
-
-    runTdk(["project", "--yes"], projectRoot);
-
-    const spec = readFileSync(join(projectRoot, ".tdk", ".tdk-out", "spec.master"), "utf-8");
-    expect(spec).not.toMatch(/"database-management":\s*True/);
-    expect(spec).not.toContain("STACK_FEATURES");
-  });
-
-  it("dedupes a duplicated service name in project.json instead of emitting a duplicate Starlark key", () => {
-    projectRoot = mkdtempSync(join(tmpdir(), "tdk-stack-feature-dupe-"));
-    runTdk(["project", "--yes"], projectRoot);
-
-    const projectJsonPath = join(projectRoot, ".tdk", "project.json");
-    const projectJson = JSON.parse(readFileSync(projectJsonPath, "utf-8"));
-    projectJson.phases.pre_alpha.enabledStacks.push("database-management");
-    writeFileSync(projectJsonPath, `${JSON.stringify(projectJson, null, 2)}\n`);
-
-    runTdk(["project"], projectRoot);
-
-    const spec = readFileSync(join(projectRoot, ".tdk", ".tdk-out", "spec.master"), "utf-8");
-    const matches = spec.match(/"database-management":\s*True/g) ?? [];
-    expect(matches.length).toBe(1);
-  });
-
-  it("adds newly discovered unassigned service stacks to pre_alpha on regeneration", () => {
-    projectRoot = mkdtempSync(join(tmpdir(), "tdk-stack-discovery-sync-"));
-    runTdk(["project", "--yes"], projectRoot);
-
-    const serviceDir = join(projectRoot, "services", "billing", "checkout-app");
-    mkdirSync(serviceDir, { recursive: true });
-    writeFileSync(
-      join(serviceDir, "service.json"),
-      `${JSON.stringify(
-        {
-          appName: "checkout-app",
-          appType: "frontend",
-          stack: "billing",
-          port: 3210,
-        },
-        null,
-        2,
-      )}\n`,
-    );
-
-    runTdk(["project", "--yes"], projectRoot);
-
-    const projectJson = JSON.parse(
-      readFileSync(join(projectRoot, ".tdk", "project.json"), "utf-8"),
-    );
-    expect(projectJson.phases.pre_alpha.enabledStacks).toContain("billing");
-
-    const spec = readFileSync(join(projectRoot, ".tdk", ".tdk-out", "spec.master"), "utf-8");
-    expect(spec).toMatch(/"billing":\s*True/);
-  });
-});