@cosmicdrift/kumiko-framework 0.389.0 → 0.390.1

package/dist/upgrade-cli.js

@@ -1,14 +1,13 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, realpathSync, statSync, writeFileSync, } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { propertyOf } from "@cosmicdrift/kumiko-types/type-guards";
 import { getFlag, getStringFlag, parseArgs } from "./arg-parser.js";
-import { compareVersions, filterEntriesAfter, parseFeatureChangelog, sortEntries, } from "./engine/index.js";
+import { sortEntries } from "./engine/feature-changelog.js";
+import { compareVersions, filterEntriesAfter, parseFeatureChangelog, } from "./engine/index.js";
 import { ensureTemporalPolyfill } from "./time/index.js";
-import { mergeUpgradeSection, setManualStatusInChangelog, } from "./upgrade-changelog.js";
+import { mergeUpgradeSection, syncResolvedManualStatuses, } from "./upgrade-changelog.js";
+import { CODEMOD_SUBDIR, findCodemodScriptsRoot, findFeatureChangelogFiles, } from "./upgrade-cli-internals.js";
 import { dedupeManualById, manualEntryId, parseStoredMarker, SEMVER_RE, } from "./upgrade-marker-parse.js";
-export { manualEntryId };
 const SEMVER_CORE_RE = /^(\d+\.\d+\.\d+)(?:-[0-9A-Za-z.-]+)?$/;
-const CODEMOD_SUBDIR = "scripts/codemod";
 function readPackageJsonVersion(packageJsonPath) {
     if (!existsSync(packageJsonPath))
         return null;
@@ -86,26 +85,6 @@ function readChangelogFile(filePath) {
         return [];
     }
 }
-export function findFeatureChangelogFiles(featuresDir) {
-    if (!existsSync(featuresDir))
-        return [];
-    const files = [];
-    const features = readdirSync(featuresDir, { withFileTypes: true })
-        .filter((d) => d.isDirectory())
-        .map((d) => d.name);
-    for (const name of features) {
-        // Layout is detected per-package, not guessed from a naming convention:
-        // enterprise packages keep changes.json under src/, framework's
-        // bundled-features keep it flat. A name-prefix heuristic (e.g. "ai-*")
-        // silently drops packages that don't match it.
-        const srcLayout = join(featuresDir, name, "src", "changes.json");
-        const flatLayout = join(featuresDir, name, "changes.json");
-        const changelogPath = existsSync(srcLayout) ? srcLayout : flatLayout;
-        if (existsSync(changelogPath))
-            files.push(changelogPath);
-    }
-    return files;
-}
 function collectChangelogs(featuresDir) {
     return findFeatureChangelogFiles(featuresDir).flatMap(readChangelogFile);
 }
@@ -201,43 +180,9 @@ export function findFeaturesDirs(cwd) {
     return dirs;
 }
 // Consumer-facing codemod scripts ship inside the published
-// @cosmicdrift/kumiko-framework package (src/scripts/codemod), not at the
+// @cosmicdrift/kumiko-feature-ast package (src/scripts/codemod), not at the
 // git repo root — only the installed package path exists in a consumer's
 // node_modules after a plain npm/bun install.
-export function findCodemodScriptsRoot(repoRoot) {
-    const local = join(repoRoot, "packages/framework/src");
-    if (existsSync(join(local, CODEMOD_SUBDIR))) {
-        // If package.json exists, require it to be kumiko-framework so a generic
-        // monorepo `packages/framework` cannot shadow the installed package.
-        // Missing package.json (test fixtures / incomplete trees) keeps prior behavior.
-        const pkgPath = join(repoRoot, "packages/framework/package.json");
-        if (existsSync(pkgPath)) {
-            try {
-                const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
-                if (propertyOf(pkg, "name") === "@cosmicdrift/kumiko-framework")
-                    return local;
-                // wrong name → fall through
-            }
-            catch {
-                // unreadable → fall through
-            }
-        }
-        else {
-            return local;
-        }
-    }
-    let dir = repoRoot;
-    for (let i = 0; i < 10; i++) {
-        const nmSrc = join(dir, "node_modules/@cosmicdrift/kumiko-framework/src");
-        if (existsSync(join(nmSrc, CODEMOD_SUBDIR)))
-            return nmSrc;
-        const parent = join(dir, "..");
-        if (parent === dir)
-            break;
-        dir = parent;
-    }
-    return null;
-}
 // Resolves a changes.json `codemod` field to an absolute script path,
 // refusing anything that would escape scripts/codemod/ (path traversal,
 // absolute paths, symlinks pointing outward) or that isn't a real .ts file.
