@suluk/platform 0.1.9 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suluk/platform",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "The platform generator (C051): write one `definePlatform` manifest → it plans the shadcn-registry adds, generates the wired Hono entry, and merges each module's provision fragment into a single provision.config. The manifest compiles to a shadcn-add list + a C047 provision.config; the generator runs the adds + `@suluk/provision`. Turns the Suluk backend registry into a one-command platform. CANDIDATE tooling.",
   "publishConfig": {
   "access": "public"

package/src/generate.ts

@@ -5,7 +5,7 @@
  * testable. Stops short of `provision apply` — that's a live infra op the operator triggers.
  */
 import type { PlatformManifest } from "./manifest";
-import { planPlatform, mergePackageJson, mergeWranglerToml, type PlatformPlan } from "./plan";
+import { planPlatform, mergePackageJson, mergeWranglerToml, mergeGitignore, type PlatformPlan } from "./plan";
 
 export interface GenerateOptions {
   /** run a command — the CLI spawns `bunx shadcn add <ref>`; a test records. */
@@ -43,10 +43,14 @@ export async function generatePlatform(manifest: PlatformManifest, opts: Generat
   log("▸ writing wrangler.toml");
   await opts.write("wrangler.toml", mergeWranglerToml(plan.wranglerToml, await read("wrangler.toml")));
   written.push("wrangler.toml");
+  // .gitignore MERGES (append missing entries) — critically ensures .env/.env.temp are ignored even if the app already had
+  // a minimal .gitignore, so secrets are never committed. .env.example + the env-check are always (re)written (no values).
+  log("▸ writing .gitignore");
+  await opts.write(".gitignore", mergeGitignore(plan.gitignore, await read(".gitignore")));
+  written.push(".gitignore");
   for (const [file, content, always] of [
     ["tsconfig.json", plan.tsconfig, false],
     ["components.json", plan.componentsJson, false],
-    [".gitignore", plan.gitignore, false],
     [".env.example", plan.envExample, true], // a checked-in template (no values) — keep it current
     ["scripts/env-check.ts", plan.envCheck, true], // the .env.temp lifecycle preflight
   ] as const) {

package/src/index.ts

@@ -7,5 +7,5 @@
 export { definePlatform, type PlatformManifest } from "./manifest";
 export { CATALOG, orderServices, collectEnv, resolveVersion, BASE_DEPS, ECOSYSTEM_VERSIONS, DEV_DEPS, type CatalogEntry, type Mount, type EnvVar } from "./catalog";
 export { mergeProvision } from "./merge";
-export { planPlatform, buildPackageJson, mergePackageJson, mergeWranglerToml, type PlatformPlan } from "./plan";
+export { planPlatform, buildPackageJson, mergePackageJson, mergeWranglerToml, mergeGitignore, type PlatformPlan } from "./plan";
 export { generatePlatform, type GenerateOptions, type GenerateResult } from "./generate";

package/src/plan.ts

@@ -137,6 +137,18 @@ function buildGitignore(): string {
   return ["node_modules/", ".env", ".env.temp", ".dev.vars", ".wrangler/", "dist/", ""].join("\n");
 }
 
+/** Merge the generated .gitignore into an existing one — APPEND any missing entries (never skip-if-present, so an app's
+ *  minimal .gitignore can't leave `.env`/`.env.temp` UNIGNORED and risk committing secrets). Dedup, preserve app entries. */
+export function mergeGitignore(generated: string, existing: string | null): string {
+  if (!existing) return generated;
+  const norm = (s: string) => s.trim().replace(/\/$/, "");
+  const have = new Set(existing.split("\n").map(norm).filter(Boolean));
+  const add = generated.split("\n").filter((l) => l.trim() && !have.has(norm(l)));
+  if (!add.length) return existing.endsWith("\n") ? existing : existing + "\n";
+  const base = existing.replace(/\n*$/, "");
+  return `${base}\n${add.join("\n")}\n`;
+}
+
 /** The `.env.temp` lifecycle preflight (run via `predev` / `bun run check`): if every REQUIRED secret is present (in `.env`
  *  or the process env), delete `.env.temp`; else write `.env.temp` from `.env.example` + report the missing keys + fail. */
 function buildEnvCheckScript(env: EnvVar[]): string {

package/test/plan.test.ts

@@ -1,5 +1,5 @@
 import { test, expect, describe } from "bun:test";
-import { definePlatform, planPlatform, mergeProvision, generatePlatform, buildPackageJson, mergePackageJson, mergeWranglerToml } from "../src/index";
+import { definePlatform, planPlatform, mergeProvision, generatePlatform, buildPackageJson, mergePackageJson, mergeWranglerToml, mergeGitignore } from "../src/index";
 import type { InstanceSpec } from "@suluk/provision";
 
 /** C051 — the platform generator: manifest → plan (adds + wired entry + merged provision), the provision merge, and the
@@ -162,11 +162,11 @@ describe("generatePlatform — the orchestration (with recorders)", () => {
     expect(ran).toEqual(plannedAdds()); // exactly the planned adds, in order
     expect(ran.length).toBe(6); // app+auth+credits+keys+billing+logs
     // config is written BEFORE the shadcn adds; the glue after. env-example + env-check + wrangler + gitignore included.
-    expect(wrote).toEqual(["package.json", "wrangler.toml", "tsconfig.json", "components.json", ".gitignore", ".env.example", "scripts/env-check.ts", "src/index.ts", "provision.config.ts"]);
+    expect(wrote).toEqual(["package.json", "wrangler.toml", ".gitignore", "tsconfig.json", "components.json", ".env.example", "scripts/env-check.ts", "src/index.ts", "provision.config.ts"]);
     expect(res.added.length).toBe(6);
   });
 
-  test("leaves an existing tsconfig/components.json/.gitignore untouched; always rewrites package.json/.env.example", async () => {
+  test("leaves an existing tsconfig/components.json untouched; always (re)writes package.json/.gitignore/.env.example", async () => {
     const wrote: string[] = [];
     await generatePlatform(manifest, {
       run: async () => {},
@@ -174,10 +174,17 @@ describe("generatePlatform — the orchestration (with recorders)", () => {
       read: async (p) => (p === "package.json" ? '{"name":"x","dependencies":{"my-lib":"^1.0.0"}}' : "existing"),
     });
     expect(wrote).toContain("package.json"); // merged + rewritten
+    expect(wrote).toContain(".gitignore"); // MERGED (never skip — must ensure .env is ignored)
     expect(wrote).toContain(".env.example"); // template — always current
     expect(wrote).toContain("scripts/env-check.ts");
     expect(wrote).not.toContain("tsconfig.json"); // present → left as-is
-    expect(wrote).not.toContain(".gitignore");
+  });
+
+  test("mergeGitignore appends missing entries so .env is always ignored", () => {
+    const merged = mergeGitignore("node_modules/\n.env\n.env.temp\n", "node_modules\n");
+    expect(merged).toContain(".env");
+    expect(merged).toContain(".env.temp");
+    expect(merged.match(/node_modules/g)?.length).toBe(1); // deduped (node_modules vs node_modules/)
   });
 });