@astryxdesign/cli 0.6.4-canary.ed2e54e → 0.6.4

package/clients/cli/commands/component/index.mjs

@@ -38,7 +38,6 @@ import {doc as componentFn} from '../../../../api/component/component.doc.mjs';
  *
  * @typedef {(
  *   | import('../../../../api/component/component.type.mjs').ComponentListResponse
- *   | import('../../../../api/component/component.type.mjs').ComponentBatchResponse
  *   | import('../../../../api/component/component.type.mjs').ComponentDetailResponse
  *   | import('../../../../api/component/component.type.mjs').ComponentDetailPropsResponse
  *   | import('../../../../api/component/component.type.mjs').ComponentDetailSourceResponse
@@ -68,11 +67,6 @@ function summarize(result) {
       );
       return resultSet({count, resultKind: 'component'});
     }
-    case 'component.batch':
-      return resultSet({
-        count: result.data.results.filter(row => row.status === 'found').length,
-        resultKind: 'component',
-      });
     case 'component.detail':
     case 'component.detail.props':
     case 'component.detail.source':
@@ -88,103 +82,19 @@ function summarize(result) {
   }
 }
 
-/**
- * Project one single-component API result through the existing formatter kit.
- * @param {import('../../../../api/component/component.type.mjs').ComponentSingleResponse} result
- * @param {string} requestedName
- * @param {'full'|'compact'|'brief'} detail
- * @param {ReturnType<typeof resolveTheme>} themeData
- * @returns {import('../../formatters/index.mjs').Block[]}
- */
-function componentDetailBlocks(result, requestedName, detail, themeData) {
-  const resolvedName = (requestedName.split('/').pop() ?? requestedName).replace(
-    /^XDS/,
-    '',
-  );
-  switch (result.type) {
-    case 'component.detail': {
-      /** @type {import('../../formatters/index.mjs').Block[]} */
-      const out = [];
-      if (result.data.parentDoc) {
-        out.push(record(result.data, {fields: ['parentDoc']}));
-      }
-      out.push(
-        detail === 'brief'
-          ? code(
-              formatBrief(result.data, resolvedName, result.data.import, {
-                themeData,
-              }),
-            )
-          : detail === 'compact'
-            ? code(
-                formatCompact(result.data, resolvedName, result.data.import),
-              )
-            : code(
-                formatFull(result.data, {
-                  themeData,
-                  importHint: result.data.import,
-                }),
-              ),
-      );
-      return out;
-    }
-    case 'component.detail.props':
-      return [code(formatProps({props: result.data}, resolvedName))];
-    case 'component.detail.source':
-    case 'component.detail.showcase':
-      return [code(result.data.source)];
-    case 'component.detail.blocks': {
-      const {showcase, examples, related} = result.data;
-      /** @type {import('../../formatters/index.mjs').Block[]} */
-      const out = [];
-      if (showcase) {
-        out.push(
-          section('Showcase'),
-          record(showcase, {fields: ['displayName', 'description']}),
-        );
-      }
-      if (examples.length > 0) {
-        out.push(
-          section('Examples'),
-          records(examples, {fields: ['name', 'description']}),
-        );
-      }
-      if (related.length > 0) {
-        out.push(
-          section(
-            `Related: ${related.length} blocks that use ${result.data.component}`,
-          ),
-          list(related.map(block => block.name)),
-        );
-      }
-      if (!showcase && examples.length === 0 && related.length === 0) {
-        out.push(text(`No blocks found for ${result.data.component}`));
-      }
-      return out;
-    }
-    default:
-      return [];
-  }
-}
-
 /**
  * @param {import('commander').Command} program
  */
 export function registerComponent(program) {
   defineCommand(program, componentCommand, {
     fn: componentFn,
-    action: async (
-      /** @type {string[] | undefined} */ names,
-      /** @type {{list?: boolean, category?: string, props?: boolean, source?: boolean, showcase?: boolean, blocks?: boolean, package?: string}} */ options,
-    ) => {
+    action: async (/** @type {string | undefined} */ name, /** @type {{list?: boolean, category?: string, props?: boolean, source?: boolean, showcase?: boolean, blocks?: boolean, package?: string}} */ options) => {
       const run = getCliInvocation();
-      const name = names?.length === 1 ? names[0] : undefined;
-      const apiInput = !names?.length ? undefined : name ?? names;
       const zh = program.opts().zh || false;
       const dense = program.opts().dense || false;
       const lang = program.opts().lang || null;
       const detailSource = program.getOptionValueSource('detail');
-      const isListView = options.list || options.category || !names?.length;
+      const isListView = options.list || options.category || !name;
       // Default detail level is full for single-component view, brief for list views.
       // (List views are scannable name lists; users can opt into compact/full.)
       let detail = program.opts().detail || 'full';
@@ -209,7 +119,7 @@ export function registerComponent(program) {
       /** @type {ComponentResult} */
       let result;
       try {
-        result = /** @type {ComponentResult} */ (await componentApi(apiInput, {
+        result = /** @type {ComponentResult} */ (await componentApi(name, {
           cwd: process.cwd(),
           list: options.list,
           category: options.category,
@@ -227,12 +137,6 @@ export function registerComponent(program) {
       }
 
       const answered = summarize(result);
-      if (
-        result.type === 'component.batch' &&
-        result.data.results.some(row => row.status !== 'found')
-      ) {
-        process.exitCode = 1;
-      }
       if (json) {
         jsonOut(result);
         return answered;
@@ -248,7 +152,7 @@ export function registerComponent(program) {
       const listFooter = text(
         [
           `Import from the path shown (e.g. import {Button} from '@astryxdesign/core/Button')`,
-          `Usage: ${run} component <name> [name...]`,
+          `Usage: ${run} component <name>`,
         ].join('\n'),
       );
 
@@ -327,65 +231,64 @@ export function registerComponent(program) {
           break;
         }
 
-        case 'component.batch': {
+        case 'component.detail': {
+          const resolvedName = (name || '').replace(/^XDS/, '');
+          const importHint = result.data.import;
+          if (result.data.parentDoc) emit(record(result.data, {fields: ['parentDoc']}));
+          const doc =
+            detail === 'brief'
+              ? code(formatBrief(result.data, resolvedName, importHint, {themeData}))
+              : detail === 'compact'
+                ? code(formatCompact(result.data, resolvedName, importHint))
+                : code(formatFull(result.data, {themeData, importHint}));
+          emit(doc);
+          break;
+        }
+
+        case 'component.detail.props': {
+          const resolvedName = (name || '').replace(/^XDS/, '');
+          emit(code(formatProps({props: result.data}, resolvedName)));
+          break;
+        }
+
+        case 'component.detail.source': {
+          emit(code(result.data.source));
+          break;
+        }
+
+        case 'component.detail.showcase': {
+          emit(code(result.data.source));
+          break;
+        }
+
+        case 'component.detail.blocks': {
+          const {showcase, examples, related} = result.data;
           /** @type {import('../../formatters/index.mjs').Block[]} */
-          const out = [
-            section('Component batch'),
-            record({count: result.data.count}),
-            section('Results'),
-          ];
-          for (const row of result.data.results) {
-            out.push(section(row.selector));
-            if (row.status === 'found') {
-              out.push(
-                record(row, {fields: ['selector', 'status']}),
-                section('Result'),
-                ...componentDetailBlocks(
-                  row.result,
-                  row.selector,
-                  detail,
-                  themeData,
-                ),
-              );
-              continue;
-            }
+          const out = [];
+          if (showcase) {
             out.push(
-              record(row, {
-                fields: ['selector', 'status', 'code', 'error'],
-              }),
+              section('Showcase'),
+              record(showcase, {fields: ['displayName', 'description']}),
             );
-            if (row.status === 'ambiguous') {
-              out.push(
-                section('Candidates'),
-                records(row.candidates, {
-                  fields: ['package', 'component', 'kind', 'installed'],
-                }),
-              );
-            } else if (row.suggestions?.length) {
-              out.push(
-                section('Suggestions'),
-                records(row.suggestions, {fields: ['name', 'reason']}),
-              );
-            }
+          }
+          if (examples.length > 0) {
+            out.push(
+              section('Examples'),
+              records(examples, {fields: ['name', 'description']}),
+            );
+          }
+          if (related.length > 0) {
+            out.push(
+              section(`Related: ${related.length} blocks that use ${result.data.component}`),
+              list(related.map(b => b.name)),
+            );
+          }
+          if (!showcase && examples.length === 0 && related.length === 0) {
+            out.push(text(`No blocks found for ${result.data.component}`));
           }
           emit(...out);
           break;
         }
-
-        case 'component.detail':
-        case 'component.detail.props':
-        case 'component.detail.source':
-        case 'component.detail.showcase':
-        case 'component.detail.blocks':
-          emit(
-            ...componentDetailBlocks(
-              result,
-              name ?? '',
-              detail,
-              themeData,
-            ),
-          );
-          break;
       }
       return answered;
     },

package/clients/cli/commands/component-ownership.test.mjs

@@ -277,95 +277,6 @@ describe('component() — integration ownership via config', () => {
     expect(result.data.import).toBe(`${INTEGRATION_NAME}/Toolbar/Search`);
   });
 
-  it('reports every installed candidate for an ambiguous batch selector', async () => {
-    createFixture({extraComponent: 'AppShell'});
-    const result = await component(['MetaAppShell', 'AppShell'], {cwd: tmpDir});
-    expect(result.type).toBe('component.batch');
-    expect(result.data.results[0]).toMatchObject({
-      selector: 'MetaAppShell',
-      status: 'found',
-    });
-    expect(result.data.results[1]).toMatchObject({
-      selector: 'AppShell',
-      status: 'ambiguous',
-      code: 'ERR_UNKNOWN_COMPONENT',
-    });
-    expect(result.data.results[1].candidates).toEqual(
-      expect.arrayContaining([
-        {
-          package: CORE_PACKAGE,
-          component: 'AppShell',
-          kind: 'component',
-          installed: true,
-        },
-        {
-          package: INTEGRATION_NAME,
-          component: 'AppShell',
-          kind: 'component',
-          installed: true,
-        },
-      ]),
-    );
-  });
-
-  it('keeps the single-result envelope for one package-qualified selector', async () => {
-    createFixture();
-    const result = await component('@test/meta@1.2.3/MetaAppShell', {
-      cwd: tmpDir,
-    });
-    expect(result.type).toBe('component.detail');
-    expect(result.data).toMatchObject({
-      name: 'MetaAppShell',
-      package: INTEGRATION_NAME,
-    });
-  });
-
-  it('resolves an exact installed package version and refuses another version', async () => {
-    createFixture();
-    const result = await component(
-      [
-        '@test/meta@1.2.3/MetaAppShell',
-        '@test/meta@9.9.9/MetaAppShell',
-      ],
-      {cwd: tmpDir},
-    );
-    expect(result.type).toBe('component.batch');
-    expect(result.data.results[0]).toMatchObject({
-      selector: '@test/meta@1.2.3/MetaAppShell',
-      status: 'found',
-      result: {type: 'component.detail'},
-    });
-    expect(result.data.results[1]).toMatchObject({
-      selector: '@test/meta@9.9.9/MetaAppShell',
-      status: 'not_found',
-      code: 'ERR_UNKNOWN_PACKAGE',
-      suggestions: [
-        {
-          name: 'astryx discover @test/meta@9.9.9',
-          reason: 'look up this package version',
-        },
-      ],
-    });
-  });
-
-  it('reports a package-qualified selector that conflicts with --package', async () => {
-    createFixture();
-    const result = await component(
-      ['@test/meta/MetaAppShell', 'Button'],
-      {cwd: tmpDir, package: CORE_PACKAGE},
-    );
-    expect(result.type).toBe('component.batch');
-    expect(result.data.results[0]).toMatchObject({
-      selector: '@test/meta/MetaAppShell',
-      status: 'error',
-      code: 'ERR_INVALID_ARGUMENT',
-    });
-    expect(result.data.results[1]).toMatchObject({
-      selector: 'Button',
-      status: 'found',
-    });
-  });
-
   it('JSON list includes integration components as {name, package} objects', async () => {
     createFixture();
     const result = await component(undefined, {cwd: tmpDir, list: true});

package/clients/cli/commands/component.doc.mjs

@@ -16,23 +16,11 @@ export const doc = {
   namespace: 'cli/commands',
   summary: 'List components or print component docs',
   description:
-    'Resolves one or several components by exact selector across core and integration ' +
-    'packages and prints each authored doc, or lists the catalog grouped by category. ' +
-    "Use 'Button', 'widgets/Button', '@acme/widgets/Button', or " +
-    "'@acme/widgets@1.2.3/Button'. A version applies to the package and must match the " +
-    'installed version. Boolean flags narrow every resolved component to just its props, ' +
-    'source, showcase, or example blocks.',
+    'Resolves a component by name across core and integration packages and prints ' +
+    'its authored doc, or lists the catalog grouped by category. Boolean flags narrow ' +
+    'a single component to just its props, source, showcase, or example blocks.',
   fn: 'component',
-  args: [
-    {
-      name: 'names',
-      param: 'name',
-      description:
-        'One or more exact selectors. Use Name, package/Name, @scope/package/Name, or @scope/package@version/Name. Two or more return one ordered batch. At most 100 selectors are accepted.',
-      required: false,
-      variadic: true,
-    },
-  ],
+  args: [{name: 'name', param: 'name', required: false}],
   options: [
     {
       flag: '--list',
@@ -67,16 +55,11 @@ export const doc = {
     {
       flag: '--package <name>',
       param: 'options.package',
-      description:
-        'Scope lookup to an external package (e.g. @acme/xds-widgets)',
+      description: 'Scope lookup to an external package (e.g. @acme/xds-widgets)',
     },
   ],
   examples: [
     {label: 'Browse the catalog', cli: 'astryx component --list'},
-    {
-      label: 'Look up several components',
-      cli: 'astryx component Button Badge Text',
-    },
     {
       label: 'Props table as JSON',
       cli: 'astryx component XDSButton --props --json',
@@ -86,7 +69,7 @@ export const doc = {
     {code: 0, when: 'success'},
     {
       code: 1,
-      when: 'unknown component, category, or package; more than 100 selectors; any batch row is unresolved; or @astryxdesign/core cannot be resolved',
+      when: 'unknown component, category, or package, or @astryxdesign/core cannot be resolved',
     },
   ],
   related: ['search', 'hook', 'docs', 'template', 'swizzle'],

package/clients/cli/commands/debug-result-summary.test.mjs

@@ -179,9 +179,9 @@ describe('DebugEvent result summary', () => {
   it(
     'says so explicitly when a command has no result set',
     async () => {
-      // Bare `integration` prints its subcommand list: nothing was looked
+      // `layout check` returns a verdict on one expression: nothing was looked
       // up, and the run says that rather than leaving four ambiguous nulls.
-      const {event} = await runWithDebug(['integration']);
+      const {event} = await runWithDebug(['layout', 'check', 'VStack>Text']);
       expect(event.output).toMatchObject({
         resultKind: 'none',
         resultCount: null,

package/clients/cli/commands/discover.doc.mjs

@@ -14,13 +14,11 @@ export const doc = {
   name: 'discover',
   displayName: 'astryx discover',
   namespace: 'cli/commands',
-  summary:
-    'Browse and search integrations: the ones you have and the ones you could add',
+  summary: 'Discover external packages and components',
   description:
-    'Lists the integrations this project loads and, when it has a discover source, the ones it could add, with what each one adds. ' +
-    'A package query shows one package: what it adds, every version a source knows, and the command that adds it. ' +
-    "An @scope/name/Component path prints an installed component's doc; any other item path shows that item. " +
-    'Anything else, even an exact component name, searches every item and package and lists the matches. Discover only reads: your package manager installs, updates, and removes packages.',
+    'Explores components contributed by configured external packages and integrations. ' +
+    'With no query it lists those packages; an @scope/name query browses one package; ' +
+    'an @scope/name/Component path or a free-text term resolves to a component doc.',
   fn: 'discover',
   args: [{name: 'query', param: 'query', required: false}],
   options: [
@@ -28,61 +26,19 @@ export const doc = {
       flag: '--components',
       param: 'options.components',
       description:
-        'In the package list, print every component, and every other item, of each package instead of the first 10 and a "+N more" count. No effect on --json output or on a package, component, or search query.',
-    },
-    {
-      flag: '--type <kind>',
-      param: 'options.type',
-      description:
-        'Only one kind: component, template, doc, theme, codemod, or agent-doc. In the list, only packages that add it; in a search, only items of that kind.',
-    },
-    {
-      flag: '--installed',
-      param: 'options.installed',
-      description:
-        'Only what this project has. Cannot be set with --available.',
-    },
-    {
-      flag: '--available',
-      param: 'options.available',
-      description:
-        'Only what this project could add. Cannot be set with --installed.',
-    },
-    {
-      flag: '--limit <n>',
-      param: 'options.limit',
-      description:
-        'Max number of search results, a positive integer (default 20).',
+        'In the package list, print every component of each package instead of the first 10 and a "+N more" count. No effect on --json output or on a package, component, or search query.',
     },
   ],
   examples: [
-    {
-      label: 'List what you have and what you could add',
-      cli: 'astryx discover',
-    },
-    {
-      label: 'List every component of each package',
-      cli: 'astryx discover --components',
-    },
-    {
-      label: 'Only packages that add themes',
-      cli: 'astryx discover --type theme',
-    },
-    {
-      label: 'Browse a package and its versions',
-      cli: 'astryx discover @acme/ui',
-    },
-    {label: 'See one version', cli: 'astryx discover @acme/ui@2.1.0'},
-    {
-      label: 'Search templates you could add',
-      cli: 'astryx discover dashboard --type template --available',
-    },
+    {label: 'List packages', cli: 'astryx discover --json'},
+    {label: 'List every component of each package', cli: 'astryx discover --components'},
+    {label: 'Browse a package', cli: 'astryx discover @acme/ui'},
   ],
   exitCodes: [
     {code: 0, when: 'success'},
     {
       code: 1,
-      when: 'unknown package, version, component, or item; a malformed doc; an invalid --type or --limit; --installed with --available; or a blank query when packages are discovered',
+      when: 'unknown package or component, a malformed doc, or a blank query when packages are discovered',
     },
   ],
   related: ['component', 'search', 'template'],