create-svc 0.1.25 → 0.1.27

package/README.md

@@ -7,7 +7,7 @@
 - Go or Bun runtime choices where the target supports them
 - HTTP frameworks (`chi` or `hono`) and ConnectRPC variants
 - standalone package output that does not assume repo bootstrap
-- a generated `service.config.ts` manifest
+- a generated `service.jsonc` manifest
 - one `service` CLI for scaffold, create, deploy, migrate, seed, dashboards, doctor, and destroy
 - local Docker Compose Postgres for first-run development
 - Neon-backed remote environments

package/package.json

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

package/src/jsonc.ts

@@ -0,0 +1,63 @@
+export function parseJsonc(text: string): unknown {
+  return JSON.parse(stripTrailingCommas(stripJsonComments(text)));
+}
+
+function stripJsonComments(text: string) {
+  let output = "";
+  let inString = false;
+  let quote = "";
+  let escaped = false;
+
+  for (let index = 0; index < text.length; index += 1) {
+    const char = text[index] ?? "";
+    const next = text[index + 1] ?? "";
+
+    if (inString) {
+      output += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === quote) {
+        inString = false;
+        quote = "";
+      }
+      continue;
+    }
+
+    if (char === '"' || char === "'") {
+      inString = true;
+      quote = char;
+      output += char;
+      continue;
+    }
+
+    if (char === "/" && next === "/") {
+      while (index < text.length && text[index] !== "\n") {
+        index += 1;
+      }
+      output += "\n";
+      continue;
+    }
+
+    if (char === "/" && next === "*") {
+      index += 2;
+      while (index < text.length && !(text[index] === "*" && text[index + 1] === "/")) {
+        if (text[index] === "\n") {
+          output += "\n";
+        }
+        index += 1;
+      }
+      index += 1;
+      continue;
+    }
+
+    output += char;
+  }
+
+  return output;
+}
+
+function stripTrailingCommas(text: string) {
+  return text.replace(/,\s*([}\]])/g, "$1");
+}

package/src/post-scaffold.ts

@@ -1,4 +1,5 @@
 import type { ScaffoldConfig } from "./scaffold";
+import { dirname } from "node:path";
 
 type CommandOptions = {
   cwd: string;
@@ -169,7 +170,7 @@ function requireCommand(name: string) {
 function run(command: string, args: string[], options: CommandOptions): CommandResult {
   const result = Bun.spawnSync([command, ...args], {
     cwd: options.cwd,
-    env: process.env,
+    env: postScaffoldEnv(),
     stdin: options.input === undefined ? undefined : encoder.encode(options.input),
     stdout: options.allowFailure || options.quiet ? "pipe" : "inherit",
     stderr: options.allowFailure || options.quiet ? "pipe" : "inherit",
@@ -188,3 +189,11 @@ function run(command: string, args: string[], options: CommandOptions): CommandR
     stderr,
   };
 }
+
+function postScaffoldEnv() {
+  const currentBinDir = dirname(Bun.argv[1] ?? "");
+  return {
+    ...process.env,
+    PATH: currentBinDir ? `${currentBinDir}:${process.env.PATH ?? ""}` : process.env.PATH,
+  };
+}

package/src/scaffold.test.ts

@@ -54,28 +54,28 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
       })
     );
 
