@astryxdesign/cli 0.1.3-canary.cbfd87b → 0.1.3-canary.cd0c106

package/docs/browser-support.doc.mjs

@@ -15,11 +15,11 @@ export const docs = {
       content: [
         {
           type: 'prose',
-          text: 'Astryx is built on modern web platform features — the Popover API, CSS anchor positioning, and CSS `light-dark()`. These let components stay small, accessible, and dependency-free, but they also set a floor on which browsers render everything correctly.',
+          text: 'Astryx is built on modern web platform features: the Popover API, CSS anchor positioning, and CSS `light-dark()`. These let components stay small, accessible, and dependency-free, but they also set a floor on which browsers render everything correctly.',
         },
         {
           type: 'prose',
-          text: 'A design system does not own its traffic — the products built on it do. Their audiences range from evergreen-Chrome-only internal tools to public sites with meaningful older-Safari share. So Astryx does not declare a single hard browser floor the way an app would. Instead it defines tiers that describe what works at each level, and hands the final decision to you. Pick the tier that matches your audience.',
+          text: 'A design system does not own its traffic; the products built on it do. Their audiences range from evergreen-Chrome-only internal tools to public sites with meaningful older-Safari share. So Astryx does not declare a single hard browser floor the way an app would. Instead it defines tiers that describe what works at each level, and hands the final decision to you. Pick the tier that matches your audience.',
         },
       ],
     },
