@astryxdesign/cli 0.1.6-canary.ba37404 → 0.1.6-canary.c899736

package/docs/internationalization.doc.mjs

@@ -16,7 +16,7 @@ export const docs = {
       content: [
         {
           type: 'prose',
-          text: 'Internationalization ships with `@astryxdesign/core`. There is nothing to install. Wrap your app in `<InternationalizationProvider>` and set a `locale` — astryx components pick up localized strings automatically.',
+          text: 'Internationalization ships with `@astryxdesign/core`. There is nothing to install. Wrap your app in `<InternationalizationProvider>` and set a `locale`, and astryx components pick up localized strings automatically.',
         },
         {
           type: 'code',
@@ -45,11 +45,11 @@ function SaveButton() {
         },
         {
           type: 'prose',
-          text: 'The hook is available to consumer components too, but using it is entirely optional — many teams keep their app strings on their existing i18n library (react-intl, i18next, next-intl, LinguiJS) and only use `useTranslator` when reading astryx keys. If you do route your own strings through it, we recommend namespacing them (`@myapp.*` or your npm scope) to keep them separated from `@astryx.*`, but this is a convention, not a requirement — the resolver treats every key as an opaque string.',
+          text: 'The hook is available to consumer components too, but using it is entirely optional: many teams keep their app strings on their existing i18n library (react-intl, i18next, next-intl, LinguiJS) and only use `useTranslator` when reading astryx keys. If you do route your own strings through it, we recommend namespacing them (`@myapp.*` or your npm scope) to keep them separated from `@astryx.*`, but this is a convention, not a requirement; the resolver treats every key as an opaque string.',
         },
         {
           type: 'prose',
-          text: "Astryx ships translations only for English today. First-party translations for other locales are on the roadmap and coming soon — track https://github.com/facebook/astryx/issues/3641. In the meantime, if you want astryx UI translated into another locale, you can ship your own catalog through the `messages` prop (covered in the next section). If you're using `useTranslator` for your own strings, you'll want to ship your own catalog either way — astryx only carries the fallback for `@astryx.*` keys, not the ones you author.",
+          text: "Astryx ships translations only for English today. First-party translations for other locales are on the roadmap; track https://github.com/facebook/astryx/issues/3641. In the meantime, if you want astryx UI translated into another locale, you can ship your own catalog through the `messages` prop (covered in the next section). If you're using `useTranslator` for your own strings, you'll want to ship your own catalog either way, since astryx only carries the fallback for `@astryx.*` keys, not the ones you author.",
         },
       ],
     },
@@ -59,7 +59,7 @@ function SaveButton() {
       content: [
         {
           type: 'prose',
-          text: 'Astryx bundles only the English catalog today. To render in any other locale, provide a translation catalog through the `messages` prop and set `locale` accordingly. This matches how MUI, Ant Design, and AG Grid work — the consumer app supplies the catalogs it actually needs so unused translations stay out of the bundle.',
+          text: 'Astryx bundles only the English catalog today. To render in any other locale, provide a translation catalog through the `messages` prop and set `locale` accordingly. This matches how MUI, Ant Design, and AG Grid work: the consumer app supplies the catalogs it actually needs so unused translations stay out of the bundle.',
         },
         {
           type: 'code',
@@ -74,11 +74,11 @@ import fr from './locales/astryx/fr.json';
         },
         {
           type: 'prose',
-          text: "See `@astryxdesign/core/locales/en.json` for the full inventory of keys to translate. Copy it as the starting point — every key you translate replaces the English default; anything you omit falls back through the locale chain to English (e.g. `pt-BR` walks to `pt` then to shipped `en`), so a partial translation renders as a mix rather than empty text or raw key names.",
+          text: "See `@astryxdesign/core/locales/en.json` for the full inventory of keys to translate. Copy it as the starting point: every key you translate replaces the English default; anything you omit falls back through the locale chain to English (e.g. `pt-BR` walks to `pt` then to shipped `en`), so a partial translation renders as a mix rather than empty text or raw key names.",
         },
         {
           type: 'prose',
-          text: 'A community-maintained set of astryx translations is on the roadmap but not shipped yet. For now, consumer apps that ship in multiple languages own their astryx catalogs alongside their app catalogs. Contributions to a first-party set are welcome — track discussion at https://github.com/facebook/astryx/issues/3641.',
+          text: 'A community-maintained set of astryx translations is on the roadmap but not shipped yet. For now, consumer apps that ship in multiple languages own their astryx catalogs alongside their app catalogs. Contributions to a first-party set are welcome; track discussion at https://github.com/facebook/astryx/issues/3641.',
         },
       ],
     },
@@ -113,7 +113,7 @@ import fr from './locales/astryx/fr.json';
       content: [
         {
           type: 'prose',
-          text: "Astryx components render astryx strings through astryx's provider. Consumer components render consumer strings through whatever i18n library you already use — react-intl, i18next, next-intl, LinguiJS, and so on. The two systems coexist and read from the same source of truth for the active locale.",
+          text: "Astryx components render astryx strings through astryx's provider. Consumer components render consumer strings through whatever i18n library you already use: react-intl, i18next, next-intl, LinguiJS, and so on. The two systems coexist and read from the same source of truth for the active locale.",
         },
         {
           type: 'code',
@@ -165,11 +165,11 @@ export default function App() {
         },
         {
           type: 'prose',
-          text: 'Keep the two providers in sync on locale, and each library owns its own catalog. Astryx never sees your app strings, and your i18n library never sees astryx internals. Runtime locale swap works the same way — re-render both providers with a new `locale` prop and the whole tree updates live.',
+          text: 'Keep the two providers in sync on locale, and each library owns its own catalog. Astryx never sees your app strings, and your i18n library never sees astryx internals. Runtime locale swap works the same way: re-render both providers with a new `locale` prop and the whole tree updates live.',
         },
         {
           type: 'prose',
-          text: "Single-catalog usage — where an external i18n runtime like react-intl or i18next resolves both your app strings AND astryx's strings through one provider — is on the roadmap via a `Translator` adapter. Track https://github.com/facebook/astryx/issues/4029. For now, run the two providers side by side as shown above.",
+          text: "Single-catalog usage (where an external i18n runtime like react-intl or i18next resolves both your app strings AND astryx's strings through one provider) is on the roadmap via a `Translator` adapter. Track https://github.com/facebook/astryx/issues/4029. For now, run the two providers side by side as shown above.",
         },
       ],
     },
@@ -225,7 +225,7 @@ export default function App() {
         },
         {
           type: 'prose',
-          text: "Pseudoloc also has a subtle caveat worth knowing: the pseudo catalog is complete (astryx generates it from every shipped key), so a component using an astryx-shipped key will always render its pseudo version. Your handwritten translation catalogs, on the other hand, only cover the keys you translated — anything missing falls back to English. That means \"looks perfect in pseudo\" is not the same guarantee as \"looks perfect in French.\" Check each real locale by hand for coverage gaps.",
+          text: "Pseudoloc also has a subtle caveat worth knowing: the pseudo catalog is complete (astryx generates it from every shipped key), so a component using an astryx-shipped key will always render its pseudo version. Your handwritten translation catalogs, on the other hand, only cover the keys you translated; anything missing falls back to English. That means \"looks perfect in pseudo\" is not the same guarantee as \"looks perfect in French.\" Check each real locale by hand for coverage gaps.",
         },
       ],
     },