-    const serviceConfig = await Bun.file(join(generatedRoot, "service.config.ts")).text();
-    expect(serviceConfig).toContain('service_id: "dns-api"');
-    expect(serviceConfig).toContain('target: "cloudrun"');
-    expect(serviceConfig).toContain('profile: "microservice"');
-    expect(serviceConfig).toContain('domain: "waitlist"');
-    expect(serviceConfig).toContain('kind: "microservice"');
-    expect(serviceConfig).toContain(`runtime: "${variant.runtime}"`);
-    expect(serviceConfig).toContain(`framework: "${variant.framework}"`);
-    expect(serviceConfig).toContain('module: "buf.build/anmho/dns-api"');
-    expect(serviceConfig).toContain('cloudflare_vault_path: "prod/providers/cloudflare"');
-    expect(serviceConfig).toContain('issuer: "https://auth.anmho.com/api/auth"');
-    expect(serviceConfig).toContain('audience: "api://dns-api"');
-    expect(serviceConfig).toContain('vault_path_prefix: "prod/apps/dns-api/server/oauth-clients"');
-    expect(serviceConfig).toContain('api_key_secret_name: "dns-api-temporal-api-key"');
-    expect(serviceConfig).toContain('project_mode: "create_new"');
-    expect(serviceConfig).toContain('quota_project_id: "anmho-infra-prod"');
-    expect(serviceConfig).toContain('jwks_url: "https://auth.anmho.com/api/auth/jwks"');
-    expect(serviceConfig).toContain('project_id: ""');
-    expect(serviceConfig).toContain('base_branch_id: ""');
-    expect(serviceConfig).toContain('base_branch_name: "main"');
-    expect(serviceConfig).toContain('preview_branch_prefix: "dns-api-pr"');
-    expect(serviceConfig).toContain('hostname: "api.dns-api.anmho.com"');
+    const serviceConfig = await Bun.file(join(generatedRoot, "service.jsonc")).text();
+    expect(serviceConfig).toContain('"service_id": "dns-api"');
+    expect(serviceConfig).toContain('"target": "cloudrun"');
+    expect(serviceConfig).toContain('"profile": "microservice"');
+    expect(serviceConfig).toContain('"domain": "waitlist"');
+    expect(serviceConfig).toContain('"kind": "microservice"');
+    expect(serviceConfig).toContain(`"runtime": "${variant.runtime}"`);
+    expect(serviceConfig).toContain(`"framework": "${variant.framework}"`);
+    expect(serviceConfig).toContain('"module": "buf.build/anmho/dns-api"');
+    expect(serviceConfig).toContain('"cloudflare_vault_path": "prod/providers/cloudflare"');
+    expect(serviceConfig).toContain('"issuer": "https://auth.anmho.com/api/auth"');
+    expect(serviceConfig).toContain('"audience": "api://dns-api"');
+    expect(serviceConfig).toContain('"vault_path_prefix": "prod/apps/dns-api/server/oauth-clients"');
+    expect(serviceConfig).toContain('"api_key_secret_name": "dns-api-temporal-api-key"');
+    expect(serviceConfig).toContain('"project_mode": "create_new"');
+    expect(serviceConfig).toContain('"quota_project_id": "anmho-infra-prod"');
+    expect(serviceConfig).toContain('"jwks_url": "https://auth.anmho.com/api/auth/jwks"');
+    expect(serviceConfig).toContain('"project_id": ""');
+    expect(serviceConfig).toContain('"base_branch_id": ""');
+    expect(serviceConfig).toContain('"base_branch_name": "main"');
+    expect(serviceConfig).toContain('"preview_branch_prefix": "dns-api-pr"');
+    expect(serviceConfig).toContain('"hostname": "api.dns-api.anmho.com"');
     expect(serviceConfig).not.toContain("github:");
     expect(serviceConfig).not.toContain("attachmentBucket");
     expect(await Bun.file(join(generatedRoot, "scripts", "cloudrun", "integrations.ts")).exists()).toBeFalse();
