bestax-migrate 2.2.0 → 2.2.2

package/dist/sources/_shared/semver-range.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Minimal semver-range reading for the manifest passes, shared by every source.
+ *
+ * Not a semver implementation: the workspace deliberately carries no `semver`
+ * dependency for this, and the two questions the passes ask are narrow. Both
+ * are answered conservatively, so an unrecognised shape is left alone rather
+ * than guessed at. The one thing this file must never do is rewrite a value it
+ * does not understand, so every accepting path below goes through one grammar.
+ */
+/**
+ * True only when `range` PROVABLY admits no version >= 1.0.0.
+ *
+ * The first version of this matched a leading `0` and nothing else, so a range
+ * written as comparators (`>=0.7 <1`) was left on 0.x and then reported as
+ * already v1. It lived in the rbx source only; the react-bulma-components
+ * manifest pass kept the regex until review found the unported half.
+ * This walks each `||` alternative and its comparators: a set is pre-v1 when
+ * some comparator caps it below 1.0.0 and none of them opens it at 1 or above.
+ *
+ * Conservative by design: an unrecognised shape returns false and the range is
+ * left alone (and reported as such). Bumping a range that might already admit
+ * v1 would be the best-guess rewrite this package refuses to make.
+ */
+export declare function isPreV1(range: string): boolean;
+/**
+ * True when every comparator in every alternative parses to a semver major,
+ * so the headline can tell "already v1" apart from "not a version range at
+ * all" (`latest`, a git URL) rather than calling both v1.
+ */
+export declare function isRecognisedRange(range: string): boolean;
+//# sourceMappingURL=semver-range.d.ts.map

package/dist/sources/_shared/semver-range.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"semver-range.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/semver-range.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA4BH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG9C;AAgGD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAoBxD"}

package/dist/sources/_shared/semver-range.js

