@astryxdesign/cli 0.1.0-canary.eb78210 → 0.1.0-canary.f54a06f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.0-canary.eb78210",
+  "version": "0.1.0-canary.f54a06f",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -54,9 +54,9 @@
     "jscodeshift": "^17.3.0"
   },
   "peerDependencies": {
-    "@astryxdesign/core": "0.1.0-canary.eb78210",
-    "@astryxdesign/lab": "0.1.0-canary.eb78210",
-    "@astryxdesign/theme-neutral": "0.1.0-canary.eb78210"
+    "@astryxdesign/core": "0.1.0-canary.f54a06f",
+    "@astryxdesign/lab": "0.1.0-canary.f54a06f",
+    "@astryxdesign/theme-neutral": "0.1.0-canary.f54a06f"
   },
   "peerDependenciesMeta": {
     "@astryxdesign/core": {
@@ -70,9 +70,9 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/core": "0.1.0-canary.eb78210",
-    "@astryxdesign/lab": "0.1.0-canary.eb78210",
-    "@astryxdesign/theme-neutral": "0.1.0-canary.eb78210"
+    "@astryxdesign/core": "0.1.0-canary.f54a06f",
+    "@astryxdesign/lab": "0.1.0-canary.f54a06f",
+    "@astryxdesign/theme-neutral": "0.1.0-canary.f54a06f"
   },
   "scripts": {
     "astryx": "node bin/astryx.mjs",

package/src/codemods/__tests__/registry.test.mjs

@@ -16,6 +16,7 @@ describe('registry', () => {
         '0.0.13',
         '0.0.14',
         '0.0.15',
+        '0.1.0',
       ]);
     });
   });

package/src/codemods/registry.mjs

@@ -17,6 +17,7 @@ const registry = new Map([
   ['0.0.13', () => import('./transforms/v0.0.13/index.mjs')],
   ['0.0.14', () => import('./transforms/v0.0.14/index.mjs')],
   ['0.0.15', () => import('./transforms/v0.0.15/index.mjs')],
+  ['0.1.0', () => import('./transforms/v0.1.0/index.mjs')],
 ]);
 
 // Re-export from the shared utility so registry callers and other consumers

package/src/codemods/runner.mjs

@@ -11,7 +11,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as p from '@clack/prompts';
-import {getRunPrefix} from '../utils/package-manager.mjs';
 import {humanLog} from '../lib/json.mjs';
 
 // Known corruption patterns that indicate a broken transform.
@@ -87,39 +86,6 @@ function findSourceFiles(dir) {
   return results.sort();
 }
 
