@revstackhq/cli 0.0.0-dev-20260226055348 → 0.0.0-dev-20260226061807

package/src/commands/pull.ts

@@ -52,19 +52,9 @@ interface RemoteConfig {
   plans: Record<string, RemotePlan>;
 }
 
-// ─── Code Generator ──────────────────────────────────────────
-
-function indent(text: string, spaces: number): string {
-  const pad = " ".repeat(spaces);
-  return text
-    .split("\n")
-    .map((line) => (line.trim() ? pad + line : line))
-    .join("\n");
-}
-
 function serializeObject(
   obj: Record<string, unknown>,
-  depth: number = 0
+  depth: number = 0,
 ): string {
   const entries = Object.entries(obj);
   if (entries.length === 0) return "{}";
@@ -110,8 +100,7 @@ function serializeArray(arr: unknown[], depth: number): string {
   return `[\n${items.join("\n")}\n${closePad}]`;
 }
 
-function generateConfigSource(config: RemoteConfig): string {
-  // ── Features ─────────────────────────────────────────────
+function generateFeaturesSource(config: RemoteConfig): string {
   const featureEntries = Object.entries(config.features).map(([slug, f]) => {
     const props: Record<string, unknown> = {
       name: f.name,
@@ -123,7 +112,15 @@ function generateConfigSource(config: RemoteConfig): string {
     return `  ${slug}: defineFeature(${serializeObject(props, 2)}),`;
   });
 
-  // ── Plans ────────────────────────────────────────────────
+  return `import { defineFeature } from "@revstackhq/core";
+
+export const features = {
+${featureEntries.join("\n")}
+};
+`;
+}
+
+function generatePlansSource(config: RemoteConfig): string {
   const planEntries = Object.entries(config.plans).map(([slug, plan]) => {
     const props: Record<string, unknown> = {
       name: plan.name,
@@ -146,21 +143,23 @@ function generateConfigSource(config: RemoteConfig): string {
     return `${comment}    ${slug}: definePlan<typeof features>(${serializeObject(props, 3)}),`;
   });
 
-  return `import { defineConfig, definePlan, defineFeature } from "@revstackhq/core";
-
-// ─── Features ────────────────────────────────────────────────
+  return `import { definePlan } from "@revstackhq/core";
+import { features } from "./features";
 
-const features = {
-${featureEntries.join("\n")}
+export const plans = {
+${planEntries.join("\n")}
 };
+`;
+}
 
-// ─── Plans ───────────────────────────────────────────────────
+function generateRootConfigSource(): string {
+  return `import { defineConfig } from "@revstackhq/core";
+import { features } from "./revstack/features";
+import { plans } from "./revstack/plans";
 
 export default defineConfig({
   features,
-  plans: {
-${planEntries.join("\n")}
-  },
+  plans,
 });
 `;
 }
@@ -173,7 +172,7 @@ const API_BASE = "https://app.revstack.dev";
 
 export const pullCommand = new Command("pull")
   .description(
-    "Pull the remote billing config and overwrite revstack.config.ts"
+    "Pull the remote billing config and overwrite local revstack.config.ts and revstack/ files",
   )
   .option("-e, --env <environment>", "Target environment", "test")
   .action(async (options: { env: string }) => {
@@ -185,7 +184,7 @@ export const pullCommand = new Command("pull")
           chalk.red("  ✖ Not authenticated.\n") +
           chalk.dim("    Run ") +
           chalk.bold("revstack login") +
-          chalk.dim(" first.\n")
+          chalk.dim(" first.\n"),
       );
       process.exit(1);
     }
@@ -203,13 +202,13 @@ export const pullCommand = new Command("pull")
         `${API_BASE}/api/v1/cli/pull?env=${encodeURIComponent(options.env)}`,
         {
           headers: { Authorization: `Bearer ${apiKey}` },
-        }
+        },
       );
 
       if (!res.ok) {
         spinner.fail("Failed to fetch remote config");
         console.error(
-          chalk.red(`\n  API returned ${res.status}: ${res.statusText}\n`)
+          chalk.red(`\n  API returned ${res.status}: ${res.statusText}\n`),
         );
         process.exit(1);
       }
@@ -230,19 +229,25 @@ export const pullCommand = new Command("pull")
       "\n" +
         chalk.dim("  Remote state: ") +
         chalk.white(`${featureCount} features, ${planCount} plans`) +
-        chalk.dim(` (${options.env})\n`)
+        chalk.dim(` (${options.env})\n`),
     );
 
     // ── 3. Confirm overwrite ───────────────────────────────
-    const configPath = path.resolve(process.cwd(), "revstack.config.ts");
-    const exists = fs.existsSync(configPath);
+    const cwd = process.cwd();
+    const configPath = path.resolve(cwd, "revstack.config.ts");
+    const revstackDir = path.resolve(cwd, "revstack");
+    const featuresPath = path.resolve(revstackDir, "features.ts");
+    const plansPath = path.resolve(revstackDir, "plans.ts");
 
-    if (exists) {
+    const rootExists = fs.existsSync(configPath);
+    const dirExists = fs.existsSync(revstackDir);
+
+    if (rootExists || dirExists) {
       const { confirm } = await prompts({
         type: "confirm",
         name: "confirm",
         message:
-          "This will overwrite your local revstack.config.ts. Are you sure?",
+          "This will overwrite your local configuration files (revstack.config.ts and revstack/ data). Are you sure?",
         initial: false,
       });
 
@@ -253,14 +258,23 @@ export const pullCommand = new Command("pull")
     }
 
     // ── 4. Generate and write ──────────────────────────────
-    const source = generateConfigSource(remoteConfig);
-    fs.writeFileSync(configPath, source, "utf-8");
+    if (!fs.existsSync(revstackDir)) {
+      fs.mkdirSync(revstackDir, { recursive: true });
+    }
+
+    const featuresSource = generateFeaturesSource(remoteConfig);
+    const plansSource = generatePlansSource(remoteConfig);
+    const rootSource = generateRootConfigSource();
+
+    fs.writeFileSync(featuresPath, featuresSource, "utf-8");
+    fs.writeFileSync(plansPath, plansSource, "utf-8");
+    fs.writeFileSync(configPath, rootSource, "utf-8");
 
     console.log(
       "\n" +
-        chalk.green("  ✔ revstack.config.ts updated from remote.\n") +
-        chalk.dim("    Review the file and run ") +
+        chalk.green("  ✔ Local files updated from remote.\n") +
+        chalk.dim("    Review the files and run ") +
         chalk.bold("revstack push") +
-        chalk.dim(" to re-deploy.\n")
+        chalk.dim(" to re-deploy.\n"),
     );
   });

package/tests/integration/init.test.ts

@@ -6,9 +6,27 @@ vi.mock("node:fs", () => ({
   default: {
     existsSync: vi.fn(),
     writeFileSync: vi.fn(),
+    mkdirSync: vi.fn(),
   },
   existsSync: vi.fn(),
   writeFileSync: vi.fn(),
+  mkdirSync: vi.fn(),
+}));
+
+// ── Mock node:child_process ────────────────────────────────────
+vi.mock("node:child_process", () => ({
+  spawnSync: vi.fn().mockReturnValue({ status: 0, error: null }),
+}));
+
+// ── Mock ora ─────────────────────────────────────────────────
+const mockSpinner = {
+  start: vi.fn().mockReturnThis(),
+  succeed: vi.fn().mockReturnThis(),
+  fail: vi.fn().mockReturnThis(),
+};
+
+vi.mock("ora", () => ({
+  default: vi.fn(() => mockSpinner),
 }));
 
 // ── Mock chalk (no-op proxy) ─────────────────────────────────
@@ -67,13 +85,28 @@ describe("init command", () => {
     const program = createTestProgram();
     await program.parseAsync(["node", "revstack", "init"], { from: "node" });
 
+    expect(mockFs.mkdirSync).toHaveBeenCalledWith(
+      expect.stringContaining("revstack"),
+      { recursive: true },
+    );
+    expect(mockFs.writeFileSync).toHaveBeenCalledTimes(3);
+    expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+      expect.stringContaining("features.ts"),
+      expect.stringContaining("defineFeature"),
+      "utf-8",
+    );
+    expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+      expect.stringContaining("plans.ts"),
+      expect.stringContaining("definePlan"),
+      "utf-8",
+    );
     expect(mockFs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("revstack.config.ts"),
       expect.stringContaining("defineConfig"),
-      "utf-8"
+      "utf-8",
     );
     expect(consoleSpy).toHaveBeenCalledWith(
-      expect.stringContaining("Created revstack.config.ts")
+      expect.stringContaining("Created revstack config structure"),
     );
 
     consoleSpy.mockRestore();
@@ -86,7 +119,7 @@ describe("init command", () => {
     const program = createTestProgram();
 
     await expect(
-      program.parseAsync(["node", "revstack", "init"], { from: "node" })
+      program.parseAsync(["node", "revstack", "init"], { from: "node" }),
     ).rejects.toThrow(ProcessExitError);
 
     expect(exitSpy).toHaveBeenCalledWith(1);

package/tests/integration/pull.test.ts

@@ -37,9 +37,11 @@ vi.mock("node:fs", () => ({
   default: {
     existsSync: vi.fn(),
     writeFileSync: vi.fn(),
+    mkdirSync: vi.fn(),
   },
   existsSync: vi.fn(),
   writeFileSync: vi.fn(),
+  mkdirSync: vi.fn(),
 }));
 
 // ── Imports (after mocks) ────────────────────────────────────
@@ -130,7 +132,7 @@ describe("pull command", () => {
     const program = createTestProgram();
 
     await expect(
-      program.parseAsync(["node", "revstack", "pull"], { from: "node" })
+      program.parseAsync(["node", "revstack", "pull"], { from: "node" }),
     ).rejects.toThrow(ProcessExitError);
 
     expect(exitSpy).toHaveBeenCalledWith(1);
@@ -148,7 +150,7 @@ describe("pull command", () => {
     const program = createTestProgram();
 
     await expect(
-      program.parseAsync(["node", "revstack", "pull"], { from: "node" })
+      program.parseAsync(["node", "revstack", "pull"], { from: "node" }),
     ).rejects.toThrow(ProcessExitError);
 
     expect(exitSpy).toHaveBeenCalledWith(1);
@@ -157,7 +159,9 @@ describe("pull command", () => {
 
   it("pulls config and writes file after user confirmation", async () => {
     mockGetApiKey.mockReturnValue("sk_test_valid123");
-    mockFs.existsSync.mockReturnValue(true); // config file exists
+    mockFs.existsSync.mockImplementation((p) =>
+      String(p).endsWith("revstack.config.ts"),
+    ); // config file exists
 
     const mockFetch = vi
       .fn()
@@ -171,10 +175,25 @@ describe("pull command", () => {
 
     expect(mockFetch).toHaveBeenCalledTimes(1);
     expect(mockFetch.mock.calls[0][0]).toContain("/api/v1/cli/pull");
+    expect(mockFs.mkdirSync).toHaveBeenCalledWith(
+      expect.stringContaining("revstack"),
+      { recursive: true },
+    );
+    expect(mockFs.writeFileSync).toHaveBeenCalledTimes(3);
+    expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+      expect.stringContaining("features.ts"),
+      expect.stringContaining("defineFeature"),
+      "utf-8",
+    );
+    expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+      expect.stringContaining("plans.ts"),
+      expect.stringContaining("definePlan"),
+      "utf-8",
+    );
     expect(mockFs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("revstack.config.ts"),
       expect.stringContaining("defineConfig"),
-      "utf-8"
+      "utf-8",
     );
   });
 
@@ -193,6 +212,7 @@ describe("pull command", () => {
     await program.parseAsync(["node", "revstack", "pull"], { from: "node" });
 
     expect(mockFs.writeFileSync).not.toHaveBeenCalled();
+    expect(mockFs.mkdirSync).not.toHaveBeenCalled();
   });
 
   it("skips confirmation when config file does not exist", async () => {
@@ -211,6 +231,6 @@ describe("pull command", () => {
     // Prompts never called since file doesn't exist
     expect(mockPrompts).not.toHaveBeenCalled();
     // File was written directly
-    expect(mockFs.writeFileSync).toHaveBeenCalled();
+    expect(mockFs.writeFileSync).toHaveBeenCalledTimes(3);
   });
 });

package/tsup.config.ts

@@ -1,9 +1,10 @@
 import { defineConfig } from "tsup";
+import { execa } from "execa";
 
 export default defineConfig({
-  entry: ["src/cli.ts"],
+  entry: ["src/**/*.ts"],
   format: ["esm"],
-  dts: false,
+  dts: true,
   splitting: false,
   sourcemap: true,
   clean: true,
@@ -13,4 +14,9 @@ export default defineConfig({
   banner: {
     js: "#!/usr/bin/env node",
   },
+  async onSuccess() {
+    await execa("tsc-alias", ["-p", "tsconfig.json"], {
+      stdio: "inherit",
+    });
+  },
 });