@react-spectrum/codemods 1.2.1 → 1.2.3

package/dist/test-utils-rc-update/src/codemod.js

@@ -0,0 +1,236 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = transformer;
+const parser_1 = require("@babel/parser");
+const recast_1 = require("recast");
+const RENAME_MAP = {
+    checkboxgroup: 'getCheckboxGroup',
+    checkboxes: 'getCheckboxes',
+    selectedCheckboxes: 'getSelectedCheckboxes',
+    combobox: 'getCombobox',
+    trigger: 'getTrigger',
+    listbox: 'getListbox',
+    sections: 'getSections',
+    options: 'getOptions',
+    focusedOption: 'getFocusedOption',
+    selectOption: 'toggleOptionSelection',
+    dialog: 'getDialog',
+    gridlist: 'getGridlist',
+    rows: 'getRows',
+    selectedRows: 'getSelectedRows',
+    cells: 'getCells',
+    selectedOptions: 'getSelectedOptions',
+    menu: 'getMenu',
+    submenuTriggers: 'getSubmenuTriggers',
+    radiogroup: 'getRadioGroup',
+    radios: 'getRadios',
+    selectedRadio: 'getSelectedRadio',
+    table: 'getTable',
+    rowGroups: 'getRowGroups',
+    columns: 'getColumns',
+    rowHeaders: 'getRowHeaders',
+    tablist: 'getTablist',
+    tabpanels: 'getTabpanels',
+    selectedTab: 'getSelectedTab',
+    tabs: 'getTabs',
+    activeTabpanel: 'getActiveTabpanel',
+    tree: 'getTree'
+};
+const FIND_PARAM_KEY_MAP = {
+    findCheckbox: 'checkboxIndexOrText',
+    findOption: 'optionIndexOrText',
+    findRow: 'rowIndexOrText',
+    findRadio: 'radioIndexOrText',
+    findTab: 'tabIndexOrText'
+};
+// Methods on a tester that return another tester object
+const TESTER_RETURNING_METHODS = new Set(['openSubmenu']);
+function transformer(file, api) {
+    let j = api.jscodeshift.withParser({
+        parse(source) {
+            return (0, recast_1.parse)(source, {
+                parser: {
+                    parse(innerSource) {
+                        return (0, parser_1.parse)(innerSource, {
+                            sourceType: 'module',
+                            plugins: [
+                                'jsx',
+                                'typescript',
+                                'importAssertions',
+                                'dynamicImport',
+                                'decorators-legacy',
+                                'classProperties',
+                                'classPrivateProperties',
+                                'classPrivateMethods',
+                                'exportDefaultFrom',
+                                'exportNamespaceFrom',
+                                'objectRestSpread',
+                                'optionalChaining',
+                                'nullishCoalescingOperator',
+                                'topLevelAwait'
+                            ],
+                            tokens: true,
+                            errorRecovery: true
+                        });
+                    }
+                }
+            });
+        }
+    });
+    let root = j(file.source);
+    let testerVarNames = new Set();
+    function unwrapAwait(node) {
+        while (node?.type === 'AwaitExpression' || node?.type === 'TSNonNullExpression') {
+            node = node.type === 'TSNonNullExpression' ? node.expression : node.argument;
+        }
+        return node;
+    }
+    function isCallOf(node) {
+        return node?.type === 'CallExpression' || node?.type === 'OptionalCallExpression';
+    }
+    function isMemberOf(node) {
+        return node?.type === 'MemberExpression' || node?.type === 'OptionalMemberExpression';
+    }
+    // Initial pass: find variables directly from createTester(...)
+    root.find(j.VariableDeclarator).forEach(path => {
+        let id = path.node.id;
+        if (id.type !== 'Identifier') {
+            return;
+        }
+        let call = unwrapAwait(path.node.init);
+        if (!isCallOf(call)) {
+            return;
+        }
+        let callee = call.callee;
+        let isCreateTester = (isMemberOf(callee) && callee.property?.name === 'createTester') ||
+            (callee?.type === 'Identifier' && callee?.name === 'createTester');
+        if (isCreateTester) {
+            testerVarNames.add(id.name);
+        }
+    });
+    if (testerVarNames.size === 0) {
+        return file.source;
+    }
+    // Multi-pass: propagate tracking through methods that return testers (e.g. openSubmenu)
+    let propagating = true;
+    while (propagating) {
+        propagating = false;
+        root.find(j.VariableDeclarator).forEach(path => {
+            let id = path.node.id;
+            if (id.type !== 'Identifier' || testerVarNames.has(id.name)) {
+                return;
+            }
+            let call = unwrapAwait(path.node.init);
+            if (!isCallOf(call) || !isMemberOf(call.callee)) {
+                return;
+            }
+            let obj = call.callee.object;
+            let methodName = call.callee.property?.type === 'Identifier' ? call.callee.property.name : '';
+            if (obj?.type === 'Identifier' &&
+                testerVarNames.has(obj.name) &&
+                TESTER_RETURNING_METHODS.has(methodName)) {
+                testerVarNames.add(id.name);
+                propagating = true;
+            }
+        });
+    }
+    let didChange = false;
+    function renamePropInCallee(callee) {
+        if (!isMemberOf(callee) ||
+            callee.object?.type !== 'Identifier' ||
+            !testerVarNames.has(callee.object.name)) {
+            return false;
+        }
+        let propName = callee.property?.type === 'Identifier' ? callee.property.name : '';
+        let newName = RENAME_MAP[propName];
+        if (!newName) {
+            return false;
+        }
+        callee.property = j.identifier(newName);
+        return true;
+    }
+    // Pass 1: Rename method calls — tester.options() → tester.getOptions()
+    root.find(j.CallExpression, { callee: { type: 'MemberExpression' } }).forEach(path => {
+        if (path.node.type !== 'CallExpression') {
+            return; // skip OptionalCallExpression matched by babel parser
+        }
+        if (renamePropInCallee(path.node.callee)) {
+            didChange = true;
+        }
+    });
+    // Pass 1B: tester?.options() → tester?.getOptions()
+    root.find(j.OptionalCallExpression).forEach(path => {
+        if (renamePropInCallee(path.node.callee)) {
+            didChange = true;
+        }
+    });
+    // Pass 2: Property access → call — tester.rows → tester.getRows()
+    root.find(j.MemberExpression).forEach(path => {
+        let node = path.node;
+        if (node.type !== 'MemberExpression') {
+            return; // skip OptionalMemberExpression matched by babel parser
+        }
+        if (node.object?.type !== 'Identifier' || !testerVarNames.has(node.object.name)) {
+            return;
+        }
+        let propName = node.property?.type === 'Identifier' ? node.property.name : '';
+        let newName = RENAME_MAP[propName];
+        if (!newName) {
+            return;
+        }
+        let parent = path.parent?.node;
+        if (parent?.type === 'CallExpression' && parent.callee === path.node) {
+            return;
+        }
+        j(path).replaceWith(j.callExpression(j.memberExpression(node.object, j.identifier(newName)), []));
+        didChange = true;
+    });
+    // Pass 2B: tester?.rows → tester?.getRows()
+    root.find(j.OptionalMemberExpression).forEach(path => {
+        let node = path.node;
+        if (node.object?.type !== 'Identifier' || !testerVarNames.has(node.object.name)) {
+            return;
+        }
+        let propName = node.property?.type === 'Identifier' ? node.property.name : '';
+        let newName = RENAME_MAP[propName];
+        if (!newName) {
+            return;
+        }
+        let parent = path.parent?.node;
+        if ((parent?.type === 'OptionalCallExpression' || parent?.type === 'CallExpression') &&
+            parent.callee === path.node) {
+            return;
+        }
+        j(path).replaceWith(j.optionalCallExpression(j.optionalMemberExpression(node.object, j.identifier(newName), false, true), [], false));
+        didChange = true;
+    });
+    // Pass 3: Rename param keys inside find* calls — {optionIndexOrText: x} → {indexOrText: x}
+    function renameFindParamKey(callPath) {
+        let callee = callPath.node.callee;
+        if (!isMemberOf(callee) ||
+            callee.object?.type !== 'Identifier' ||
+            !testerVarNames.has(callee.object.name)) {
+            return;
+        }
+        let methodName = callee.property?.type === 'Identifier' ? callee.property.name : '';
+        let oldKey = FIND_PARAM_KEY_MAP[methodName];
+        if (!oldKey) {
+            return;
+        }
+        let firstArg = callPath.node.arguments[0];
+        if (firstArg?.type !== 'ObjectExpression') {
+            return;
+        }
+        for (let prop of firstArg.properties) {
+            if (prop.type === 'ObjectProperty' &&
+                prop.key?.type === 'Identifier' &&
+                prop.key.name === oldKey) {
+                prop.key = j.identifier('indexOrText');
+                didChange = true;
+            }
+        }
+    }
+    root.find(j.CallExpression, { callee: { type: 'MemberExpression' } }).forEach(renameFindParamKey);
+    root.find(j.OptionalCallExpression).forEach(renameFindParamKey);
+    return didChange ? root.toSource({ quote: 'single' }) : file.source;
+}