@@ -0,0 +1,186 @@
+/**
+ * Minimal semver-range reading for the manifest passes, shared by every source.
+ *
+ * Not a semver implementation: the workspace deliberately carries no `semver`
+ * dependency for this, and the two questions the passes ask are narrow. Both
+ * are answered conservatively, so an unrecognised shape is left alone rather
+ * than guessed at. The one thing this file must never do is rewrite a value it
+ * does not understand, so every accepting path below goes through one grammar.
+ */
+const NUMERIC = String.raw `(?:0|[1-9]\d*)`;
+const WILD = String.raw `(?:x|X|\*)`;
+// SemVer's own identifier grammar: dot-separated, non-empty, no leading zero on
+// a numeric prerelease identifier. Looser fragments accepted `0.9.0-alpha..1`,
+// `0.9.0-01` and `0.9.0+foo..bar` as complete versions and overwrote them.
+const PRE_ID = String.raw `(?:0|[1-9]\d*|\d*[A-Za-z-][0-9A-Za-z-]*)`;
+const PRERELEASE = String.raw `-${PRE_ID}(?:\.${PRE_ID})*`;
+const BUILD = String.raw `\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*`;
+/**
+ * An exclusive upper bound that sits exactly at 1.0.0: `1`, `1.0`, `1.0.0`,
+ * and the x-ranges that desugar to it (`1.x`, `1.0.x`, `1.*`), optionally with
+ * build metadata, which carries no precedence. `1.1.x` desugars to 1.1.0 and
+ * still admits 1.0.x, so it is deliberately not here.
+ */
+const STABLE_ONE_BOUND = new RegExp(`^1(?:\\.(?:0|${WILD}))?(?:\\.(?:0|${WILD}))?(?:${BUILD})?$`);
+/**
+ * A plain version or x-range: `N`, `N.N`, `N.N.N[-pre][+build]`, `N.x`,
+ * `N.x.x`, `N.N.x`. SemVer forbids leading zeros in numeric parts, and once a
+ * component is a wildcard everything after it must be a wildcard or omitted.
+ */
+const VERSION = new RegExp(`^(${NUMERIC})(?:\\.(?:${NUMERIC}(?:\\.(?:${WILD}|${NUMERIC}(?:${PRERELEASE})?(?:${BUILD})?))?|${WILD}(?:\\.${WILD})?))?$`);
+/**
+ * True only when `range` PROVABLY admits no version >= 1.0.0.
+ *
+ * The first version of this matched a leading `0` and nothing else, so a range
+ * written as comparators (`>=0.7 <1`) was left on 0.x and then reported as
+ * already v1. It lived in the rbx source only; the react-bulma-components
+ * manifest pass kept the regex until review found the unported half.
+ * This walks each `||` alternative and its comparators: a set is pre-v1 when
+ * some comparator caps it below 1.0.0 and none of them opens it at 1 or above.
+ *
+ * Conservative by design: an unrecognised shape returns false and the range is
+ * left alone (and reported as such). Bumping a range that might already admit
+ * v1 would be the best-guess rewrite this package refuses to make.
+ */
+export function isPreV1(range) {
+    const alternatives = range.trim().split(/\s*\|\|\s*/);
+    return alternatives.length > 0 && alternatives.every(setIsPreV1);
+}
+function setIsPreV1(set) {
+    // npm accepts whitespace between an operator and its version
+    // (`>= 0.7.0 < 1.0.0`); splitting on whitespace first made the operator a
+    // token of its own, so the range parsed as unrecognised and was left alone.
+    const text = glueOperators(set);
+    if (text === '' || /^(\*|x|X|latest)$/.test(text))
+        return false;
+    const hyphen = text.match(/^(\S+)\s+-\s+(\S+)$/);
+    if (hyphen) {
+        // Both endpoints must be plain versions; `not-a-range - 0.9.4` was
+        // accepted on its upper bound alone and overwritten.
+        const lower = versionMajor(hyphen[1]);
+        const upper = versionMajor(hyphen[2]);
+        if (lower === null || upper === null)
+            return false;
+        return upper === 0 || (upper === 1 && isPrereleaseOfOne(hyphen[2]));
+    }
+    let cappedBelowOne = false;
+    for (const token of text.split(/\s+/)) {
+        const match = token.match(/^(>=|<=|>|<|=)?(.*)$/);
+        if (!match)
+            return false;
+        const [, op = '', version] = match;
+        // After a comparator only a plain version may follow: `==0.9.4` and
+        // `<^0.9` were each read by stripping a second operator, then overwritten.
+        const major = op ? versionMajor(version) : majorOf(version);
+        if (major === null)
+            return false;
+        const plain = version.replace(/^v/, '');
+        switch (op) {
+            case '>':
+            case '>=':
+                // A lower bound on a 1.0.0 prerelease (`>=1.0.0-rc.1`) does not open
+                // the range at a stable v1; keep scanning for an upper cap.
+                if (major >= 1 && !isPrereleaseOfOne(version))
+                    return false;
+                break;
+            case '<':
+                // `<1`, `<1.0`, `<1.0.0` (build metadata carries no precedence, so
+                // `<1.0.0+build.1` is the same) exclude every stable v1, as does a
+                // prerelease of 1.0.0 (`<1.0.0-0`, `<1.0.0-rc.1`); `<0.9` does too.
+                // A higher upper bound (`<2` in `<1 <2`) never widens the set, so it
+                // is neutral rather than disqualifying; the result still needs some
+                // other comparator to cap it. Alone, `<2` therefore stays unbumped.
+                if (major === 0 ||
+                    (major === 1 && STABLE_ONE_BOUND.test(plain)) ||
+                    isPrereleaseOfOne(version)) {
+                    cappedBelowOne = true;
+                }
+                break;
+            case '<=':
+                // `<=1.0.0-0` caps at the lowest 1.0.0 prerelease, so it excludes
+                // every stable v1 just as `<1.0.0-0` does. A higher inclusive bound
+                // is neutral for the same reason as above.
+                if (major === 0 || isPrereleaseOfOne(version)) {
+                    cappedBelowOne = true;
+                }
+                break;
+            default:
+                // `0.9.4`, `=0.9.4`, `^0.9`, `~0.7.5`, `0.x`: caret and tilde never
+                // cross a major, so major 0 stays below 1. An exact `1.0.0-rc.1` pins
+                // a prerelease and admits no stable v1 either; `^1.0.0-rc.1` does.
+                if (major === 0) {
+                    cappedBelowOne = true;
+                }
+                else if (!/^[~^]/.test(version) &&
+                    isPrereleaseOfOne(version.replace(/^=/, ''))) {
+                    cappedBelowOne = true;
+                }
+                else {
+                    return false;
+                }
+        }
+    }
+    return cappedBelowOne;
+}
+/**
+ * `1.0.0-0`, `1.0.0-rc.1`: a prerelease of exactly 1.0.0 orders below every
+ * stable 1.x, so as an upper bound or an exact pin it admits no usable v1.
+ * Three numeric parts only, matching semver; `1.0-beta` is not a token this
+ * parser reads and is left alone. A caret or tilde on one is different
+ * (`^1.0.0-rc.1` admits 1.0.4), which is why the callers check the operator.
+ * Accepts the same optional `v` that the version grammar does.
+ */
+function isPrereleaseOfOne(version) {
+    return /^v?1\.0\.0-/.test(version);
+}
+function glueOperators(set) {
+    // Only when what follows starts a plain version. Gluing unconditionally
+    // turned the invalid `> =0.7` into a valid `>=0.7`, which was then bumped.
+    // node-semver normalises a spaced tilde or caret (`~ 0.7.5`) the same way.
+    return set.trim().replace(/(>=|<=|>|<|=|~|\^)\s+(?=[0-9vxX*])/g, '$1');
+}
+/**
+ * True when every comparator in every alternative parses to a semver major,
+ * so the headline can tell "already v1" apart from "not a version range at
+ * all" (`latest`, a git URL) rather than calling both v1.
+ */
+export function isRecognisedRange(range) {
+    return range
+        .trim()
+        .split(/\s*\|\|\s*/)
+        .every(alt => {
+        const text = glueOperators(alt);
+        if (/^(\*|x|X)$/.test(text))
+            return true;
+        const hyphen = text.match(/^(\S+)\s+-\s+(\S+)$/);
+        if (hyphen) {
+            return (versionMajor(hyphen[1]) !== null && versionMajor(hyphen[2]) !== null);
+        }
+        return text.split(/\s+/).every(tok => {
+            const m = tok.match(/^(>=|<=|>|<|=)?(.*)$/);
+            if (!m)
+                return false;
+            const [, op = '', v] = m;
+            return (op ? versionMajor(v) : majorOf(v)) !== null;
+        });
+    });
+}
+/**
+ * The major of a COMPLETE plain version or x-range, or null. npm's optional
+ * leading `v` is the only prefix allowed here. Reading a numeric prefix alone
+ * accepted a dist-tag like `0.next` as major 0, and the manifest was then
+ * overwritten with `^1.0.4`, which is the one thing this parser must never do
+ * to a value it does not understand.
+ */
+function versionMajor(version) {
+    const m = version.replace(/^v/, '').match(VERSION);
+    return m ? Number(m[1]) : null;
+}
+/**
+ * The major of a BARE token, which may carry exactly one range prefix (`^`,
+ * `~`, `=`) before the version. Stripping any run of prefix characters
+ * accepted `^^0.9.4` and `vv0.9.4` as major 0 and overwrote them.
+ */
+function majorOf(token) {
+    return versionMajor(token.replace(/^[~^=]/, ''));
+}

