@tdk-landscape/tdk-cli-core 1.3.45 → 1.3.48

package/cli/shared-platform-engineering/docker-templates/prisma-normalize-client.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+set -e
+
+PRISMA_EXPORT_GENERATED_CLIENT="${PRISMA_EXPORT_GENERATED_CLIENT:-1}"
+PRISMA_DOT_DIR="node_modules/.prisma"
+PRISMA_DOT_CLIENT="node_modules/.prisma/client"
+
+# Normalize Prisma output for both import styles: ../generated-client and node_modules/.prisma/client
+if [ ! -d "$PRISMA_DOT_CLIENT" ] && [ -d /app/node_modules/.prisma/client ]; then
+  mkdir -p "$PRISMA_DOT_DIR"
+  cp -R /app/node_modules/.prisma/client "$PRISMA_DOT_CLIENT"
+fi
+
+if [ "$PRISMA_EXPORT_GENERATED_CLIENT" = "1" ] && [ -d "$PRISMA_DOT_CLIENT" ] && [ ! -d generated-client ] && [ ! -f generated-client.ts ]; then
+  printf "export * from './node_modules/.prisma/client/client';\n" > generated-client.ts
+fi
+
+mkdir -p "$PRISMA_DOT_CLIENT"
+if [ -d generated-client ] && [ -z "$(ls -A "$PRISMA_DOT_CLIENT" 2>/dev/null)" ]; then
+  cp -r generated-client/. "$PRISMA_DOT_CLIENT/"
+fi
+
+# Prisma v7 prisma-client may emit TS-only artifacts; add declaration/js entrypoints
+if [ -f "$PRISMA_DOT_CLIENT/client.ts" ] && [ ! -f "$PRISMA_DOT_CLIENT/index.d.ts" ]; then
+  printf "export * from './client';\n" > "$PRISMA_DOT_CLIENT/index.d.ts"
+fi
+if [ -f "$PRISMA_DOT_CLIENT/client.ts" ] && [ ! -f "$PRISMA_DOT_CLIENT/default.d.ts" ]; then
+  printf "export * from './client';\n" > "$PRISMA_DOT_CLIENT/default.d.ts"
+fi
+if [ -f "$PRISMA_DOT_CLIENT/client.ts" ] && [ ! -f "$PRISMA_DOT_CLIENT/index.js" ]; then
+  printf "export * from './client.js';\n" > "$PRISMA_DOT_CLIENT/index.js"
+fi
+
+# Prisma v7 may generate malformed package.json under Bun
+if [ -f "$PRISMA_DOT_CLIENT/client.ts" ]; then
+  echo '{"name":"prisma-client-generated","types":"index.d.ts","main":"index.js"}' > "$PRISMA_DOT_CLIENT/package.json"
+fi
+
+# Prisma v7: @prisma/client/default.js requires .prisma/client/default
+if [ -d "$PRISMA_DOT_CLIENT" ] && [ ! -f "$PRISMA_DOT_CLIENT/default.js" ]; then
+  printf "module.exports = require('./client.js');\n" > "$PRISMA_DOT_CLIENT/default.js"
+fi
+
+# Ensure @prisma/client package can resolve '.prisma/client/*' under Bun hoisting
+if [ -d "$PRISMA_DOT_DIR" ]; then
+  for pkg in node_modules/@prisma/client node_modules/.bun/@prisma+client*/node_modules/@prisma/client; do
+    [ -d "$pkg" ] && ln -sfn "$(pwd)/$PRISMA_DOT_DIR" "$pkg/.prisma" || true
+  done
+fi
+
+# Also fix corrupted package.json in .bun cache
+for pkg in node_modules/.bun/@prisma+client*/node_modules/@prisma/client/package.json; do
+  [ -f "$pkg" ] && echo '{"name":"@prisma/client","main":"index.js","types":"index.d.ts"}' > "$pkg" || true
+done
+
+test -f "$PRISMA_DOT_CLIENT/client.ts" -o -f "$PRISMA_DOT_CLIENT/index.d.ts" || true

package/{dist/cli.js → cli/src/cli.ts}

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 import chalk from "chalk";
 import { Command } from "commander";
 import pkg from "../package.json" with { type: "json" };
@@ -19,22 +20,27 @@ import { uiCommand } from "./commands/ui.js";
 import { upCommand } from "./commands/up.js";
 import { upgradeCommand } from "./commands/upgrade.js";
 import { versionCommand } from "./commands/version.js";
+
 const program = new Command();
+
 program
-    .name("tdk")
-    .description("Tilt Development Kit - Project/Stack/Resource management")
-    .version(pkg.version, "-v, --version", "Display version number")
-    .option("--verbose", "Enable verbose output", false)
-    .configureOutput({
+  .name("tdk")
+  .description("Tilt Development Kit - Project/Stack/Resource management")
+  .version(pkg.version, "-v, --version", "Display version number")
+  .option("--verbose", "Enable verbose output", false)
+  .configureOutput({
     outputError: (str, write) => write(chalk.red(str)),
     writeOut: (str) => process.stdout.write(str),
     writeErr: (str) => process.stderr.write(str),
-});
+  });
+
 program.helpCommand("help [command]", "Show colorful help").on("--help", () => {
-    showHelp();
-    process.exit(0);
+  showHelp();
+  process.exit(0);
 });