-/**
- * Detect the project's formatter and run it on changed files.
- * Tries prettier, then biome. Silently skips if none found.
- *
- * @param {string[]} files - Absolute paths to files that were modified
- * @param {boolean} [silent] - Suppress human-facing output
- */
-async function formatChangedFiles(files, silent = false) {
-  if (files.length === 0) return;
-
-  const {execSync} = await import('node:child_process');
-  const fileArgs = files.map(f => `"${f}"`).join(' ');
-  const prefix = getRunPrefix();
-
-  const formatters = [
-    {name: 'prettier', cmd: `${prefix} prettier --write ${fileArgs}`},
-    {name: 'biome', cmd: `${prefix} biome format --write ${fileArgs}`},
-  ];
-
-  for (const {name, cmd} of formatters) {
-    try {
-      execSync(cmd, {stdio: 'pipe', timeout: 30000});
-      if (!silent)
-        p.log.info(
-          `Formatted ${files.length} file${files.length === 1 ? '' : 's'} with ${name}`,
-        );
-      return;
-    } catch {
-      // Formatter not available or failed — try next
-    }
-  }
-}
-
 /**
  * Validate transform output before writing to disk.
  *
@@ -162,6 +128,86 @@ export function validateOutput(result, source, j, {parse = true} = {}) {
   return {valid: true};
 }
 
+function isConfigCodemod(transformEntry) {
+  return transformEntry.meta?.codemodType === 'config';
+}
+
+const CONFIG_CODEMOD_PATHS = new Set([
+  'package.json',
+  'astryx.config.mjs',
+  'xds.config.mjs',
+]);
+
+function resolveConfigPath(relativePath) {
+  if (!CONFIG_CODEMOD_PATHS.has(relativePath)) {
+    throw new Error(`unsupported config codemod path: ${relativePath}`);
+  }
+  return path.resolve(process.cwd(), relativePath);
+}
+
+function readOptionalConfigFile(relativePath) {
+  const fullPath = resolveConfigPath(relativePath);
+  if (!fs.existsSync(fullPath)) return null;
+  return {path: relativePath, source: fs.readFileSync(fullPath, 'utf-8')};
+}
+
+function getConfigCodemodContext() {
+  return {
+    packageJson: readOptionalConfigFile('package.json'),
+    astryxConfig: readOptionalConfigFile('astryx.config.mjs'),
+    xdsConfig: readOptionalConfigFile('xds.config.mjs'),
+  };
+}
+
+async function runConfigCodemod(transformEntry, {apply, log}) {
+  const {transform} = transformEntry;
+  const api = {config: getConfigCodemodContext()};
+  const result = await transform({path: process.cwd(), source: ''}, api);
+  const errors = result?.errors ?? [];
+  if (errors.length > 0) {
+    for (const error of errors) {
+      log.error(`    ✗ ${error.file ?? 'config'} — ${error.error}`);
+    }
+    return {filesChanged: 0, errors};
+  }
+
+  const changes = result?.changes ?? [];
+  if (changes.length === 0) return {filesChanged: 0, errors: []};
+
+  for (const change of changes) {
+    const fullPath = resolveConfigPath(change.path);
+    if (change.delete) {
+      if (apply) fs.rmSync(fullPath, {force: true});
+      log[apply ? 'success' : 'warn'](
+        `    ${apply ? '✓' : '~'} ${change.path} (delete${apply ? '' : ', dry run'})`,
+      );
+      continue;
+    }
+
+    if (apply) {
+      fs.writeFileSync(fullPath, change.source, 'utf-8');
+    }
+    log[apply ? 'success' : 'warn'](
+      `    ${apply ? '✓' : '~'} ${change.path}${apply ? '' : ' (would change)'}`,
+    );
+  }
+
+  if (changes.length > 0) {
+    const verb = apply ? 'Updated' : 'Would update';
+    log.info(
+      `  ${verb} ${changes.length} config file${changes.length === 1 ? '' : 's'}`,
+    );
+  }
+
+  return {
+    filesChanged: changes.length,
+    writtenFiles: changes
+      .filter(change => !change.delete && path.extname(change.path) !== '.json')
+      .map(change => resolveConfigPath(change.path)),
+    errors: [],
+  };
+}
+
 /**
  * Run codemods against source files.
  *
@@ -197,18 +243,12 @@ export async function runCodemods(
 
   if (files.length === 0) {
     log.warn('No source files found.');
-    return {
-      ok: true,
-      totalFilesChanged: 0,
-      totalTransformsApplied: 0,
-      errors: [],
-      writtenFiles: [],
-      skippedOptional: [],
-    };
+  } else {
+    log.info(
+      `Found ${files.length} source file${files.length === 1 ? '' : 's'}`,
+    );
   }
 
-  log.info(`Found ${files.length} source file${files.length === 1 ? '' : 's'}`);
-
   // Dynamically import jscodeshift
   const jscodeshift = (await import('jscodeshift')).default;
 
@@ -239,6 +279,24 @@ export async function runCodemods(
 
       log.info(`  ${meta.title}`);
 
+      if (isConfigCodemod(transformEntry)) {
+        const result = await runConfigCodemod(transformEntry, {apply, log});
+        if (result.errors.length > 0) {
+          for (const error of result.errors) {
+            errors.push({
+              file: error.file ?? 'config',
+              codemod: name,
+              error: error.error,
+            });
+          }
+        } else if (result.filesChanged > 0) {
+          totalFilesChanged += result.filesChanged;
+          totalTransformsApplied += result.filesChanged;
+          writtenFiles.push(...(result.writtenFiles ?? []));
+        }
+        continue;
+      }
+
       let filesChanged = 0;
 
       for (const filePath of files) {
@@ -323,12 +381,6 @@ export async function runCodemods(
     }
   }
 
-  // Post-codemod formatting: run the project's formatter on changed files
-  // so codemods don't introduce style drift (jscodeshift may change quotes, etc.)
-  if (apply && writtenFiles.length > 0) {
-    await formatChangedFiles(writtenFiles, silent);
-  }
-
   if (totalValidationBlocked > 0) {
     log.warn(
       `${totalValidationBlocked} file${totalValidationBlocked === 1 ? ' was' : 's were'} blocked by validation — no changes written to ${totalValidationBlocked === 1 ? 'that file' : 'those files'}.`,
@@ -366,7 +418,9 @@ export async function runCodemods(
       if (meta.description) {
         log.info(`    ${meta.description}`);
       }
-      log.info(`    Run: astryx upgrade --codemod ${name} --path <dir> --apply`);
+      log.info(
+        `    Run: astryx upgrade --codemod ${name} --path <dir> --apply`,
+      );
     }
   }
 

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

@@ -0,0 +1,116 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+import {describe, it, expect} from 'vitest';
+
+async function applyConfigCodemod(files) {
+  const {default: transform} =
+    await import('../migrate-xds-config-surfaces.mjs');
+  const config = {
+    packageJson: files['package.json']
+      ? {path: 'package.json', source: files['package.json']}
+      : null,
+    astryxConfig: files['astryx.config.mjs']
+      ? {path: 'astryx.config.mjs', source: files['astryx.config.mjs']}
+      : null,
+    xdsConfig: files['xds.config.mjs']
+      ? {path: 'xds.config.mjs', source: files['xds.config.mjs']}
+      : null,
+  };
+  return transform({path: process.cwd(), source: ''}, {config});
+}
+
+describe('migrate-xds-config-surfaces', () => {
+  it('extracts package.json xds config into astryx.config.mjs and removes the package key in place', async () => {
+    const input = `{
+    "dependencies": {"@xds/core":"^0.0.15"},
+    "xds"  : {"theme":"neutral","docs":"./src"}
+}
+`;
+
+    const result = await applyConfigCodemod({'package.json': input});
+    expect(result.errors ?? []).toEqual([]);
+    expect(result.changes).toEqual([
+      {
+        path: 'package.json',
+        source: `{
+    "dependencies": {"@xds/core":"^0.0.15"}
+}
+`,
+      },
+      {
+        path: 'astryx.config.mjs',
+        source: `export default {
+  "theme": "neutral",
+  "docs": "./src"
+};
+`,
+      },
+    ]);
+  });
+
+  it('extracts package.json astryx config into astryx.config.mjs too', async () => {
+    const result = await applyConfigCodemod({
+      'package.json': `{"astryx":{"theme":"neutral"}}\n`,
+    });
+    expect(result.changes).toEqual([
+      {path: 'package.json', source: `{}\n`},
+      {
+        path: 'astryx.config.mjs',
+        source: `export default {
+  "theme": "neutral"
+};
+`,
+      },
+    ]);
+  });
+
+  it('bails when package.json contains both xds and astryx config keys', async () => {
+    const result = await applyConfigCodemod({
+      'package.json': `{"xds":{"theme":"default"},"astryx":{"theme":"neutral"}}\n`,
+    });
+    expect(result.errors?.[0]?.error).toMatch(/both xds and astryx/);
+  });
+
+  it('does not rewrite dependency keys in package.json', async () => {
+    const input = `{"dependencies":{"@xds/core":"^0.0.15"}}\n`;
+    const result = await applyConfigCodemod({'package.json': input});
+    expect(result.changes).toEqual([]);
+  });
+
+  it('bails when package config and astryx.config.mjs both exist', async () => {
+    const result = await applyConfigCodemod({
+      'package.json': `{"xds":{"theme":"neutral"}}\n`,
+      'astryx.config.mjs': `export default {};\n`,
+    });
+    expect(result.errors?.[0]?.error).toMatch(/migrate the config manually/);
+  });
+
+  it('bails when package config and xds.config.mjs both exist', async () => {
+    const result = await applyConfigCodemod({
+      'package.json': `{"xds":{"theme":"neutral"}}\n`,
+      'xds.config.mjs': `export default {};\n`,
+    });
+    expect(result.errors?.[0]?.error).toMatch(/migrate the config manually/);
+  });
+
+  it('renames xds.config.mjs to astryx.config.mjs when no package config exists', async () => {
+    const result = await applyConfigCodemod({
+      'xds.config.mjs': "export default { theme: 'neutral' };\n",
+    });
+    expect(result.changes).toEqual([
+      {
+        path: 'astryx.config.mjs',
+        source: "export default { theme: 'neutral' };\n",
+      },
+      {path: 'xds.config.mjs', delete: true},
+    ]);
+  });
+
+  it('bails when xds.config.mjs and astryx.config.mjs both exist', async () => {
+    const result = await applyConfigCodemod({
+      'xds.config.mjs': `export default {};\n`,
+      'astryx.config.mjs': `export default {};\n`,
+    });
+    expect(result.errors?.[0]?.error).toMatch(/migrate the config manually/);
+  });
+});

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

@@ -0,0 +1,51 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+import {describe, it, expect} from 'vitest';
+
+async function applyTransform(source, filePath = 'test.tsx') {
+  const {default: transform} =
+    await import('../migrate-xds-module-specifiers.mjs');
+  const jscodeshift = (await import('jscodeshift')).default;
+  const j = jscodeshift.withParser('tsx');
+  const api = {jscodeshift: j, stats: () => {}, report: () => {}};
+  const file = {source, path: filePath};
+  const result = transform(file, api);
+  return result ?? source;
+}
+
+describe('migrate-xds-module-specifiers', () => {
+  it('renames import and export source paths including subpaths', async () => {
+    const input = [
+      "import {Button} from '@xds/core/Button';",
+      "import '@xds/theme-default/theme.css';",
+      "export {LabThing} from '@xds/lab/Thing';",
+      "export * from '@xds/core/theme';",
+    ].join('\n');
+
+    const output = await applyTransform(input);
+    expect(output).toContain('@astryxdesign/core/Button');
+    expect(output).toContain('@astryxdesign/theme-neutral/theme.css');
+    expect(output).toContain('@astryxdesign/lab/Thing');
+    expect(output).toContain('@astryxdesign/core/theme');
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('renames dynamic import and require string literals', async () => {
+    const output = await applyTransform(
+      [
+        "const mod = await import('@xds/core/theme');",
+        "const core = require('@xds/core');",
+      ].join('\n'),
+      'test.ts',
+    );
+    expect(output).toContain('@astryxdesign/core/theme');
+    expect(output).toContain('@astryxdesign/core');
+    expect(output).not.toContain('@xds/');
+  });
+
+  it('does not rewrite ordinary string literals', async () => {
+    const input = "const packageName = '@xds/core';";
+    const output = await applyTransform(input, 'test.ts');
+    expect(output).toBe(input);
+  });
+});

package/src/codemods/transforms/v0.1.0/index.mjs

@@ -0,0 +1,28 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file v0.1.0 transform manifest
+ *
+ * Lists all codemods for the v0.1.0 release in the order they should run.
+ */
+
+import migrateXdsConfigSurfaces, {
+  meta as migrateXdsConfigSurfacesMeta,
+} from './migrate-xds-config-surfaces.mjs';
+
+import migrateXdsModuleSpecifiers, {
+  meta as migrateXdsModuleSpecifiersMeta,
+} from './migrate-xds-module-specifiers.mjs';
+
+export default [
+  {
+    name: 'migrate-xds-config-surfaces',
+    transform: migrateXdsConfigSurfaces,
+    meta: migrateXdsConfigSurfacesMeta,
+  },
+  {
+    name: 'migrate-xds-module-specifiers',
+    transform: migrateXdsModuleSpecifiers,
+    meta: migrateXdsModuleSpecifiersMeta,
+  },
+];

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