package/dist/sources/rbx/deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../../src/sources/rbx/deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAgHzD,eAAO,MAAM,kBAAkB,EAAE,kBAqLhC,CAAC"}
+{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../../src/sources/rbx/deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAsBzD,eAAO,MAAM,kBAAkB,EAAE,kBAqLhC,CAAC"}

package/dist/sources/rbx/deps.js

@@ -13,6 +13,7 @@
  * see the note on that below.
  * says so by name.
  */
+import { isPreV1, isRecognisedRange } from '../_shared/semver-range.js';
 const BESTAX_RANGE = '^5';
 const BULMA_RANGE = '^1.0.4';
 // Bulma v1's sass tree uses `color.channel(…)` — needs dart-sass ≥ 1.79.
@@ -29,102 +30,6 @@ const RBX_STYLE_DEPS = [
     'bulma-tooltip',
 ];
 const DEP_SECTIONS = ['dependencies', 'devDependencies'];
-/**
- * True only when `range` PROVABLY admits no version >= 1.0.0.
- *
- * The first version matched a leading `0` and nothing else, so a range written
- * as comparators (`>=0.7 <1`) was left on 0.x and then reported as already v1.
- * This walks each `||` alternative and its comparators: a set is pre-v1 when
- * some comparator caps it below 1.0.0 and none of them opens it at 1 or above.
- *
- * Conservative by design: an unrecognised shape returns false and the range is
- * left alone (and reported as such). Bumping a range that might already admit
- * v1 would be the best-guess rewrite this package refuses to make.
- */
-function isPreV1(range) {
-    const alternatives = range.trim().split(/\s*\|\|\s*/);
-    return alternatives.length > 0 && alternatives.every(setIsPreV1);
-}
-function setIsPreV1(set) {
-    // npm accepts whitespace between an operator and its version
-    // (`>= 0.7.0 < 1.0.0`); splitting on whitespace first made the operator a
-    // token of its own, so the range parsed as unrecognised and was left alone.
-    const text = glueOperators(set);
-    if (text === '' || /^(\*|x|X|latest)$/.test(text))
-        return false;
-    const hyphen = text.match(/^(\S+)\s+-\s+(\S+)$/);
-    if (hyphen)
-        return majorOf(hyphen[2]) === 0;
-    let cappedBelowOne = false;
-    for (const token of text.split(/\s+/)) {
-        const match = token.match(/^(>=|<=|>|<|=)?\s*v?(.*)$/);
-        if (!match)
-            return false;
-        const [, op = '', version] = match;
-        const major = majorOf(version);
-        if (major === null)
-            return false;
-        switch (op) {
-            case '>':
-            case '>=':
-                if (major >= 1)
-                    return false;
-                break;
-            case '<':
-                // `<1`, `<1.0`, `<1.0.0` exclude every v1; `<0.9` does too.
-                if (major === 0 || (major === 1 && /^1(\.0)*$/.test(version))) {
-                    cappedBelowOne = true;
-                }
-                else {
-                    return false;
-                }
-                break;
-            case '<=':
-                if (major === 0)
-                    cappedBelowOne = true;
-                else
-                    return false;
-                break;
-            default:
-                // `0.9.4`, `=0.9.4`, `^0.9`, `~0.7.5`, `0.x`: caret and tilde never
-                // cross a major, so major 0 stays below 1.
-                if (major === 0)
-                    cappedBelowOne = true;
-                else
-                    return false;
-        }
-    }
-    return cappedBelowOne;
-}
-function glueOperators(set) {
-    return set.trim().replace(/(>=|<=|>|<|=)\s+/g, '$1');
-}
-/**
- * True when every comparator in every alternative parses to a semver major,
- * so the headline can tell "already v1" apart from "not a version range at
- * all" (`latest`, a git URL) rather than calling both v1.
- */
-function isRecognisedRange(range) {
-    return range
-        .trim()
-        .split(/\s*\|\|\s*/)
-        .every(alt => {
-        const text = glueOperators(alt);
-        if (/^(\*|x|X)$/.test(text))
-            return true;
-        const hyphen = text.match(/^(\S+)\s+-\s+(\S+)$/);
-        if (hyphen) {
-            return majorOf(hyphen[1]) !== null && majorOf(hyphen[2]) !== null;
-        }
-        return text
-            .split(/\s+/)
-            .every(tok => majorOf(tok.replace(/^(>=|<=|>|<|=)/, '')) !== null);
-    });
-}
-function majorOf(version) {
-    const m = version.replace(/^[~^=v]+/, '').match(/^(\d+)(?:\.|$)/);
-    return m ? Number(m[1]) : null;
-}
 export const updateDependencies = (filePath, pkg, collector, options) => {
     const changes = [];
     const next = pkg;

package/dist/sources/rbx/mapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapping.d.ts","sourceRoot":"","sources":["../../../src/sources/rbx/mapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAuCnE;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAiCtD,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAOrD,CAAC;AAEF,2DAA2D;AAC3D,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQvD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAShE,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAosBpD,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CA2FhD,CAAC;AAEF,sDAAsD;AACtD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,gBAAgB,GAAG,SAAS,CAM3E"}
+{"version":3,"file":"mapping.d.ts","sourceRoot":"","sources":["../../../src/sources/rbx/mapping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAuCnE;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAiCtD,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAOrD,CAAC;AAEF,2DAA2D;AAC3D,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAQvD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAShE,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAssBpD,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CA2FhD,CAAC;AAEF,sDAAsD;AACtD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,gBAAgB,GAAG,SAAS,CAM3E"}

package/dist/sources/rbx/mapping.js

@@ -126,7 +126,7 @@ export const MAPPING = {
     },
     forwardRefAs: {
         status: 'todo',
-        todo: '`forwardRefAs` is rbx-internal and has no counterpart. Only the bestax form controls and a few components (Dialog, Sidebar, Toast, Carousel) forward refs; most, Button and Box included, are plain function components that do not — put the ref on a wrapping element you control',
+        todo: '`forwardRefAs` is rbx-internal and has no counterpart. bestax forwards a ref from the form controls and from `Button`, `LinkButton`, `Modal`, `Dropdown`, `Navbar` (plus `Navbar.Burger` and `Navbar.Link`), `Dialog`, `Sidebar`, `Toast` and `Carousel` — pass `ref` directly on those. Mind the `Navbar.Dropdown` collision: your rbx `Navbar.Dropdown` is the menu and becomes `Navbar.DropdownMenu`, which forwards no ref, while bestax `Navbar.Dropdown` — the container your `<Navbar.Item dropdown>` becomes — does. The rest, `Box` included, are plain function components that forward no ref; put the ref on a wrapping element you control',
     },
     // ---- elements -----------------------------------------------------------
     Block: { status: 'mapped', target: 'Block' },
@@ -136,6 +136,7 @@ export const MAPPING = {
         target: 'Button',
         props: {
             as: AS_OK,
+            innerRef: { rename: 'ref' },
             color: {},
             size: {},
             outlined: { booleanToProp: { name: 'isOutlined' } },
@@ -497,9 +498,7 @@ export const MAPPING = {
             managed: {
                 todo: 'bestax `Dropdown` is uncontrolled by default; use `active` + `onActiveChange` for controlled behaviour',
             },
-            innerRef: {
-                todo: 'this bestax component is a plain function component and forwards no ref; drop `innerRef`, or put the ref on a wrapping element you control',
-            },
+            innerRef: { rename: 'ref' },
         },
         subs: {
             Container: { status: 'mapped', special: 'dropdown-container' },
@@ -606,25 +605,25 @@ export const MAPPING = {
         props: {
             active: {},
             onClose: {},
-            closeOnEsc: {
-                todo: 'bestax `Modal` implements no Escape handling at all; add your own keydown listener, or drop the prop if the behaviour is not needed',
-            },
+            closeOnEsc: { rename: 'closeOnEscape' },
             closeOnBlur: {
-                todo: "bestax `Modal` has no built-in background-click close; wire it through `Modal.Background`'s onClick and `onClose`",
+                todo: 'bestax `Modal` closes on background click in its legacy form, where it renders its own background wired to `onClose`; a `Modal.Content` or `Modal.Card` child selects the compound form, which renders only the children you wrote — there, add a `<Modal.Background>` whose `onClick` calls your close handler, or drop the prop if you passed false',
             },
             document: {
-                todo: 'bestax `Modal` renders inline where you place it rather than portalling into a document at all; drop this prop, and see the advisory the codemod adds on every Modal',
+                todo: 'bestax `Modal` portals via `portal`, but that takes `true`, a selector or an element — not a `Document`. Pass an element from the document you targeted, or drop the prop if you were passing the default document',
             },
             containerClassName: { rename: 'className' },
-            innerRef: {
-                todo: 'this bestax component is a plain function component and forwards no ref; drop `innerRef`, or put the ref on a wrapping element you control',
-            },
+            innerRef: { rename: 'ref' },
         },
         subs: {
             Background: { status: 'mapped', target: 'Modal.Background' },
             Close: { status: 'mapped', target: 'Modal.Close' },
             Content: { status: 'mapped', target: 'Modal.Content' },
-            Container: { status: 'mapped', special: 'modal-container' },
+            Container: {
+                status: 'mapped',
+                special: 'modal-container',
+                props: { innerRef: { rename: 'ref' } },
+            },
             Card: {
                 status: 'mapped',
                 target: 'Modal.Card',
@@ -641,7 +640,7 @@ export const MAPPING = {
             },
             Portal: {
                 status: 'todo',
-                todo: '`Modal.Portal` is rbx-internal; bestax `<Modal>` renders inline and does not portal at all — wrap it in `createPortal` yourself if you relied on that (see the advisory the codemod adds on every Modal)',
+                todo: '`Modal.Portal` is rbx-internal; set `portal` on the `<Modal>` instead — it takes `true`, a selector or an element',
             },
         },
     },
@@ -659,13 +658,15 @@ export const MAPPING = {
                 todo: 'bestax `Navbar` is uncontrolled; drop `managed`',
             },
             document: { todo: 'bestax `Navbar` has no `document` prop; drop it' },
-            innerRef: {
-                todo: 'this bestax component is a plain function component and forwards no ref; drop `innerRef`, or put the ref on a wrapping element you control',
-            },
+            innerRef: { rename: 'ref' },
         },
         subs: {
             Brand: { status: 'mapped', target: 'Navbar.Brand' },
-            Burger: { status: 'mapped', target: 'Navbar.Burger' },
+            Burger: {
+                status: 'mapped',
+                target: 'Navbar.Burger',
+                props: { innerRef: { rename: 'ref' } },
+            },
             Divider: { status: 'mapped', target: 'Navbar.Divider' },
             Menu: { status: 'mapped', target: 'Navbar.Menu' },
             Link: {
@@ -673,6 +674,7 @@ export const MAPPING = {
                 target: 'Navbar.Link',
                 props: {
                     as: AS_OK,
+                    innerRef: { rename: 'ref' },
                     arrowless: {},
                     onClick: {},
                 },

package/dist/sources/rbx/specials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specials.d.ts","sourceRoot":"","sources":["../../../src/sources/rbx/specials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAO3C,OAAO,EAYL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAC;AAEtC,YAAY,EAAE,aAAa,EAAE,CAAC;AAy8B9B,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,GACX,aAAa,CAIf"}
+{"version":3,"file":"specials.d.ts","sourceRoot":"","sources":["../../../src/sources/rbx/specials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAO3C,OAAO,EAYL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAC;AAEtC,YAAY,EAAE,aAAa,EAAE,CAAC;AAw9B9B,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,GACX,aAAa,CAIf"}

package/dist/sources/rbx/specials.js

@@ -538,15 +538,14 @@ const SPECIALS = {
         return { ...result, handledProps: ['align', 'as'] };
     },
     /**
-     * The markup maps cleanly, but three rbx behaviours do not exist in bestax
-     * and none of them fail loudly: rbx portals the modal into `document.body`,
-     * closes it on Escape by default, and clips document scroll while it is
-     * open. bestax renders inline and implements none of the three. An
-     * unmodified `<Modal>` therefore migrates to something that looks right and
-     * behaves differently, so every conversion is flagged.
+     * rbx's Modal portals into `document.body`, closes on Escape and clips
+     * document scroll, all by default. bestax matches two of those since #633 —
+     * `closeOnEscape` and `lockScroll` both default to `true` — but still
+     * renders inline unless `portal` is set. That last difference does not fail
+     * loudly, so every conversion is still flagged, now about the portal alone.
      */
     modal(ctx, path, _element) {
-        addTodo(ctx, path, 'component:Modal', 'bestax `Modal` renders inline rather than portalling into document.body, and implements neither Escape-to-close nor scroll locking — rbx did all three by default. Re-add whichever your UI relied on');
+        addTodo(ctx, path, 'component:Modal', 'bestax `Modal` closes on Escape and locks body scroll by default, matching rbx, but it renders inline: set `portal` if you relied on rbx portalling into document.body');
         return {};
     },
     /** rbx Modal.Container is the modal itself in bestax. */
@@ -588,6 +587,21 @@ const SPECIALS = {
             addTodo(ctx, path, `prop:${prop}`, `bestax \`Navbar.Item\` has no \`${prop}\` prop; restructure or add a class by hand`);
             ctx.dirty = true;
         }
+        // bestax's `Navbar.Dropdown` forwards a ref, but it is the one such target
+        // the `innerRef: { rename: 'ref' }` entries in mapping.ts cannot reach:
+        // that table is keyed on the rbx name (`Navbar.Item`), and only this
+        // handler knows which of the two targets was picked. A plain
+        // `Navbar.Item` is still a function component, so the rename is
+        // conditional — there, `innerRef` is left alone.
+        const renamedInnerRef = [];
+        if (target === 'Navbar.Dropdown') {
+            const innerRefAttr = findAttr(element, 'innerRef');
+            if (innerRefAttr) {
+                innerRefAttr.name = ctx.j.jsxIdentifier('ref');
+                renamedInnerRef.push('innerRef');
+                ctx.dirty = true;
+            }
+        }
         restrictAsToTargets(ctx, path, element, target ?? 'Navbar.Item', [
             'Navbar.Item',
         ]);
@@ -601,6 +615,7 @@ const SPECIALS = {
                 'expanded',
                 'hoverable',
                 'managed',
+                ...renamedInnerRef,
             ],
         };
     },

package/dist/sources/rbx/styles.d.ts

@@ -5,11 +5,11 @@
  * identical.
  *
  * Note what it does NOT do: a `bulma-*` extension import in Sass is left in
- * place with a TODO, not removed. Only the JS/CSS-import side of rbx's
- * extension cleanup is automatic (transform.ts prunes
- * `bulma-badge`/`bulma-divider`/`bulma-pageloader`/`bulma-tooltip` CSS
- * imports outright, since bestax ships all four as components). A Sass
- * `@import` of one may be pulling in customisation the codemod cannot see,
+ * place with a TODO, not removed. The JS/CSS-import side in transform.ts does
+ * the same for `bulma-badge`/`bulma-divider`/`bulma-pageloader`/`bulma-tooltip`
+ * (kept, with a TODO), and the manifest pass reports rather than removes the
+ * packages, since markup outside rbx may still use the extension's classes. A
+ * Sass `@import` of one may be pulling in customisation the codemod cannot see,
  * so it is flagged for a human instead.
  *
  * rbx's own stylesheet is `rbx/rbx` (its Sass entry, usually imported as

package/dist/sources/rbx/styles.js

@@ -5,11 +5,11 @@
  * identical.
  *
  * Note what it does NOT do: a `bulma-*` extension import in Sass is left in
- * place with a TODO, not removed. Only the JS/CSS-import side of rbx's
- * extension cleanup is automatic (transform.ts prunes
- * `bulma-badge`/`bulma-divider`/`bulma-pageloader`/`bulma-tooltip` CSS
- * imports outright, since bestax ships all four as components). A Sass
- * `@import` of one may be pulling in customisation the codemod cannot see,
+ * place with a TODO, not removed. The JS/CSS-import side in transform.ts does
+ * the same for `bulma-badge`/`bulma-divider`/`bulma-pageloader`/`bulma-tooltip`
+ * (kept, with a TODO), and the manifest pass reports rather than removes the
+ * packages, since markup outside rbx may still use the extension's classes. A
+ * Sass `@import` of one may be pulling in customisation the codemod cannot see,
  * so it is flagged for a human instead.
  *
  * rbx's own stylesheet is `rbx/rbx` (its Sass entry, usually imported as

package/dist/sources/react-bulma-components/deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../../src/sources/react-bulma-components/deps.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAazD,eAAO,MAAM,kBAAkB,EAAE,kBAqHhC,CAAC"}
+{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../../src/sources/react-bulma-components/deps.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUzD,eAAO,MAAM,kBAAkB,EAAE,kBAqHhC,CAAC"}

package/dist/sources/react-bulma-components/deps.js

@@ -4,14 +4,12 @@
  * with dart-sass. Pure data-in/data-out — the CLI owns file IO, and no
  * package manager is ever invoked (the report tells the user to install).
  */
+import { isPreV1 } from '../_shared/semver-range.js';
 const BESTAX_RANGE = '^5';
 const BULMA_RANGE = '^1.0.4';
 // Bulma v1's sass tree uses `color.channel(…)` — needs dart-sass ≥ 1.79.
 const SASS_RANGE = '^1.79.0';
 const DEP_SECTIONS = ['dependencies', 'devDependencies'];
-function isPreV1(range) {
-    return /^[~^]?0[.x]/.test(range.trim());
-}
 export const updateDependencies = (filePath, pkg, collector, options) => {
     const changes = [];
     const next = pkg;

package/dist/sources/react-bulma-components/mapping.js

@@ -26,7 +26,7 @@ export const UNIVERSAL_PROPS = {
         todo: 'this bestax component has no `as` prop; restructure the element instead',
     },
     domRef: {
-        todo: 'bestax-bulma components do not take domRef; use a ref on a DOM child or wrap the component',
+        todo: 'bestax-bulma has no `domRef`. The form controls and `Button`, `LinkButton`, `Modal`, `Dropdown`, `Navbar` (plus `Navbar.Burger` and `Navbar.Link`), `Dialog`, `Sidebar`, `Toast` and `Carousel` forward a ref — on those, rename `domRef` to `ref`. Mind the `Navbar.Dropdown` collision: the `Navbar.Item` that wrapped your dropdown became bestax `Navbar.Dropdown` and forwards one, while your `Navbar.Dropdown` became `Navbar.DropdownMenu` and does not. The rest forward no ref: put the ref on a DOM child or wrap the component',
     },
     // ColorProps
     backgroundColor: { rename: 'bgColor' },
@@ -555,12 +555,12 @@ export const MAPPING = {
         props: {
             show: { rename: 'active' },
             onClose: {},
-            closeOnEsc: { todo: 'bestax Modal closes on Esc by default; remove' },
+            closeOnEsc: { rename: 'closeOnEscape' },
             closeOnBlur: {
-                todo: 'bestax Modal background click closes when onClose is set; remove',
+                todo: 'bestax Modal closes on background click only in its legacy form; the Modal.Content/Modal.Card child selects the compound form, which renders only the children you wrote — add a `<Modal.Background>` whose `onClick` calls your close handler, or drop the prop if you passed false',
             },
             showClose: {
-                todo: 'bestax Modal renders the close button when onClose is set; remove',
+                todo: 'bestax Modal renders a close button only in its legacy form; the Modal.Content/Modal.Card child selects the compound form, which renders only the children you wrote — add a `<Modal.Close variant="floating">` whose `onClick` calls your close handler, or drop the prop if you passed false',
             },
             document: { drop: true },
         },

package/dist/sources/react-bulma-components/specials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specials.d.ts","sourceRoot":"","sources":["../../../src/sources/react-bulma-components/specials.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAWL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAC;AAEtC,YAAY,EAAE,aAAa,EAAE,CAAC;AAsvB9B,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,GACX,aAAa,CAIf;AAED,kEAAkE;AAClE,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAGjE,CAAC"}
+{"version":3,"file":"specials.d.ts","sourceRoot":"","sources":["../../../src/sources/react-bulma-components/specials.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAWL,KAAK,gBAAgB,EACtB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,8BAA8B,CAAC;AAEtC,YAAY,EAAE,aAAa,EAAE,CAAC;AAqwB9B,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,GACX,aAAa,CAIf;AAED,kEAAkE;AAClE,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAGjE,CAAC"}

package/dist/sources/react-bulma-components/specials.js

@@ -61,7 +61,18 @@ const SPECIALS = {
             // (`remove={false}`, `remove=""`, `remove={0}`) → just drop the prop.
             removeAttr(element, attr);
             ctx.dirty = true;
-            return resolved === 'truthy' ? { target: 'Delete' } : {};
+            if (resolved !== 'truthy')
+                return {};
+            // The universal `domRef` advice lists `Button` among the components that
+            // forward a ref, but this element is no longer a Button: `Delete` is a
+            // plain function component. Claim the prop so that advice cannot fire
+            // here, and say what actually applies to the target we picked.
+            const handledProps = [];
+            if (findAttr(element, 'domRef')) {
+                addTodo(ctx, path, 'prop:domRef', 'this `<Button remove>` became bestax `<Delete>`, which forwards no ref — the general `domRef` advice does not apply here; put the ref on a DOM child or wrap the component');
+                handledProps.push('domRef');
+            }
+            return { target: 'Delete', handledProps };
         }
         addTodo(ctx, path, 'prop:remove', '`remove` has a dynamic value; this can render as either a Button or a Delete cross — split the branch by hand');
         return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bestax-migrate",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "Codemods for migrating existing React apps from other Bulma libraries to @allxsmith/bestax-bulma",
   "type": "module",
   "bin": {
@@ -51,7 +51,7 @@
     "react-dom": "^19.2.8",
     "ts-jest": "^29.4.12",
     "typescript": "^6.0.3",
-    "@allxsmith/bestax-bulma": "^5.11.7"
+    "@allxsmith/bestax-bulma": "^5.15.0"
   },
   "publishConfig": {
     "access": "public"