bestax-migrate 2.3.7 → 2.3.9

package/dist/sources/_shared/specials-utils.d.ts

@@ -29,7 +29,7 @@ export declare function alignTarget(ctx: TransformContext, path: ASTPath<any>, e
  * bound for a plain HTML element (they only exist on bestax components),
  * leaving a TODO when any were dropped.
  */
-export declare function makeStripModifierProps(universalProps: Record<string, PropAction>, responsiveBreakpoints: Record<string, string | null>): (ctx: TransformContext, path: ASTPath<any>, attrs: any[], where: string) => any[];
+export declare function makeStripModifierProps(universalProps: Record<string, PropAction>, responsiveBreakpoints: Record<string, string | null>, refProp?: string): (ctx: TransformContext, path: ASTPath<any>, attrs: any[], where: string) => any[];
 /**
  * Consume the element's `className` so a plain-element rewrite can merge it
  * with its hard-coded Bulma class instead of dropping it. A dynamic value

package/dist/sources/_shared/specials-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specials-utils.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/specials-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"specials-utils.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/specials-utils.ts"],"names":[],"mappings":"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"}

package/dist/sources/_shared/specials-utils.js

@@ -39,12 +39,30 @@ export function alignTarget(ctx, path, element, prop, targets, fallback) {
  * bound for a plain HTML element (they only exist on bestax components),
  * leaving a TODO when any were dropped.
  */
-export function makeStripModifierProps(universalProps, responsiveBreakpoints) {
+export function makeStripModifierProps(universalProps, responsiveBreakpoints, refProp) {
     return function stripModifierProps(ctx, path, attrs, where) {
         const kept = [];
         const dropped = [];
         for (const attr of attrs) {
             const name = attr?.name?.name;
+            // Both sources keep their ref escape hatch (`innerRef`, `domRef`) in
+            // the universal table so an unmapped one is flagged rather than passed
+            // through in silence. Neither is a Bulma modifier, and the intrinsic
+            // tag this rewrite produces takes a real `ref` — so it is renamed onto
+            // the tag here. Dropping it would delete a working ref and tell the
+            // user to "restyle with classes", which is advice for a modifier.
+            // The same collision `applyPropAction` guards: with a `ref` already on
+            // the element the rename would emit two, which does not compile.
+            if (refProp && name === refProp) {
+                if (attrs.some(other => other?.name?.name === 'ref')) {
+                    addTodo(ctx, path, `prop:${refProp}`, `${where}: \`${refProp}\` maps to \`ref\`, but \`ref\` is already set on this element, so \`${refProp}\` was dropped — reconcile by hand`);
+                    continue;
+                }
+                attr.name = ctx.j.jsxIdentifier('ref');
+                ctx.dirty = true;
+                kept.push(attr);
+                continue;
+            }
             if (name && (universalProps[name] || name in responsiveBreakpoints)) {
                 dropped.push(name);
             }

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

@@ -1 +1 @@
-{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../../src/sources/bloomer/deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUzD,eAAO,MAAM,kBAAkB,EAAE,kBAsHhC,CAAC"}
+{"version":3,"file":"deps.d.ts","sourceRoot":"","sources":["../../../src/sources/bloomer/deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAUzD,eAAO,MAAM,kBAAkB,EAAE,kBAwChC,CAAC"}

package/dist/sources/bloomer/deps.js

@@ -12,28 +12,17 @@
  * not the app's; if they appear here the app declared them for its own
  * reasons, so they are left alone.
  */
-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'];
+import { DEP_SECTIONS, addBestax, moveBulmaToV1, openManifest, replaceNodeSass, reportPeerRanges, } from '../_shared/deps-common.js';
 export const updateDependencies = (filePath, pkg, collector, options) => {
-    const changes = [];
-    const next = pkg;
-    const section = (name) => (next[name] ?? undefined);
-    const note = (message) => {
-        changes.push(message);
-        collector?.add({ file: filePath, line: null, rule: 'deps', message });
-    };
+    const manifest = openManifest(filePath, pkg, collector);
     // bloomer goes away entirely.
     let removedSource = false;
     for (const name of DEP_SECTIONS) {
-        const deps = section(name);
+        const deps = manifest.section(name);
         if (deps && 'bloomer' in deps) {
             delete deps.bloomer;
             removedSource = true;
-            note(`removed bloomer from ${name}`);
+            manifest.note(`removed bloomer from ${name}`);
         }
     }
     // The transform deliberately RETAINS imports for components with no bestax
@@ -42,78 +31,14 @@ export const updateDependencies = (filePath, pkg, collector, options) => {
     // imports once the user runs the install the report asks for, so say so
     // rather than letting them find out at build time.
     if (removedSource && options.sourceStillImported) {
-        collector?.add({
-            file: filePath,
-            line: null,
-            rule: 'deps',
-            message: 'bloomer was removed from package.json, but some files still import it for components with no bestax equivalent — resolve those `TODO(bestax-migrate)` imports before installing, or re-add bloomer until you have',
-        });
-    }
-    // @allxsmith/bestax-bulma comes in (runtime dependency).
-    const dependencies = (next.dependencies ??= {});
-    if (!dependencies['@allxsmith/bestax-bulma'] &&
-        !section('devDependencies')?.['@allxsmith/bestax-bulma']) {
-        dependencies['@allxsmith/bestax-bulma'] = BESTAX_RANGE;
-        note(`added @allxsmith/bestax-bulma ${BESTAX_RANGE} to dependencies`);
-    }
-    // Bulma: bump a pre-1 range; add only when sources still reference bulma/…
-    // directly (otherwise it arrives transitively via bestax-bulma).
-    let bulmaDeclared = false;
-    for (const name of DEP_SECTIONS) {
-        const deps = section(name);
-        if (deps?.bulma) {
-            bulmaDeclared = true;
-            if (isPreV1(deps.bulma)) {
-                deps.bulma = BULMA_RANGE;
-                note(`bumped bulma to ${BULMA_RANGE} in ${name} (was pre-1.0)`);
-            }
-        }
-    }
-    if (!bulmaDeclared && options.bulmaReferenced) {
-        dependencies.bulma = BULMA_RANGE;
-        note(`added bulma ${BULMA_RANGE} to dependencies (sources import bulma/… directly)`);
-    }
-    // bestax-bulma requires React 18/19; bloomer peer-depended on React ^16.2.
-    // Report only — a React major upgrade is the app's own migration step.
-    for (const name of DEP_SECTIONS) {
-        const range = section(name)?.react;
-        if (range && /^[~^]?(?:[0-9]|1[0-7])(?:[.x]|$)/.test(range.trim())) {
-            collector?.add({
-                file: filePath,
-                line: null,
-                rule: 'peer-deps',
-                message: `react ${range} predates bestax-bulma's peer range (^18 || ^19) — upgrade react and react-dom to 18 or 19 before installing`,
-            });
-        }
-    }
-    // Font Awesome older than 6 conflicts with bestax-bulma's optional peer
-    // range and makes `npm install` fail with ERESOLVE. Report only — icon
-    // names change across FA majors, so upgrading is the app's decision. (A
-    // bloomer-era app more often loads Font Awesome 4 from a CDN <link>, which
-    // no manifest pass can see; the Icon conversion flags those in the code.)
-    for (const name of DEP_SECTIONS) {
-        const range = section(name)?.['@fortawesome/fontawesome-free'];
-        if (range && /^[~^]?[0-5](?:[.x]|$)/.test(range.trim())) {
-            collector?.add({
-                file: filePath,
-                line: null,
-                rule: 'peer-deps',
-                message: `@fortawesome/fontawesome-free ${range} predates bestax-bulma's optional peer range (^6.7.2 || ^7.0.0) — upgrade it, or install with \`npm install --legacy-peer-deps\``,
-            });
-        }
-    }
-    // node-sass is dead; dart-sass replaces it in the same section.
-    for (const name of DEP_SECTIONS) {
-        const deps = section(name);
-        if (deps && 'node-sass' in deps) {
-            delete deps['node-sass'];
-            note(`removed node-sass from ${name}`);
-            const sassDeclared = DEP_SECTIONS.some(s => section(s)?.sass);
-            if (!sassDeclared) {
-                deps.sass = SASS_RANGE;
-                note(`added sass ${SASS_RANGE} to ${name} (replaces node-sass)`);
-            }
-        }
-    }
-    return changes.length > 0 ? next : null;
+        manifest.report('deps', 'bloomer was removed from package.json, but some files still import it for components with no bestax equivalent — resolve those `TODO(bestax-migrate)` imports before installing, or re-add bloomer until you have');
+    }
+    addBestax(manifest);
+    moveBulmaToV1(manifest, options.bulmaReferenced);
+    // bloomer peer-depended on React ^16.2. A bloomer-era app more often loads
+    // Font Awesome 4 from a CDN <link>, which no manifest pass can see; the Icon
+    // conversion flags those in the code.
+    reportPeerRanges(manifest);
+    replaceNodeSass(manifest);
+    return manifest.result();
 };

package/dist/sources/bloomer/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/sources/bloomer/transform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAwDvD,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,EACR,OAAO,GAAE,gBAAqB,GAC7B,MAAM,GAAG,SAAS,CA86BpB"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/sources/bloomer/transform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AA8CvD,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,GAAG,EACR,OAAO,GAAE,gBAAqB,GAC7B,MAAM,GAAG,SAAS,CA4uBpB"}

package/dist/sources/bloomer/transform.js

@@ -25,28 +25,13 @@ import { HELPERLESS_TARGETS, MAPPING, NO_CLASSNAME_TARGETS, UNIVERSAL_PROPS, hel
 import { addTodo, attributesOf, jsxNameParts, literalValueOf, removeAttr, renameElement, } from '../_shared/jsx-utils.js';
 import { applyPropAction, applyUniversalProps, mergeClass, } from '../_shared/props.js';
 import { enforcePolymorphicProps } from '../_shared/polymorphic.js';
+import { bestaxValueLocals, buildBestaxImport, carryPrunedComments, placeBestaxImport, seedBestaxImport, } from '../_shared/bestax-import.js';
+import { rewriteStylesheetImports } from '../_shared/css-imports.js';
 import { collectBoundNames, makeReserve, nameOf, prefersTabs, resolvesToBinding, } from '../_shared/imports.js';
 import { flattenResponsiveProps, RESPONSIVE_KINDS } from './responsive.js';
 import { runSpecial } from './specials.js';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const BLOOMER = 'bloomer';
-const BESTAX = '@allxsmith/bestax-bulma';
-const BESTAX_CSS = '@allxsmith/bestax-bulma/bestax.css';
-const EXTRAS_CSS = '@allxsmith/bestax-bulma/extras.css';
-const BULMA_CSS_SPECIFIERS = new Set([
-    'bulma/css/bulma.css',
-    'bulma/css/bulma.min.css',
-]);
-const BESTAX_CSS_SPECIFIERS = new Set([
-    BESTAX_CSS,
-    '@allxsmith/bestax-bulma/bestax.min.css',
-    '@allxsmith/bestax-bulma/dist/bestax.css',
-    '@allxsmith/bestax-bulma/dist/bestax.min.css',
-]);
-const EXTRAS_CSS_SPECIFIERS = new Set([
-    EXTRAS_CSS,
-    '@allxsmith/bestax-bulma/dist/extras.css',
-]);
 export default function transform(fileInfo, api, options = {}) {
     const j = api.jscodeshift;
     const root = j(fileInfo.source);
@@ -116,61 +101,8 @@ export default function transform(fileInfo, api, options = {}) {
         addTodo(ctx, p, 'imports', `\`export * from '${BLOOMER}'\` was not migrated; re-export the bestax components you need by hand`);
     });
     // ---- 1a. Stylesheet imports (mode-driven) -----------------------------
-    // `bestax` (default): everything converges on the recommended combined
-    // bundle. `bulma`: plain Bulma v1 CSS plus the separate extras file.
-    // `keep`: nothing to do — bloomer has no stylesheet of its own.
-    const cssMode = options.cssMode ?? 'bestax';
-    let sawBestaxCss = root
-        .find(j.ImportDeclaration)
-        .paths()
-        .some(p => BESTAX_CSS_SPECIFIERS.has(String(p.node.source.value)));
-    // Whether some import in this file will become bestax.css, regardless of
-    // where it sits relative to an existing extras import.
-    const willAdoptBestaxCss = cssMode === 'bestax' &&
-        root
-            .find(j.ImportDeclaration)
-            .paths()
-            .some(p => BULMA_CSS_SPECIFIERS.has(String(p.node.source.value)));
-    root.find(j.ImportDeclaration).forEach(path => {
-        const source = String(path.node.source.value);
-        const isBulmaCss = BULMA_CSS_SPECIFIERS.has(source);
-        const isExtrasCss = EXTRAS_CSS_SPECIFIERS.has(source);
-        if (!isBulmaCss && !isExtrasCss)
-            return;
-        if (cssMode === 'bestax') {
-            if (isBulmaCss) {
-                if (sawBestaxCss) {
-                    path.prune(); // bestax.css already imported elsewhere in this file
-                }
-                else {
-                    path.node.source = j.stringLiteral(BESTAX_CSS);
-                    sawBestaxCss = true;
-                }
-                ctx.dirty = true;
-            }
-            else if (isExtrasCss && (sawBestaxCss || willAdoptBestaxCss)) {
-                // bestax.css already contains the extras. `willAdoptBestaxCss` covers
-                // the case where the extras import comes FIRST in the file and the
-                // bulma import that becomes bestax.css has not been visited yet —
-                // previously the extras survived alongside it and double-loaded.
-                path.prune();
-                ctx.dirty = true;
-            }
-        }
-        else if (cssMode === 'bulma') {
-            if (isBulmaCss && !sawBestaxCss) {
-                const hasExtras = root
-                    .find(j.ImportDeclaration)
-                    .paths()
-                    .some(p => EXTRAS_CSS_SPECIFIERS.has(String(p.node.source.value)));
-                if (!hasExtras) {
-                    // Themed Radio/Checkbox need the bestax extras next to plain Bulma.
-                    path.insertAfter(j.importDeclaration([], j.stringLiteral(EXTRAS_CSS)));
-                    ctx.dirty = true;
-                }
-            }
-        }
-    });
+    // bloomer has no stylesheet of its own, so `keep` has nothing to do.
+    rewriteStylesheetImports(ctx, root, options.cssMode ?? 'bestax');
     if (imports.size === 0 && !ctx.dirty) {
         return undefined;
     }
@@ -283,45 +215,7 @@ export default function transform(fileInfo, api, options = {}) {
             bound.add(head);
     });
     ctx.reserve = makeReserve(ctx, bound);
-    // Names the passes actually asked for. `ctx.needed` is also seeded from an
-    // existing bestax import's specifiers below (so JSX reuses their locals),
-    // and that seeding alone must not turn a type-only specifier into a value
-    // import nobody needed.
-    const requested = new Set();
-    const baseReserve = ctx.reserve;
-    ctx.reserve = root => {
-        requested.add(root);
-        return baseReserve(root);
-    };
-    // Merge with an existing bestax import: reuse its locals verbatim.
-    // Only a declaration that already uses NAMED specifiers can absorb more of
-    // them. `import * as Bestax from '…'` cannot: a namespace specifier may not
-    // share a declaration with named ones, and appending to it emits a file
-    // that does not parse.
-    const existingBestax = root
-        .find(j.ImportDeclaration, { source: { value: BESTAX } })
-        .paths()
-        .find(p => 
-    // A type-only declaration cannot take a value specifier: merging a
-    // component into `import type { … }` erases it at runtime.
-    p.node.importKind !== 'type' &&
-        (p.node.specifiers ?? []).every((spec) => spec.type === 'ImportSpecifier'));
-    const preExistingImports = new Set();
-    if (existingBestax) {
-        for (const spec of existingBestax.node.specifiers ?? []) {
-            if (spec.type === 'ImportSpecifier' && spec.local) {
-                // The local name is reused either way, so the JSX never needs an
-                // alias. But an inline `type` specifier (`import { type Box }`) is
-                // not a value binding: it is not counted as already imported, so the
-                // component is written as a value below — onto this specifier, which
-                // keeps its name, rather than as a duplicate.
-                ctx.needed.set(nameOf(spec.imported), nameOf(spec.local));
-                if (spec.importKind !== 'type') {
-                    preExistingImports.add(nameOf(spec.imported));
-                }
-            }
-        }
-    }
+    const bestaxImportState = seedBestaxImport(ctx, root);
     // ---- 2. Transform JSX elements ----------------------------------------
     root.find(j.JSXElement).forEach(path => {
         const element = path.node;
@@ -693,62 +587,13 @@ export default function transform(fileInfo, api, options = {}) {
     // ---- 3. Rewrite imports -----------------------------------------------
     if (imports.size > 0) {
         const retainedNames = [...ctx.retained].sort((a, b) => a.localeCompare(b));
-        const freshNames = [...ctx.needed.entries()]
-            .filter(([imported]) => requested.has(imported) && !preExistingImports.has(imported))
-            .sort((a, b) => a[0].localeCompare(b[0]));
-        const bestaxImport = freshNames.length > 0
-            ? j.importDeclaration(freshNames.map(([imported, local]) => j.importSpecifier(j.identifier(imported), j.identifier(local))), j.stringLiteral(BESTAX))
-            : null;
-        /**
-    
-         * A pruned declaration takes its comments with it — a licence header, an
-    
-         * eslint directive. Hand them to what replaces it, or to the next statement.
-    
-         */
-        const carryComments = (node, importPath) => {
-            const comments = node.comments ?? [];
-            if (comments.length === 0)
-                return;
-            const body = importPath.parent?.node?.body ?? [];
-            const index = body.indexOf(node);
-            // The fresh specifiers are merged INTO an existing bestax import when there
-            // is one, and the `bestaxImport` node is then discarded — so the comments
-            // have to follow the declaration that survives, not the one that does not.
-            const carrier = (existingBestax ? existingBestax.node : bestaxImport) ??
-                (index >= 0 ? body[index + 1] : undefined);
-            if (carrier) {
-                carrier.comments = [...comments, ...(carrier.comments ?? [])];
-            }
-            else if (index > 0) {
-                // The import was the last statement: the comments stay where they
-                // were, after what precedes it.
-                const previous = body[index - 1];
-                previous.comments = [
-                    ...(previous.comments ?? []),
-                    ...comments.map((c) => ({
-                        ...c,
-                        leading: false,
-                        trailing: true,
-                    })),
-                ];
-            }
-            else {
-                // The import was the only statement: the comments become the file's.
-                const program = importPath.parent?.node;
-                if (program)
-                    program.comments = [...comments, ...(program.comments ?? [])];
-            }
-            node.comments = [];
-        };
+        const bestaxImport = buildBestaxImport(ctx, bestaxImportState);
         let inserted = false;
         // A retained bloomer specifier must never collide with a bestax import local
         // (possible when one component is both JSX-migrated and value-retained).
         // Only a VALUE local can collide at runtime: a type-only specifier the
         // seeding above recorded, and nothing promoted, binds no value.
-        const bestaxLocals = new Set([...ctx.needed.entries()]
-            .filter(([imported]) => requested.has(imported) || preExistingImports.has(imported))
-            .map(([, local]) => local));
+        const bestaxLocals = bestaxValueLocals(ctx, bestaxImportState);
         for (const path of sourceImportPaths) {
             const node = path.node;
             const keepSpecifiers = (node.specifiers ?? []).filter((spec) => {
@@ -766,28 +611,7 @@ export default function transform(fileInfo, api, options = {}) {
                     !bestaxLocals.has(nameOf(spec.local)));
             });
             if (!inserted) {
-                if (existingBestax && bestaxImport) {
-                    const current = existingBestax.node.specifiers ?? [];
-                    const appended = [];
-                    for (const fresh of bestaxImport.specifiers) {
-                        // A type-only specifier for the same name becomes the value
-                        // import (a value import carries the type too); appending a
-                        // second `Box` beside `type Box` would be a duplicate identifier.
-                        const typeOnly = current.find((spec) => spec.type === 'ImportSpecifier' &&
-                            spec.importKind === 'type' &&
-                            nameOf(spec.imported) === nameOf(fresh.imported));
-                        if (typeOnly) {
-                            typeOnly.importKind = null;
-                        }
-                        else {
-                            appended.push(fresh);
-                        }
-                    }
-                    existingBestax.node.specifiers = [...current, ...appended];
-                }
-                else if (bestaxImport) {
-                    path.insertBefore(bestaxImport);
-                }
+                placeBestaxImport(bestaxImportState, bestaxImport, path);
                 inserted = true;
             }
             const droppedOnCollision = (node.specifiers ?? []).filter((spec) => spec.type === 'ImportSpecifier' &&
@@ -810,7 +634,7 @@ export default function transform(fileInfo, api, options = {}) {
                 }
             }
             else {
-                carryComments(node, path);
+                carryPrunedComments(node, path, bestaxImportState.existing?.node ?? bestaxImport);
                 path.prune();
             }
             ctx.dirty = true;

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;AAsBzD,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;AAwBzD,eAAO,MAAM,kBAAkB,EAAE,kBAgGhC,CAAC"}

package/dist/sources/rbx/deps.js

@@ -13,11 +13,8 @@
  * 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.
-const SASS_RANGE = '^1.79.0';
+import { BULMA_RANGE, DEP_SECTIONS, addBestax, moveBulmaToV1, openManifest, replaceNodeSass, reportPeerRanges, } from '../_shared/deps-common.js';
+import { isRecognisedRange } from '../_shared/semver-range.js';
 /**
  * The Bulma extensions rbx depends on directly. Bulma v1 and bestax cover all
  * four: badge and tooltip became bestax components, the page loader became
@@ -29,23 +26,16 @@ const RBX_STYLE_DEPS = [
     'bulma-pageloader',
     'bulma-tooltip',
 ];
-const DEP_SECTIONS = ['dependencies', 'devDependencies'];
 export const updateDependencies = (filePath, pkg, collector, options) => {
-    const changes = [];
-    const next = pkg;
-    const section = (name) => (next[name] ?? undefined);
-    const note = (message) => {
-        changes.push(message);
-        collector?.add({ file: filePath, line: null, rule: 'deps', message });
-    };
+    const manifest = openManifest(filePath, pkg, collector);
     // rbx goes away entirely.
     const removed = [];
     for (const name of DEP_SECTIONS) {
-        const deps = section(name);
+        const deps = manifest.section(name);
         if (deps && 'rbx' in deps) {
             delete deps.rbx;
             removed.push('rbx');
-            note(`removed rbx from ${name}`);
+            manifest.note(`removed rbx from ${name}`);
         }
     }
     // The four Bulma extensions are REPORTED, not removed.
@@ -60,7 +50,7 @@ export const updateDependencies = (filePath, pkg, collector, options) => {
     const extensions = [];
     if (removed.includes('rbx')) {
         for (const name of DEP_SECTIONS) {
-            const deps = section(name);
+            const deps = manifest.section(name);
             if (!deps)
                 continue;
             for (const extension of RBX_STYLE_DEPS) {
@@ -70,56 +60,19 @@ export const updateDependencies = (filePath, pkg, collector, options) => {
         }
     }
     if (extensions.length > 0) {
-        collector?.add({
-            file: filePath,
-            line: null,
-            rule: 'deps',
-            message: `${extensions.join(', ')} ${extensions.length === 1 ? 'is a Bulma extension' : 'are Bulma extensions'} rbx depended on, and bestax ships ${extensions.length === 1 ? 'its' : 'their'} equivalent${extensions.length === 1 ? '' : 's'} (Badge, Divider, Loading, Tooltip). Declared in this manifest, so removing ${extensions.length === 1 ? 'it' : 'them'} is your call — drop ${extensions.length === 1 ? 'it' : 'them'} unless your own Sass imports ${extensions.length === 1 ? 'it' : 'them'} directly`,
-        });
-    }
-    // @allxsmith/bestax-bulma comes in (runtime dependency).
-    const dependencies = (next.dependencies ??= {});
-    if (!dependencies['@allxsmith/bestax-bulma'] &&
-        !section('devDependencies')?.['@allxsmith/bestax-bulma']) {
-        dependencies['@allxsmith/bestax-bulma'] = BESTAX_RANGE;
-        note(`added @allxsmith/bestax-bulma ${BESTAX_RANGE} to dependencies`);
-    }
-    // Bulma: rbx pinned 0.7.5 as a direct dependency, so this almost always
-    // fires. Add it back only when sources still reference bulma/… directly —
-    // otherwise it arrives transitively via bestax-bulma.
-    let bulmaDeclared = false;
-    let declaredBulma = '';
-    let bulmaBumped = false;
-    let bulmaAdded = false;
-    for (const name of DEP_SECTIONS) {
-        const deps = section(name);
-        if (deps?.bulma) {
-            bulmaDeclared = true;
-            declaredBulma = deps.bulma;
-            if (isPreV1(deps.bulma)) {
-                deps.bulma = BULMA_RANGE;
-                bulmaBumped = true;
-                note(`bumped bulma to ${BULMA_RANGE} in ${name} (was pre-1.0)`);
-            }
-        }
-    }
-    if (!bulmaDeclared && options.bulmaReferenced) {
-        dependencies.bulma = BULMA_RANGE;
-        bulmaAdded = true;
-        note(`added bulma ${BULMA_RANGE} to dependencies (sources import bulma/… directly)`);
+        manifest.report('deps', `${extensions.join(', ')} ${extensions.length === 1 ? 'is a Bulma extension' : 'are Bulma extensions'} rbx depended on, and bestax ships ${extensions.length === 1 ? 'its' : 'their'} equivalent${extensions.length === 1 ? '' : 's'} (Badge, Divider, Loading, Tooltip). Declared in this manifest, so removing ${extensions.length === 1 ? 'it' : 'them'} is your call — drop ${extensions.length === 1 ? 'it' : 'them'} unless your own Sass imports ${extensions.length === 1 ? 'it' : 'them'} directly`);
     }
+    addBestax(manifest);
+    // rbx pinned Bulma 0.7.5 as a direct dependency, so the bump almost always
+    // fires.
+    const bulma = moveBulmaToV1(manifest, options.bulmaReferenced);
     // The transform deliberately keeps a trimmed rbx import for components
     // with no bestax equivalent (Tile, Generic, List, …) so a partially
     // migrated app still runs. Removing the package from the manifest strands
     // exactly those imports once the user runs the install the report asks for,
     // so say so rather than letting them find out at build time.
     if (removed.includes('rbx') && options.sourceStillImported) {
-        collector?.add({
-            file: filePath,
-            line: null,
-            rule: 'deps',
-            message: 'rbx was removed from package.json, but some files still import it for components with no bestax equivalent — resolve those `TODO(bestax-migrate)` imports before installing, or re-add rbx until you have',
-        });
+        manifest.report('deps', 'rbx was removed from package.json, but some files still import it for components with no bestax equivalent — resolve those `TODO(bestax-migrate)` imports before installing, or re-add rbx until you have');
     }
     // The headline result: rbx pinned Bulma 0.7.5 as a DIRECT dependency, so
     // removing rbx is what frees the app to choose its own Bulma version.
@@ -130,63 +83,22 @@ export const updateDependencies = (filePath, pkg, collector, options) => {
     // arrives transitively via bestax-bulma. Saying "bumped bulma" there
     // described a pin the user would not find in their manifest.
     if (removed.includes('rbx')) {
-        collector?.add({
-            file: filePath,
-            line: null,
-            rule: 'deps',
-            message: `removed rbx ${bulmaBumped
-                ? `and bumped bulma to ${BULMA_RANGE}`
-                : bulmaAdded
-                    ? `and added bulma ${BULMA_RANGE}`
-                    : bulmaDeclared
-                        ? isRecognisedRange(declaredBulma)
-                            ? 'and left your declared bulma range alone (already v1)'
-                            : `and left your declared bulma specifier alone (${JSON.stringify(declaredBulma)} is not a version range this tool can read; make sure it resolves to Bulma 1.x)`
-                        : '— bulma now arrives transitively via @allxsmith/bestax-bulma'} — rbx pinned Bulma 0.7.5 as a direct dependency, so the app can now choose its own Bulma version${extensions.length > 0 ? `; ${extensions.length} Bulma extension(s) are reported above for you to remove` : ''}`,
-        });
-    }
-    // bestax-bulma requires React 18/19; rbx peer-depends on ^16.8.6, and React
-    // 19 removed the `defaultProps` its forwardRefAs base is built on — so this
-    // is the other half of why an rbx app is stuck. Report only: a React major
-    // upgrade is the app's own migration step.
-    for (const name of DEP_SECTIONS) {
-        const range = section(name)?.react;
-        if (range && /^[~^]?(?:[0-9]|1[0-7])(?:[.x]|$)/.test(range.trim())) {
-            collector?.add({
-                file: filePath,
-                line: null,
-                rule: 'peer-deps',
-                message: `react ${range} predates bestax-bulma's peer range (^18 || ^19) — upgrade react and react-dom to 18 or 19 before installing`,
-            });
-        }
-    }
-    // Font Awesome older than 6 conflicts with bestax-bulma's optional peer
-    // range and makes `npm install` fail with ERESOLVE. Report only — icon
-    // names change across FA majors, so upgrading is the app's decision.
-    for (const name of DEP_SECTIONS) {
-        const range = section(name)?.['@fortawesome/fontawesome-free'];
-        if (range && /^[~^]?[0-5](?:[.x]|$)/.test(range.trim())) {
-            collector?.add({
-                file: filePath,
-                line: null,
-                rule: 'peer-deps',
-                message: `@fortawesome/fontawesome-free ${range} predates bestax-bulma's optional peer range (^6.7.2 || ^7.0.0) — upgrade it, or install with \`npm install --legacy-peer-deps\``,
-            });
-        }
-    }
-    // node-sass is dead; dart-sass replaces it in the same section. rbx's own
-    // customisation guide told people to install node-sass, so this is common.
-    for (const name of DEP_SECTIONS) {
-        const deps = section(name);
-        if (deps && 'node-sass' in deps) {
-            delete deps['node-sass'];
-            note(`removed node-sass from ${name}`);
-            const sassDeclared = DEP_SECTIONS.some(s => section(s)?.sass);
-            if (!sassDeclared) {
-                deps.sass = SASS_RANGE;
-                note(`added sass ${SASS_RANGE} to ${name} (replaces node-sass)`);
-            }
-        }
+        manifest.report('deps', `removed rbx ${bulma.bumped
+            ? `and bumped bulma to ${BULMA_RANGE}`
+            : bulma.added
+                ? `and added bulma ${BULMA_RANGE}`
+                : bulma.declared !== null
+                    ? isRecognisedRange(bulma.declared)
+                        ? 'and left your declared bulma range alone (already v1)'
+                        : `and left your declared bulma specifier alone (${JSON.stringify(bulma.declared)} is not a version range this tool can read; make sure it resolves to Bulma 1.x)`
+                    : '— bulma now arrives transitively via @allxsmith/bestax-bulma'} — rbx pinned Bulma 0.7.5 as a direct dependency, so the app can now choose its own Bulma version${extensions.length > 0 ? `; ${extensions.length} Bulma extension(s) are reported above for you to remove` : ''}`);
     }
-    return changes.length > 0 ? next : null;
+    // rbx peer-depends on React ^16.8.6, and React 19 removed the
+    // `defaultProps` its forwardRefAs base is built on — so an old React is the
+    // other half of why an rbx app is stuck.
+    reportPeerRanges(manifest);
+    // rbx's own customisation guide told people to install node-sass, so this
+    // is common.
+    replaceNodeSass(manifest);
+    return manifest.result();
 };

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;AA8BnE;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAoCtD,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,CAktBpD,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;AA8BnE;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CA6CtD,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,CAktBpD,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"}