@@ -0,0 +1,230 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Codemod: migrate XDS config surfaces to Astryx v0.1.0
+ *
+ * The v0.1.0 CLI reads astryx.config.mjs. This config codemod migrates
+ * legacy xds.config.mjs and package.json's top-level `xds` config without
+ * changing dependency names or versions.
+ */
+
+export const meta = {
+  title: 'Migrate xds config surfaces to astryx',
+  description:
+    'Moves legacy package.json xds config into astryx.config.mjs, or renames ' +
+    'xds.config.mjs when no package.json config exists. Bails out if both exist.',
+  pr: '#3092',
+  codemodType: 'config',
+};
+
+function findTopLevelKey(source, targetKey) {
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  let stringStart = -1;
+
+  for (let i = 0; i < source.length; i++) {
+    const ch = source[i];
+
+    if (inString) {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (ch === '\\') {
+        escaped = true;
+        continue;
+      }
+      if (ch !== '"') continue;
+
+      inString = false;
+      const rawKey = source.slice(stringStart + 1, i);
+      if (depth !== 1 || rawKey !== targetKey) continue;
+
+      let j = i + 1;
+      while (/\s/.test(source[j] ?? '')) j++;
+      if (source[j] !== ':') continue;
+
+      const valueStart = j + 1;
+      const value = readJsonValue(source, valueStart);
+      if (!value) return null;
+      return {keyStart: stringStart, keyEnd: i + 1, colon: j, ...value};
+    }
+
+    if (ch === '"') {
+      inString = true;
+      stringStart = i;
+      continue;
+    }
+    if (ch === '{' || ch === '[') depth++;
+    else if (ch === '}' || ch === ']') depth--;
+  }
+  return null;
+}
+
+function readJsonValue(source, start) {
+  let i = start;
+  while (/\s/.test(source[i] ?? '')) i++;
+  const valueStart = i;
+  let inString = false;
+  let escaped = false;
+  let depth = 0;
+
+  for (; i < source.length; i++) {
+    const ch = source[i];
+    if (inString) {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (ch === '\\') {
+        escaped = true;
+        continue;
+      }
+      if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      continue;
+    }
+    if (ch === '{' || ch === '[') {
+      depth++;
+      continue;
+    }
+    if (ch === '}' || ch === ']') {
+      if (depth === 0) break;
+      depth--;
+      continue;
+    }
+    if (depth === 0 && ch === ',') break;
+  }
+
+  const valueEnd = i;
+  const rawValue = source.slice(valueStart, valueEnd).trim();
+  try {
+    JSON.parse(rawValue);
+  } catch {
+    return null;
+  }
+  return {valueStart, valueEnd, rawValue, terminator: source[i]};
+}
+
+function removeTopLevelProperty(source, property) {
+  let removeStart = property.keyStart;
+  let removeEnd = property.valueEnd;
+
+  if (source[removeEnd] === ',') {
+    removeEnd++;
+    if (source[removeEnd] === '\n') removeEnd++;
+    return source.slice(0, removeStart) + source.slice(removeEnd);
+  }
+
+  let i = removeStart - 1;
+  while (/\s/.test(source[i] ?? '')) i--;
+  if (source[i] === ',') {
+    const whitespaceBetweenCommaAndKey = source.slice(i + 1, removeStart);
+    const preservedWhitespace = whitespaceBetweenCommaAndKey.includes('\n')
+      ? '\n'
+      : '';
+    return source.slice(0, i) + preservedWhitespace + source.slice(removeEnd);
+  }
+
+  return source.slice(0, removeStart) + source.slice(removeEnd);
+}
+
+function formatConfigSource(rawConfig) {
+  const parsed = JSON.parse(rawConfig);
+  return `export default ${JSON.stringify(parsed, null, 2)};\n`;
+}
+
+function migratePackageJsonConfig(config) {
+  if (!config.packageJson) return {changes: []};
+
+  const packageJson = config.packageJson.source;
+  const xdsConfig = findTopLevelKey(packageJson, 'xds');
+  const astryxConfig = findTopLevelKey(packageJson, 'astryx');
+  if (!xdsConfig && !astryxConfig) return {changes: []};
+
+  if (config.astryxConfig) {
+    return {
+      errors: [
+        {
+          file: 'package.json',
+          error:
+            'package.json contains xds/astryx config and astryx.config.mjs already exists; migrate the config manually.',
+        },
+      ],
+    };
+  }
+
+  if (xdsConfig && astryxConfig) {
+    return {
+      errors: [
+        {
+          file: 'package.json',
+          error:
+            'package.json contains both xds and astryx config keys; migrate the config manually.',
+        },
+      ],
+    };
+  }
+
+  const configProperty = astryxConfig ?? xdsConfig;
+  const packageJsonWithoutConfig = removeTopLevelProperty(
+    packageJson,
+    configProperty,
+  );
+  return {
+    changes: [
+      {path: 'package.json', source: packageJsonWithoutConfig},
+      {
+        path: 'astryx.config.mjs',
+        source: formatConfigSource(configProperty.rawValue),
+      },
+    ],
+  };
+}
+
+function migrateXdsConfigFile(config) {
+  if (!config.xdsConfig) return {changes: []};
+  if (config.astryxConfig) {
+    return {
+      errors: [
+        {
+          file: 'xds.config.mjs',
+          error:
+            'xds.config.mjs and astryx.config.mjs both exist; migrate the config manually.',
+        },
+      ],
+    };
+  }
+  return {
+    changes: [
+      {path: 'astryx.config.mjs', source: config.xdsConfig.source},
+      {path: 'xds.config.mjs', delete: true},
+    ],
+  };
+}
+
+export default function transformer(_file, api) {
+  const config = api.config ?? {};
+  const packageResult = migratePackageJsonConfig(config);
+  if (packageResult.errors?.length) return packageResult;
+  if (packageResult.changes?.length) {
+    if (config.xdsConfig) {
+      return {
+        errors: [
+          {
+            file: 'package.json',
+            error:
+              'package.json contains xds/astryx config and xds.config.mjs exists; migrate the config manually.',
+          },
+        ],
+      };
+    }
+    return packageResult;
+  }
+
+  return migrateXdsConfigFile(config);
+}