@astryxdesign/cli 0.1.7 → 0.1.8-canary.07362a9

package/{src/codemods → codemods}/transforms/v0.0.6/migrate-shadow-tokens.mjs

@@ -34,6 +34,7 @@ export const meta = {
     'Renames --elevation-* to --shadow-base/menu/hover/dialog and --inset-shadow-border-*. Also migrates --shadow-1/2/3/4 from the brief numeric naming period.',
 };
 
+/** @type {Record<string, string>} */
 const TOKEN_MAP = {
   '--elevation-input-hover-success': '--inset-shadow-border-positive',
   '--elevation-input-hover-warning': '--inset-shadow-border-warning',
@@ -49,6 +50,7 @@ const TOKEN_MAP = {
   '--shadow-4': '--shadow-dialog',
 };
 
+/** @type {Record<string, string>} */
 const IDENTIFIER_MAP = {
   elevationDefaults: 'shadowDefaults',
   elevationVars: 'shadowVars',
@@ -64,16 +66,21 @@ const OLD_TOKENS_PATTERN = new RegExp(
   'g',
 );
 
-function replaceTokens(str) {
-  return str.replace(OLD_TOKENS_PATTERN, (match) => TOKEN_MAP[match] || match);
+function replaceTokens(/** @type {any} */ str) {
+  return str.replace(OLD_TOKENS_PATTERN, (/** @type {any} */ match) => TOKEN_MAP[match] || match);
 }
 
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
   let hasChanges = false;
 
-  const replaceInStringNode = (path) => {
+  const replaceInStringNode = (/** @type {any} */ path) => {
     if (typeof path.node.value !== 'string') return;
     const original = path.node.value;
     const replaced = replaceTokens(original);
@@ -84,11 +91,11 @@ export default function transformer(file, api) {
   };
 
   root.find(j.StringLiteral).forEach(replaceInStringNode);
-  root.find(j.Literal).forEach((path) => {
+  root.find(j.Literal).forEach((/** @type {any} */ path) => {
     if (typeof path.node.value === 'string') replaceInStringNode(path);
   });
 
-  root.find(j.TemplateLiteral).forEach((path) => {
+  root.find(j.TemplateLiteral).forEach((/** @type {any} */ path) => {
     for (const quasi of path.node.quasis) {
       const originalRaw = quasi.value.raw;
       const replacedRaw = replaceTokens(originalRaw);
@@ -100,7 +107,7 @@ export default function transformer(file, api) {
     }
   });
 
-  root.find(j.Identifier).forEach((path) => {
+  root.find(j.Identifier).forEach((/** @type {any} */ path) => {
     if (Object.hasOwn(IDENTIFIER_MAP, path.node.name)) {
       path.node.name = IDENTIFIER_MAP[path.node.name];
       hasChanges = true;

package/{src/codemods → codemods}/transforms/v0.0.6/migrate-skeleton-radius.mjs

@@ -16,6 +16,7 @@ export const meta = {
     'Replaces semantic radius prop values (inner, content, element, container) with numeric equivalents (0, 1, 2, 3).',
 };
 
+/** @type {Record<string, number>} */
 const RADIUS_MAP = {
   inner: 0,
   content: 1,
@@ -23,6 +24,11 @@ const RADIUS_MAP = {
   container: 3,
 };
 
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
@@ -32,7 +38,7 @@ export default function transformer(file, api) {
     .find(j.JSXOpeningElement, {
       name: {name: 'XDSSkeleton'},
     })
-    .forEach((path) => {
+    .forEach((/** @type {any} */ path) => {
       const attrs = path.node.attributes;
       for (const attr of attrs) {
         if (attr.type !== 'JSXAttribute') continue;

package/{src/codemods → codemods}/transforms/v0.0.6/migrate-token-names.mjs

@@ -66,6 +66,7 @@ export const meta = {
 
 // Ordered longest-first to prevent partial matches
 // (e.g. --color-educational-deemphasized must match before --color-educational)
+/** @type {Record<string, string>} */
 const TOKEN_MAP = {
   '--color-educational-deemphasized': '--color-info-muted',
   '--color-divider-high-contrast': '--color-border-strong',
@@ -114,17 +115,22 @@ const OLD_TOKENS_PATTERN = new RegExp(
   'g',
 );
 
-function replaceTokens(str) {
-  return str.replace(OLD_TOKENS_PATTERN, (match) => TOKEN_MAP[match] || match);
+function replaceTokens(/** @type {any} */ str) {
+  return str.replace(OLD_TOKENS_PATTERN, (/** @type {any} */ match) => TOKEN_MAP[match] || match);
 }
 
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
   let hasChanges = false;
 
   // Replace in string literals (StringLiteral or Literal with string value)
-  const replaceInStringNode = (path) => {
+  const replaceInStringNode = (/** @type {any} */ path) => {
     if (typeof path.node.value !== 'string') return;
     const original = path.node.value;
     const replaced = replaceTokens(original);
@@ -135,14 +141,14 @@ export default function transformer(file, api) {
   };
 
   root.find(j.StringLiteral).forEach(replaceInStringNode);
-  root.find(j.Literal).forEach((path) => {
+  root.find(j.Literal).forEach((/** @type {any} */ path) => {
     if (typeof path.node.value === 'string') {
       replaceInStringNode(path);
     }
   });
 
   // Replace in template literal quasis
-  root.find(j.TemplateLiteral).forEach((path) => {
+  root.find(j.TemplateLiteral).forEach((/** @type {any} */ path) => {
     for (const quasi of path.node.quasis) {
       const original = quasi.value.raw;
       const replaced = replaceTokens(original);

package/{src/codemods → codemods}/transforms/v0.0.7/rename-banner-variant-to-container.mjs

@@ -20,6 +20,11 @@ export const meta = {
   pr: '#814',
 };
 
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
@@ -30,8 +35,8 @@ export default function transformer(file, api) {
     .find(j.JSXOpeningElement, {
       name: {name: 'XDSBanner'},
     })
-    .forEach((path) => {
-      path.node.attributes.forEach((attr) => {
+    .forEach((/** @type {any} */ path) => {
+      path.node.attributes.forEach((/** @type {any} */ attr) => {
         if (attr.type === 'JSXAttribute' && attr.name.name === 'variant') {
           attr.name.name = 'container';
           hasChanges = true;
@@ -40,7 +45,7 @@ export default function transformer(file, api) {
     });
 
   // 2. Rename type references: XDSBannerVariant → XDSBannerContainer
-  root.find(j.Identifier, {name: 'XDSBannerVariant'}).forEach((path) => {
+  root.find(j.Identifier, {name: 'XDSBannerVariant'}).forEach((/** @type {any} */ path) => {
     path.node.name = 'XDSBannerContainer';
     hasChanges = true;
   });

package/{src/codemods → codemods}/transforms/v0.0.8/migrate-token-renames.mjs

@@ -50,6 +50,7 @@ export const meta = {
 // Token string renames (CSS custom property names)
 // =============================================================================
 
+/** @type {Record<string, string>} */
 const TOKEN_MAP = {
   // Color — Core Semantic
   '--color-secondary': '--color-neutral',
@@ -195,6 +196,7 @@ const TOKEN_MAP = {
 // JS identifier renames (import names, variable references)
 // =============================================================================
 
+/** @type {Record<string, string>} */
 const IDENTIFIER_MAP = {
   lineHeightVars: 'typeScaleVars',
   lineHeightDefaults: 'typeScaleDefaults',
@@ -213,21 +215,26 @@ const OLD_TOKENS_PATTERN = new RegExp(
   'g',
 );
 
-function replaceTokens(str) {
-  return str.replace(OLD_TOKENS_PATTERN, (match) => TOKEN_MAP[match] || match);
+function replaceTokens(/** @type {any} */ str) {
+  return str.replace(OLD_TOKENS_PATTERN, (/** @type {any} */ match) => TOKEN_MAP[match] || match);
 }
 
 // =============================================================================
 // Transformer
 // =============================================================================
 
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
   let hasChanges = false;
 
   // --- Pass 1: Rename token strings in string literals ---
-  const replaceInStringNode = (path) => {
+  const replaceInStringNode = (/** @type {any} */ path) => {
     if (typeof path.node.value !== 'string') return;
     const original = path.node.value;
     const replaced = replaceTokens(original);
@@ -238,14 +245,14 @@ export default function transformer(file, api) {
   };
 
   root.find(j.StringLiteral).forEach(replaceInStringNode);
-  root.find(j.Literal).forEach((path) => {
+  root.find(j.Literal).forEach((/** @type {any} */ path) => {
     if (typeof path.node.value === 'string') {
       replaceInStringNode(path);
     }
   });
 
   // --- Pass 2: Rename token strings in template literals ---
-  root.find(j.TemplateLiteral).forEach((path) => {
+  root.find(j.TemplateLiteral).forEach((/** @type {any} */ path) => {
     for (const quasi of path.node.quasis) {
       const original = quasi.value.raw;
       const replaced = replaceTokens(original);
@@ -263,7 +270,7 @@ export default function transformer(file, api) {
   // Special handling for imports: if the target name already exists as an import
   // specifier in the same declaration, remove the old specifier instead of renaming
   // it (avoids duplicate identifier declarations).
-  root.find(j.ImportSpecifier).forEach((importPath) => {
+  root.find(j.ImportSpecifier).forEach((/** @type {any} */ importPath) => {
     const oldName = importPath.node.imported.name;
     if (!Object.hasOwn(IDENTIFIER_MAP, oldName)) return;
 
@@ -271,7 +278,7 @@ export default function transformer(file, api) {
     const declaration = importPath.parent.node;
     const siblings = declaration.specifiers || [];
     const targetExists = siblings.some(
-      (s) =>
+      (/** @type {any} */ s) =>
         s !== importPath.node &&
         s.type === 'ImportSpecifier' &&
         s.imported.name === newName,
@@ -295,7 +302,7 @@ export default function transformer(file, api) {
   });
 
   // Rename remaining non-import identifier references
-  root.find(j.Identifier).forEach((path) => {
+  root.find(j.Identifier).forEach((/** @type {any} */ path) => {
     if (!Object.hasOwn(IDENTIFIER_MAP, path.node.name)) return;
     // Skip import specifiers (already handled above)
     if (path.parent.node.type === 'ImportSpecifier') return;

package/{src/codemods → codemods}/transforms/v0.0.8/rename-endslot-to-endcontent.mjs

@@ -23,13 +23,18 @@ export const meta = {
   pr: '#895',
 };
 
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
   let hasChanges = false;
 
   // 1. Rename JSX prop: <XDSButton endSlot={...} /> → <XDSButton endContent={...} />
-  root.find(j.JSXAttribute, {name: {name: 'endSlot'}}).forEach((path) => {
+  root.find(j.JSXAttribute, {name: {name: 'endSlot'}}).forEach((/** @type {any} */ path) => {
     path.node.name.name = 'endContent';
     hasChanges = true;
   });
@@ -37,7 +42,7 @@ export default function transformer(file, api) {
   // 2. Rename in all Identifier nodes named 'endSlot' that are object keys
   //    This covers both Property and ObjectProperty (parser-dependent),
   //    object literals, destructuring patterns, etc.
-  root.find(j.Identifier, {name: 'endSlot'}).forEach((path) => {
+  root.find(j.Identifier, {name: 'endSlot'}).forEach((/** @type {any} */ path) => {
     const parent = path.parent.node;
 
     // Object property key: { endSlot: value } or { endSlot } (shorthand)

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

@@ -166,15 +166,50 @@ describe('drop-xds-prefix-imports', () => {
     expect(output).toContain('export const other = Card;');
   });
 
-  it('un-prefixes normally when there is NO local collision', async () => {
+  it('un-prefixes override keys inside an @xds/core mock factory', async () => {
     const input = [
-      `import {XDSCodeBlock} from '@xds/core/CodeBlock';`,
-      `export const App = () => <XDSCodeBlock code="x" />;`,
+      `vi.mock('@xds/core/Text', async orig => ({`,
+      `  ...(await orig<typeof import('@xds/core/Text')>()),`,
+      `  useXDSTruncation: () => ({ref: vi.fn(), isTruncated: true, fullText: ''}),`,
+      `}));`,
     ].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');
+    expect(output).toContain('useTruncation:');
+    expect(output).not.toContain('useXDSTruncation');
+    // This codemod does not touch the module-path string (that is the
+    // module-specifiers codemod's job); the @xds/core/Text path stays here.
+    expect(output).toContain(`vi.mock('@xds/core/Text'`);
+  });
+
+  it('un-prefixes component override keys inside a bare @xds/core jest.mock factory', async () => {
+    const input = [
+      `jest.mock('@xds/core', () => ({`,
+      `  XDSButton: () => null,`,
+      `  useXDSToast: () => ({}),`,
+      `}));`,
+    ].join('\n');
+    const output = await applyTransform(input);
+    expect(output).toContain('Button:');
+    expect(output).toContain('useToast:');
+    expect(output).not.toContain('XDSButton');
+    expect(output).not.toContain('useXDSToast');
+  });
+
+  it('does NOT touch mock factory keys for a non-@xds package', async () => {
+    const input = [
+      `vi.mock('some-other-pkg', () => ({`,
+      `  useXDSFoo: () => 1,`,
+      `}));`,
+    ].join('\n');
+    const output = await applyTransform(input);
+    expect(output).toBe(input);
+  });
+
+  it('does NOT touch useXDS keys in an unrelated object literal (not a mock factory)', async () => {
+    const input = [`const config = {`, `  useXDSWhatever: true,`, `};`].join(
+      '\n',
+    );
+    const output = await applyTransform(input);
+    expect(output).toBe(input);
   });
 });

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

@@ -89,4 +89,47 @@ describe('migrate-xds-module-specifiers', () => {
     expect(output).not.toContain('defaultTheme');
     expect(output).not.toContain('neutralTheme as');
   });
+
+  it('rewrites the mocked module path in vi.mock (including the inline import() type arg)', async () => {
+    const input = [
+      "vi.mock('@xds/core/Text', async orig => ({",
+      "  ...(await orig<typeof import('@xds/core/Text')>()),",
+      '}));',
+    ].join('\n');
+    const output = await applyTransform(input);
+    expect(output).toMatch(/vi\.mock\(['"]@astryxdesign\/core\/Text['"]/);
+    // The inline dynamic import() type argument is rewritten too.
+    expect(output).toMatch(/import\(['"]@astryxdesign\/core\/Text['"]\)/);
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('rewrites the mocked module path in jest.mock (bare @xds/core)', async () => {
+    const output = await applyTransform(
+      "jest.mock('@xds/core', () => ({}));",
+      'test.ts',
+    );
+    expect(output).toMatch(/jest\.mock\(['"]@astryxdesign\/core['"]/);
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('rewrites vi.doMock / jest.doMock and a bare mock() call', async () => {
+    const output = await applyTransform(
+      [
+        "vi.doMock('@xds/lab/Thing', () => ({}));",
+        "jest.doMock('@xds/core/Text', () => ({}));",
+        "mock('@xds/core', () => ({}));",
+      ].join('\n'),
+      'test.ts',
+    );
+    expect(output).toMatch(/vi\.doMock\(['"]@astryxdesign\/lab\/Thing['"]/);
+    expect(output).toMatch(/jest\.doMock\(['"]@astryxdesign\/core\/Text['"]/);
+    expect(output).toMatch(/[^.]mock\(['"]@astryxdesign\/core['"]/);
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('does NOT rewrite the mock path for a non-@xds package', async () => {
+    const input = "vi.mock('some-other-pkg', () => ({useXDSFoo: () => 1}));";
+    const output = await applyTransform(input);
+    expect(output).toBe(input);
+  });
 });

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

@@ -35,11 +35,19 @@
  *    including type references in generic type-argument positions such as
  *    `useMemo<XDSTableColumn<Issue>[]>(...)`
  * 3. Re-exports from @xds/core: export {XDSButton} from '@xds/core/Button'
+ * 4. Object-property keys inside a test-framework mock factory for an
+ *    `@xds/core` module: the partial-mock override in
+ *    `vi.mock('@xds/core/Text', async orig => ({...await orig(),
+ *    useXDSTruncation: () => ...}))` must be un-prefixed to `useTruncation`,
+ *    otherwise the key targets a name the renamed module no longer exports and
+ *    the mock silently overrides nothing.
  *
  * Does NOT touch:
  * - import source paths (`@xds/core/Button` stays -- subpath dirs are unchanged
  *   by the prefix migration)
  * - identifiers not bound to an @xds/core import
+ * - object-property keys outside an `@xds/core` mock factory (an unrelated
+ *   `{useXDSFoo: ...}` literal, or a mock of some other package, is untouched)
  * - the `XDSBaseProps`-style names only when they are NOT imported from core
  */
 
@@ -48,7 +56,8 @@ export const meta = {
   description:
     'Rewrites @xds/core imports and their usages from the prefixed names ' +
     '(XDSButton, useXDSTheme, XDSIconRegistry, XDSButtonProps) to their bare ' +
-    'names (Button, useTheme, IconRegistry, ButtonProps). Only renames ' +
+    'names (Button, useTheme, IconRegistry, ButtonProps), including override ' +
+    'keys in a vi.mock/jest.mock factory for an @xds/core module. Only renames ' +
     'bindings imported from @xds/core, leaving unrelated identifiers untouched.',
   pr: '#2880',
 };
@@ -59,7 +68,7 @@ const XDS_CORE_SOURCE = /^@xds\/core(\/.*)?$/;
  * Compute the bare (unprefixed) name for an XDS-prefixed identifier.
  * Returns null if the name is not XDS-prefixed in a renameable way.
  */
-function bareName(name) {
+function bareName(/** @type {any} */ name) {
   if (name.startsWith('useXDS') && name.length > 'useXDS'.length) {
     return 'use' + name.slice('useXDS'.length);
   }
@@ -74,6 +83,86 @@ function bareName(name) {
   return null;
 }
 
+// A test-framework mock of an `@xds/core` module (`vi.mock('@xds/core/Text',
+// factory)`). We only rewrite override keys inside such a factory, so scope the
+// detection tightly: callee must be `vi.mock`/`vi.doMock`/`jest.mock`/
+// `jest.doMock` (or a bare `mock`) AND the first argument must be a string
+// literal that resolves to `@xds/core` (bare or subpath).
+const MOCK_METHOD_NAMES = new Set(['mock', 'doMock']);
+const MOCK_OBJECT_NAMES = new Set(['vi', 'jest']);
+
+function isMockCallee(/** @type {any} */ callee) {
+  if (
+    callee.type === 'MemberExpression' &&
+    !callee.computed &&
+    callee.object.type === 'Identifier' &&
+    MOCK_OBJECT_NAMES.has(callee.object.name) &&
+    callee.property.type === 'Identifier' &&
+    MOCK_METHOD_NAMES.has(callee.property.name)
+  ) {
+    return true;
+  }
+  return callee.type === 'Identifier' && callee.name === 'mock';
+}
+
+function isXdsCoreMockCall(/** @type {any} */ node) {
+  if (node.type !== 'CallExpression' || !isMockCallee(node.callee))
+    return false;
+  const [arg] = node.arguments;
+  const value =
+    arg && (arg.type === 'StringLiteral' || arg.type === 'Literal')
+      ? arg.value
+      : null;
+  return typeof value === 'string' && XDS_CORE_SOURCE.test(value);
+}
+
+// Rename XDS-prefixed object-property KEYS (not values, not nested objects)
+// within the given AST subtree. Used only on a recognized @xds/core mock
+// factory, so the scope guard lives at the call site.
+function renameMockFactoryKeys(/** @type {any} */ node, /** @type {any} */ seen, /** @type {any} */ onChange) {
+  if (!node || typeof node !== 'object') return;
+  if (Array.isArray(node)) {
+    for (const child of node) renameMockFactoryKeys(child, seen, onChange);
+    return;
+  }
+  if (seen.has(node)) return;
+  seen.add(node);
+
+  if (
+    (node.type === 'ObjectProperty' || node.type === 'Property') &&
+    !node.computed &&
+    node.key &&
+    node.key.type === 'Identifier'
+  ) {
+    const bare = bareName(node.key.name);
+    if (bare && bare !== node.key.name) {
+      node.key.name = bare;
+      onChange();
+    }
+  }
+
+  for (const key of Object.keys(node)) {
+    if (
+      key === 'loc' ||
+      key === 'start' ||
+      key === 'end' ||
+      key === 'range' ||
+      key === 'comments' ||
+      key === 'leadingComments' ||
+      key === 'trailingComments' ||
+      key === 'tokens'
+    ) {
+      continue;
+    }
+    renameMockFactoryKeys(node[key], seen, onChange);
+  }
+}
+
+/**
+ * @param {import('../../../types/codemod').AstryxCodemodFile} file
+ * @param {import('../../../types/codemod').CodemodTransformApi} api
+ * @returns {string | null | undefined}
+ */
 export default function transformer(file, api) {
   const j = api.jscodeshift;
   const root = j(file.source);
@@ -92,12 +181,12 @@ export default function transformer(file, api) {
   // 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 => {
+  root.find(j.ImportDeclaration).forEach((/** @type {any} */ path) => {
     for (const spec of path.node.specifiers || []) {
       if (spec.local && spec.local.name) existingBindings.add(spec.local.name);
     }
   });
-  const collectDeclName = node => {
+  const collectDeclName = (/** @type {any} */ node) => {
     if (!node) return;
     if (
       (node.type === 'FunctionDeclaration' ||
@@ -111,7 +200,7 @@ export default function transformer(file, api) {
       }
     }
   };
-  root.find(j.Program).forEach(path => {
+  root.find(j.Program).forEach((/** @type {any} */ path) => {
     for (const stmt of path.node.body) {
       collectDeclName(stmt);
       // Unwrap `export function X` / `export const X`.
@@ -125,11 +214,11 @@ export default function transformer(file, api) {
   });
 
   // 1. Rewrite import specifiers from @xds/core
-  root.find(j.ImportDeclaration).forEach(path => {
+  root.find(j.ImportDeclaration).forEach((/** @type {any} */ path) => {
     const source = path.node.source.value;
     if (typeof source !== 'string' || !XDS_CORE_SOURCE.test(source)) return;
 
-    path.node.specifiers = (path.node.specifiers || []).map(spec => {
+    path.node.specifiers = (path.node.specifiers || []).map((/** @type {any} */ spec) => {
       if (spec.type !== 'ImportSpecifier') return spec; // default/namespace
       const importedName = spec.imported.name;
       const bare = bareName(importedName);
@@ -169,7 +258,7 @@ export default function transformer(file, api) {
   });
 
   // 2. Rewrite re-exports from @xds/core
-  root.find(j.ExportNamedDeclaration).forEach(path => {
+  root.find(j.ExportNamedDeclaration).forEach((/** @type {any} */ path) => {
     if (!path.node.source) return;
     const source = path.node.source.value;
     if (typeof source !== 'string' || !XDS_CORE_SOURCE.test(source)) return;
@@ -190,13 +279,28 @@ export default function transformer(file, api) {
     }
   });
 
+  // 3. Un-prefix override keys inside @xds/core mock factories. Independent of
+  // the import bindings above: the override key is a factory object property,
+  // not a reference to an imported binding, so it must match the renamed export
+  // name of the mocked module regardless of what the file imports.
+  const seenMockNodes = new Set();
+  root.find(j.CallExpression).forEach((/** @type {any} */ path) => {
+    if (!isXdsCoreMockCall(path.node)) return;
+    // Only walk the factory argument(s), never the module-path string.
+    for (const arg of path.node.arguments.slice(1)) {
+      renameMockFactoryKeys(arg, seenMockNodes, () => {
+        hasChanges = true;
+      });
+    }
+  });
+
   if (localRenames.size === 0) {
     return hasChanges ? root.toSource() : undefined;
   }
 
-  // 3. Rename references to renamed local bindings
+  // 4. Rename references to renamed local bindings
   // Identifiers (type refs, value refs, etc.)
-  root.find(j.Identifier).forEach(path => {
+  root.find(j.Identifier).forEach((/** @type {any} */ path) => {
     const newName = localRenames.get(path.node.name);
     if (!newName) return;
     // Skip object property keys like `{ XDSButton: ... }` (not a reference to
@@ -223,7 +327,7 @@ export default function transformer(file, api) {
   });
 
   // JSX element names: <XDSButton> -> <Button>
-  root.find(j.JSXIdentifier).forEach(path => {
+  root.find(j.JSXIdentifier).forEach((/** @type {any} */ path) => {
     const newName = localRenames.get(path.node.name);
     if (newName) {
       path.node.name = newName;
@@ -231,7 +335,7 @@ export default function transformer(file, api) {
     }
   });
 
-  // 4. Rename TS type references in generic type-argument positions.
+  // 5. Rename TS type references in generic type-argument positions.
   //
   // `j.find(j.Identifier)` (and `j.find(j.TSTypeReference)`) do NOT visit
   // identifiers nested inside generic type arguments with the tsx/babel parser
@@ -245,7 +349,7 @@ export default function transformer(file, api) {
   // renamed binding. Renaming already-bare names is a no-op, so re-visiting a
   // node the earlier passes handled is harmless.
   const seenTypeNodes = new Set();
-  const renameTypeReferences = node => {
+  const renameTypeReferences = (/** @type {any} */ node) => {
     if (!node || typeof node !== 'object') return;
     if (Array.isArray(node)) {
       for (const child of node) renameTypeReferences(child);