package/dist/test-utils-rc-update/src/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.test_utils_rc_update = test_utils_rc_update;
+const Runner_js_1 = require("jscodeshift/src/Runner.js");
+const path_1 = __importDefault(require("path"));
+const transformPath = path_1.default.join(__dirname, 'codemod.js');
+async function test_utils_rc_update(options) {
+    let { path: filePath = '.', ...rest } = options;
+    return await (0, Runner_js_1.run)(transformPath, [filePath], rest);
+}

package/dist/use-monopackages/src/codemod.js

@@ -5,7 +5,7 @@ const path = require('path');
 const Module = require('module');
 const url = require('url');
 function areSpecifiersAlphabetized(specifiers) {
-    const specifierNames = specifiers.map((specifier) => specifier.imported.name);
+    const specifierNames = specifiers.map(specifier => specifier.imported.name);
     const sortedNames = [...specifierNames].sort();
     return specifierNames.join() === sortedNames.join();
 }
@@ -13,13 +13,17 @@ function areSpecifiersAlphabetized(specifiers) {
  * Replaces individual package imports with monopackage imports, where possible.
  *
  * Works for:
+ *
  * - `@react-spectrum/*` -> `@adobe/react-spectrum`.
  * - `@react-aria/*` -> `react-aria`.
  * - `@react-stately/*` -> `react-stately`.
  *
- * By default this will apply to all the above packages, or optionally you can specify which packages to apply this by passing a comma-separated list to the packages option: `--packages=react-aria,react-stately,react-spectrum`.
+ * By default this will apply to all the above packages, or optionally you can specify which
+ * packages to apply this by passing a comma-separated list to the packages option:
+ * `--packages=react-aria,react-stately,react-spectrum`.
  *
- * Run this from a directory where the relevant packages are installed in node_modules so it knows which monopackage exports are available to use (since exports may vary by version).
+ * Run this from a directory where the relevant packages are installed in node_modules so it knows
+ * which monopackage exports are available to use (since exports may vary by version).
  */
 const transformer = function transformer(file, api, options) {
     const j = api.jscodeshift;
@@ -38,11 +42,10 @@ const transformer = function transformer(file, api, options) {
             individualPrefix: '@react-stately/'
         }
     };
-    const selectedPackages = options?.packages?.split(',').filter((pkg) => packages[pkg]) ||
-        Object.keys(packages);
+    const selectedPackages = options?.packages?.split(',').filter(pkg => packages[pkg]) || Object.keys(packages);
     let anyIndexFound = false;
     const monopackageExports = {};
-    selectedPackages.forEach((pkg) => {
+    selectedPackages.forEach(pkg => {
         let indexPath;
         try {
             let pkgPath = path.dirname(Module.findPackageJSON(packages[pkg].monopackage, url.pathToFileURL(file.path || `${process.cwd()}/index`)));
@@ -60,8 +63,8 @@ const transformer = function transformer(file, api, options) {
             const indexRoot = j(indexFile);
             monopackageExports[pkg] = [];
             // Collect all named exports from the monopackage index file
-            indexRoot.find(j.ExportNamedDeclaration).forEach((path) => {
-                path.node.specifiers?.forEach((specifier) => {
+            indexRoot.find(j.ExportNamedDeclaration).forEach(path => {
+                path.node.specifiers?.forEach(specifier => {
                     monopackageExports[pkg].push(specifier.exported.name);
                 });
             });
@@ -72,8 +75,8 @@ const transformer = function transformer(file, api, options) {
                     type: 'Literal'
                 }
             })
-                .forEach((path) => {
-                path.node.specifiers?.forEach((specifier) => {
+                .forEach(path => {
+                path.node.specifiers?.forEach(specifier => {
                     monopackageExports[pkg].push(specifier.exported.name);
                 });
             });
@@ -86,21 +89,18 @@ const transformer = function transformer(file, api, options) {
         console.warn('None of the index files for the selected packages exist. Ensure that the packages are installed.');
         return root.toSource();
     }
-    selectedPackages.forEach((pkg) => {
+    selectedPackages.forEach(pkg => {
         // Find all imports from individual packages
-        const individualPackageImports = root
-            .find(j.ImportDeclaration)
-            .filter((path) => {
-            return path.node.source.value !== '@react-spectrum/s2' && path.node.source.value?.startsWith(packages[pkg].individualPrefix);
+        const individualPackageImports = root.find(j.ImportDeclaration).filter(path => {
+            return (path.node.source.value !== '@react-spectrum/s2' &&
+                path.node.source.value?.startsWith(packages[pkg].individualPrefix));
         });
         if (individualPackageImports.size() === 0) {
             return;
         }
         // Collect all imported specifiers from individual packages that are also in the monopackage exports
-        const importedSpecifiers = individualPackageImports
-            .nodes()
-            .reduce((acc, node) => {
-            node.specifiers?.forEach((specifier) => {
+        const importedSpecifiers = individualPackageImports.nodes().reduce((acc, node) => {
+            node.specifiers?.forEach(specifier => {
                 if (monopackageExports[pkg].includes(specifier.imported.name)) {
                     acc.push(specifier);
                 }
@@ -108,15 +108,13 @@ const transformer = function transformer(file, api, options) {
             return acc;
         }, []);
         // Remove the old imports if they are present in monopackage exports
-        individualPackageImports.forEach((path) => {
-            path.node.specifiers = path.node.specifiers?.filter((specifier) => !monopackageExports[pkg].includes(specifier.imported.name));
+        individualPackageImports.forEach(path => {
+            path.node.specifiers = path.node.specifiers?.filter(specifier => !monopackageExports[pkg].includes(specifier.imported.name));
         });
         // Remove import declarations with no specifiers left
-        individualPackageImports
-            .filter((path) => path.node.specifiers?.length === 0)
-            .remove();
+        individualPackageImports.filter(path => path.node.specifiers?.length === 0).remove();
         // Find existing monopackage import if it exists
-        const monopackageImport = root.find(j.ImportDeclaration).filter((path) => {
+        const monopackageImport = root.find(j.ImportDeclaration).filter(path => {
             return path.node.source.value === packages[pkg].monopackage;
         });
         if (monopackageImport.size() > 0) {
@@ -124,8 +122,8 @@ const transformer = function transformer(file, api, options) {
             const specifiers = existingImport.specifiers;
             if (areSpecifiersAlphabetized(specifiers)) {
                 // If imports are sorted, add the new import in sorted order
-                importedSpecifiers.forEach((newSpecifier) => {
-                    const index = specifiers.findIndex((specifier) => specifier.imported.name > newSpecifier.imported.name);
+                importedSpecifiers.forEach(newSpecifier => {
+                    const index = specifiers.findIndex(specifier => specifier.imported.name > newSpecifier.imported.name);
                     if (index === -1) {
                         specifiers.push(newSpecifier);
                     }

package/dist/use-subpaths/src/codemod.js

@@ -39,7 +39,9 @@ const parser_1 = require("@babel/parser");
 const recast_1 = require("recast");
 const t = __importStar(require("@babel/types"));
 function getImportedName(specifier) {
-    return specifier.imported.type === 'Identifier' ? specifier.imported.name : specifier.imported.value;
+    return specifier.imported.type === 'Identifier'
+        ? specifier.imported.name
+        : specifier.imported.value;
 }
 function getImportKey(specifier) {
     const importedName = getImportedName(specifier);
@@ -82,7 +84,9 @@ function resolveTargetSource(candidates, uniqueSources, existingImports) {
 }
 function moduleAugmentsRouterConfig(body) {
     for (let stmt of body.body) {
-        if (stmt.type === 'TSInterfaceDeclaration' && stmt.id.type === 'Identifier' && stmt.id.name === 'RouterConfig') {
+        if (stmt.type === 'TSInterfaceDeclaration' &&
+            stmt.id.type === 'Identifier' &&
+            stmt.id.name === 'RouterConfig') {
             return true;
         }
         if (stmt.type === 'ExportNamedDeclaration' &&
@@ -147,7 +151,8 @@ function transformer(file, api) {
                     }
                     let importedName = getImportedName(specifier);
                     let candidates = sourceMap[importedName];
-                    if (candidates && (candidates.length === 1 || candidates[0] === `${source}/${importedName}`)) {
+                    if (candidates &&
+                        (candidates.length === 1 || candidates[0] === `${source}/${importedName}`)) {
                         let importKind = node.importKind || 'value';
                         uniqueSources.add(importKind + ':' + candidates[0]);
                     }
@@ -156,7 +161,9 @@ function transformer(file, api) {
         }
         if (node.type === 'TSModuleDeclaration' && node.declare && node.id.type === 'StringLiteral') {
             let mod = node.id.value;
-            if (!specifiers_1.MONOPACKAGE_ROOTS.includes(mod) || node.body?.type !== 'TSModuleBlock' || !moduleAugmentsRouterConfig(node.body)) {
+            if (!specifiers_1.MONOPACKAGE_ROOTS.includes(mod) ||
+                node.body?.type !== 'TSModuleBlock' ||
+                !moduleAugmentsRouterConfig(node.body)) {
                 continue;
             }
             let target = `${mod}/Provider`;
@@ -225,4 +232,3 @@ function transformer(file, api) {
     });
     return didChange ? root.toSource({ quote: 'single' }) : file.source;
 }
-;

package/dist/use-subpaths/src/specifiers.js

@@ -57,7 +57,9 @@ function getSpecifiersByPackage(from) {
                         if (specifier.type !== 'ExportSpecifier') {
                             continue;
                         }
-                        let exported = specifier.exported.type === 'Identifier' ? specifier.exported.name : specifier.exported.value;
+                        let exported = specifier.exported.type === 'Identifier'
+                            ? specifier.exported.name
+                            : specifier.exported.value;
                         exports[exported] ?? (exports[exported] = []);
                         if (exported.startsWith(subpath)) {
                             exports[exported].unshift(importSpecifier);

package/package.json

@@ -1,34 +1,31 @@
 {
   "name": "@react-spectrum/codemods",
-  "version": "1.2.1",
-  "main": "dist/index.js",
-  "source": "src/index.ts",
-  "bin": "dist/index.js",
-  "targets": {
-    "main": false
-  },
-  "engines": {
-    "node": ">=22.14.0"
-  },
-  "scripts": {
-    "build": "tsc",
-    "prepublishOnly": "yarn build"
+  "version": "1.2.3",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/adobe/react-spectrum"
   },
+  "bin": "dist/index.js",
+  "source": "src/index.ts",
   "files": [
     "dist"
   ],
   "type": "commonjs",
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/adobe/react-spectrum"
+  "main": "dist/index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc",
+    "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@adobe/react-spectrum": "3.47.0",
+    "@adobe/react-spectrum": "^3.47.0",
     "@babel/parser": "^7.24.5",
     "@babel/traverse": "^7.24.5",
     "@babel/types": "^7.24.5",
-    "@react-spectrum/s2": "1.3.0",
+    "@react-spectrum/s2": "1.4.0",
     "@react-types/shared": "^3.34.0",
     "@types/node": "^24",
     "boxen": "^5.1.2",
@@ -41,17 +38,22 @@
   },
   "devDependencies": {
     "@types/jscodeshift": "^0.11.11",
+    "react": "^18.0.0 || ^19.0.0-rc.1",
+    "react-dom": "^18.0.0 || ^19.0.0-rc.1",
     "typescript": "^5.8.2"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0-rc.1",
     "react-dom": "^18.0.0 || ^19.0.0-rc.1"
   },
+  "engines": {
+    "node": ">=22.14.0"
+  },
   "rsp": {
     "type": "cli"
   },
-  "publishConfig": {
-    "access": "public"
+  "targets": {
+    "main": false
   },
-  "gitHead": "36fdd8bca2df281fa955117d946e6dd9718241e4"
+  "gitHead": "a24af13dbea967239f9daf9c0736e6946145e045"
 }