@@ -35,19 +35,19 @@ export const docs = {
           headers: ['Tier', 'Baseline', 'Representative versions', 'What your users experience'],
           rows: [
             [
-              'Tier 1 — Full fidelity',
+              'Tier 1: Full fidelity',
               'Current Baseline (2026)',
               'Chrome 125+, Edge 125+, Safari 26+, Firefox 147+',
               'Everything works, including CSS anchor positioning. This is the reference target.',
             ],
             [
-              'Tier 2 — Functional',
+              'Tier 2: Functional',
               'Baseline − 2 years (2024)',
               'Chrome 114+, Edge 114+, Safari 17+, Firefox 125+',
               'Components open, dismiss, and are fully usable. Only anchor positioning is missing, so layered surfaces (tooltips, menus, popovers) may not be positioned next to their trigger.',
             ],
             [
-              'Tier 3 — Below Tier 2',
+              'Tier 3: Below Tier 2',
               'Older than Baseline − 2',
               'Anything older',
               'Best-effort. The only guarantee is "does not crash." `light-dark()` is unavailable, so theme colors may fall back to defaults.',
@@ -70,7 +70,7 @@ export const docs = {
             [
               'CSS Anchor Positioning',
               'Positions layered surfaces relative to their trigger (tooltips, menus, popovers, dropdowns).',
-              'Baseline 2026 — the tightest requirement.',
+              'Baseline 2026: the tightest requirement.',
             ],
             [
               'Popover API',
@@ -86,7 +86,7 @@ export const docs = {
         },
         {
           type: 'prose',
-          text: 'The gap that matters is between Tier 1 and Tier 2: the Popover API and `light-dark()` reached wide availability well before anchor positioning. So in Tier 2 browsers, layered surfaces open and dismiss correctly — they just are not positioned. This is the one feature most consumers will need to reason about.',
+          text: 'The gap that matters is between Tier 1 and Tier 2: the Popover API and `light-dark()` reached wide availability well before anchor positioning. So in Tier 2 browsers, layered surfaces open and dismiss correctly; they just are not positioned. This is the one feature most consumers will need to reason about.',
         },
       ],
     },
@@ -95,7 +95,7 @@ export const docs = {
       content: [
         {
           type: 'prose',
-          text: 'The browser requirement is concentrated in the layered-surface components — anything that renders content in an overlay positioned against a trigger:',
+          text: 'The browser requirement is concentrated in the layered-surface components: anything that renders content in an overlay positioned against a trigger:',
         },
         {
           type: 'list',
@@ -112,7 +112,7 @@ export const docs = {
         },
         {
           type: 'prose',
-          text: 'If your product does not use any of these, it has no anchor-positioning requirement at all — it needs only `light-dark()` (Tier 2 and up) for correct theme colors. Layout, typography, forms, buttons, cards, tables, and navigation all work down to Tier 2 with no special handling.',
+          text: 'If your product does not use any of these, it has no anchor-positioning requirement at all; it needs only `light-dark()` (Tier 2 and up) for correct theme colors. Layout, typography, forms, buttons, cards, tables, and navigation all work down to Tier 2 with no special handling.',
         },
       ],
     },
@@ -132,7 +132,7 @@ export const docs = {
           type: 'list',
           style: 'dont',
           items: [
-            'Astryx does not guarantee correct layer positioning below Tier 1 (anchor positioning). Closing that gap for a Tier 2 audience is a consumer choice — see below.',
+            'Astryx does not guarantee correct layer positioning below Tier 1 (anchor positioning). Closing that gap for a Tier 2 audience is a consumer choice; see below.',
             'Astryx does not ship a `light-dark()` fallback, so theme colors are not guaranteed below Tier 2.',
           ],
         },
@@ -143,7 +143,7 @@ export const docs = {
       content: [
         {
           type: 'prose',
-          text: 'If your audience includes Tier 2 browsers and you need correct layer positioning, you have three options, cheapest first. All of them are decisions you make for your audience — Astryx does not impose one.',
+          text: 'If your audience includes Tier 2 browsers and you need correct layer positioning, you have three options, cheapest first. All of them are decisions you make for your audience; Astryx does not impose one.',
         },
         {
           type: 'list',
@@ -192,7 +192,7 @@ const hasLightDark = CSS.supports('color', 'light-dark(#000, #fff)');`,
         },
         {
           type: 'prose',
-          text: 'This is not an arbitrary window: Baseline − 2 is close to where anchor positioning stops being available while the Popover API and `light-dark()` still are — so the tier boundary tracks a real capability edge, not a guessed date. The version floors above are reviewed and advanced roughly once a year as new Baseline years land. Always feature-detect rather than hardcoding version numbers, so your app adapts automatically as the platform moves.',
+          text: 'This is not an arbitrary window: Baseline − 2 is close to where anchor positioning stops being available while the Popover API and `light-dark()` still are, so the tier boundary tracks a real capability edge, not a guessed date. The version floors above are reviewed and advanced roughly once a year as new Baseline years land. Always feature-detect rather than hardcoding version numbers, so your app adapts automatically as the platform moves.',
         },
       ],
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.3-canary.cbfd87b",
+  "version": "0.1.3-canary.cd0c106",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -75,9 +75,9 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@astryxdesign/core": "0.1.3-canary.cbfd87b",
-    "@astryxdesign/lab": "0.1.3-canary.cbfd87b",
-    "@astryxdesign/theme-neutral": "0.1.3-canary.cbfd87b",
+    "@astryxdesign/core": "0.1.3-canary.cd0c106",
+    "@astryxdesign/lab": "0.1.3-canary.cd0c106",
+    "@astryxdesign/theme-neutral": "0.1.3-canary.cd0c106",
     "gpt-tokenizer": "^2.0.0"
   },
   "peerDependenciesMeta": {
@@ -92,9 +92,9 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/core": "0.1.3-canary.cbfd87b",
-    "@astryxdesign/lab": "0.1.3-canary.cbfd87b",
-    "@astryxdesign/theme-neutral": "0.1.3-canary.cbfd87b",
+    "@astryxdesign/core": "0.1.3-canary.cd0c106",
+    "@astryxdesign/lab": "0.1.3-canary.cd0c106",
+    "@astryxdesign/theme-neutral": "0.1.3-canary.cd0c106",
     "gpt-tokenizer": "^2.0.0"
   },
   "scripts": {

package/src/codemods/transforms/v0.1.0/__tests__/drop-xds-prefix-imports.test.mjs

@@ -134,4 +134,47 @@ describe('drop-xds-prefix-imports', () => {
     expect(output).toContain(`import {useState} from 'react';`);
     expect(output).toContain('const x = 1;');
   });
+
+  it('aliases to Astryx<Name> when the bare name collides with a local export function', async () => {
+    const input = [
+      `import {XDSCodeBlock} from '@xds/core/CodeBlock';`,
+      `export function CodeBlock({code}: {code: string}) {`,
+      `  return <XDSCodeBlock code={code} />;`,
+      `}`,
+    ].join('\n');
+    const output = await applyTransform(input);
+    // Import aliased to AstryxCodeBlock; local declaration untouched.
+    expect(output).toContain('CodeBlock as AstryxCodeBlock');
+    expect(output).toContain('@xds/core/CodeBlock');
+    expect(output).toContain('export function CodeBlock({code}');
+    expect(output).toContain('<AstryxCodeBlock code={code} />');
+    // No duplicate CodeBlock binding (not imported bare).
+    expect(output).not.toMatch(/import \{CodeBlock\}/);
+  });
+
+  it('aliases on collision with a local const/class binding', async () => {
+    const input = [
+      `import {XDSCard} from '@xds/core';`,
+      `const Card = 42;`,
+      `export const value = <XDSCard />;`,
+      `export const other = Card;`,
+    ].join('\n');
+    const output = await applyTransform(input);
+    expect(output).toContain('import {Card as AstryxCard}');
+    expect(output).toContain('const Card = 42;');
+    expect(output).toContain('<AstryxCard />');
+    expect(output).toContain('export const other = Card;');
+  });
+
+  it('un-prefixes normally when there is NO local collision', async () => {
+    const input = [
+      `import {XDSCodeBlock} from '@xds/core/CodeBlock';`,
+      `export const App = () => <XDSCodeBlock code="x" />;`,
+    ].join('\n');
+    const output = await applyTransform(input);
+    expect(output).toContain('{CodeBlock}');
+    expect(output).toContain('@xds/core/CodeBlock');
+    expect(output).toContain('<CodeBlock code="x" />');
+    expect(output).not.toContain('AstryxCodeBlock');
+  });
 });

package/src/codemods/transforms/v0.1.0/__tests__/migrate-xds-css-surfaces.test.mjs

@@ -64,4 +64,40 @@ describe('migrate-xds-css-surfaces', () => {
     const output = await applyTransform(input);
     expect(output).toBe(input);
   });
+
+  it('rewrites @import of @xds/* package stylesheets', async () => {
+    const input = [
+      `@import '@xds/core/reset.css';`,
+      `@import '@xds/core/xds.css';`,
+      `@import '@xds/theme-default/theme.css';`,
+    ].join('\n');
+    const output = await applyTransform(input);
+    expect(output).toContain(`@import '@astryxdesign/core/reset.css';`);
+    // xds.css is renamed to astryx.css (file rename, not just scope swap).
+    expect(output).toContain(`@import '@astryxdesign/core/astryx.css';`);
+    // theme-default collapses to theme-neutral.
+    expect(output).toContain(
+      `@import '@astryxdesign/theme-neutral/theme.css';`,
+    );
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('collapses theme-daily @import to theme-neutral and preserves quote style', async () => {
+    const input = `@import "@xds/theme-daily/theme.css";`;
+    const output = await applyTransform(input);
+    expect(output).toBe(`@import "@astryxdesign/theme-neutral/theme.css";`);
+  });
+
+  it('rewrites @import url() form', async () => {
+    const input = `@import url('@xds/core/reset.css');`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`@astryxdesign/core/reset.css`);
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('does not touch @import of non-xds packages', async () => {
+    const input = `@import '@acme/widgets/styles.css';`;
+    const output = await applyTransform(input);
+    expect(output).toBe(input);
+  });
 });

package/src/codemods/transforms/v0.1.0/__tests__/migrate-xds-module-specifiers.test.mjs

@@ -48,4 +48,45 @@ describe('migrate-xds-module-specifiers', () => {
     const output = await applyTransform(input, 'test.ts');
     expect(output).toBe(input);
   });
+
+  it('remaps defaultTheme -> neutralTheme when collapsing theme-default', async () => {
+    const output = await applyTransform(
+      `import {defaultTheme} from '@xds/theme-default';`,
+      'test.ts',
+    );
+    // Package collapses to theme-neutral; binding aliased so local usage works.
+    expect(output).toContain('neutralTheme as defaultTheme');
+    expect(output).toContain('@astryxdesign/theme-neutral');
+    expect(output).not.toContain('@xds/');
+    expect(output).not.toContain('theme-default');
+  });
+
+  it('remaps defaultTheme -> neutralTheme for theme-daily and /built subpath', async () => {
+    const output = await applyTransform(
+      `import {defaultTheme} from '@xds/theme-daily/built';`,
+      'test.ts',
+    );
+    expect(output).toContain('neutralTheme as defaultTheme');
+    expect(output).toContain('@astryxdesign/theme-neutral/built');
+  });
+
+  it('preserves an existing alias when remapping defaultTheme', async () => {
+    const output = await applyTransform(
+      `import {defaultTheme as dt} from '@xds/theme-default';`,
+      'test.ts',
+    );
+    expect(output).toContain('neutralTheme as dt');
+    expect(output).toContain('@astryxdesign/theme-neutral');
+  });
+
+  it('does NOT remap neutralTheme import from theme-neutral (no rename needed)', async () => {
+    const output = await applyTransform(
+      `import {neutralTheme} from '@xds/theme-neutral';`,
+      'test.ts',
+    );
+    expect(output).toContain('neutralTheme');
+    expect(output).toContain('@astryxdesign/theme-neutral');
+    expect(output).not.toContain('defaultTheme');
+    expect(output).not.toContain('neutralTheme as');
+  });
 });

package/src/codemods/transforms/v0.1.0/drop-xds-prefix-imports.mjs

@@ -85,35 +85,87 @@ export default function transformer(file, api) {
   // local alias and only the imported name is rewritten.
   const localRenames = new Map();
 
+  // Collision detection: un-prefixing `XDSCodeBlock` -> `CodeBlock` breaks if
+  // the file already has a top-level binding named `CodeBlock` (e.g. its own
+  // `export function CodeBlock`). Collect every existing top-level binding name
+  // up front so we can alias to `Astryx<Name>` instead of producing a duplicate
+  // declaration. We gather: import locals, and top-level function/class/var
+  // declaration names (the realistic collision sources for component wrappers).
+  const existingBindings = new Set();
+  root.find(j.ImportDeclaration).forEach(path => {
+    for (const spec of path.node.specifiers || []) {
+      if (spec.local && spec.local.name) existingBindings.add(spec.local.name);
+    }
+  });
+  const collectDeclName = node => {
+    if (!node) return;
+    if (
+      (node.type === 'FunctionDeclaration' ||
+        node.type === 'ClassDeclaration') &&
+      node.id
+    ) {
+      existingBindings.add(node.id.name);
+    } else if (node.type === 'VariableDeclaration') {
+      for (const d of node.declarations) {
+        if (d.id && d.id.type === 'Identifier') existingBindings.add(d.id.name);
+      }
+    }
+  };
+  root.find(j.Program).forEach(path => {
+    for (const stmt of path.node.body) {
+      collectDeclName(stmt);
+      // Unwrap `export function X` / `export const X`.
+      if (stmt.type === 'ExportNamedDeclaration' && stmt.declaration) {
+        collectDeclName(stmt.declaration);
+      }
+      if (stmt.type === 'ExportDefaultDeclaration' && stmt.declaration) {
+        collectDeclName(stmt.declaration);
+      }
+    }
+  });
+
   // 1. Rewrite import specifiers from @xds/core
   root.find(j.ImportDeclaration).forEach(path => {
     const source = path.node.source.value;
     if (typeof source !== 'string' || !XDS_CORE_SOURCE.test(source)) return;
 
-    for (const spec of path.node.specifiers || []) {
-      if (spec.type !== 'ImportSpecifier') continue; // skip default/namespace
+    path.node.specifiers = (path.node.specifiers || []).map(spec => {
+      if (spec.type !== 'ImportSpecifier') return spec; // default/namespace
       const importedName = spec.imported.name;
       const bare = bareName(importedName);
-      if (!bare) continue;
+      if (!bare) return spec;
 
       const localName = spec.local.name;
       const wasAliased = localName !== importedName;
 
-      // Rewrite the imported name to the bare alias.
-      spec.imported.name = bare;
-
+      // We REPLACE the specifier node (rather than mutating .imported/.local)
+      // because recast preserves the original printed form of a mutated
+      // ImportSpecifier and will drop a newly-introduced `as local` alias.
+      // Building a fresh node makes recast print the full `imported as local`.
       if (wasAliased) {
         // `import {XDSButton as Btn}` -> `import {Button as Btn}`.
-        // Local binding unchanged, so no usage rewrites needed.
         hasChanges = true;
-      } else {
-        // `import {XDSButton}` -> `import {Button}`. The local binding is the
-        // prefixed name; rename it and all its references.
-        spec.local.name = bare;
-        localRenames.set(importedName, bare);
+        return j.importSpecifier(j.identifier(bare), j.identifier(localName));
+      }
+      if (bare !== importedName && existingBindings.has(bare)) {
+        // COLLISION: the bare name is already a top-level binding in this file
+        // (e.g. a local `export function CodeBlock` alongside imported
+        // `XDSCodeBlock`). Un-prefixing directly would create a duplicate
+        // declaration, so alias the import to `Astryx<Name>` and rename the
+        // import's references to that alias, leaving the local binding intact.
+        const alias = `Astryx${bare}`;
+        localRenames.set(importedName, alias);
+        existingBindings.add(alias);
         hasChanges = true;
+        return j.importSpecifier(j.identifier(bare), j.identifier(alias));
       }
-    }
+      // `import {XDSButton}` -> `import {Button}`. The local binding is the
+      // prefixed name; rename it and all its references.
+      localRenames.set(importedName, bare);
+      existingBindings.add(bare);
+      hasChanges = true;
+      return j.importSpecifier(j.identifier(bare), j.identifier(bare));
+    });
   });
 
   // 2. Rewrite re-exports from @xds/core

package/src/codemods/transforms/v0.1.0/migrate-xds-css-surfaces.mjs

@@ -18,6 +18,10 @@
  *   [data-xds-media         (media attribute selector)
  *   @layer xds-theme        (cascade layer name — incl. comma-separated
  *   @layer xds-base          `@layer a, b;` statement lists and nested blocks)
+ *   @import '@xds/...'      (package stylesheet imports — scope rewrite, plus
+ *                            the @xds/core/xds.css -> @astryxdesign/core/
+ *                            astryx.css file rename and the theme-default /
+ *                            theme-daily -> theme-neutral collapse)
  *
  * It deliberately does NOT blindly replace every `xds` substring: a bare
  * `xds` in a comment, a custom-property value, or an unrelated identifier is
@@ -30,9 +34,10 @@ export const meta = {
   description:
     'Rewrites the documented XDS CSS surfaces to their Astryx equivalents: ' +
     'the `.xds-*` class-selector prefix, `[data-xds-theme]` / ' +
-    '`[data-xds-theme-prose]` / `[data-xds-media]` attribute selectors, and ' +
-    '`@layer xds-theme` / `@layer xds-base` cascade-layer names all become ' +
-    'their `astryx-*` / `data-astryx-*` forms.',
+    '`[data-xds-theme-prose]` / `[data-xds-media]` attribute selectors, ' +
+    '`@layer xds-theme` / `@layer xds-base` cascade-layer names, and ' +
+    '`@import` of @xds/* package stylesheets (scope rewrite, xds.css->astryx.css, ' +
+    'theme-default/theme-daily->theme-neutral) all become their Astryx forms.',
   pr: '#3092',
   fileExtensions: ['.css', '.scss'],
 };
@@ -52,6 +57,32 @@ function rewriteLayerPrelude(prelude) {
   );
 }
 
+// Rewrite a single @import package-stylesheet specifier value (without quotes)
+// from an @xds/* path to its @astryxdesign/* equivalent. Handles the two
+// non-mechanical cases beyond the scope swap:
+//   @xds/core/xds.css            -> @astryxdesign/core/astryx.css   (file rename)
+//   @xds/theme-default/*         -> @astryxdesign/theme-neutral/*   (collapse)
+//   @xds/theme-daily/*           -> @astryxdesign/theme-neutral/*   (collapse)
+// Returns the original value unchanged if it is not an @xds/* specifier.
+function rewriteImportSpecifier(spec) {
+  if (!spec.startsWith('@xds/')) return spec;
+  // Theme package collapse (default/daily -> neutral).
+  let next = spec
+    .replace(/^@xds\/theme-default(\/|$)/, '@astryxdesign/theme-neutral$1')
+    .replace(/^@xds\/theme-daily(\/|$)/, '@astryxdesign/theme-neutral$1');
+  if (next === spec) {
+    // Not a collapsed theme — plain scope swap.
+    next = spec.replace(/^@xds\//, '@astryxdesign/');
+  }
+  // Core stylesheet file rename: xds.css -> astryx.css (only the core bundle;
+  // reset.css and others keep their names).
+  next = next.replace(
+    /^@astryxdesign\/core\/xds\.css$/,
+    '@astryxdesign/core/astryx.css',
+  );
+  return next;
+}
+
 // Ordered, non-overlapping replacements. Each pattern is intentionally narrow
 // so we never touch a bare `xds` substring outside these surfaces.
 const REPLACEMENTS = [
@@ -62,6 +93,15 @@ const REPLACEMENTS = [
   // Cascade-layer preludes: `@layer <names>` up to the block `{` or `;`.
   // Rewrite only the recognized xds-* layer tokens inside the prelude.
   {re: /@layer\b[^{;]*/g, to: match => rewriteLayerPrelude(match)},
+  // Package stylesheet imports: `@import '@xds/...'` or `@import url('@xds/...')`.
+  // Rewrite only the quoted @xds/* specifier, preserving the quote style.
+  {
+    re: /@import\s+(?:url\(\s*)?(['"])(@xds\/[^'"]+)\1/g,
+    to: (match, quote, spec) => {
+      const next = rewriteImportSpecifier(spec);
+      return next === spec ? match : match.replace(spec, next);
+    },
+  },
 ];
 
 export default function transformer(file /*, api */) {

package/src/codemods/transforms/v0.1.0/migrate-xds-module-specifiers.mjs

@@ -51,12 +51,57 @@ function rewriteLiteral(node) {
   return true;
 }
 
+// @xds/theme-default and @xds/theme-daily both collapse to
+// @astryxdesign/theme-neutral, whose exported theme binding is `neutralTheme`
+// (not `defaultTheme`). When we rewrite an import from one of those packages,
+// remap a `defaultTheme` named import to `neutralTheme`, aliasing back to the
+// original local name so downstream usages keep working unchanged:
+//   import {defaultTheme} from '@xds/theme-default'
+//     -> import {neutralTheme as defaultTheme} from '@astryxdesign/theme-neutral'
+// An already-aliased `{defaultTheme as x}` just has its imported name remapped.
+const THEME_EXPORT_RENAMES = new Map([['defaultTheme', 'neutralTheme']]);
+const COLLAPSED_THEME_SOURCES = new Set([
+  '@xds/theme-default',
+  '@xds/theme-daily',
+]);
+
+function isCollapsedThemeSource(value) {
+  if (typeof value !== 'string') return false;
+  for (const src of COLLAPSED_THEME_SOURCES) {
+    if (value === src || value.startsWith(src + '/')) return true;
+  }
+  return false;
+}
+
+function remapThemeExportNames(importPath, j) {
+  let changed = false;
+  importPath.node.specifiers = (importPath.node.specifiers || []).map(spec => {
+    if (spec.type !== 'ImportSpecifier') return spec;
+    const importedName = spec.imported.name;
+    const renamed = THEME_EXPORT_RENAMES.get(importedName);
+    if (!renamed) return spec;
+    // Preserve the original local binding (so downstream usages keep working),
+    // remapping only the imported name. Build a FRESH specifier node: recast
+    // preserves the printed form of a mutated ImportSpecifier and would drop a
+    // newly-introduced `as local` alias, so mutating in place loses it.
+    const localName = spec.local.name;
+    changed = true;
+    return j.importSpecifier(j.identifier(renamed), j.identifier(localName));
+  });
+  return changed;
+}
+
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
   let hasChanges = false;
 
   root.find(j.ImportDeclaration).forEach(path => {
+    // Remap collapsed-theme export names BEFORE rewriting the source specifier
+    // (the check keys off the original @xds/theme-default|daily path).
+    if (isCollapsedThemeSource(path.node.source.value)) {
+      hasChanges = remapThemeExportNames(path, j) || hasChanges;
+    }
     hasChanges = rewriteLiteral(path.node.source) || hasChanges;
   });
 

package/src/commands/doctor.test.mjs

@@ -4,6 +4,7 @@ import {describe, it, expect, beforeEach, afterEach, vi} from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
+import {fileURLToPath} from 'node:url';
 import {Command} from 'commander';
 
 import {registerDoctor} from './doctor.mjs';
@@ -128,7 +129,7 @@ describe('doctor — individual checks', () => {
     // serve a file written to an arbitrary tmp path at runtime. Write the
     // fixture inside the package tree so Vite can resolve it, then clean up.
     const fixtureDir = fs.mkdtempSync(
-      path.join(path.dirname(new URL(import.meta.url).pathname), '__doctor_cfg_'),
+      path.join(path.dirname(fileURLToPath(import.meta.url)), '__doctor_cfg_'),
     );
     const configPath = path.join(fixtureDir, 'astryx.config.mjs');
     try {
@@ -145,7 +146,7 @@ describe('doctor — individual checks', () => {
 
   it('config: FAIL when astryx.config.mjs throws on import', async () => {
     const fixtureDir = fs.mkdtempSync(
-      path.join(path.dirname(new URL(import.meta.url).pathname), '__doctor_cfg_'),
+      path.join(path.dirname(fileURLToPath(import.meta.url)), '__doctor_cfg_'),
     );
     const configPath = path.join(fixtureDir, 'astryx.config.mjs');
     try {
@@ -160,7 +161,7 @@ describe('doctor — individual checks', () => {
 
   it('config: FAIL when default export is not an object', async () => {
     const fixtureDir = fs.mkdtempSync(
-      path.join(path.dirname(new URL(import.meta.url).pathname), '__doctor_cfg_'),
+      path.join(path.dirname(fileURLToPath(import.meta.url)), '__doctor_cfg_'),
     );
     const configPath = path.join(fixtureDir, 'astryx.config.mjs');
     try {

package/src/utils/paths.test.mjs

@@ -97,7 +97,7 @@ describe('discoverExternalPackages', () => {
     fs.writeFileSync(
       path.join(scopedDir, 'package.json'),
       JSON.stringify({
-        name: '@acme/xds-widgets',
+        name: '@acme/astryx-widgets',
         astryx: {docs: './lib', category: 'Widgets'},
       }),
     );
@@ -105,7 +105,7 @@ describe('discoverExternalPackages', () => {
     const result = discoverExternalPackages(tmpDir);
     expect(result).toEqual([
       {
-        name: '@acme/xds-widgets',
+        name: '@acme/astryx-widgets',
         category: 'Widgets',
         docsDir: path.join(scopedDir, 'lib'),
         blocksDir: null,