@onrails/codemod 0.2.5 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onrails/codemod",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Codemods for migrating onto @onrails/result (neverthrow → compat shim, and beyond)",
   "license": "MIT",
   "author": "Alan R. Soares",
@@ -42,13 +42,15 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@onrails/maybe": "0.2.0",
-    "@onrails/pattern": "0.2.0",
-    "@onrails/result": "0.2.0",
-    "typescript": "^6.0.3"
+    "@onrails/maybe": "^0.2.3",
+    "@onrails/pattern": "^0.3.3",
+    "@onrails/result": "^0.4.0",
+    "typescript": "^7.0.2",
+    "typescript6": "npm:typescript@^6.0.3"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "test": "bun test"
+    "test": "bun test",
+    "check": "bun run typecheck && bun test"
   }
 }

package/src/ast.ts

@@ -1,5 +1,5 @@
 import { fromNullable, type Maybe, match, none, some } from "@onrails/maybe";
-import ts from "typescript";
+import ts from "typescript6";
 import { TYPE_ONLY_NATIVE } from "./constants.js";
 import type { Edit } from "./types.js";
 

package/src/boundary-spec.ts

@@ -66,9 +66,10 @@ export interface DeprecatedSynonym {
 
 /**
  * Deprecated neverthrow/fp-era synonyms → canonical onrails names.
- * Matching is name-based in every engine — neither GritQL nor the ESLint
- * rules scope by import, so same-named calls from other libraries (RxJS
- * `of`, fp-ts `fold`) are flagged too.
+ * The ESLint rule matches by name alone, so same-named calls from other
+ * libraries (RxJS `of`, fp-ts `fold`) are flagged too; the Biome rule scopes
+ * to files carrying an `@onrails/*` module source. See `ENGINE_DIVERGENCES`
+ * (`no-deprecated-synonyms` / `import-scoped`).
  */
 export const DEPRECATED_SYNONYMS: readonly DeprecatedSynonym[] = [
   { name: "chain", form: "method", canonical: "flatMap" },
@@ -174,6 +175,18 @@ export const ENGINE_DIVERGENCES: readonly EngineDivergence[] = [
       "flags test code too. Suppress with a biome-ignore comment or a linter " +
       "override for test globs.",
   },
+  {
+    rule: NO_DEPRECATED_SYNONYMS_RULE.id,
+    engine: "biome",
+    divergence: "import-scoped",
+    detail:
+      "GritQL can read the module sources of the file it is matching, so the " +
+      "Biome rule only flags synonyms in files that mention an `@onrails/*` " +
+      "specifier — RxJS `of` and fp-ts `fold` in unrelated files stay quiet. " +
+      "The ESLint rule matches by name everywhere, so it is the noisier of " +
+      "the two in mixed codebases and the stricter one in codebases that " +
+      "re-export onrails through a local alias.",
+  },
   {
     rule: FLUENT_STAYS_LOCAL_RULE.id,
     engine: "biome",

package/src/chains.ts

@@ -1,6 +1,6 @@
 import { compactMap, isSome, type Maybe, map, none, some } from "@onrails/maybe";
 import { match } from "@onrails/pattern";
-import ts from "typescript";
+import ts from "typescript6";
 import { argsToText, edit, lookupMap, spanEdit, walkSource } from "./ast.js";
 import {
   ASYNC_ROOT_HINTS,
@@ -34,9 +34,7 @@ const HELPERS = [
 
 type HelperName = (typeof HELPERS)[number];
 
-function isHelperName(x: string): x is HelperName {
-  return (HELPERS as readonly string[]).includes(x);
-}
+const isHelperName = (x: string): x is HelperName => (HELPERS as readonly string[]).includes(x);
 
 function identifierCallToNative(node: ts.CallExpression): Maybe<Edit> {
   if (!ts.isIdentifier(node.expression)) return none();

package/src/pkg.ts

@@ -9,7 +9,7 @@ const reorderDeps = (deps: Record<string, string>): Record<string, string> =>
   Object.fromEntries(Object.entries(deps).sort(([a], [b]) => a.localeCompare(b)));
 
 export const parsePackageJson = (raw: string): Result<Record<string, unknown>, Error> =>
-  trySync(() => JSON.parse(raw) as Record<string, unknown>, toError)();
+  trySync(() => JSON.parse(raw) as Record<string, unknown>, toError);
 
 const applyDepRewrite =
   (fileSpec: string) =>

package/src/switch.ts

@@ -1,4 +1,4 @@
-import ts from "typescript";
+import ts from "typescript6";
 import type { Edit } from "./types.js";
 
 interface Comparison {

package/src/tersify-utils.ts

@@ -1,4 +1,4 @@
-import ts from "typescript";
+import ts from "typescript6";
 
 // Helper to check for single statement return
 export function getSingleReturnExpression(statement: ts.Statement): ts.Expression | undefined {
@@ -135,12 +135,9 @@ export function getTernaryBranchText(node: ts.Expression, sf: ts.SourceFile): st
   let unwrapped: ts.Expression | undefined;
   if (ts.isJsxFragment(current)) {
     const children = current.children;
-    const nonTriviaChildren = children.filter((child) => {
-      if (ts.isJsxText(child)) {
-        return !child.containsOnlyTriviaWhiteSpaces;
-      }
-      return true;
-    });
+    const nonTriviaChildren = children.filter((child) =>
+      ts.isJsxText(child) ? !child.containsOnlyTriviaWhiteSpaces : true,
+    );
     if (nonTriviaChildren.length === 1) {
       const soleChild = nonTriviaChildren[0];
       if (soleChild && ts.isJsxExpression(soleChild) && soleChild.expression) {
@@ -152,12 +149,9 @@ export function getTernaryBranchText(node: ts.Expression, sf: ts.SourceFile): st
     if (tagName === "Fragment" || tagName === "React.Fragment" || tagName.endsWith(".Fragment")) {
       if (current.openingElement.attributes.properties.length === 0) {
         const children = current.children;
-        const nonTriviaChildren = children.filter((child) => {
-          if (ts.isJsxText(child)) {
-            return !child.containsOnlyTriviaWhiteSpaces;
-          }
-          return true;
-        });
+        const nonTriviaChildren = children.filter((child) =>
+          ts.isJsxText(child) ? !child.containsOnlyTriviaWhiteSpaces : true,
+        );
         if (nonTriviaChildren.length === 1) {
           const soleChild = nonTriviaChildren[0];
           if (soleChild && ts.isJsxExpression(soleChild) && soleChild.expression) {

package/src/tersify.ts

@@ -1,5 +1,5 @@
 import { type Maybe, none, some } from "@onrails/maybe";
-import ts from "typescript";
+import ts from "typescript6";
 import { edit, spanEdit, walkSource } from "./ast.js";
 import { applyEditStep, byStartDesc } from "./chains.js";
 import { scanIfToSwitchSequences } from "./switch.js";

package/src/warnings.ts

@@ -1,4 +1,4 @@
-import ts from "typescript";
+import ts from "typescript6";
 import { walkSource } from "./ast.js";
 import { COMPAT_ONLY_PATTERNS, COMPAT_SPEC } from "./constants.js";
 import type { Warning } from "./types.js";