@inixiative/config 0.1.0 → 0.3.0

package/README.md

@@ -12,6 +12,7 @@ Shared toolchain for the inixiative ecosystem: tsconfig/biome/tsup presets, a ve
 | `@inixiative/config/biome/base.json` | formatter + linter core (single quotes, lineWidth 100, recommended + strictness block) |
 | `@inixiative/config/biome/react.json` | overlay: hook dependency linting |
 | `@inixiative/config/tsup` | `node(options)` / `react(options)` build presets |
+| `@inixiative/config/lefthook/base.yml` | pre-commit hooks: typecheck + biome on staged files |
 
 Adoption is three stub files plus the devDependency:
 
@@ -55,7 +56,7 @@ bunx @inixiative/config scan  [root]
 bunx @inixiative/config train [root]
 ```
 
-`check` is read-only and exits non-zero on drift — run it in CI after a frozen-lockfile install. It verifies toolchain pins, `"latest"` ranges, `packageManager`/`.bun-version`, legacy `bun.lockb`, a committed (tracked, un-ignored) `bun.lock`, required scripts (`check`/`typecheck`/`lint`/`test`), stub `extends`, presence of this package, and for every ecosystem dependency that the declared range admits the blessed version and the lockfile actually resolves to it (the stale-lockfile class).
+`check` is read-only and exits non-zero on drift — run it in CI after a frozen-lockfile install. It verifies toolchain pins, `"latest"` ranges, `packageManager`/`.bun-version`, legacy `bun.lockb`, a committed (tracked, un-ignored) `bun.lock`, required scripts (`check`/`typecheck`/`lint`/`test`), lefthook (dep + `lefthook.yml` extending the shared hooks + `prepare` script; git repos only), stub `extends`, presence of this package, and for every ecosystem dependency that the declared range admits the blessed version and the lockfile actually resolves to it (the stale-lockfile class).
 
 `sync` applies every fix, re-locks via `bun install`, and runs `bun update` on stale ecosystem entries. It refuses to run on a dirty working tree without `--force`. The react preset is inferred from a `react` dependency; override with `--preset`. Missing scripts are filled with defaults; existing script bodies are never touched.
 

package/dist/cli.js

@@ -69,7 +69,7 @@ var tryParseJsonc = (text) => {
   }
 };
 var parseRange = (range) => {
-  const match = range.match(/^(\^|~|>=)?\s*(\d+)\.(\d+)\.(\d+)(?:-[\w.]+)?$/);
+  const match = range.match(/^(\^|~|>=)?\s*(\d+)\.(\d+)\.(\d+)$/);
   if (!match) return null;
   return {
     op: match[1] ?? "=",
@@ -90,7 +90,9 @@ var admits = (range, version) => {
     if (parts.some((p) => p === true)) return true;
     return parts.includes(null) ? null : false;
   }
-  const parsed = parseRange(range.trim());
+  const target = range.trim();
+  if (version.includes("-")) return target === version ? true : null;
+  const parsed = parseRange(target);
   if (!parsed) return null;
   const cmp = compare(version, parsed.version);
   if (parsed.op === "=") return cmp === 0;
@@ -98,12 +100,22 @@ var admits = (range, version) => {
   if (cmp < 0) return false;
   const [major, minor] = parsed.version.split(".").map(Number);
   const [vMajor, vMinor] = version.split(".").map(Number);
-  if (parsed.op === "^") return major === 0 ? vMajor === 0 && vMinor === minor : vMajor === major;
+  if (parsed.op === "^") {
+    if (major > 0) return vMajor === major;
+    if (minor > 0) return vMajor === 0 && vMinor === minor;
+    return cmp === 0;
+  }
   return vMajor === major && vMinor === minor;
 };
 var lockedVersion = (lockText, name) => {
-  const match = lockText.match(new RegExp(`"${name.replace(/\//g, "\\/")}@(\\d[^"]*)"`));
-  return match ? match[1] : null;
+  const lock = tryParseJsonc(lockText);
+  const packages = lock?.packages;
+  if (!packages || typeof packages !== "object") return null;
+  const entry = packages[name];
+  const spec = Array.isArray(entry) ? entry[0] : null;
+  if (typeof spec !== "string" || !spec.startsWith(`${name}@`)) return null;
+  const version = spec.slice(name.length + 1);
+  return /^\d/.test(version) ? version : null;
 };
 var topoOrder = (root, manifest2) => {
   const repos = discoverRepos(root, manifest2).map((repo) => ({
@@ -273,15 +285,87 @@ function inspect(dir2, manifest2, presetOverride) {
         level: "error",
         message: "bun.lock missing \u2192 run bun install and commit the lockfile"
       });
-    } else if (spawnSync("git", ["check-ignore", "-q", "bun.lock"], { cwd: dir2 }).status === 0) {
+    } else {
+      const ignoreStatus = spawnSync("git", ["check-ignore", "-q", "bun.lock"], {
+        cwd: dir2
+      }).status;
+      if (ignoreStatus === 0) {
+        findings.push({
+          level: "error",
+          message: "bun.lock is gitignored \u2192 removing the ignore rule; commit the lockfile",
+          fix: () => {
+            const gitignorePath = join(dir2, ".gitignore");
+            if (!existsSync(gitignorePath)) return;
+            const kept = readFileSync(gitignorePath, "utf8").split("\n").filter((line) => !/^\s*bun\.lockb?\s*$/.test(line));
+            writeFileSync(gitignorePath, kept.join("\n"));
+          }
+        });
+      } else if (ignoreStatus === 1) {
+        const trackedStatus = spawnSync("git", ["ls-files", "--error-unmatch", "bun.lock"], {
+          cwd: dir2
+        }).status;
+        if (trackedStatus === 1) {
+          findings.push({
+            level: "error",
+            message: "bun.lock untracked \u2192 staging it; commit the lockfile",
+            fix: () => {
+              spawnSync("git", ["add", "bun.lock"], { cwd: dir2 });
+            }
+          });
+        } else if (trackedStatus !== 0) {
+          findings.push({
+            level: "warn",
+            message: "git ls-files failed \u2014 cannot verify the lockfile is tracked"
+          });
+        }
+      } else {
+        findings.push({
+          level: "warn",
+          message: "git check-ignore failed \u2014 cannot verify the lockfile is not ignored"
+        });
+      }
+    }
+    const lefthookPin = manifest2.toolchain.lefthook;
+    if (lefthookPin && !DEP_FIELDS.some((field) => pkg[field]?.lefthook)) {
       findings.push({
         level: "error",
-        message: "bun.lock is gitignored \u2192 stop ignoring it and commit the lockfile"
+        message: `lefthook missing \u2192 devDependency ${lefthookPin}`,
+        fix: () => {
+          pkg.devDependencies ??= {};
+          pkg.devDependencies.lefthook = lefthookPin;
+          touch();
+        }
       });
-    } else if (spawnSync("git", ["ls-files", "--error-unmatch", "bun.lock"], { cwd: dir2 }).status !== 0) {
+    }
+    const lefthookPath = join(dir2, "lefthook.yml");
+    const lefthookStub = "extends:\n  - node_modules/@inixiative/config/lefthook/base.yml\n";
+    if (!existsSync(lefthookPath)) {
+      findings.push({
+        level: "error",
+        message: "lefthook.yml missing \u2192 stub extending @inixiative/config/lefthook/base.yml",
+        fix: () => writeFileSync(lefthookPath, lefthookStub)
+      });
+    } else if (!readFileSync(lefthookPath, "utf8").includes("lefthook/base.yml")) {
+      findings.push({
+        level: "error",
+        message: "lefthook.yml does not extend the shared hooks \u2192 replaced with extends stub (local hooks overwritten \u2014 review the diff)",
+        fix: () => writeFileSync(lefthookPath, lefthookStub)
+      });
+    }
+    if (!pkg.scripts?.prepare) {
       findings.push({
         level: "error",
-        message: "bun.lock untracked \u2192 commit the lockfile"
+        message: 'scripts.prepare missing \u2192 "lefthook install"',
+        fix: () => {
+          pkg.scripts ??= {};
+          pkg.scripts.prepare = "lefthook install";
+          touch();
+        }
+      });
+    } else if (!pkg.scripts.prepare.includes("lefthook")) {
+      findings.push({
+        level: "warn",
+        message: "scripts.prepare does not run lefthook install \u2014 hooks will not auto-install"
       });
     }
   }
@@ -492,7 +576,8 @@ if (command === "train") {
       bump.fix?.();
     }
     inspection.flush();
-    let touched = bumps.length > 0;
+    const bumped = bumps.length > 0;
+    const staleLock = inspection.findings.some((finding) => finding.kind === "stale-lock");
     const remote = spawnSync2("npm", ["view", `${repo.name}@latest`, "version"], {
       encoding: "utf8"
     });
@@ -504,7 +589,7 @@ if (command === "train") {
       skipped.push(repo.name);
       continue;
     }
-    if (touched || ahead) {
+    if (bumped || ahead || staleLock) {
       const install = spawnSync2("bun", ["install"], { cwd: repo.dir, stdio: "inherit" });
       if (install.status !== 0) {
         console.error("\u2717 bun install failed \u2014 aborting train");
@@ -513,7 +598,6 @@ if (command === "train") {
       const stale = inspect(repo.dir, manifest).findings.filter((finding) => finding.kind === "stale-lock" && finding.name).map((finding) => finding.name);
       if (stale.length > 0) {
         spawnSync2("bun", ["update", ...new Set(stale)], { cwd: repo.dir, stdio: "inherit" });
-        touched = true;
       }
       const check = spawnSync2("bun", ["run", "check"], { cwd: repo.dir, stdio: "inherit" });
       if (check.status !== 0) {
@@ -521,7 +605,11 @@ if (command === "train") {
         process.exit(1);
       }
     }
-    if (touched) {
+    const mutated = spawnSync2("git", ["status", "--porcelain", "package.json", "bun.lock"], {
+      cwd: repo.dir,
+      encoding: "utf8"
+    });
+    if (mutated.status === 0 && mutated.stdout.trim().length > 0) {
       spawnSync2("git", ["add", "package.json", "bun.lock"], { cwd: repo.dir });
       const commit = spawnSync2(
         "git",
@@ -584,4 +672,8 @@ if (!flags.has("--no-install")) {
   }
 }
 var final = inspect(dir, manifest, presetFlag);
-process.exit(report(final.findings) > 0 ? 1 : 0);
+var remaining = final.findings.filter((finding) => finding.fix);
+for (const finding of remaining) finding.fix?.();
+final.flush();
+var settled = remaining.length > 0 ? inspect(dir, manifest, presetFlag) : final;
+process.exit(report(settled.findings) > 0 ? 1 : 0);

package/dist/tsup.js

@@ -8,12 +8,13 @@ var base = {
   sourcemap: true,
   clean: true
 };
-var node = (options = {}) => defineConfig({ ...base, ...options });
+var withDts = (options) => options.dts === true ? { ...options, dts: base.dts } : options;
+var node = (options = {}) => defineConfig({ ...base, ...withDts(options) });
 var react = (options = {}) => {
   const external = Array.isArray(options.external) ? options.external : [];
   return defineConfig({
     ...base,
-    ...options,
+    ...withDts(options),
     external: [.../* @__PURE__ */ new Set(["react", "react-dom", "react/jsx-runtime", ...external])]
   });
 };

package/lefthook/base.yml

@@ -0,0 +1,8 @@
+pre-commit:
+  parallel: true
+  commands:
+    typecheck:
+      run: bun run typecheck
+    lint:
+      run: bunx biome check --no-errors-on-unmatched --diagnostic-level=error {staged_files}
+      glob: "*.{ts,tsx}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inixiative/config",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Shared toolchain for the inixiative ecosystem: tsconfig/biome/tsup presets, a version manifest (BOM), and a sync/check CLI",
   "type": "module",
   "license": "MIT",
@@ -19,6 +19,7 @@
     "dist",
     "tsconfig",
     "biome",
+    "lefthook",
     "versions.json",
     "README.md"
   ],
@@ -29,12 +30,14 @@
     "./tsconfig/react.json": "./tsconfig/react.json",
     "./biome/base.json": "./biome/base.json",
     "./biome/react.json": "./biome/react.json",
+    "./lefthook/base.yml": "./lefthook/base.yml",
     "./tsup": {
       "types": "./dist/tsup.d.ts",
       "import": "./dist/tsup.js"
     }
   },
   "scripts": {
+    "prepare": "lefthook install",
     "build": "tsup",
     "test": "bun test",
     "typecheck": "tsc --noEmit",
@@ -47,6 +50,7 @@
   "devDependencies": {
     "@biomejs/biome": "2.5.2",
     "@types/bun": "1.3.14",
+    "lefthook": "2.1.9",
     "tsup": "8.5.1",
     "typescript": "6.0.3"
   },

package/versions.json

@@ -4,15 +4,20 @@
     "@biomejs/biome": "2.5.2",
     "typescript": "6.0.3",
     "tsup": "8.5.1",
-    "@types/bun": "1.3.14"
+    "@types/bun": "1.3.14",
+    "lefthook": "2.1.9"
   },
-  "required": ["@biomejs/biome", "typescript", "@types/bun"],
+  "required": [
+    "@biomejs/biome",
+    "typescript",
+    "@types/bun"
+  ],
   "ecosystem": {
-    "@inixiative/json-rules": "2.12.1",
-    "@inixiative/permissions": "0.3.1",
-    "@inixiative/transitions": "0.0.3",
-    "@inixiative/rules-builder": "0.13.0",
+    "@inixiative/json-rules": "2.13.0",
+    "@inixiative/permissions": "0.3.2",
+    "@inixiative/transitions": "0.1.0",
+    "@inixiative/rules-builder": "0.14.0",
     "@inixiative/prisma-map": "0.1.0",
-    "@inixiative/atlas": "0.1.0"
+    "@inixiative/atlas": "0.1.1"
   }
 }