bestax-migrate 2.2.2 → 2.3.0

package/README.md

@@ -13,10 +13,11 @@ Codemods that migrate existing React apps to [`@allxsmith/bestax-bulma`](https:/
 
 Currently supported source libraries:
 
-| Source                                                                           | Status                                                              |
-| -------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
-| [`react-bulma-components`](https://github.com/couds/react-bulma-components) (v4) | ✅ All 32 components mapped (a few patterns are flagged as TODOs)   |
-| [`rbx`](https://github.com/dfee/rbx) (v2)                                        | ✅ Full export surface mapped (a few patterns are flagged as TODOs) |
+| Source                                                                           | Status                                                                             |
+| -------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
+| [`react-bulma-components`](https://github.com/couds/react-bulma-components) (v4) | ✅ All 32 components mapped (a few patterns are flagged as TODOs)                  |
+| [`rbx`](https://github.com/dfee/rbx) (v2)                                        | ✅ Full export surface mapped (a few patterns are flagged as TODOs)                |
+| [`bloomer`](https://github.com/AlgusDark/bloomer) (0.6)                          | ✅ All 108 exports mapped (Font Awesome 4 icons and Bulma 0.4's `Nav` are flagged) |
 
 Pass the source library as the first argument: `bestax-migrate <source> <paths…>`.
 
@@ -33,8 +34,9 @@ the app being migrated — the source is read as text and is never executed.
 ```bash
 # Preview what would change (no writes)
 pnpm dlx bestax-migrate react-bulma-components src/ --dry
-# …or, for an rbx app
+# …or, for an rbx or bloomer app
 pnpm dlx bestax-migrate rbx src/ --dry
+pnpm dlx bestax-migrate bloomer src/ --dry
 
 # Apply the migration
 pnpm dlx bestax-migrate react-bulma-components src/
@@ -45,14 +47,14 @@ npm and yarn work too: `npx bestax-migrate …` / `yarn dlx bestax-migrate …`.
 The codemod uses [jscodeshift](https://github.com/facebook/jscodeshift) to:
 
 - rewrite the source library's imports to `@allxsmith/bestax-bulma` (including destructuring and namespace imports)
-- rename components and compound sub-components (`Form.Textarea` → `TextArea`, `Card.Footer.Item` → `Card.FooterItem`, `Hero.Footer` → `Hero.Foot`, …)
+- rename components and compound sub-components (`Form.Textarea` → `TextArea`, `Card.Footer.Item` → `Card.FooterItem`, `Hero.Footer` → `Hero.Foot`, …) — and, for bloomer, its flat names onto bestax's compounds (`CardHeaderTitle` → `Card.Header.Title`)
 - convert props (`renderAs` → `as`, `loading` → `isLoading`, numeric spacing/text sizes → string unions, `textAlign="center"` → `textAlign="centered"`, …)
-- flatten responsive breakpoint objects (`mobile={{ size: 4 }}` → `sizeMobile={4}`)
+- flatten responsive breakpoint objects (`mobile={{ size: 4 }}` → `sizeMobile={4}`) and bloomer's `isDisplay`/`isHidden` strings, arrays and objects (`isHidden="touch"` → `visibilityTouch="hidden"`)
 - restructure patterns bestax models differently (`Table.Container`, Navbar dropdowns, `Form.Help`, icon-font children → `<Icon name=…>`)
 - migrate stylesheets: CSS imports converge on `@allxsmith/bestax-bulma/bestax.css`, and SCSS files move from Bulma 0.9's `@import` + `$var !default` overrides to `@use 'bulma/sass' with (…)` plus `@use '@allxsmith/bestax-bulma/scss/extras'`
-- update `package.json`: remove the source library, add `@allxsmith/bestax-bulma`, raise a declared pre-1.0 `bulma` to `^1` (adding it only when your sources import `bulma/…` directly — otherwise it arrives transitively), and swap the dead `node-sass` for dart `sass` (no install is ever run). Migrating **rbx** is what frees an app from Bulma 0.7.5: rbx pinned it as a _direct_ dependency, so the app could not choose its own Bulma version at all. The four Bulma extensions rbx also pulled in (`bulma-badge`, `bulma-divider`, `bulma-pageloader`, `bulma-tooltip`) are **reported rather than removed** — bestax replaces all four, but a manifest entry is a deliberate declaration and your own Sass may import them
+- update `package.json`: remove the source library, add `@allxsmith/bestax-bulma`, raise a declared pre-1.0 `bulma` to `^1` (adding it only when your sources import `bulma/…` directly — otherwise it arrives transitively), and swap the dead `node-sass` for dart `sass` (no install is ever run). Migrating **rbx** is what frees an app from Bulma 0.7.5: rbx pinned it as a _direct_ dependency, so the app could not choose its own Bulma version at all. The four Bulma extensions rbx also pulled in (`bulma-badge`, `bulma-divider`, `bulma-pageloader`, `bulma-tooltip`) are **reported rather than removed** — bestax replaces all four, but a manifest entry is a deliberate declaration and your own Sass may import them. A **bloomer** app declared its own Bulma 0.6, which is what gets bumped
 
-Anything without a safe automatic conversion is left in place with a `// TODO(bestax-migrate): …` comment, and the run ends with a report of every TODO by file and line. TODOs are expected output, not errors — resolve them with the migration guide ([react-bulma-components](https://bestax.io/docs/guides/getting-started/migration/react-bulma-components), [rbx](https://bestax.io/docs/guides/getting-started/migration/rbx)), or let the [`bestax-migrate` Agent Skill](https://bestax.io/docs/skills/intro) walk them for you:
+Anything without a safe automatic conversion is left in place with a `// TODO(bestax-migrate): …` comment, and the run ends with a report of every TODO by file and line. TODOs are expected output, not errors — resolve them with the migration guide ([react-bulma-components](https://bestax.io/docs/guides/getting-started/migration/react-bulma-components), [rbx](https://bestax.io/docs/guides/getting-started/migration/rbx), [bloomer](https://bestax.io/docs/guides/getting-started/migration/bloomer)), or let the [`bestax-migrate` Agent Skill](https://bestax.io/docs/skills/intro) walk them for you:
 
 ```bash
 npx skills add https://github.com/allxsmith/bestax --skill bestax-migrate
@@ -74,7 +76,7 @@ npx skills add https://github.com/allxsmith/bestax --skill bestax-migrate
 2. Search for `TODO(bestax-migrate)` and resolve each comment
 3. Typecheck/build and review the rendered app
 
-Full walkthrough: [react-bulma-components migration guide](https://bestax.io/docs/guides/getting-started/migration/react-bulma-components) · [rbx migration guide](https://bestax.io/docs/guides/getting-started/migration/rbx).
+Full walkthrough: [react-bulma-components migration guide](https://bestax.io/docs/guides/getting-started/migration/react-bulma-components) · [rbx migration guide](https://bestax.io/docs/guides/getting-started/migration/rbx) · [bloomer migration guide](https://bestax.io/docs/guides/getting-started/migration/bloomer).
 
 ## Hardened by default
 

package/dist/sources/_shared/imports.d.ts

@@ -43,4 +43,32 @@ export declare function prefersTabs(source: string): boolean;
  * declarators at any depth.
  */
 export declare function resolvesToBinding(path: ASTPath<any>, name: string, expected: unknown): boolean;
+/**
+ * Registry of `const { Item } = Card`-style aliases, keyed by the AST node
+ * that owns the declaring scope rather than by bare name. Two functions can
+ * each destructure `Header` from a different component; a name-keyed map let
+ * the second overwrite the first, and both declarations were then pruned
+ * while both `<Header…>` references were left resolving to nothing.
+ *
+ * Resolution walks the reference's ANCESTORS rather than consulting
+ * `scope.lookup`, because by the time references are rewritten the alias
+ * pass has already pruned the declaration -- so the binding is gone from the
+ * scope table, and `path.scope` objects are not identity-stable across
+ * traversals either.
+ *
+ * Source-agnostic: every transform resolves aliases the same way, and #613
+ * shipped this block duplicated in two of them.
+ */
+export interface AliasRegistry {
+    /** Record that `local` in the scope owned by `owner` names `target`. */
+    register(owner: unknown, local: string, target: string[]): void;
+    /**
+     * The canonical path `name` aliases at `at` (a reference's path), or
+     * undefined when no alias applies to that reference.
+     */
+    aliasAt(name: string, at?: unknown): string[] | undefined;
+    /** Whether ANY scope aliases `name` — regardless of the reference. */
+    anyAlias(name: string): boolean;
+}
+export declare function makeAliasRegistry(): AliasRegistry;
 //# sourceMappingURL=imports.d.ts.map

package/dist/sources/_shared/imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/imports.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIvD,eAAO,MAAM,MAAM,GAAI,MAAM,GAAG,KAAG,MACyB,CAAC;AAE7D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,WAAW,EACd,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,gBAAgB,EAAE,MAAM,GACvB,GAAG,CAAC,MAAM,CAAC,CAmEb;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,gBAAgB,EACrB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GACjB,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAiBlC;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQnD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAChB,OAAO,CAST"}
+{"version":3,"file":"imports.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/imports.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIvD,eAAO,MAAM,MAAM,GAAI,MAAM,GAAG,KAAG,MACyB,CAAC;AAE7D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,WAAW,EACd,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,gBAAgB,EAAE,MAAM,GACvB,GAAG,CAAC,MAAM,CAAC,CAmEb;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,gBAAgB,EACrB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GACjB,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,CAiBlC;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAQnD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,GAChB,OAAO,CAST;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW,aAAa;IAC5B,wEAAwE;IACxE,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChE;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;IAC1D,sEAAsE;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;CACjC;AAED,wBAAgB,iBAAiB,IAAI,aAAa,CAoEjD"}

package/dist/sources/_shared/imports.js

@@ -150,3 +150,65 @@ export function resolvesToBinding(path, name, expected) {
     // the shadowing case it guards against.
     return !declaring || declaring === expected;
 }
+export function makeAliasRegistry() {
+    const aliasesByOwner = new Map();
+    const ownersFor = (name) => {
+        const owners = [];
+        for (const [owner, perScope] of aliasesByOwner) {
+            if (perScope.has(name))
+                owners.push(owner);
+        }
+        return owners;
+    };
+    const register = (owner, local, target) => {
+        let perScope = aliasesByOwner.get(owner);
+        if (!perScope) {
+            perScope = new Map();
+            aliasesByOwner.set(owner, perScope);
+        }
+        perScope.set(local, target);
+    };
+    const aliasAt = (name, at) => {
+        const owners = ownersFor(name);
+        if (owners.length === 0)
+            return undefined;
+        // Without a reference location there is nothing to walk, so the only
+        // owner is the best answer available. WITH one, always walk: an unrelated
+        // `Header` parameter in another function must not resolve to the alias
+        // merely because the alias is the only one by that name. A single-owner
+        // shortcut here rewrote such a parameter to `{ Header: Card.Header }`,
+        // which is not even valid syntax.
+        if (at === undefined) {
+            return owners.length === 1
+                ? aliasesByOwner.get(owners[0]).get(name)
+                : undefined;
+        }
+        let cursor = at;
+        while (cursor) {
+            if (cursor.node !== undefined) {
+                const hit = aliasesByOwner.get(cursor.node)?.get(name);
+                if (hit) {
+                    // The walk finds the nearest OWNER, but a binding can intervene
+                    // between the reference and that owner: `function F(Header)` under
+                    // a module-level `const { Header } = Card` shadows the alias, and
+                    // resolving through it rewrote the parameter itself to
+                    // `F(Card.Header)`. If the scope table still binds the name
+                    // somewhere other than the owner, that nearer binding wins. (After
+                    // the alias declaration is pruned the lookup returns nothing for
+                    // the alias itself, which is the case this must keep allowing.)
+                    const declaring = at.scope?.lookup(name)?.path?.node;
+                    if (declaring !== undefined &&
+                        declaring !== null &&
+                        declaring !== cursor.node) {
+                        return undefined;
+                    }
+                    return hit;
+                }
+            }
+            cursor = cursor.parent;
+        }
+        return undefined;
+    };
+    const anyAlias = (name) => ownersFor(name).length > 0;
+    return { register, aliasAt, anyAlias };
+}

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

@@ -62,6 +62,23 @@ export type LiteralValue = {
 };
 /** Extract the literal value of a JSX attribute, if it has one. */
 export declare function literalValueOf(attr: any): LiteralValue;
+/**
+ * The literal value of an expression node (as opposed to `literalValueOf`,
+ * which reads a JSX attribute): a string, number or boolean literal's value,
+ * otherwise undefined.
+ */
+export declare function literalOf(node: any): string | number | boolean | undefined;
+/**
+ * Reuse a value node as a JSX attribute value: a string literal can sit bare
+ * (`size="one-third"`), anything else needs an expression container.
+ */
+export declare function attrValue(j: JSCodeshift, node: any): any;
+/** The static key of an object property (`{ tablet: … }`, `{ 'inline-block': … }`). */
+export declare function propKey(prop: any): string | undefined;
+/** The ObjectExpression inside a JSX attribute value, or null. */
+export declare function objectExpressionOf(value: any): any | null;
+/** The ArrayExpression inside a JSX attribute value, or null. */
+export declare function arrayExpressionOf(value: any): any | null;
 export type Booleanish = 'truthy' | 'falsy' | 'expression';
 /**
  * Classify a JSX attribute by the truthiness the source library evaluates it

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

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

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

@@ -74,6 +74,50 @@ export function literalValueOf(attr) {
     }
     return { kind: 'expression' };
 }
+/**
+ * The literal value of an expression node (as opposed to `literalValueOf`,
+ * which reads a JSX attribute): a string, number or boolean literal's value,
+ * otherwise undefined.
+ */
+export function literalOf(node) {
+    if (!node)
+        return undefined;
+    if (node.type === 'StringLiteral')
+        return node.value;
+    if (node.type === 'NumericLiteral')
+        return node.value;
+    if (node.type === 'BooleanLiteral')
+        return node.value;
+    return undefined;
+}
+/**
+ * Reuse a value node as a JSX attribute value: a string literal can sit bare
+ * (`size="one-third"`), anything else needs an expression container.
+ */
+export function attrValue(j, node) {
+    return node?.type === 'StringLiteral'
+        ? j.stringLiteral(node.value)
+        : j.jsxExpressionContainer(node);
+}
+/** The static key of an object property (`{ tablet: … }`, `{ 'inline-block': … }`). */
+export function propKey(prop) {
+    const key = prop.key?.name ?? prop.key?.value;
+    return typeof key === 'string' ? key : undefined;
+}
+/** The ObjectExpression inside a JSX attribute value, or null. */
+export function objectExpressionOf(value) {
+    return value?.type === 'JSXExpressionContainer' &&
+        value.expression?.type === 'ObjectExpression'
+        ? value.expression
+        : null;
+}
+/** The ArrayExpression inside a JSX attribute value, or null. */
+export function arrayExpressionOf(value) {
+    return value?.type === 'JSXExpressionContainer' &&
+        value.expression?.type === 'ArrayExpression'
+        ? value.expression
+        : null;
+}
 /**
  * Classify a JSX attribute by the truthiness the source library evaluates it
  * with at runtime (`!!value`): every statically-known literal (boolean,
@@ -140,7 +184,11 @@ export function addTodo(ctx, path, rule, message) {
 export function plainElement(j, tag, className, attrs, children, selfClosing = false) {
     const allAttrs = [...attrs];
     if (className) {
-        allAttrs.unshift(makeAttr(j, 'className', className));
+        // After the LAST spread, so a `className` inside one cannot replace the
+        // class this element exists for, while every other attribute keeps the
+        // place (and so the precedence) it had in the source.
+        const lastSpread = allAttrs.reduce((last, a, i) => a.type === 'JSXSpreadAttribute' ? i : last, -1);
+        allAttrs.splice(lastSpread + 1, 0, makeAttr(j, 'className', className));
     }
     const opening = j.jsxOpeningElement(j.jsxIdentifier(tag), allAttrs, selfClosing);
     const closing = selfClosing

package/dist/sources/_shared/props.d.ts

@@ -9,6 +9,23 @@
 import type { ASTPath } from 'jscodeshift';
 import type { PropAction } from '../../types.js';
 import { type TransformContext } from './jsx-utils.js';
+/**
+ * Add a converted attribute unless the target name is already present — two
+ * source props can map onto one bestax prop (e.g. RBC's `textTransform` +
+ * `italic`), and a silent duplicate would be invalid JSX.
+ */
+export declare function addConverted(ctx: TransformContext, path: ASTPath<any>, element: any, originalName: string, name: string, value: string | undefined): void;
+/**
+ * The same refusal for an attribute the caller has already built — a numeric
+ * `size={6}` or a reused expression node, which `makeAttr` cannot express.
+ */
+export declare function addAttrOnce(ctx: TransformContext, path: ASTPath<any>, element: any, originalName: string, attr: any): void;
+/**
+ * Merge a Bulma class into the element's `className`: appended to a string
+ * literal, written fresh when there is none, and a TODO when the existing
+ * value is dynamic (the class cannot be spliced into an expression safely).
+ */
+export declare function mergeClass(ctx: TransformContext, path: ASTPath<any>, element: any, cls: string, originalName: string): void;
 /** Apply one PropAction to `attr` on `element`. */
 export declare function applyPropAction(ctx: TransformContext, path: ASTPath<any>, element: any, attr: any, action: PropAction): void;
 /**

package/dist/sources/_shared/props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/props.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EASL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AA6BxB,mDAAmD;AACnD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,UAAU,GACjB,IAAI,CA6HN;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GACzC,IAAI,CAQN"}
+{"version":3,"file":"props.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/props.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EASL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAIxB;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,GAAG,GACR,IAAI,CAmBN;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,GACnB,IAAI,CAoBN;AAED,mDAAmD;AACnD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,UAAU,GACjB,IAAI,CAqLN;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,EACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GACzC,IAAI,CAQN"}

package/dist/sources/_shared/props.js

@@ -13,12 +13,48 @@ import { addAttr, addTodo, attributesOf, findAttr, literalValueOf, makeAttr, rem
  * source props can map onto one bestax prop (e.g. RBC's `textTransform` +
  * `italic`), and a silent duplicate would be invalid JSX.
  */
-function addConverted(ctx, path, element, originalName, name, value) {
+export function addConverted(ctx, path, element, originalName, name, value) {
+    addAttrOnce(ctx, path, element, originalName, makeAttr(ctx.j, name, value));
+}
+/**
+ * The same refusal for an attribute the caller has already built — a numeric
+ * `size={6}` or a reused expression node, which `makeAttr` cannot express.
+ */
+export function addAttrOnce(ctx, path, element, originalName, attr) {
+    const name = attr.name.name;
     if (findAttr(element, name)) {
-        addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` maps to \`${name}${value === undefined ? '' : `="${value}"`}\`, but \`${name}\` is already set on this element; reconcile by hand`);
+        const value = attr.value;
+        const rendered = value == null
+            ? ''
+            : value.type === 'StringLiteral'
+                ? `="${value.value}"`
+                : '={…}';
+        addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` maps to \`${name}${rendered}\`, but \`${name}\` is already set on this element; reconcile by hand`);
         return;
     }
-    addAttr(element, makeAttr(ctx.j, name, value));
+    addAttr(element, attr);
+}
+/**
+ * Merge a Bulma class into the element's `className`: appended to a string
+ * literal, written fresh when there is none, and a TODO when the existing
+ * value is dynamic (the class cannot be spliced into an expression safely).
+ */
+export function mergeClass(ctx, path, element, cls, originalName) {
+    const { j } = ctx;
+    const existing = findAttr(element, 'className');
+    if (!existing) {
+        addAttr(element, makeAttr(j, 'className', cls));
+        return;
+    }
+    const literal = literalValueOf(existing);
+    if (literal.kind === 'string') {
+        const classes = literal.value.split(/\s+/).filter(Boolean);
+        if (!classes.includes(cls))
+            classes.push(cls);
+        existing.value = j.stringLiteral(classes.join(' '));
+        return;
+    }
+    addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` becomes the \`${cls}\` class, but \`className\` is dynamic here; add \`${cls}\` to it by hand`);
 }
 /** Apply one PropAction to `attr` on `element`. */
 export function applyPropAction(ctx, path, element, attr, action) {
@@ -29,6 +65,30 @@ export function applyPropAction(ctx, path, element, attr, action) {
         ctx.dirty = true;
         return;
     }
+    if (action.toClass) {
+        const resolved = resolveBooleanish(attr);
+        if (resolved === 'expression') {
+            addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` has a dynamic value; bestax has no prop for it — add the \`${action.toClass}\` class conditionally by hand`);
+            return;
+        }
+        removeAttr(element, attr);
+        ctx.dirty = true;
+        if (resolved === 'truthy') {
+            mergeClass(ctx, path, element, action.toClass, originalName);
+        }
+        return;
+    }
+    if (action.toClassPrefix) {
+        const value = literalValueOf(attr);
+        if (value.kind !== 'string') {
+            addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` has a dynamic value; bestax has no prop for it — add the \`${action.toClassPrefix}<value>\` class by hand`);
+            return;
+        }
+        removeAttr(element, attr);
+        ctx.dirty = true;
+        mergeClass(ctx, path, element, `${action.toClassPrefix}${value.value}`, originalName);
+        return;
+    }
     if (action.todo) {
         addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` — ${action.todo}`);
         return;
@@ -80,6 +140,15 @@ export function applyPropAction(ctx, path, element, attr, action) {
         return;
     }
     let renamedTo = originalName;
+    if (action.rename &&
+        action.rename !== originalName &&
+        findAttr(element, action.rename)) {
+        // Two source props can converge on one bestax prop (`isSize` and
+        // `isFullHeight` both on `size`); renaming over the one already written
+        // produced a duplicate attribute, which is invalid JSX.
+        addTodo(ctx, path, `prop:${originalName}`, `\`${originalName}\` maps to \`${action.rename}\`, but \`${action.rename}\` is already set on this element; reconcile by hand`);
+        return;
+    }
     if (action.rename) {
         attr.name = j.jsxIdentifier(action.rename);
         renamedTo = action.rename;

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

@@ -36,10 +36,56 @@ export declare function makeStripModifierProps(universalProps: Record<string, Pr
  * can't be merged safely — keep the base class and leave a TODO.
  */
 export declare function mergeClassName(ctx: TransformContext, path: ASTPath<any>, element: any, base: string | undefined, where: string): string | undefined;
-/** Parse an icon-font <i className="..."> into bestax Icon name/library/variant. */
-export declare function parseIconClasses(className: string): {
+/** What an icon-font class string says about a bestax `Icon`. */
+export interface ParsedIconClasses {
     name: string;
     library?: string;
     variant?: string;
-} | null;
+    /** Recognised modifier classes (`fa-spin`, `fa-2x`, `mdi-48px`) — bestax's `features`. */
+    features: string[];
+    /**
+     * Tokens that are neither the icon, its style, nor a modifier the library
+     * documents — an app's own class. bestax's Icon has nowhere to put them
+     * on the glyph, so a caller that wants exact markup keeps the child.
+     */
+    leftovers: string[];
+}
+/**
+ * Parse an icon-font class string (`fas fa-home fa-spin`, `mdi mdi-account`)
+ * into bestax Icon props. Returns null when no icon name can be read.
+ */
+export declare function parseIconClasses(className: string): ParsedIconClasses | null;
+/**
+ * Write a parsed icon onto a bestax `Icon`-shaped element: `name`, then
+ * `library`/`variant` when known, then `features` — one string, or an array
+ * literal when there are several — and make the element self-closing.
+ */
+export declare function applyIconProps(ctx: TransformContext, path: ASTPath<any>, element: any, parsed: ParsedIconClasses): void;
+/**
+ * Turn a literal modifier prop into an `is-*` class fragment for an element
+ * on its way to becoming plain HTML. Returns the class (or undefined) and
+ * always removes the attribute.
+ */
+export declare function modifierClass(ctx: TransformContext, path: ASTPath<any>, element: any, prop: string, base: string, where: string): string;
+/**
+ * A source that puts `as` (or its own name for it) on every component can
+ * land, through a handler that picks its target from a prop value, on a
+ * bestax component that has no `as` — Media.Item resolves to
+ * Left/Content/Right where only Left declares one. Opting into `as` in the
+ * mapping table cannot express that, so the target has to be checked after
+ * it is picked.
+ */
+export declare function restrictAsToTargets(ctx: TransformContext, path: ASTPath<any>, element: any, target: string | undefined, allowed: string[], prop?: string): void;
+/** Attribute filter a source applies before an element becomes plain HTML. */
+export type AttrStrip = (ctx: TransformContext, path: ASTPath<any>, attrs: any[], where: string) => any[];
+/**
+ * The two structural rewrites every source needs, bound to that source's own
+ * attribute strip (its modifier vocabulary is the one thing that differs):
+ * replacing an element with plain HTML, and folding a wrapper onto the single
+ * child it exists to wrap.
+ */
+export declare function makeStructuralHelpers(strip: AttrStrip): {
+    replaceWithPlain: (ctx: TransformContext, path: ASTPath<any>, element: any, tag: string, className: string | undefined, where: string) => SpecialResult;
+    collapseOntoChild: (ctx: TransformContext, path: ASTPath<any>, element: any, where: string, expected: string | string[]) => SpecialResult | null;
+};
 //# sourceMappingURL=specials-utils.d.ts.map

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":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAKL,KAAK,gBAAgB,EACtB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,aAAa;IAC5B,2DAA2D;IAC3D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,KACT,aAAa,CAAC;AAEnB,4EAA4E;AAC5E,wBAAgB,WAAW,CACzB,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,QAAQ,EAAE,MAAM,GACf,aAAa,CAuBf;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EAC1C,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAGlD,KAAK,gBAAgB,EACrB,MAAM,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,GAAG,EAAE,EACZ,OAAO,MAAM,KACZ,GAAG,EAAE,CAuBT;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,gBAAgB,EACrB,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,EAClB,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAiBpB;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,GAChB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA2C7D"}
+{"version":3,"file":"specials-utils.d.ts","sourceRoot":"","sources":["../../../src/sources/_shared/specials-utils.ts"],"names":[],"mappings":"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"}