@cosmicdrift/kumiko-feature-ast 0.391.0 → 0.392.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-feature-ast",
-  "version": "0.391.0",
+  "version": "0.392.0",
   "description": "Feature-file AST for Kumiko: parse, patch and render feature definitions, the pattern library, and the codemods kumiko-upgrade runs.",
   "license": "MIT",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -22,8 +22,8 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-framework": "0.391.0",
-    "@cosmicdrift/kumiko-types": "0.391.0",
+    "@cosmicdrift/kumiko-framework": "0.392.0",
+    "@cosmicdrift/kumiko-types": "0.392.0",
     "ts-morph": "^28.0.0",
     "zod": "^4.6.7"
   },

package/src/changes.json

@@ -1,4 +1,16 @@
 [
+  {
+    "version": "0.392.0",
+    "type": "improvement",
+    "title": "Codemod entries return their exit code",
+    "detail": "The feature-ast codemods export main(argv) and runCodemod next to runCodemodCli; they return an exit code instead of calling process.exit, so callers can run them in-process. Invocation from the shell is unchanged."
+  },
+  {
+    "version": "0.391.1",
+    "type": "fix",
+    "title": "Type-aware codemods no longer exhaust memory when the app pins another zod",
+    "detail": "ctx-namespaces and remove-engine-payload-casts build their ts-morph project with a resolution host that resolves zod and its subpaths from the app root, so the program holds one zod copy even when bun nests a second version under each framework package. Without zod at the app root, resolution is unchanged. A small app with zod 4.6.6 next to framework packages on 4.6.7 went from 17 GB and 36 s to 1.1 GB and 3 s for ctx-namespaces, with the same rewrites."
+  },
   {
     "version": "0.391.0",
     "type": "fix",

package/src/scripts/codemod/codemod-support.ts

@@ -286,13 +286,16 @@ export interface CodemodCliConfig {
   readonly extraExtensions?: readonly string[];
 }
 
-function parseArgsOrExit(codemodName: string, argv: readonly string[]): CliOptions {
+function parseArgsOrUsageError(
+  codemodName: string,
+  argv: readonly string[],
+): CliOptions | { readonly exitCode: number } {
   try {
     return parseArgs(argv);
   } catch (err) {
     if (err instanceof CliError) {
       console.error(`[${codemodName}] ${err.message}`);
-      process.exit(2);
+      return { exitCode: 2 };
     }
     throw err;
   }
@@ -329,8 +332,17 @@ function transformFiles(
 export async function runCodemodCli(
   config: CodemodCliConfig,
   argv: readonly string[],
-): Promise<void> {
-  const options = parseArgsOrExit(config.name, argv);
+): Promise<never> {
+  process.exit(await runCodemod(config, argv));
+}
+
+// Exit code instead of process.exit so the CLI logic can run in-process (tests).
+export async function runCodemod(
+  config: CodemodCliConfig,
+  argv: readonly string[],
+): Promise<number> {
+  const options = parseArgsOrUsageError(config.name, argv);
+  if ("exitCode" in options) return options.exitCode;
   const files = collectSourceFiles(options.paths, {
     isMigratableFile: (name) =>
       isSourceFileName(name) ||
@@ -348,5 +360,5 @@ export async function runCodemodCli(
       resolve(options.paths[0] ?? "."),
     );
   }
-  process.exit(options.mode === "check" && rewrites.length + manual.length > 0 ? 1 : 0);
+  return options.mode === "check" && rewrites.length + manual.length > 0 ? 1 : 0;
 }

package/src/scripts/codemod/ctx-namespaces.ts

@@ -1,9 +1,9 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join, relative, resolve } from "node:path";
-import { Project } from "ts-morph";
 import { type CodemodSite, formatWithBiome } from "./codemod-support.ts";
 import { collectSourceFiles } from "./collect-source-files.ts";
 import { transformCtxNamespaces } from "./ctx-namespaces-transform.ts";
+import { createTypeAwareProject } from "./type-aware-project.ts";
 
 const NAME = "ctx-namespaces";
 
@@ -101,10 +101,7 @@ function runGroup(
   mode: Mode,
   totals: RunTotals,
 ): void {
-  const project = new Project({
-    ...(tsconfig === undefined ? {} : { tsConfigFilePath: tsconfig }),
-    skipAddingFilesFromTsConfig: true,
-  });
+  const project = createTypeAwareProject(tsconfig);
   totals.projects += 1;
   // Receivers are found through references: a structural helper is only recognised as taking a
   // handler context when its callers in other files are already part of the project.
@@ -127,14 +124,14 @@ function runGroup(
 
 // kumiko-upgrade runs this as `bun ctx-namespaces.ts <repoDir> [--dry-run]` and treats a non-zero
 // exit as a failed codemod, so manual sites alone must not fail write or dry-run.
-async function main(argv: readonly string[]): Promise<void> {
+export async function main(argv: readonly string[]): Promise<number> {
   let options: CliOptions;
   try {
     options = parseArgs(argv);
   } catch (error) {
     if (error instanceof CliError) {
       console.error(`[${NAME}] ${error.message}`);
-      process.exit(2);
+      return 2;
     }
     throw error;
   }
@@ -160,11 +157,9 @@ async function main(argv: readonly string[]): Promise<void> {
   if (options.mode === "write" && options.format && totals.changedFiles.length > 0) {
     await formatWithBiome(NAME, totals.changedFiles, resolve(options.paths[0] ?? "."));
   }
-  process.exit(
-    options.mode === "check" && totals.rewrites.length + totals.manual.length > 0 ? 1 : 0,
-  );
+  return options.mode === "check" && totals.rewrites.length + totals.manual.length > 0 ? 1 : 0;
 }
 
 if (import.meta.main) {
-  await main(process.argv.slice(2));
+  process.exit(await main(process.argv.slice(2)));
 }

package/src/scripts/codemod/feature-layout.ts

@@ -389,13 +389,13 @@ function writeResult(result: FeatureLayoutResult): void {
   }
 }
 
-async function main(argv: readonly string[]): Promise<void> {
+export async function main(argv: readonly string[]): Promise<number> {
   let options: CliOptions;
   try {
     options = parseArgs(argv);
   } catch (err) {
     console.error(`[feature-layout] ${err instanceof Error ? err.message : String(err)}`);
-    process.exit(2);
+    return 2;
   }
   const files = readTargetFiles(options.paths);
   const result = applyFeatureLayout(files, options);
@@ -418,7 +418,7 @@ async function main(argv: readonly string[]): Promise<void> {
     }
   }
   const pending = result.markersRemoved.length + result.manual.length;
-  process.exit(options.mode === "check" && pending > 0 ? 1 : 0);
+  return options.mode === "check" && pending > 0 ? 1 : 0;
 }
 
-if (import.meta.main) await main(process.argv.slice(2));
+if (import.meta.main) process.exit(await main(process.argv.slice(2)));

package/src/scripts/codemod/object-form.ts

@@ -683,13 +683,15 @@ function countByMethod(rewrites: readonly ObjectFormRewrite[]): string {
     .join(", ");
 }
 
-function parseArgsOrExit(argv: readonly string[]): CliOptions {
+function parseArgsOrUsageError(
+  argv: readonly string[],
+): CliOptions | { readonly exitCode: number } {
   try {
     return parseArgs(argv);
   } catch (err) {
     if (err instanceof CliError) {
       console.error(`[object-form] ${err.message}`);
-      process.exit(2);
+      return { exitCode: 2 };
     }
     throw err;
   }
@@ -722,8 +724,9 @@ function transformFiles(files: readonly string[], mode: Mode): RunSummary {
   return summary;
 }
 
-async function main(): Promise<void> {
-  const options = parseArgsOrExit(process.argv.slice(2));
+export async function main(argv: readonly string[]): Promise<number> {
+  const options = parseArgsOrUsageError(argv);
+  if ("exitCode" in options) return options.exitCode;
   const files = collectSourceFiles(options.paths, { isMigratableFile }).filter(
     (file) => !isFixturePath(file),
   );
@@ -738,9 +741,9 @@ async function main(): Promise<void> {
   }
 
   const hasOpenSites = rewrites.length + manual.length > 0;
-  process.exit(options.mode === "check" && hasOpenSites ? 1 : 0);
+  return options.mode === "check" && hasOpenSites ? 1 : 0;
 }
 
 if (import.meta.main) {
-  await main();
+  process.exit(await main(process.argv.slice(2)));
 }

package/src/scripts/codemod/package-merge.ts

@@ -15,6 +15,7 @@
 import { Node, Project } from "ts-morph";
 import {
   applyEdits,
+  type CodemodCliConfig,
   type CodemodResult,
   detectIndent,
   isSortedKeys,
@@ -270,15 +271,14 @@ function isSkippedPath(file: string): boolean {
   return SKIPPED_PATH_SUFFIXES.some((suffix) => file.endsWith(suffix));
 }
 
+export const PACKAGE_MERGE_CLI: CodemodCliConfig = {
+  name: "package-merge",
+  transform: (source, filePath) => transformPackageMergeSource(source, filePath),
+  isSkippedPath,
+  extraFileNames: ["package.json"],
+  extraExtensions: [".css"],
+};
+
 if (import.meta.main) {
-  await runCodemodCli(
-    {
-      name: "package-merge",
-      transform: (source, filePath) => transformPackageMergeSource(source, filePath),
-      isSkippedPath,
-      extraFileNames: ["package.json"],
-      extraExtensions: [".css"],
-    },
-    process.argv.slice(2),
-  );
+  await runCodemodCli(PACKAGE_MERGE_CLI, process.argv.slice(2));
 }

package/src/scripts/codemod/remove-engine-payload-casts.ts

@@ -13,8 +13,9 @@
 // program, so the framework version the app compiles against decides the row type.
 
 import { dirname, resolve } from "node:path";
-import { type AsExpression, Node, Project, type SourceFile, SyntaxKind, ts } from "ts-morph";
+import { type AsExpression, Node, type Project, type SourceFile, SyntaxKind, ts } from "ts-morph";
 import { type CodemodResult, runCodemodCli } from "./codemod-support.ts";
+import { createTypeAwareProject } from "./type-aware-project.ts";
 
 const CAST_MARKER = "@cast-boundary";
 const EXECUTOR_TYPES_FILE = "/event-store-executor-types.ts";
@@ -278,7 +279,7 @@ function projectFor(filePath: string): Project | undefined {
   if (tsconfig === undefined) return undefined;
   const cached = projectsByTsconfig.get(tsconfig);
   if (cached !== undefined) return cached;
-  const project = new Project({ tsConfigFilePath: tsconfig, skipAddingFilesFromTsConfig: true });
+  const project = createTypeAwareProject(tsconfig);
   projectsByTsconfig.set(tsconfig, project);
   return project;
 }

package/src/scripts/codemod/testing-move.ts

@@ -506,20 +506,23 @@ function transformFiles(files: readonly string[], mode: Mode): RunSummary {
   return summary;
 }
 
-function parseArgsOrExit(argv: readonly string[]): CliOptions {
+function parseArgsOrUsageError(
+  argv: readonly string[],
+): CliOptions | { readonly exitCode: number } {
   try {
     return parseArgs(argv);
   } catch (err) {
     if (err instanceof CliError) {
       console.error(`[testing-move] ${err.message}`);
-      process.exit(2);
+      return { exitCode: 2 };
     }
     throw err;
   }
 }
 
-async function main(): Promise<void> {
-  const options = parseArgsOrExit(process.argv.slice(2));
+export async function main(argv: readonly string[]): Promise<number> {
+  const options = parseArgsOrUsageError(argv);
+  if ("exitCode" in options) return options.exitCode;
   const files = collectSourceFiles(options.paths, { isMigratableFile }).filter(
     (file) => !isSkippedPath(file),
   );
@@ -534,9 +537,9 @@ async function main(): Promise<void> {
   }
 
   const hasOpenSites = rewrites.length + manual.length > 0;
-  process.exit(options.mode === "check" && hasOpenSites ? 1 : 0);
+  return options.mode === "check" && hasOpenSites ? 1 : 0;
 }
 
 if (import.meta.main) {
-  await main();
+  process.exit(await main(process.argv.slice(2)));
 }

package/src/scripts/codemod/type-aware-project.ts

@@ -0,0 +1,47 @@
+import { dirname, join, resolve } from "node:path";
+import { Project, type ResolutionHostFactory, ts } from "ts-morph";
+
+function isZodSpecifier(moduleName: string): boolean {
+  return moduleName === "zod" || moduleName.startsWith("zod/");
+}
+
+// A second zod nested under a package makes the checker compare schemas structurally across both
+// copies at every framework call, which exhausts memory; one copy keeps them nominal.
+function appRootZodResolution(appRoot: string): ResolutionHostFactory {
+  const appRootAnchor = join(appRoot, "codemod-resolution-anchor.ts");
+  return (moduleResolutionHost, getCompilerOptions) => {
+    const cache = ts.createModuleResolutionCache(
+      appRoot,
+      (fileName) => fileName,
+      getCompilerOptions(),
+    );
+    const resolveFrom = (moduleName: string, containingFile: string, options: ts.CompilerOptions) =>
+      ts.resolveModuleName(moduleName, containingFile, options, moduleResolutionHost, cache)
+        .resolvedModule;
+    return {
+      resolveModuleNames: (
+        moduleNames,
+        containingFile,
+        _reusedNames,
+        _redirectedReference,
+        options,
+      ) =>
+        moduleNames.map(
+          (moduleName) =>
+            (isZodSpecifier(moduleName)
+              ? resolveFrom(moduleName, appRootAnchor, options)
+              : undefined) ?? resolveFrom(moduleName, containingFile, options),
+        ),
+    };
+  };
+}
+
+export function createTypeAwareProject(tsconfig: string | undefined): Project {
+  if (tsconfig === undefined) return new Project({ skipAddingFilesFromTsConfig: true });
+  const tsConfigFilePath = resolve(tsconfig);
+  return new Project({
+    tsConfigFilePath,
+    skipAddingFilesFromTsConfig: true,
+    resolutionHost: appRootZodResolution(dirname(tsConfigFilePath)),
+  });
+}

package/src/scripts/codemod/unprocessable-error-details-reason.ts

@@ -365,9 +365,9 @@ function migrateFile(sourceFile: SourceFile, skips: SkipEntry[]): number {
   return removedCount;
 }
 
-async function main(): Promise<void> {
-  const positional = process.argv.slice(2).filter((a) => !a.startsWith("--"));
-  const dryRun = process.argv.includes("--dry-run");
+export async function main(argv: readonly string[]): Promise<number> {
+  const positional = argv.filter((a) => !a.startsWith("--"));
+  const dryRun = argv.includes("--dry-run");
   const rootDir = resolve(positional[0] ?? process.cwd());
 
   const files = findTargetFiles(rootDir);
@@ -406,6 +406,7 @@ async function main(): Promise<void> {
     }
   }
   console.log();
+  return 0;
 }
 
-await main();
+if (import.meta.main) process.exit(await main(process.argv.slice(2)));