@cosmicdrift/kumiko-framework 0.387.0 → 0.389.0

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

@@ -12,7 +12,14 @@
 // Without a mode flag it writes (kumiko-upgrade --apply calls it that way). --check exits 1
 // while any rewritable or manual site is left; --dry-run only reports.
 
-import { type ImportDeclaration, Project, SyntaxKind } from "ts-morph";
+import {
+  type ExportDeclaration,
+  type ExportSpecifier,
+  type ImportDeclaration,
+  type ImportSpecifier,
+  Project,
+  SyntaxKind,
+} from "ts-morph";
 import {
   type CodemodResult,
   ensureNamedImport,
@@ -64,6 +71,115 @@ function reportNamespaceUses(
   }
 }
 
+function reportStarReexport(
+  declaration: ExportDeclaration,
+  filePath: string,
+  result: SiteLists,
+): void {
+  result.manual.push({
+    file: filePath,
+    line: declaration.getStartLineNumber(),
+    description: `export * from ${declaration.getModuleSpecifierValue()}: re-export the moved names from ${TARGET_MODULE} by hand`,
+  });
+}
+
+function moveNamedReexports(
+  declaration: ExportDeclaration,
+  movedExports: readonly ExportSpecifier[],
+  filePath: string,
+  result: SiteLists,
+): void {
+  const line = declaration.getStartLineNumber();
+  const snapshots = movedExports.map((named) => ({
+    name: named.getName(),
+    alias: named.getAliasNode()?.getText(),
+    isTypeOnly: named.isTypeOnly(),
+  }));
+  for (const named of movedExports) named.remove();
+  const typeOnlyDeclaration = declaration.isTypeOnly();
+  if (declaration.getNamedExports().length === 0) declaration.remove();
+  declaration.getSourceFile().addExportDeclaration({
+    moduleSpecifier: TARGET_MODULE,
+    namedExports: snapshots,
+    isTypeOnly: typeOnlyDeclaration,
+  });
+  result.rewrites.push({
+    file: filePath,
+    line,
+    description: `export { ${snapshots.map((snapshot) => snapshot.name).join(", ")} } -> ${TARGET_MODULE}`,
+  });
+}
+
+function rewriteReexports(
+  declaration: ExportDeclaration,
+  moved: ReadonlySet<string>,
+  filePath: string,
+  result: SiteLists,
+): void {
+  const namedExports = declaration.getNamedExports();
+  const movedExports = namedExports.filter((named) => moved.has(named.getName()));
+  if (namedExports.length === 0) reportStarReexport(declaration, filePath, result);
+  else if (movedExports.length > 0) moveNamedReexports(declaration, movedExports, filePath, result);
+}
+
+function moveNamedImports(
+  declaration: ImportDeclaration,
+  movedImports: readonly ImportSpecifier[],
+  filePath: string,
+  result: SiteLists,
+): void {
+  const line = declaration.getStartLineNumber();
+  const typeOnlyDeclaration = declaration.isTypeOnly();
+  const sourceFile = declaration.getSourceFile();
+  const names = movedImports.map((named) => named.getName());
+  // Collected first: removing a specifier invalidates the nodes of its siblings.
+  const snapshots = movedImports.map((named) => ({
+    name: named.getName(),
+    alias: named.getAliasNode()?.getText(),
+    typeOnly: named.isTypeOnly(),
+  }));
+  for (const named of movedImports) named.remove();
+  if (
+    declaration.getNamedImports().length === 0 &&
+    declaration.getNamespaceImport() === undefined &&
+    declaration.getDefaultImport() === undefined
+  ) {
+    declaration.remove();
+  }
+  for (const snapshot of snapshots) {
+    const typeOnly = typeOnlyDeclaration || snapshot.typeOnly;
+    if (snapshot.alias === undefined) {
+      ensureNamedImport(sourceFile, TARGET_MODULE, snapshot.name, typeOnly);
+    } else {
+      sourceFile.addImportDeclaration({
+        moduleSpecifier: TARGET_MODULE,
+        namedImports: [{ name: snapshot.name, alias: snapshot.alias }],
+        isTypeOnly: typeOnly,
+      });
+    }
+  }
+  result.rewrites.push({
+    file: filePath,
+    line,
+    description: `${names.join(", ")} -> ${TARGET_MODULE}`,
+  });
+}
+
+function rewriteImportDeclaration(
+  declaration: ImportDeclaration,
+  filePath: string,
+  result: SiteLists,
+): void {
+  const moved = movedNamesOf(declaration);
+  if (moved !== undefined) {
+    reportNamespaceUses(declaration, moved, filePath, result);
+    const movedImports = declaration
+      .getNamedImports()
+      .filter((named) => moved.has(named.getName()));
+    if (movedImports.length > 0) moveNamedImports(declaration, movedImports, filePath, result);
+  }
+}
+
 export function transformTestingInjectionSource(
   source: string,
   filePath = "source.ts",
@@ -77,47 +193,11 @@ export function transformTestingInjectionSource(
   });
   const sourceFile = project.createSourceFile(filePath, source);
   for (const declaration of sourceFile.getImportDeclarations()) {
-    const moved = movedNamesOf(declaration);
-    if (moved === undefined) continue;
-    reportNamespaceUses(declaration, moved, filePath, result);
-    const movedImports = declaration
-      .getNamedImports()
-      .filter((named) => moved.has(named.getName()));
-    if (movedImports.length === 0) continue;
-    const line = declaration.getStartLineNumber();
-    const typeOnlyDeclaration = declaration.isTypeOnly();
-    const names = movedImports.map((named) => named.getName());
-    // Collected first: removing a specifier invalidates the nodes of its siblings.
-    const snapshots = movedImports.map((named) => ({
-      name: named.getName(),
-      alias: named.getAliasNode()?.getText(),
-      typeOnly: named.isTypeOnly(),
-    }));
-    for (const named of movedImports) named.remove();
-    if (
-      declaration.getNamedImports().length === 0 &&
-      declaration.getNamespaceImport() === undefined &&
-      declaration.getDefaultImport() === undefined
-    ) {
-      declaration.remove();
-    }
-    for (const snapshot of snapshots) {
-      const typeOnly = typeOnlyDeclaration || snapshot.typeOnly;
-      if (snapshot.alias === undefined) {
-        ensureNamedImport(sourceFile, TARGET_MODULE, snapshot.name, typeOnly);
-      } else {
-        sourceFile.addImportDeclaration({
-          moduleSpecifier: TARGET_MODULE,
-          namedImports: [{ name: snapshot.name, alias: snapshot.alias }],
-          isTypeOnly: typeOnly,
-        });
-      }
-    }
-    result.rewrites.push({
-      file: filePath,
-      line,
-      description: `${names.join(", ")} -> ${TARGET_MODULE}`,
-    });
+    rewriteImportDeclaration(declaration, filePath, result);
+  }
+  for (const declaration of sourceFile.getExportDeclarations()) {
+    const moved = MOVED_NAMES_BY_MODULE.get(declaration.getModuleSpecifierValue() ?? "");
+    if (moved !== undefined) rewriteReexports(declaration, moved, filePath, result);
   }
   const output = result.rewrites.length > 0 ? sourceFile.getFullText() : source;
   return { output, ...result };

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