+
 program.addHelpText("before", "");
+
 program.addCommand(stacksCommand);
 program.addCommand(resourcesCommand);
 program.addCommand(projectsCommand);
@@ -51,14 +57,16 @@ program.addCommand(doctorCommand);
 program.addCommand(completionCommand);
 program.addCommand(upgradeCommand);
 program.addCommand(networksCommand);
+
 // Default: show help if no command provided
 if (process.argv.length === 2) {
-    showHelp();
-    process.exit(0);
+  showHelp();
+  process.exit(0);
 }
+
 if (process.argv.length === 3 && ["-h", "--help", "help"].includes(process.argv[2])) {
-    showHelp();
-    process.exit(0);
+  showHelp();
+  process.exit(0);
 }
+
 program.parse();
-//# sourceMappingURL=cli.js.map

package/cli/src/commands/__tests__/always-enabled-infra.test.ts

@@ -0,0 +1,115 @@
+import { describe, expect, it } from "vitest";
+
+interface PhaseFixture {
+  name: string;
+  description: string;
+  enabledStacks: string[];
+}
+
+interface ProjectConfigFixture {
+  version: string;
+  project: { name: string; version: string };
+  phases: {
+    pre_alpha: PhaseFixture;
+    alpha: PhaseFixture;
+    beta: PhaseFixture;
+    out_of_scope: PhaseFixture;
+  };
+  always_enabled_infra?: string[];
+}
+
+describe("always_enabled_infra", () => {
+  it("includes core infrastructure always enabled in pre_alpha", () => {
+    const projectConfig: ProjectConfigFixture = {
+      version: "1.0",
+      project: { name: "checkout-app", version: "1.0.0" },
+      phases: {
+        pre_alpha: {
+          name: "Pre-Alpha",
+          description: "Core infrastructure and MVP services",
+          enabledStacks: ["proxy", "billing", "checkout-app", "database-management"],
+        },
+        alpha: {
+          name: "Alpha",
+          description: "Essential business services",
+          enabledStacks: [],
+        },
+        beta: {
+          name: "Beta",
+          description: "Extended features",
+          enabledStacks: [],
+        },
+        out_of_scope: {
+          name: "Out of Scope",
+          description: "Future releases",
+          enabledStacks: [],
+        },
+      },
+      always_enabled_infra: [
+        "database-management",
+        "proxy",
+      ],
+    };
+
+    expect(projectConfig.always_enabled_infra).toContain("database-management");
+    expect(projectConfig.always_enabled_infra).toContain("proxy");
+    expect(projectConfig.phases.pre_alpha.enabledStacks).toContain("proxy");
+  });
+
+  it("always_enabled_infra defaults when not specified", () => {
+    const projectConfig: ProjectConfigFixture = {
+      version: "1.0",
+      project: { name: "my-project", version: "1.0.0" },
+      phases: {
+        pre_alpha: {
+          name: "Pre-Alpha",
+          description: "Core infrastructure and MVP services",
+          enabledStacks: [],
+        },
+        alpha: {
+          name: "Alpha",
+          description: "Essential business services",
+          enabledStacks: [],
+        },
+        beta: {
+          name: "Beta",
+          description: "Extended features",
+          enabledStacks: [],
+        },
+        out_of_scope: {
+          name: "Out of Scope",
+          description: "Future releases",
+          enabledStacks: [],
+        },
+      },
+    };
+
+    // TemplateEngine uses ?? operator to default when undefined/null
+    const defaults = projectConfig.always_enabled_infra ?? [
+      "database-management",
+      "proxy",
+    ];
+
+    expect(defaults).toContain("database-management");
+    expect(defaults).toContain("proxy");
+  });
+
+  it("always_enabled_infra + enabledStacks can overlap, including explicit premium infra", () => {
+    const projectConfig = {
+      version: "1.0",
+      project: { name: "test-project", version: "1.0.0" },
+      phases: {
+        pre_alpha: {
+          name: "Pre-Alpha",
+          description: "Core infrastructure and MVP services",
+          enabledStacks: ["proxy", "database-management"],
+        },
+      },
+      always_enabled_infra: ["proxy", "infisical"],
+    };
+
+    expect(projectConfig.phases.pre_alpha.enabledStacks).toContain("proxy");
+    expect(projectConfig.always_enabled_infra).toContain("infisical");
+    expect(projectConfig.always_enabled_infra).toContain("proxy");
+  });
+});

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