@@ -268,6 +213,10 @@ function resolveCodemodScriptAt(codemodScriptsRoot, codemodField) {
     }
     return resolved;
 }
+function findCodemodScriptsRootPreferring(resolveFrom, repoRoot) {
+    const own = resolveFrom === undefined ? null : findCodemodScriptsRoot(resolveFrom);
+    return own ?? findCodemodScriptsRoot(repoRoot);
+}
 export function resolveCodemodScript(repoRoot, codemodField) {
     const scriptsRoot = findCodemodScriptsRoot(repoRoot);
     if (!scriptsRoot)
@@ -405,14 +354,15 @@ function manualWithStatus(manualEntries, previous) {
 function writeUpgradeChangelog(targetDir, bump) {
     const path = join(targetDir, "CHANGELOG.md");
     const existing = existsSync(path) ? readFileSync(path, "utf-8") : undefined;
-    writeFileSync(path, mergeUpgradeSection(existing, {
+    const merged = mergeUpgradeSection(existing, {
         from: bump.from,
         to: bump.to,
         date: Temporal.Now.instant().toString().slice(0, 10),
         breaking: bump.pending.filter((entry) => entry.type === "breaking"),
         manual: manualWithStatus(bump.manualEntries, bump.previous),
         codemods: bump.ran,
-    }), "utf-8");
+    });
+    writeFileSync(path, syncResolvedManualStatuses(merged, bump.previous.resolvedManual), "utf-8");
 }
 // Records the codemods that already wrote files before a later one failed, so
 // a re-run resumes after them instead of replaying non-idempotent codemods.
@@ -442,7 +392,7 @@ function writePartialMarker(out, targetDir, pending, manualEntries, failedVersio
 // even with zero pending entries, so an already-current app still gets a
 // bootstrap marker recording its installed version.
 // kumiko-lint-ignore complexity-budget sequential codemod runner with zero-pending bootstrap marker
-async function applyCodemods(out, pending, repoRoot, targetDir, dryRun, 
+async function applyCodemods(out, pending, codemodLocation, targetDir, dryRun, 
 // Installed version for the zero-pending bootstrap marker — never a
 // `--from` filter override (that would permanently skip real pending
 // codemods once the CI guard compares against the fake marker).
@@ -497,14 +447,16 @@ markerVersion, previous, fromVersion, manualDetails) {
         }
         return 0;
     }
-    const codemodScriptsRoot = findCodemodScriptsRoot(repoRoot);
+    const { repoRoot, resolveFrom: codemodResolveFrom } = codemodLocation;
+    const codemodScriptsRoot = findCodemodScriptsRootPreferring(codemodResolveFrom, repoRoot);
     if (codemodScriptsRoot === null) {
-        out.err(`  ✗ could not locate @cosmicdrift/kumiko-framework/src/scripts/codemod — is the framework installed? searched from ${repoRoot} upward`);
+        const searched = codemodResolveFrom === undefined ? repoRoot : `${codemodResolveFrom} and ${repoRoot}`;
+        out.err(`  ✗ could not locate @cosmicdrift/kumiko-feature-ast/src/scripts/codemod — is @cosmicdrift/kumiko-cli or @cosmicdrift/kumiko-dev-server installed? searched from ${searched} upward`);
         return 1;
     }
     const ran = [];
     for (const e of codemodEntries) {
-        const scriptPath = resolveCodemodScript(repoRoot, e.codemod);
+        const scriptPath = resolveCodemodScriptAt(codemodScriptsRoot, e.codemod);
         if (!scriptPath) {
             out.err(`  ✗ ${e.version} · ${e.title} — invalid codemod path "${e.codemod}"`);
             if (!dryRun)
@@ -627,7 +579,7 @@ function resolveManualMigrations(out, args, targetDir) {
     const changelogPath = join(targetDir, "CHANGELOG.md");
     if (existsSync(changelogPath)) {
         const content = readFileSync(changelogPath, "utf-8");
-        writeFileSync(changelogPath, setManualStatusInChangelog(content, resolvedIds, resolution), "utf-8");
+        writeFileSync(changelogPath, syncResolvedManualStatuses(content, resolvedManual), "utf-8");
     }
     out.log("");
     out.log(`  ✓ Marked ${newlyResolved.length} manual migration(s) as ${resolution}:`);
@@ -735,7 +687,7 @@ function planUpgrade(args, cwd, targetDir) {
         value: { ...baseline.value, targetInstalledVersion, allEntries, pending },
     };
 }
-async function applyPlannedUpgrade(out, args, plan, repoRoot, targetDir) {
+async function applyPlannedUpgrade(out, args, plan, codemodLocation, targetDir) {
     // Marker must reflect what is actually installed under the target (or
     // cwd), not the filter baseline above — otherwise CI stays green forever.
     const markerVersion = plan.targetInstalledVersion;
@@ -744,7 +696,7 @@ async function applyPlannedUpgrade(out, args, plan, repoRoot, targetDir) {
         return failUpgrade(out, `Could not detect the installed Kumiko version under ${targetDir}.`, "Refusing to write an upgrade marker without it (--from is only a filter).");
     }
     out.log("");
-    const code = await applyCodemods(out, plan.pending, repoRoot, targetDir, dryRun, markerVersion ?? plan.currentVersion, carryOf(plan.markerRead), plan.currentVersion, getFlag(args, "verbose") ? manualDetailsOf(plan.allEntries) : undefined);
+    const code = await applyCodemods(out, plan.pending, codemodLocation, targetDir, dryRun, markerVersion ?? plan.currentVersion, carryOf(plan.markerRead), plan.currentVersion, getFlag(args, "verbose") ? manualDetailsOf(plan.allEntries) : undefined);
     out.log("");
     return code;
 }
@@ -856,7 +808,13 @@ export async function runUpgradeCli(argv, cwd, out, options) {
     if (planned.kind === "error")
         return failUpgrade(out, ...planned.lines);
     if (getFlag(args, "apply")) {
-        return applyPlannedUpgrade(out, args, planned.value, options?.repoRoot ?? cwd, targetDir);
+        const codemodLocation = {
+            repoRoot: options?.repoRoot ?? cwd,
+            ...(options?.codemodResolveFrom !== undefined && {
+                resolveFrom: options.codemodResolveFrom,
+            }),
+        };
+        return applyPlannedUpgrade(out, args, planned.value, codemodLocation, targetDir);
     }
     if (getFlag(args, "json"))
         return reportUpgradeJson(out, planned.value);

package/dist/utils/import-optional-peer.d.ts

@@ -0,0 +1,6 @@
+export type OptionalPeer = {
+    readonly name: string;
+    readonly range: string;
+    readonly requiredBy: string;
+};
+export declare function importOptionalPeer<T>(peer: OptionalPeer, importer: () => Promise<T>): Promise<T>;

package/dist/utils/import-optional-peer.js

@@ -0,0 +1,19 @@
+import { errorCodeOf } from "@cosmicdrift/kumiko-types/type-guards";
+// Bun and Node both report a missing package as ERR_MODULE_NOT_FOUND with
+// "Cannot find package '<name>' imported from ...". A peer's own missing
+// dependency carries a different name, so it must not be mistaken for the peer.
+function isPeerItselfMissing(error, peerName) {
+    return (errorCodeOf(error) === "ERR_MODULE_NOT_FOUND" &&
+        error instanceof Error &&
+        error.message.includes(`'${peerName}'`));
+}
+export async function importOptionalPeer(peer, importer) {
+    try {
+        return await importer();
+    }
+    catch (error) {
+        if (!isPeerItselfMissing(error, peer.name))
+            throw error;
+        throw new Error(`${peer.name} is not installed. ${peer.requiredBy} needs it as a peer dependency: bun add ${peer.name}@${peer.range}`, { cause: error });
+    }
+}

package/dist/utils/index.d.ts

@@ -1,9 +1,6 @@
 export { assertUnreachable } from "./assert.ts";
-export { toSnakeCase } from "./case.ts";
-export { compareByCodepoint } from "./compare.ts";
-export { readPositiveIntEnv } from "./env-parse.ts";
 export { generateDeterministicId, generateId } from "./ids.ts";
 export { isPlainObject } from "./is-plain-object.ts";
 export { parseStringArrayJson } from "./parse-string-array-json.ts";
-export { parseJsonOrThrow, parseJsonSafe, stringifyJson } from "./safe-json.ts";
+export { parseJsonOrThrow, parseJsonSafe } from "./safe-json.ts";
 export { parseRoles } from "./serialization.ts";

package/dist/utils/index.js

@@ -1,9 +1,6 @@
 export { assertUnreachable } from "./assert.js";
-export { toSnakeCase } from "./case.js";
-export { compareByCodepoint } from "./compare.js";
-export { readPositiveIntEnv } from "./env-parse.js";
 export { generateDeterministicId, generateId } from "./ids.js";
 export { isPlainObject } from "./is-plain-object.js";
 export { parseStringArrayJson } from "./parse-string-array-json.js";
-export { parseJsonOrThrow, parseJsonSafe, stringifyJson } from "./safe-json.js";
+export { parseJsonOrThrow, parseJsonSafe } from "./safe-json.js";
 export { parseRoles } from "./serialization.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-framework",
-  "version": "0.389.0",
+  "version": "0.390.1",
   "description": "Framework core — engine, pipeline, API, DB, and every other bit that makes Kumiko go.",
   "license": "MIT",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -25,9 +25,9 @@
   "type": "module",
   "kumiko": {
     "runtime": "runtime",
-    "bunOnlyExports": [
-      "./engine/codemod"
-    ]
+    "optionalPeerExports": {
+      "./search/meilisearch": "meilisearch"
+    }
   },
   "exports": {
     "./compliance": {
@@ -60,10 +60,6 @@
       "types": "./dist/env/dry-run.d.ts",
       "default": "./dist/env/dry-run.js"
     },
-    "./engine/codemod": {
-      "types": "./dist/engine/codemod/index.d.ts",
-      "default": "./dist/engine/codemod/index.js"
-    },
     "./errors": {
       "types": "./dist/errors/index.d.ts",
       "default": "./dist/errors/index.js"
@@ -176,6 +172,10 @@
       "types": "./dist/api/request-context.d.ts",
       "default": "./dist/api/request-context.js"
     },
+    "./internal/row-level-security": {
+      "types": "./dist/internal/row-level-security.d.ts",
+      "default": "./dist/internal/row-level-security.js"
+    },
     "./internal/stack-support": {
       "types": "./dist/internal/stack-support.d.ts",
       "default": "./dist/internal/stack-support.js"
@@ -199,27 +199,32 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-types": "0.389.0",
+    "@cosmicdrift/kumiko-types": "0.390.1",
     "bullmq": "^5.76.7",
     "hono": "^4.13.1",
     "i18next": "^26.1.0",
     "ioredis": "^5.10.1",
     "jose": "^6.2.3",
-    "meilisearch": "^0.58.0",
     "pino": "^10.3.1",
     "temporal-polyfill": "^0.3.2",
-    "ts-morph": "^28.0.0",
     "uuid": "^14.0.0",
     "write-excel-file": "^4.1.1",
-    "zod": "^4.4.3"
+    "zod": "^4.6.7"
   },
   "peerDependencies": {
-    "bun-types": "^1.4.4"
+    "bun-types": "^1.4.4",
+    "meilisearch": "^0.58.0"
+  },
+  "peerDependenciesMeta": {
+    "meilisearch": {
+      "optional": true
+    }
   },
   "devDependencies": {
-    "@cosmicdrift/kumiko-testing": "0.389.0",
+    "@cosmicdrift/kumiko-testing": "0.390.1",
     "bun-types": "^1.4.4",
     "fflate": "^0.8.2",
+    "meilisearch": "^0.58.0",
     "pino-pretty": "^13.1.3"
   },
   "publishConfig": {
@@ -256,10 +261,6 @@
         "types": "./dist/env/dry-run.d.ts",
         "default": "./dist/env/dry-run.js"
       },
-      "./engine/codemod": {
-        "types": "./dist/engine/codemod/index.d.ts",
-        "default": "./dist/engine/codemod/index.js"
-      },
       "./errors": {
         "types": "./dist/errors/index.d.ts",
         "default": "./dist/errors/index.js"
@@ -372,6 +373,10 @@
         "types": "./dist/api/request-context.d.ts",
         "default": "./dist/api/request-context.js"
       },
+      "./internal/row-level-security": {
+        "types": "./dist/internal/row-level-security.d.ts",
+        "default": "./dist/internal/row-level-security.js"
+      },
       "./internal/stack-support": {
         "types": "./dist/internal/stack-support.d.ts",
         "default": "./dist/internal/stack-support.js"
@@ -400,7 +405,6 @@
     "kumiko-es-tables.json",
     "presets",
     "src/changes.json",
-    "src/scripts/codemod",
     "README.md",
     "LICENSE",
     "AGENTS.md",