@@ -195,10 +195,10 @@ test("scaffolds all runtime/framework variants with shared cloudrun config", asy
       expect(packageJson).toContain('"destroy": "service destroy"');
       expect(await Bun.file(join(generatedRoot, "scripts", "cloudrun", "cli.ts")).exists()).toBeFalse();
       expect(await Bun.file(join(generatedRoot, "scripts", "authctl.ts")).exists()).toBeFalse();
-      const serviceConfig = await Bun.file(join(generatedRoot, "service.config.ts")).text();
-      expect(serviceConfig).toContain('service_id: "dns-api"');
-      expect(serviceConfig).toContain('project_id: "anmho-dns-api"');
-      expect(serviceConfig).toContain('database_name: "dns_api"');
+      const serviceConfig = await Bun.file(join(generatedRoot, "service.jsonc")).text();
+      expect(serviceConfig).toContain('"service_id": "dns-api"');
+      expect(serviceConfig).toContain('"project_id": "anmho-dns-api"');
+      expect(serviceConfig).toContain('"database_name": "dns_api"');
       const authScript = await Bun.file(join(generatedRoot, "src", "auth.ts")).text();
       expect(authScript).toContain('"Ed25519"');
 
@@ -324,10 +324,10 @@ test("scaffolds the workers target with wrangler lifecycle commands", async () =
   expect(readme).toContain("Cloudflare Workers");
   expect(readme).toContain("Hyperdrive binding for Neon-backed Postgres persistence");
   expect(readme).not.toContain("Cloud Run");
-  const serviceConfig = await Bun.file(join(generatedRoot, "service.config.ts")).text();
-  expect(serviceConfig).toContain('target: "workers"');
-  expect(serviceConfig).toContain('hostname: "api.dns-api.anmho.com"');
-  expect(serviceConfig).toContain('database_name: "dns_api"');
+  const serviceConfig = await Bun.file(join(generatedRoot, "service.jsonc")).text();
+  expect(serviceConfig).toContain('"target": "workers"');
+  expect(serviceConfig).toContain('"hostname": "api.dns-api.anmho.com"');
+  expect(serviceConfig).toContain('"database_name": "dns_api"');
   const makefile = await Bun.file(join(generatedRoot, "Makefile")).text();
   expect(makefile).toContain('no generated code for workers');
   expect(makefile).toContain("auth:");

package/src/service-runtime/cloudrun/lib.ts

@@ -1,5 +1,7 @@
 import { intro, log, outro, spinner } from "@clack/prompts";
+import { join } from "node:path";
 import { config } from "./config";
+import { serviceRoot } from "../runtime";
 
 type CommandOptions = {
   allowFailure?: boolean;
@@ -422,7 +424,7 @@ export function resolveDeploymentTarget(environment: DeployArgs["environment"],
 }
 
 export async function renderManifest(image: string, target: DeploymentTarget) {
-  const template = await Bun.file(new URL("../../service.yaml", import.meta.url)).text();
+  const template = await Bun.file(join(serviceRoot, "service.yaml")).text();
   const temporal = resolveTemporalRuntimeConfig();
   const values = {
     SERVICE_NAME: target.serviceName,

package/src/service-runtime/runtime.ts

@@ -1,8 +1,15 @@
 import { join } from "node:path";
-import { pathToFileURL } from "node:url";
+import { parseJsonc } from "../jsonc";
 
 export const serviceRoot = process.env.CREATE_SVC_SERVICE_ROOT?.trim() || process.cwd();
 
-export const serviceConfig = (
-  await import(pathToFileURL(join(serviceRoot, "service.config.ts")).href)
-).default;
+export const serviceConfig = await readServiceConfig(serviceRoot);
+
+async function readServiceConfig(root: string) {
+  const configPath = join(root, "service.jsonc");
+  const parsed = parseJsonc(await Bun.file(configPath).text());
+  if (!parsed || typeof parsed !== "object") {
+    throw new Error(`${configPath} must contain a JSON object`);
+  }
+  return parsed as any;
+}

package/src/service.test.ts

@@ -21,7 +21,7 @@ test("findGeneratedServiceRoot detects generated service context from nested dir
   const serviceRoot = join(root, "generated-api");
   const nested = join(serviceRoot, "src", "waitlist");
   await mkdir(nested, { recursive: true });
-  await writeFile(join(serviceRoot, "service.config.ts"), "export default {}");
+  await writeFile(join(serviceRoot, "service.jsonc"), "{}");
 
   expect(findGeneratedServiceRoot(nested)).toBe(serviceRoot);
   expect(findGeneratedServiceRoot(root)).toBeUndefined();

package/src/service.ts

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { run as runScaffoldCli } from "./cli";
+import { parseJsonc } from "./jsonc";
 
 const SCAFFOLD_COMMANDS = new Set(["create", "new", "init"]);
 
@@ -41,7 +42,7 @@ export function findGeneratedServiceRoot(start: string): string | undefined {
 }
 
 function isGeneratedServiceRoot(path: string) {
-  return existsSync(join(path, "service.config.ts"));
+  return existsSync(join(path, "service.jsonc"));
 }
 
 async function delegateToGeneratedService(serviceRoot: string, argv: string[]) {
@@ -49,7 +50,7 @@ async function delegateToGeneratedService(serviceRoot: string, argv: string[]) {
   process.chdir(serviceRoot);
   process.env.CREATE_SVC_SERVICE_ROOT = serviceRoot;
 
-  const serviceConfig = (await import(`${serviceRoot}/service.config.ts`)).default;
+  const serviceConfig = parseJsonc(await Bun.file(join(serviceRoot, "service.jsonc")).text()) as { target?: string };
   if (serviceConfig.target === "workers") {
     const { main } = await import("./service-runtime/workers/cli");
     await main(argv);

package/templates/shared/README.md

@@ -59,7 +59,7 @@ No cloud credentials are required for local HTTP development after Docker and Po
 
 ## Remote provisioning
 
-The generated service config lives in [service.config.ts](service.config.ts).
+The generated service config lives in [service.jsonc](service.jsonc).
 
 Create, deploy, and destroy use:
 

package/templates/shared/service.jsonc

@@ -0,0 +1,106 @@
+{
+  // The installed `service` CLI reads this file to choose Cloud Run vs Workers
+  // operations for this generated repo.
+  "service_id": "{{SERVICE_ID}}",
+  "target": "{{TARGET}}",
+  "runtime": "{{RUNTIME}}",
+  "framework": "{{FRAMEWORK}}",
+  "profile": "{{PROFILE}}",
+  "stage_default": "prod",
+
+  "example": {
+    "kind": "{{EXAMPLE_KIND}}",
+    "domain": "{{EXAMPLE_DOMAIN}}",
+    "label": "{{EXAMPLE_LABEL}}"
+  },
+
+  "dns": {
+    "hostname": "{{API_HOSTNAME}}",
+    "base_domain": "{{API_BASE_DOMAIN}}",
+    "cloudflare_api_base_url": "https://api.cloudflare.com/client/v4",
+    "cloudflare_vault_path": "prod/providers/cloudflare",
+    "cloudflare_vault_field": "api_token"
+  },
+
+  "ownership": {
+    "managed_by": "create-service",
+    "service_id": "{{SERVICE_ID}}"
+  },
+
+  "auth": {
+    "issuer": "{{AUTH_ISSUER}}",
+    "token_endpoint": "https://auth.anmho.com/api/auth/oauth2/token",
+    "jwks_url": "https://auth.anmho.com/api/auth/jwks",
+    "resource_server": {
+      "id": "{{SERVICE_ID}}",
+      "audience": "api://{{SERVICE_ID}}",
+      "default_scopes": ["{{SERVICE_ID}}:read", "{{SERVICE_ID}}:write"]
+    },
+    "client": {
+      "app_id": "{{SERVICE_ID}}",
+      "identity": "server",
+      "vault_path_prefix": "prod/apps/{{SERVICE_ID}}/server/oauth-clients"
+    }
+  },
+
+  "temporal": {
+    "enabled": false,
+    "address": "localhost:7233",
+    "namespace": "default",
+    "task_queue": "{{SERVICE_ID}}",
+    "api_key_secret_name": "{{SERVICE_ID}}-temporal-api-key"
+  },
+
+  "providers": {
+    "vault": {
+      "mount": "secret",
+      "neon_path": "prod/providers/neon",
+      "cloudflare_path": "prod/providers/cloudflare",
+      "grafana_path": "prod/providers/grafana",
+      "clerk_m2m_path": "prod/providers/clerk-m2m",
+      "temporal_path": "prod/providers/temporal"
+    }
+  },
+
+  "neon": {
+    "project_id": "{{NEON_PROJECT_ID}}",
+    "base_branch_id": "{{NEON_BASE_BRANCH_ID}}",
+    "base_branch_name": "{{NEON_BASE_BRANCH_NAME}}",
+    "database_name": "{{NEON_DATABASE_NAME}}",
+    "role_name": "{{NEON_ROLE_NAME}}",
+    "preview_branch_prefix": "{{NEON_PREVIEW_BRANCH_PREFIX}}",
+    "personal_branch_prefix": "{{NEON_PERSONAL_BRANCH_PREFIX}}"
+  },
+
+  "buf": {
+    "module": "buf.build/anmho/{{SERVICE_ID}}"
+  },
+
+  "cloudrun": {
+    "project_id": "{{PROJECT_ID}}",
+    "project_name": "{{PROJECT_NAME}}",
+    "project_mode": "{{GCP_PROJECT_MODE}}",
+    "create_if_missing": {{PROJECT_CREATE_IF_MISSING}},
+    "billing_account": "{{BILLING_ACCOUNT}}",
+    "quota_project_id": "{{QUOTA_PROJECT_ID}}",
+    "region": "{{REGION}}",
+    "artifact_repository": "cloud-run",
+    "service_account": "{{RUNTIME_SERVICE_ACCOUNT}}",
+    "required_apis": [
+      "run.googleapis.com",
+      "cloudbuild.googleapis.com",
+      "artifactregistry.googleapis.com",
+      "iam.googleapis.com",
+      "iamcredentials.googleapis.com",
+      "secretmanager.googleapis.com",
+      "serviceusage.googleapis.com",
+      "sts.googleapis.com"
+    ]
+  },
+
+  "workers": {
+    "script_name": "{{SERVICE_ID}}",
+    "hyperdrive_binding": "HYPERDRIVE",
+    "cron": "*/15 * * * *"
+  }
+}

package/templates/shared/service.config.ts

@@ -1,94 +0,0 @@
-export default {
-  service_id: "{{SERVICE_ID}}",
-  target: "{{TARGET}}",
-  runtime: "{{RUNTIME}}",
-  framework: "{{FRAMEWORK}}",
-  profile: "{{PROFILE}}",
-  stage_default: "prod",
-  example: {
-    kind: "{{EXAMPLE_KIND}}",
-    domain: "{{EXAMPLE_DOMAIN}}",
-    label: "{{EXAMPLE_LABEL}}",
-  },
-  dns: {
-    hostname: "{{API_HOSTNAME}}",
-    base_domain: "{{API_BASE_DOMAIN}}",
-    cloudflare_api_base_url: "https://api.cloudflare.com/client/v4",
-    cloudflare_vault_path: "prod/providers/cloudflare",
-    cloudflare_vault_field: "api_token",
-  },
-  ownership: {
-    managed_by: "create-service",
-    service_id: "{{SERVICE_ID}}",
-  },
-  auth: {
-    issuer: "{{AUTH_ISSUER}}",
-    token_endpoint: "https://auth.anmho.com/api/auth/oauth2/token",
-    jwks_url: "https://auth.anmho.com/api/auth/jwks",
-    resource_server: {
-      id: "{{SERVICE_ID}}",
-      audience: "api://{{SERVICE_ID}}",
-      default_scopes: ["{{SERVICE_ID}}:read", "{{SERVICE_ID}}:write"],
-    },
-    client: {
-      app_id: "{{SERVICE_ID}}",
-      identity: "server",
-      vault_path_prefix: "prod/apps/{{SERVICE_ID}}/server/oauth-clients",
-    },
-  },
-  temporal: {
-    enabled: false,
-    address: "localhost:7233",
-    namespace: "default",
-    task_queue: "{{SERVICE_ID}}",
-    api_key_secret_name: "{{SERVICE_ID}}-temporal-api-key",
-  },
-  providers: {
-    vault: {
-      mount: "secret",
-      neon_path: "prod/providers/neon",
-      cloudflare_path: "prod/providers/cloudflare",
-      grafana_path: "prod/providers/grafana",
-      clerk_m2m_path: "prod/providers/clerk-m2m",
-      temporal_path: "prod/providers/temporal",
-    },
-  },
-  neon: {
-    project_id: "{{NEON_PROJECT_ID}}",
-    base_branch_id: "{{NEON_BASE_BRANCH_ID}}",
-    base_branch_name: "{{NEON_BASE_BRANCH_NAME}}",
-    database_name: "{{NEON_DATABASE_NAME}}",
-    role_name: "{{NEON_ROLE_NAME}}",
-    preview_branch_prefix: "{{NEON_PREVIEW_BRANCH_PREFIX}}",
-    personal_branch_prefix: "{{NEON_PERSONAL_BRANCH_PREFIX}}",
-  },
-  buf: {
-    module: "buf.build/anmho/{{SERVICE_ID}}",
-  },
-  cloudrun: {
-    project_id: "{{PROJECT_ID}}",
-    project_name: "{{PROJECT_NAME}}",
-    project_mode: "{{GCP_PROJECT_MODE}}",
-    create_if_missing: {{PROJECT_CREATE_IF_MISSING}},
-    billing_account: "{{BILLING_ACCOUNT}}",
-    quota_project_id: "{{QUOTA_PROJECT_ID}}",
-    region: "{{REGION}}",
-    artifact_repository: "cloud-run",
-    service_account: "{{RUNTIME_SERVICE_ACCOUNT}}",
-    required_apis: [
-      "run.googleapis.com",
-      "cloudbuild.googleapis.com",
-      "artifactregistry.googleapis.com",
-      "iam.googleapis.com",
-      "iamcredentials.googleapis.com",
-      "secretmanager.googleapis.com",
-      "serviceusage.googleapis.com",
-      "sts.googleapis.com",
-    ],
-  },
-  workers: {
-    script_name: "{{SERVICE_ID}}",
-    hyperdrive_binding: "HYPERDRIVE",
-    cron: "*/15 * * * *",
-  },
-} as const;