@@ -0,0 +1,146 @@
+import { describe, expect, it } from "vitest";
+
+describe("config command", () => {
+  describe("project config structure", () => {
+    it("should have required project.json fields", () => {
+      const expectedConfig = {
+        version: "2",
+        project: {
+          name: "test-project",
+          version: "1.0.0",
+        },
+        phases: {
+          pre_alpha: { name: "pre-alpha", description: "Pre-alpha phase", enabledStacks: [] },
+          alpha: { name: "alpha", description: "Alpha phase", enabledStacks: [] },
+          beta: { name: "beta", description: "Beta phase", enabledStacks: [] },
+          out_of_scope: { name: "out-of-scope", description: "Future phase", enabledStacks: [] },
+        },
+        optional_infra: {
+          monitoring: false,
+          elk: false,
+          debezium: false,
+          golden_image: false,
+        },
+        discovery: {
+          paths: [],
+        },
+      };
+
+      expect(expectedConfig).toHaveProperty("version");
+      expect(expectedConfig).toHaveProperty("project");
+      expect(expectedConfig).toHaveProperty("phases");
+      expect(expectedConfig).toHaveProperty("optional_infra");
+      expect(expectedConfig).toHaveProperty("discovery");
+
+      expect(expectedConfig.project).toHaveProperty("name");
+      expect(expectedConfig.project).toHaveProperty("version");
+    });
+  });
+
+  describe("config verification logic", () => {
+    it("should detect missing files", () => {
+      const existingFiles: string[] = [];
+      const requiredFiles = ["TILT_TECH_STACK.star", "TILT_RESOURCE_DEFAULTS.star", "spec.master"];
+
+      const missingFiles = requiredFiles.filter((f) => !existingFiles.includes(f));
+      expect(missingFiles).toHaveLength(3);
+    });
+
+    it("should detect when all files exist", () => {
+      const existingFiles = ["TILT_TECH_STACK.star", "TILT_RESOURCE_DEFAULTS.star", "spec.master"];
+      const requiredFiles = [...existingFiles];
+
+      const missingFiles = requiredFiles.filter((f) => !existingFiles.includes(f));
+      expect(missingFiles).toHaveLength(0);
+    });
+
+    it("should detect content differences", () => {
+      const currentContent = '{"version": "1", "old": true}';
+      const newContent = '{"version": "2", "new": true}';
+
+      expect(currentContent).not.toBe(newContent);
+    });
+
+    it("should detect identical content", () => {
+      const content = '{"version": "2"}';
+      const sameContent = '{"version": "2"}';
+
+      expect(content).toBe(sameContent);
+    });
+  });
+
+  describe("template generation", () => {
+    it("should generate required output files", () => {
+      const expectedFiles = [
+        "TILT_TECH_STACK.star",
+        "TILT_RESOURCE_DEFAULTS.star",
+        "spec.master",
+        "Tiltfile",
+      ];
+
+      expect(expectedFiles).toContain("TILT_TECH_STACK.star");
+      expect(expectedFiles).toContain("TILT_RESOURCE_DEFAULTS.star");
+      expect(expectedFiles).toContain("spec.master");
+      expect(expectedFiles).toContain("Tiltfile");
+    });
+
+    it("should validate TILT_TECH_STACK.star content", () => {
+      const techStackContent = `
+TECH_STACK = {
+  BUNDLER = "bun"
+  RUNTIME = "bun"
+}
+`;
+
+      expect(techStackContent).toContain("TECH_STACK");
+      expect(techStackContent).toContain("BUNDLER");
+      expect(techStackContent).toContain("RUNTIME");
+    });
+
+    it("should validate TILT_RESOURCE_DEFAULTS.star content", () => {
+      const resourceDefaultsContent = `
+BASE_PORT_FRONTEND = 3000
+BASE_PORT_BACKEND = 4000
+HEALTH_CHECK_PATH = "/health"
+`;
+
+      expect(resourceDefaultsContent).toContain("BASE_PORT");
+      expect(resourceDefaultsContent).toContain("HEALTH_CHECK");
+    });
+  });
+
+  describe("diff functionality", () => {
+    it("should identify new files", () => {
+      const existingFiles: string[] = [];
+      const newFiles = ["TILT_TECH_STACK.star", "spec.master"];
+
+      const addedFiles = newFiles.filter((f) => !existingFiles.includes(f));
+      expect(addedFiles).toEqual(["TILT_TECH_STACK.star", "spec.master"]);
+    });
+
+    it("should calculate line count differences", () => {
+      const currentLines = ["line1", "line2", "line3"];
+      const newLines = ["line1", "line2", "line3", "line4", "line5"];
+
+      const lineDiff = newLines.length - currentLines.length;
+      expect(lineDiff).toBe(2);
+      expect(newLines.length).toBe(5);
+      expect(currentLines.length).toBe(3);
+    });
+
+    it("should find first difference line", () => {
+      const currentLines = ["line1", "line2", "line3"];
+      const newLines = ["line1", "modified", "line3"];
+
+      let firstDiffLine = -1;
+      for (let i = 0; i < Math.max(currentLines.length, newLines.length); i++) {
+        if (currentLines[i] !== newLines[i]) {
+          firstDiffLine = i;
+          break;
+        }
+      }
+
+      expect(firstDiffLine).toBe(1);
+    });
+  });
+});