@@ -235,7 +235,7 @@ export default function App() {
       content: [
         {
           type: 'prose',
-          text: "Astryx's own strings live in `packages/core/locales/en.json`. New user-facing strings must go through `useTranslator` — this is enforced by the `@astryx/no-hardcoded-i18n-string` ESLint rule. See the AI contribution guide for the alias-and-resolve pattern used when adding new keys.",
+          text: "Astryx's own strings live in `packages/core/locales/en.json`. New user-facing strings must go through `useTranslator`; this is enforced by the `@astryx/no-hardcoded-i18n-string` ESLint rule. See the AI contribution guide for the alias-and-resolve pattern used when adding new keys.",
         },
       ],
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astryxdesign/cli",
-  "version": "0.1.6-canary.ba37404",
+  "version": "0.1.6-canary.c899736",
   "displayName": "CLI",
   "description": "Scaffold projects, browse templates, generate themes, and get agent-ready docs from the command line.",
   "author": "Meta Open Source",
@@ -47,6 +47,10 @@
       "types": "./src/types/integration.d.ts",
       "import": "./src/integration.mjs"
     },
+    "./doc": {
+      "types": "./src/types/doc.d.ts",
+      "import": "./src/doc.mjs"
+    },
     "./template": {
       "types": "./src/types/template-api.d.ts",
       "import": "./src/template.mjs"
@@ -75,10 +79,10 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@astryxdesign/charts": "0.1.6-canary.ba37404",
-    "@astryxdesign/core": "0.1.6-canary.ba37404",
-    "@astryxdesign/lab": "0.1.6-canary.ba37404",
-    "@astryxdesign/theme-neutral": "0.1.6-canary.ba37404",
+    "@astryxdesign/charts": "0.1.6-canary.c899736",
+    "@astryxdesign/core": "0.1.6-canary.c899736",
+    "@astryxdesign/lab": "0.1.6-canary.c899736",
+    "@astryxdesign/theme-neutral": "0.1.6-canary.c899736",
     "gpt-tokenizer": "^3.4.0"
   },
   "peerDependenciesMeta": {
@@ -96,10 +100,10 @@
     }
   },
   "devDependencies": {
-    "@astryxdesign/charts": "0.1.6-canary.ba37404",
-    "@astryxdesign/core": "0.1.6-canary.ba37404",
-    "@astryxdesign/lab": "0.1.6-canary.ba37404",
-    "@astryxdesign/theme-neutral": "0.1.6-canary.ba37404",
+    "@astryxdesign/charts": "0.1.6-canary.c899736",
+    "@astryxdesign/core": "0.1.6-canary.c899736",
+    "@astryxdesign/lab": "0.1.6-canary.c899736",
+    "@astryxdesign/theme-neutral": "0.1.6-canary.c899736",
     "gpt-tokenizer": "^3.4.0"
   },
   "scripts": {

package/src/api/template.mjs

@@ -8,7 +8,7 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {createJiti} from 'jiti';
 import {loadModuleWithSchema} from '../lib/module-loader.mjs';
-import {TemplateEnvelopeSchema} from '../template.mjs';
+import {TemplateEnvelopeSchema} from '../schemas/template-schema.mjs';
 import {CLI_ROOT, discoverExternalPackages} from '../utils/paths.mjs';
 import {
   assertWithin,

package/src/api/validate-integration.mjs

@@ -67,11 +67,6 @@ function error(code, message) {
   return {code, severity: 'error', message};
 }
 
-/** @param {string} code @param {string} message @returns {Issue} */
-function warning(code, message) {
-  return {code, severity: 'warning', message};
-}
-
 /**
  * Verify each declared contribution root exists on disk. A declared-but-missing
  * root is a `missing_root` error.
@@ -365,6 +360,3 @@ export function summarizeIssues(issues) {
   }
   return {errors, warnings};
 }
-
-// Re-export issue constructors for callers/tests that want them.
-export {error as integrationError, warning as integrationWarning};

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

@@ -20,6 +20,7 @@ describe('registry', () => {
         '0.1.2',
         '0.1.3',
         '0.1.5',
+        '0.1.7',
       ]);
     });
   });

package/src/codemods/registry.mjs

@@ -21,6 +21,7 @@ const registry = new Map([
   ['0.1.2', () => import('./transforms/v0.1.2/index.mjs')],
   ['0.1.3', () => import('./transforms/v0.1.3/index.mjs')],
   ['0.1.5', () => import('./transforms/v0.1.5/index.mjs')],
+  ['0.1.7', () => import('./transforms/v0.1.7/index.mjs')],
 ]);
 
 // Re-export from the shared utility so registry callers and other consumers

package/src/codemods/transforms/v0.1.7/__tests__/migrate-table-tableprops-to-direct-props.test.mjs

@@ -0,0 +1,120 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+import {describe, it, expect} from 'vitest';
+
+async function applyTransform(source) {
+  const {default: transform} = await import(
+    '../migrate-table-tableprops-to-direct-props.mjs'
+  );
+  const jscodeshift = (await import('jscodeshift')).default;
+  const j = jscodeshift.withParser('tsx');
+  const api = {jscodeshift: j, stats: () => {}, report: () => {}};
+  const file = {source, path: 'test.tsx'};
+  const result = transform(file, api);
+  return result ?? source;
+}
+
+const TODO = 'TODO(astryx): tableProps is deprecated';
+
+describe('migrate-table-tableprops-to-direct-props', () => {
+  it('lifts className and style to sibling props', async () => {
+    const input = `import {Table} from '@astryxdesign/core';
+const x = <Table tableProps={{className: 'striped', style: {width: 400}}} columns={cols} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`className='striped'`);
+    expect(output).toContain('style={{width: 400}}');
+    expect(output).not.toContain('tableProps');
+  });
+
+  it(`lifts 'aria-label' and 'data-testid' string keys to hyphenated props`, async () => {
+    const input = `import {Table} from '@astryxdesign/core/Table';
+const x = <Table tableProps={{'aria-label': 'Users', 'data-testid': 'users-table'}} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`aria-label='Users'`);
+    expect(output).toContain(`data-testid='users-table'`);
+    expect(output).not.toContain('tableProps');
+  });
+
+  it('lifts id and an onClick handler', async () => {
+    const input = `import {Table} from '@xds/core';
+const x = <Table tableProps={{id: 'users', onClick: (e) => handle(e)}} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`id='users'`);
+    expect(output).toContain('onClick={(e) => handle(e)}');
+    expect(output).not.toContain('tableProps');
+  });
+
+  it('keeps colliding keys in a shrunken tableProps with a TODO comment', async () => {
+    const input = `import {Table} from '@astryxdesign/core';
+const x = <Table className='mine' tableProps={{className: 'theirs', id: 'users'}} />;`;
+    const output = await applyTransform(input);
+    // Non-colliding key lifted
+    expect(output).toContain(`id='users'`);
+    // Existing sibling wins; colliding key stays inside tableProps
+    expect(output).toContain(`className='mine'`);
+    expect(output).toContain('tableProps={{');
+    expect(output).toContain(`className: 'theirs'`);
+    expect(output).not.toContain('id: ');
+    expect(output).toContain(TODO);
+  });
+
+  it('leaves a dynamic tableProps={identifier} untouched with a TODO comment', async () => {
+    const input = `import {Table} from '@astryxdesign/core';
+const x = <Table tableProps={props} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain('tableProps={props}');
+    expect(output).toContain(TODO);
+  });
+
+  it('leaves an object containing a spread untouched with a TODO comment (no partial lift)', async () => {
+    const input = `import {Table} from '@astryxdesign/core';
+const x = <Table tableProps={{className: 'x', ...rest}} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`tableProps={{className: 'x', ...rest}}`);
+    expect(output).not.toContain(`<Table className=`);
+    expect(output).toContain(TODO);
+  });
+
+  it('transforms aliased Table imports', async () => {
+    const input = `import {Table as DataTable} from '@astryxdesign/core';
+const x = <DataTable tableProps={{className: 'x'}} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`<DataTable className='x' />`);
+    expect(output).not.toContain('tableProps');
+  });
+
+  it('does not touch other components with a tableProps attribute', async () => {
+    const input = `import {Table} from '@astryxdesign/core';
+const a = <Table tableProps={{id: 'users'}} />;
+const b = <OtherComponent tableProps={{className: 'x'}} />;`;
+    const output = await applyTransform(input);
+    expect(output).toContain(`<Table id='users' />`);
+    expect(output).toContain(`<OtherComponent tableProps={{className: 'x'}} />`);
+  });
+
+  it('returns undefined for files without a Table import', async () => {
+    const {default: transform} = await import(
+      '../migrate-table-tableprops-to-direct-props.mjs'
+    );
+    const jscodeshift = (await import('jscodeshift')).default;
+    const j = jscodeshift.withParser('tsx');
+    const api = {jscodeshift: j, stats: () => {}, report: () => {}};
+    const source = `import {Grid} from '@astryxdesign/core';
+const x = <Table tableProps={{className: 'x'}} />;`;
+    const result = transform({source, path: 'test.tsx'}, api);
+    expect(result).toBeUndefined();
+  });
+
+  it('returns undefined for already-migrated files (no tableProps)', async () => {
+    const {default: transform} = await import(
+      '../migrate-table-tableprops-to-direct-props.mjs'
+    );
+    const jscodeshift = (await import('jscodeshift')).default;
+    const j = jscodeshift.withParser('tsx');
+    const api = {jscodeshift: j, stats: () => {}, report: () => {}};
+    const source = `import {Table} from '@astryxdesign/core';
+const x = <Table className='x' />;`;
+    const result = transform({source, path: 'test.tsx'}, api);
+    expect(result).toBeUndefined();
+  });
+});

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

@@ -0,0 +1,19 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file v0.1.7 transform manifest
+ *
+ * Lists all codemods for the v0.1.7 release in the order they should run.
+ */
+
+import migrateTableTablePropsToDirectProps, {
+  meta as migrateTableTablePropsToDirectPropsMeta,
+} from './migrate-table-tableprops-to-direct-props.mjs';
+
+export default [
+  {
+    name: 'migrate-table-tableprops-to-direct-props',
+    transform: migrateTableTablePropsToDirectProps,
+    meta: migrateTableTablePropsToDirectPropsMeta,
+  },
+];

package/src/codemods/transforms/v0.1.7/migrate-table-tableprops-to-direct-props.mjs

@@ -0,0 +1,188 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Codemod: Migrate Table tableProps to direct root props
+ * @see https://github.com/facebook/astryx/issues/3679
+ *
+ * `tableProps` (typed HTMLAttributes<HTMLTableElement>, nesting HTML
+ * attributes one level deep) is deprecated. As of v0.1.7, <Table> honors
+ * className/style/xstyle directly and spreads all other BaseProps
+ * (id, aria-*, data-*, event handlers, ...) onto the root <table>, with
+ * direct props taking precedence over tableProps.
+ *
+ * This codemod lifts object-literal `tableProps` keys into sibling JSX
+ * props:
+ *
+ * - tableProps={{className: 'x', style: s}} → className="x" style={s}
+ * - String-literal keys ('aria-label', 'data-testid') become hyphenated
+ *   JSX attributes.
+ * - Keys that collide with an existing sibling attribute (or fail the
+ *   attribute-name guard) are kept inside a shrunken tableProps with a
+ *   trailing TODO comment for manual migration.
+ * - Dynamic values (tableProps={props}, tableProps={fn()}, objects with
+ *   spreads/computed keys/methods) are left untouched with a TODO comment.
+ *
+ * Only elements whose name resolves to a `Table` import (alias-aware)
+ * from an Astryx core source are rewritten. No import changes are needed.
+ */
+
+export const meta = {
+  title: 'Migrate Table tableProps to direct root props',
+  description:
+    'Lifts object-literal `tableProps` keys on <Table> into sibling JSX props ' +
+    '(className, style, id, aria-*, data-*, event handlers). Dynamic or ' +
+    'colliding entries are kept and annotated with a TODO comment.',
+  pr: '#3679',
+};
+
+/** Import sources that provide the Astryx Table component. */
+const TABLE_IMPORT_SOURCES = new Set([
+  '@astryxdesign/core',
+  '@astryxdesign/core/Table',
+  '@xds/core',
+  '@xds/core/Table',
+]);
+
+/** Keys must be valid JSX attribute names to be lifted. */
+const LIFTABLE_KEY_RE = /^[a-zA-Z_][a-zA-Z0-9_-]*$/;
+
+const TODO_COMMENT =
+  ' TODO(astryx): tableProps is deprecated — merge these into direct props manually ';
+
+/**
+ * Extract the static key name from an object property, or null when the
+ * property is not a simple liftable entry (spread, computed key, method,
+ * getter/setter, non-string literal key).
+ */
+function getPropertyKeyName(prop) {
+  if (prop.type !== 'ObjectProperty' && prop.type !== 'Property') return null;
+  // espree-style Property nodes: skip methods and accessors
+  if (prop.method || (prop.kind != null && prop.kind !== 'init')) return null;
+  if (prop.computed) return null;
+  const key = prop.key;
+  if (key.type === 'Identifier') return key.name;
+  if (
+    (key.type === 'StringLiteral' || key.type === 'Literal') &&
+    typeof key.value === 'string'
+  ) {
+    return key.value;
+  }
+  return null;
+}
+
+export default function transformer(file, api) {
+  const j = api.jscodeshift;
+  const root = j(file.source);
+  let hasChanges = false;
+
+  // --- 1. Track local names for the Table import (alias-aware) ---
+  const tableLocals = new Set();
+  root.find(j.ImportDeclaration).forEach((path) => {
+    if (!TABLE_IMPORT_SOURCES.has(path.node.source.value)) return;
+    for (const spec of path.node.specifiers ?? []) {
+      if (spec.type === 'ImportSpecifier' && spec.imported.name === 'Table') {
+        tableLocals.add(spec.local.name);
+      }
+    }
+  });
+
+  if (tableLocals.size === 0) return undefined;
+
+  function attachTodo(attr) {
+    if (!attr.comments) attr.comments = [];
+    if (attr.comments.some((c) => c.value === TODO_COMMENT)) return;
+    attr.comments.push(j.commentBlock(TODO_COMMENT, false, true));
+    hasChanges = true;
+  }
+
+  function buildAttributeValue(valueNode) {
+    if (
+      valueNode.type === 'StringLiteral' ||
+      (valueNode.type === 'Literal' && typeof valueNode.value === 'string')
+    ) {
+      return j.stringLiteral(valueNode.value);
+    }
+    return j.jsxExpressionContainer(valueNode);
+  }
+
+  // --- 2. Rewrite tableProps on tracked <Table> elements ---
+  root.find(j.JSXOpeningElement).forEach((path) => {
+    const name = path.node.name;
+    const componentName = name.type === 'JSXIdentifier' ? name.name : null;
+    if (!componentName || !tableLocals.has(componentName)) return;
+
+    const attrs = path.node.attributes;
+    const tablePropsAttr = attrs.find(
+      (a) => a.type === 'JSXAttribute' && a.name?.name === 'tableProps',
+    );
+    if (!tablePropsAttr) return;
+
+    const value = tablePropsAttr.value;
+    const isObjectLiteral =
+      value?.type === 'JSXExpressionContainer' &&
+      value.expression.type === 'ObjectExpression';
+
+    // Dynamic case: tableProps={identifier}, tableProps={fn()}, ... —
+    // leave the attribute untouched and warn via a trailing comment
+    // (api.report is a stub; comments are the only warning channel).
+    if (!isObjectLiteral) {
+      attachTodo(tablePropsAttr);
+      return;
+    }
+
+    const obj = value.expression;
+
+    // Objects containing spreads, computed keys, or methods are treated
+    // as dynamic: no partial lift, just the TODO comment.
+    const allSimple = obj.properties.every(
+      (prop) => getPropertyKeyName(prop) !== null,
+    );
+    if (!allSimple) {
+      attachTodo(tablePropsAttr);
+      return;
+    }
+
+    const lifted = [];
+    const kept = [];
+    for (const prop of obj.properties) {
+      const keyName = getPropertyKeyName(prop);
+      const collidesWithSibling = attrs.some(
+        (a) => a.type === 'JSXAttribute' && a.name?.name === keyName,
+      );
+      const collidesWithLifted = lifted.some(
+        (a) => a.name.name === keyName,
+      );
+      if (
+        !LIFTABLE_KEY_RE.test(keyName) ||
+        collidesWithSibling ||
+        collidesWithLifted
+      ) {
+        kept.push(prop);
+        continue;
+      }
+      lifted.push(
+        j.jsxAttribute(
+          j.jsxIdentifier(keyName),
+          buildAttributeValue(prop.value),
+        ),
+      );
+    }
+
+    const tablePropsIdx = attrs.indexOf(tablePropsAttr);
+    if (kept.length === 0) {
+      // All keys lifted — replace tableProps with the sibling attributes.
+      attrs.splice(tablePropsIdx, 1, ...lifted);
+      hasChanges = true;
+    } else {
+      // Some keys collide or fail the name guard — keep only those in a
+      // shrunken tableProps and flag it for manual migration.
+      attrs.splice(tablePropsIdx, 0, ...lifted);
+      obj.properties = kept;
+      attachTodo(tablePropsAttr);
+      if (lifted.length > 0) hasChanges = true;
+    }
+  });
+
+  if (!hasChanges) return undefined;
+  return root.toSource({quote: 'single'});
+}

package/src/commands/agent-docs.mjs

@@ -197,6 +197,20 @@ export function generateCompressedIndex(version, {coreDir, runPrefix = getRunPre
     lines.push("- Custom styling: component props first; else style/className with tokens — var(--color-*|--spacing-*|--radius-*). No raw hex/px. (No StyleX/Tailwind compiler here — don't use xstyle/utility classes.)");
   }
   lines.push('- Tokens for every value (`astryx docs tokens`). Brand/accent via `astryx theme` — never override --color-* in :root.');
+  // Self-check — post-generation pass. Validated via vibe tests (internal/vibe-tests/
+  // prompt-purity-test): on complex multi-step UIs the rules above alone still leave raw
+  // CSS in ~11-13% of runs; a re-read-and-fix pass cuts that ~4x at negligible token cost.
+  // The fix names the sanctioned escape hatch for the configured system.
+  const selfCheckFix = {
+    stylex:
+      'replace any className=, style={{…}}, raw <div>/<span> layout, imported .css/@apply, or hardcoded #hex/px with the component or the xstyle prop + a token',
+    tailwind:
+      'replace any style={{…}}, raw <div>/<span> layout, imported .css/@apply, or hardcoded/arbitrary value (e.g. bg-[#fff], p-[13px]) with the component or a token-backed utility',
+    css: 'replace any raw <div>/<span> layout, imported .css/@apply, or hardcoded value (#hex, 16px) with the component or a token (var(--color-*|--spacing-*|…))',
+  };
+  lines.push(
+    `- SELF-CHECK before you finish: re-read the file and ${selfCheckFix[stylingSystem] ?? selfCheckFix.css}. If unsure a component/prop exists, run \`astryx component <Name>\` / \`astryx search "<thing>"\`; don't hand-roll CSS.`,
+  );
   lines.push('');
 
   // Command reference — build/template/component are covered in WORKFLOW above.

package/src/commands/agent-docs.test.mjs

@@ -43,6 +43,26 @@ describe('generateCompressedIndex', () => {
     expect(result).toMatch(/never override --color-/);
   });
 
+  it('includes the post-generation self-check rule', () => {
+    const result = generateCompressedIndex('1.0.0');
+    expect(result).toContain('SELF-CHECK before you finish');
+    expect(result).toMatch(/re-read the file/);
+    expect(result).toMatch(/don't hand-roll CSS/);
+  });
+
+  it('tailors the self-check to the styling system (xstyle for StyleX, not className for Tailwind)', () => {
+    // StyleX path: className/inline style are veers; the fix is the xstyle prop + a token
+    const stylex = generateCompressedIndex('1.0.0', {stylingSystem: 'stylex'});
+    const stylexSelfCheck = stylex.split('\n').find(l => l.includes('SELF-CHECK'));
+    expect(stylexSelfCheck).toMatch(/xstyle/);
+    expect(stylexSelfCheck).toMatch(/className=/);
+    // className IS the system in Tailwind — it must NOT be flagged
+    const tailwind = generateCompressedIndex('1.0.0', {stylingSystem: 'tailwind'});
+    const tailwindSelfCheck = tailwind.split('\n').find(l => l.includes('SELF-CHECK'));
+    expect(tailwindSelfCheck).toBeDefined();
+    expect(tailwindSelfCheck).not.toMatch(/className=/);
+  });
+
   it('defaults to the CSS-variable styling path (no compiler)', () => {
     const result = generateCompressedIndex('1.0.0');
     expect(result).toMatch(/style\/className with tokens/);

package/src/config.mjs

@@ -1,18 +1,9 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates.
 
 /**
- * Type-preserving helper for the Astryx config file.
- *
- * This is an intentionally tiny runtime identity function: it returns its
- * argument unchanged. Its value is the exported TypeScript surface from
- * `@astryxdesign/cli/config`, so config files get editor/type feedback without
- * coupling to CLI internals. Validation is NOT performed here — it happens at
- * the load boundary (see `loadModuleWithSchema` + `AstryxConfigSchema`).
- *
- * @template {import('./types/config').AstryxConfig} T
- * @param {T} config
- * @returns {T}
+ * Re-export of the config-authoring helper, which now lives in
+ * `@astryxdesign/core/config` so an app's config file gets type feedback
+ * without depending on the CLI. Kept here so existing
+ * `@astryxdesign/cli/config` imports continue to work unchanged.
  */
-export function createConfig(config) {
-  return config;
-}
+export {createConfig} from '@astryxdesign/core/config';

package/src/doc.mjs

@@ -0,0 +1,27 @@
+// Copyright (c) Meta Platforms, Inc. and affiliates.
+
+/**
+ * @file Doc-authoring API (public `@astryxdesign/cli/doc`).
+ *
+ * The `createComponentDoc`/`createFunctionDoc`/`createDoc` authoring helpers now
+ * live in `@astryxdesign/core/authoring` and are re-exported here so existing
+ * `@astryxdesign/cli/doc` imports keep working. The Zod load-boundary schemas
+ * live in `./schemas/doc-schema.mjs` (core-free) and are re-exported here for
+ * back-compat; internal hot-path code imports them from the schema module
+ * directly so it never depends on core's built `dist/`.
+ */
+
+export {
+  createComponentDoc,
+  createFunctionDoc,
+  createDoc,
+} from '@astryxdesign/core/authoring';
+
+export {
+  ComponentDocKindSchema,
+  FunctionDocKindSchema,
+  GenericDocKindSchema,
+  StampedDocSchema,
+  LegacyDocSchema,
+  ComponentDocSchema,
+} from './schemas/doc-schema.mjs';