create-svc 0.1.37 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",

package/src/service.test.ts

@@ -2,13 +2,12 @@ import { expect, test } from "bun:test";
 import { mkdtemp, mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
-import { findGeneratedServiceRoot, generatedDependenciesInstalled, normalizeScaffoldArgs } from "./service";
+import { findGeneratedServiceRoot, formatOutsideServiceCommandError, generatedDependenciesInstalled, normalizeScaffoldArgs } from "./service";
 
-test("normalizeScaffoldArgs treats service create as the scaffold command outside a service repo", () => {
+test("normalizeScaffoldArgs treats explicit scaffold commands as generator commands", () => {
   expect(normalizeScaffoldArgs(["create", "launch-api", "--yes"])).toEqual(["launch-api", "--yes"]);
   expect(normalizeScaffoldArgs(["new", "launch-api"])).toEqual(["launch-api"]);
   expect(normalizeScaffoldArgs(["init", "launch-api"])).toEqual(["launch-api"]);
-  expect(normalizeScaffoldArgs(["launch-api", "--yes"])).toEqual(["launch-api", "--yes"]);
 });
 
 test("normalizeScaffoldArgs maps service help to generator help outside a service repo", () => {
@@ -16,6 +15,17 @@ test("normalizeScaffoldArgs maps service help to generator help outside a servic
   expect(normalizeScaffoldArgs(["help", "--verbose"])).toEqual(["--help", "--verbose"]);
 });
 
+test("formatOutsideServiceCommandError rejects repo-local commands outside generated services", () => {
+  expect(formatOutsideServiceCommandError("destroy")).toContain("service destroy must be run inside a generated service repo");
+  expect(formatOutsideServiceCommandError("deploy")).toContain("No service.jsonc was found");
+});
+
+test("formatOutsideServiceCommandError does not treat positional names as scaffold commands", () => {
+  const message = formatOutsideServiceCommandError("launch-api");
+  expect(message).toContain("Unknown command: launch-api");
+  expect(message).toContain("service create <service_id>");
+});
+
 test("findGeneratedServiceRoot detects generated service context from nested directories", async () => {
   const root = await mkdtemp(join(tmpdir(), "create-svc-service-root-"));
   const serviceRoot = join(root, "generated-api");

package/src/service.ts

@@ -1,9 +1,22 @@
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { run as runScaffoldCli } from "./cli";
+import { formatScaffoldHelp, run as runScaffoldCli } from "./cli";
 import { parseJsonc } from "./jsonc";
 
 const SCAFFOLD_COMMANDS = new Set(["create", "new", "init"]);
+const GENERATED_SERVICE_COMMANDS = new Set([
+  "auth",
+  "create",
+  "dashboards",
+  "deploy",
+  "destroy",
+  "dev",
+  "dns",
+  "doctor",
+  "migrate",
+  "sdk",
+  "seed",
+]);
 
 export async function runServiceCommand(argv: string[], cwd = process.cwd()) {
   const serviceRoot = findGeneratedServiceRoot(cwd);
@@ -12,7 +25,19 @@ export async function runServiceCommand(argv: string[], cwd = process.cwd()) {
     return;
   }
 
-  await runScaffoldCli(normalizeScaffoldArgs(argv));
+  const [command] = argv;
+  if (!command || command === "--help" || command === "-h" || command === "help") {
+    console.log(formatScaffoldHelp());
+    return;
+  }
+
+  if (SCAFFOLD_COMMANDS.has(command)) {
+    await runScaffoldCli(normalizeScaffoldArgs(argv));
+    return;
+  }
+
+  console.error(formatOutsideServiceCommandError(command));
+  process.exit(1);
 }
 
 export function normalizeScaffoldArgs(argv: string[]) {
@@ -26,6 +51,20 @@ export function normalizeScaffoldArgs(argv: string[]) {
   return argv;
 }
 
+export function formatOutsideServiceCommandError(command: string) {
+  if (GENERATED_SERVICE_COMMANDS.has(command)) {
+    return [
+      `service ${command} must be run inside a generated service repo.`,
+      "",
+      "No service.jsonc was found in this directory or its parents.",
+      "To create a new service, run:",
+      "  service create <service_id>",
+    ].join("\n");
+  }
+
+  return [`Unknown command: ${command}`, "", formatScaffoldHelp()].join("\n");
+}
+
 export function findGeneratedServiceRoot(start: string): string | undefined {
   let current = start;
   while (true) {