@@ -172,7 +172,9 @@ function repointDeclaration(
 function isWholeModuleReference(declaration: NamedDeclaration): boolean {
   if (Node.isImportDeclaration(declaration)) {
     return (
-      declaration.getNamespaceImport() !== undefined || declaration.getDefaultImport() !== undefined
+      declaration.getNamespaceImport() !== undefined ||
+      declaration.getDefaultImport() !== undefined ||
+      declaration.getNamedImports().length === 0
     );
   }
   return declaration.isNamespaceExport() || declaration.getNamedExports().length === 0;
@@ -186,14 +188,34 @@ function usesSplitName(
   const namespaceName = Node.isImportDeclaration(declaration)
     ? declaration.getNamespaceImport()?.getText()
     : undefined;
+  if (
+    Node.isImportDeclaration(declaration) &&
+    declaration.getDefaultImport() === undefined &&
+    namespaceName === undefined
+  ) {
+    return false; // side-effect import: nothing is used, so any package of the old module serves
+  }
   if (namespaceName === undefined) return true;
   return sourceFile
-    .getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)
-    .some(
-      (access) =>
-        access.getExpression().getText() === namespaceName &&
-        targetForName(old, access.getName()) !== mainTarget(old),
-    );
+    .getDescendantsOfKind(SyntaxKind.Identifier)
+    .some((identifier) => namespaceUseNeedsSplit(identifier, namespaceName, old));
+}
+
+// Conservative: any use other than `ns.name` / `ns.name` in a type position (destructuring,
+// passing the namespace on, typeof) cannot be attributed to one target package.
+function namespaceUseNeedsSplit(identifier: Node, namespaceName: string, old: OldModule): boolean {
+  if (identifier.getText() !== namespaceName) return false;
+  if (identifier.getFirstAncestorByKind(SyntaxKind.ImportDeclaration) !== undefined) return false;
+  const parent = identifier.getParent();
+  if (Node.isPropertyAccessExpression(parent)) {
+    if (parent.getNameNode() === identifier) return false;
+    return targetForName(old, parent.getName()) !== mainTarget(old);
+  }
+  if (Node.isQualifiedName(parent)) {
+    if (parent.getRight() === identifier) return false;
+    return targetForName(old, parent.getRight().getText()) !== mainTarget(old);
+  }
+  return true;
 }
 
 function repointWholeModule(

package/dist/engine/provider-plugin-context.d.ts

@@ -1,3 +0,0 @@
-import type { HandlerContext, JobContext, ProviderPluginContext } from "@cosmicdrift/kumiko-types/handlers";
-export declare function providerPluginContextFromHandler(ctx: HandlerContext): ProviderPluginContext;
-export declare function providerPluginContextFromJob(ctx: JobContext): ProviderPluginContext;

package/dist/engine/provider-plugin-context.js

@@ -1,28 +0,0 @@
-export function providerPluginContextFromHandler(ctx) {
-    return {
-        db: ctx.db,
-        dbOutsideTransaction: ctx.dbOutsideTransaction,
-        systemDb: ctx.systemDb,
-        registry: ctx.registry,
-        user: ctx.user,
-        log: ctx.log,
-        triggeredBy: ctx.triggeredBy,
-        config: ctx.config,
-        secrets: ctx.secrets,
-    };
-}
-// Jobs have no request user: the job's system user is the acting identity, and no
-// outside-transaction handle exists because jobs never run inside the handler's tx.
-export function providerPluginContextFromJob(ctx) {
-    return {
-        db: ctx.db,
-        dbOutsideTransaction: undefined,
-        systemDb: ctx.systemDb,
-        registry: ctx.registry,
-        user: ctx.systemUser,
-        log: ctx.log,
-        triggeredBy: ctx.triggeredBy,
-        config: ctx.config,
-        secrets: ctx.secrets,
-    };
-}