@ingram-tech/nk-dev 0.2.4 → 0.2.5

package/bin/format-staged.mjs

@@ -8,24 +8,50 @@
  *
  * Behavior:
  *   - Only staged files are touched (never the whole tree).
+ *   - Partially staged files (staged + unstaged hunks in the same file) are
+ *     SKIPPED: `oxfmt --write` rewrites the working tree and the re-`git add`
+ *     would silently sweep the unstaged hunks into the commit.
  *   - Only extensions oxfmt understands are passed to it.
  *   - oxfmt auto-discovers the repo's `.oxfmtrc.json` for house style.
  *   - Files are re-staged after formatting so the commit includes the result.
  *   - Formatting only — no lint gate on commit (lint runs in CI).
  */
 import { execFileSync } from "node:child_process";
+import { existsSync } from "node:fs";
 
 const FORMATTABLE = /\.(jsx?|mjs|cjs|tsx?|mts|cts|json|jsonc|css|graphql|gql)$/;
 
-const git = (args) => execFileSync("git", args, { encoding: "utf8" }).trim();
+const git = (args) => execFileSync("git", args, { encoding: "utf8" });
 
-const stagedFiles = git(["diff", "--cached", "--name-only", "--diff-filter=ACMRTUXB"])
-	.split("\n")
-	.filter(Boolean);
+// -z: NUL-separated, unquoted names. The default output octal-escapes any
+// non-ASCII filename ("\303\251 test.ts"), which then matches no real path and
+// silently never gets formatted or re-staged.
+const gitPathList = (args) =>
+	git([...args, "-z"])
+		.split("\0")
+		.filter(Boolean);
+
+const stagedFiles = gitPathList([
+	"diff",
+	"--cached",
+	"--name-only",
+	"--diff-filter=ACMRTUXB",
+]);
 
 if (stagedFiles.length === 0) process.exit(0);
 
-const toFormat = stagedFiles.filter((f) => FORMATTABLE.test(f));
+// Files that also carry unstaged edits: formatting + re-adding them would
+// commit hunks the developer deliberately left out (git add -p).
+const partiallyStaged = new Set(gitPathList(["diff", "--name-only"]));
+
+const formattable = stagedFiles.filter((f) => FORMATTABLE.test(f));
+const toFormat = formattable.filter((f) => !partiallyStaged.has(f));
+const skipped = formattable.filter((f) => partiallyStaged.has(f));
+if (skipped.length > 0) {
+	console.warn(
+		`[nextkit] not formatting partially staged file(s) (unstaged hunks would be committed): ${skipped.join(", ")}`,
+	);
+}
 if (toFormat.length === 0) process.exit(0);
 
 try {
@@ -40,12 +66,5 @@ try {
 }
 
 // Re-stage only the files that were already staged and still exist.
-const existing = toFormat.filter((f) => {
-	try {
-		execFileSync("test", ["-e", f]);
-		return true;
-	} catch {
-		return false;
-	}
-});
+const existing = toFormat.filter((f) => existsSync(f));
 if (existing.length > 0) git(["add", "--", ...existing]);

package/bin/nk.js

@@ -13,8 +13,8 @@ Commands:
   init                Scaffold this project to use nextkit: writes the oxlint /
                       oxfmt / TypeScript / Vitest config, the format-on-commit
                       hook, and the agent-guide import. Skips files that exist.
-  dev                 Start the Next dev server. Boots local PGlite first when
-                      @ingram-tech/nk-db is installed (no Docker); else plain dev.
+  dev                 Start the Next dev server (Turbopack). Boots local PGlite
+                      first when @ingram-tech/nk-db is installed (no Docker).
   format [--check]    Format code with oxfmt and SQL with Prettier. --check
                       verifies without writing (for CI).
   lint                Lint with oxlint.

package/guide.md

@@ -57,9 +57,12 @@ the UI/page tree, and never expose internal plumbing under `/api/`.
   nanoids. UUIDv7 is time-ordered, so it keeps index locality instead of
   fragmenting the B-tree on random inserts, and one uniform id format spans every
   table. On Postgres ≥18 the column default is native `uuidv7()`
-  (`uuid("id").primaryKey().default(sql\`uuidv7()\`)`); set Better Auth
-  `advanced.database.generateId: false` so the DB — not Better Auth's JS nanoid —
-  mints ids. Ids that cross a **public contract** are skinned to `prefix_base58`
+  (`uuid("id").primaryKey().default(sql\`uuidv7()\`)`) and Better Auth gets
+  `advanced.database.generateId: false` so the DB mints ids; below 18 — and in
+  the nk-auth README's canonical example — pass
+  `advanced.database.generateId: uuidGenerateId` (JS-minted UUIDv7 from
+  `@ingram-tech/nk-auth`) instead. Either way, never Better Auth's default JS
+  nanoid. Ids that cross a **public contract** are skinned to `prefix_base58`
   via `@ingram-tech/nk-db/id` (`createIdRegistry`) — never expose a raw UUID.
   External ids you don't mint (Stripe `cus_`, OAuth) stay `text`.
 - **Migrations don't auto-apply on deploy.** Code ships ahead of the prod schema

package/lib/dev.js

@@ -3,9 +3,11 @@ import { createRequire } from "node:module";
 import { resolve } from "node:path";
 
 /**
- * Whether the site has `@ingram-tech/nk-db` installed — i.e. its `nk-pglite-dev`
- * bin is available. Resolved from the site's own `node_modules`, so `nk` only
- * orchestrates a tool the site already provides (the carve-out).
+ * Whether `@ingram-tech/nk-db` is resolvable from the site — the signal that
+ * its `nk-pglite-dev` bin is available. Note this is package *resolvability*,
+ * not a direct-dependency check: a transitively hoisted nk-db also flips PGlite
+ * mode on (harmless — the bin still runs `next dev`; it just also boots a local
+ * Postgres the site may not use).
  */
 function hasPgliteDev() {
 	try {
@@ -38,5 +40,6 @@ export function dev(extraArgs = []) {
 	}
 	// spawnSync inherits stdio and blocks until exit, so Ctrl-C reaches the child.
 	const res = spawnSync("bunx", command, { stdio: "inherit" });
-	process.exit(res.status ?? 0);
+	// Signal-killed (status null) is a failure, not a clean exit.
+	process.exit(res.status ?? (res.signal ? 1 : 0));
 }

package/lib/format.js

@@ -1,5 +1,5 @@
 import { spawnSync } from "node:child_process";
-import { readdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { join, relative } from "node:path";
 import { FORMATTER } from "./formatter.js";
@@ -8,8 +8,14 @@ import { run } from "./run.js";
 const require = createRequire(import.meta.url);
 
 // House SQL defaults, used only when the site has no Prettier config of its own
-// (matches the house tab style + the PostgreSQL dialect).
-const SQL_DEFAULTS = { useTabs: true, language: "postgresql" };
+// (matches the house tabs/4/88 style + the PostgreSQL dialect; without the
+// explicit widths Prettier falls back to 80/2).
+const SQL_DEFAULTS = {
+	useTabs: true,
+	tabWidth: 4,
+	printWidth: 88,
+	language: "postgresql",
+};
 
 /**
  * `nk format` / `nk format --check`.
@@ -24,13 +30,18 @@ export async function format({ check }) {
 	const code = run(op[0], op[1]);
 	if (code !== 0) process.exitCode = code;
 
-	await formatSql({ check });
+	if (await formatSql({ check })) process.exitCode = 1;
 }
 
-/** Format (or, with `check`, verify) every tracked `.sql` file via Prettier. */
+/**
+ * Format (or, with `check`, verify) every tracked `.sql` file via Prettier.
+ * Returns true when a check found unformatted files — the caller owns the exit
+ * code (inferring failure from the `process.exitCode` global misattributes any
+ * earlier failure to SQL).
+ */
 export async function formatSql({ check }) {
 	const files = sqlFiles();
-	if (files.length === 0) return;
+	if (files.length === 0) return false;
 
 	const prettier = require("prettier");
 	const pluginPath = require.resolve("prettier-plugin-sql");
@@ -38,6 +49,9 @@ export async function formatSql({ check }) {
 	let unformatted = 0;
 	let written = 0;
 	for (const file of files) {
+		// git ls-files lists tracked files deleted from the worktree without
+		// `git rm`; reading one would throw an unhandled ENOENT.
+		if (!existsSync(file)) continue;
 		const source = readFileSync(file, "utf8");
 		// The site's own .prettierrc / package.json "prettier" wins over our
 		// defaults; we always inject the bundled SQL plugin + parser.
@@ -72,24 +86,25 @@ export async function formatSql({ check }) {
 		console.error(
 			`nk: ${unformatted} SQL file(s) need formatting — run \`nk format\`.`,
 		);
-		process.exitCode = 1;
-	} else if (!check && written > 0) {
+		return true;
+	}
+	if (!check && written > 0) {
 		console.log(`nk: formatted ${written} SQL file(s).`);
 	}
+	return false;
 }
 
 /** Tracked + untracked-not-ignored `.sql` files; falls back to an fs walk. */
 function sqlFiles() {
+	// -z: NUL-separated, unquoted — the default output octal-escapes non-ASCII
+	// filenames, which then match no real path.
 	const res = spawnSync(
 		"git",
-		["ls-files", "--cached", "--others", "--exclude-standard", "*.sql"],
+		["ls-files", "-z", "--cached", "--others", "--exclude-standard", "*.sql"],
 		{ encoding: "utf8" },
 	);
 	if (res.status === 0) {
-		return res.stdout
-			.split("\n")
-			.map((s) => s.trim())
-			.filter(Boolean);
+		return res.stdout.split("\0").filter(Boolean);
 	}
 	return walkSql(process.cwd());
 }

package/lib/passthrough.js

@@ -19,8 +19,7 @@ export async function check() {
 	// hide another. oxc splits lint (oxlint) and format (oxfmt), so we run both.
 	const lintFailed = run(FORMATTER.lint[0], FORMATTER.lint[1]) !== 0;
 	const fmtFailed = run(FORMATTER.checkFormat[0], FORMATTER.checkFormat[1]) !== 0;
-	await formatSql({ check: true });
-	const sqlFailed = Boolean(process.exitCode);
+	const sqlFailed = await formatSql({ check: true });
 	// knip (unused deps/exports/files). Opt-in: only when the repo has a knip
 	// config — knip has no shareable config, so absence means "not adopted".
 	const knipFailed = hasKnipConfig() ? runKnip() !== 0 : false;

package/lib/run.js

@@ -12,29 +12,9 @@ export function run(tool, args = [], opts = {}) {
 		}
 		throw res.error;
 	}
-	return res.status ?? 0;
-}
-
-/**
- * Run a tool capturing its stdout (stderr still streams to the terminal).
- * Exits the process if the tool fails — callers depend on the captured output.
- */
-export function capture(tool, args = [], opts = {}) {
-	const res = spawnSync("bunx", [tool, ...args], {
-		encoding: "utf8",
-		stdio: ["inherit", "pipe", "inherit"],
-		...opts,
-	});
-	if (res.error) {
-		if (res.error.code === "ENOENT") {
-			fail("could not run `bunx` — is bun installed and on PATH?");
-		}
-		throw res.error;
-	}
-	if (res.status !== 0) {
-		fail(`\`${tool} ${args.join(" ")}\` exited with ${res.status}`);
-	}
-	return res.stdout ?? "";
+	// A signal-killed child (OOM, SIGSEGV) has status null — that's a failure,
+	// not a pass; `?? 0` would let a crashed linter through the CI gate.
+	return res.status ?? (res.signal ? 1 : 0);
 }
 
 /** Print an `nk:`-prefixed error and exit non-zero. */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ingram-tech/nk-dev",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"description": "The nextkit dev toolchain in one package: the `nk` CLI plus shared oxlint/oxfmt, TypeScript, and Vitest config, the format-on-commit hook, and the AI agent guide. `nk init` scaffolds a site to use it.",
 	"license": "MIT",
 	"type": "module",
@@ -45,13 +45,13 @@
 	"dependencies": {
 		"@testing-library/jest-dom": "^6.9.1",
 		"jsdom": "^29.1.1",
-		"knip": "^6.17.1",
-		"oxfmt": "^0.55.0",
-		"oxlint": "^1.70.0",
-		"prettier": "^3.8.3",
+		"knip": "^6.23.0",
+		"oxfmt": "^0.56.0",
+		"oxlint": "^1.71.0",
+		"prettier": "^3.9.3",
 		"prettier-plugin-sql": "^0.20.0",
 		"typescript": "^6.0.3",
-		"vitest": "^4.1.6"
+		"vitest": "^4.1.9"
 	},
 	"engines": {
 		"node": ">=20"