@astryxdesign/cli 0.6.3-canary.f22695a → 0.6.3

package/clients/cli/formatters/index.test.mjs

@@ -8,9 +8,6 @@ import {
   list,
   record,
   records,
-  wrapText,
-  displayWidth,
-  WRAP_WIDTH,
   code,
   Block,
   BULLET,
@@ -151,91 +148,3 @@ describe('emit', () => {
     expect(spy).not.toHaveBeenCalled();
   });
 });
-
-describe('wrapText', () => {
-  it('leaves short lines and its own line breaks alone', () => {
-    expect(wrapText('a b\nc')).toBe('a b\nc');
-  });
-
-  it('wraps at the width with a hanging indent', () => {
-    expect(wrapText('aaa bbb ccc', {width: 7, indent: '  '})).toBe('aaa bbb\n  ccc');
-  });
-
-  it('keeps a word longer than the width whole', () => {
-    expect(wrapText('x '.concat('y'.repeat(20)), {width: 10})).toBe(
-      `x\n${'y'.repeat(20)}`,
-    );
-  });
-});
-
-describe('records inline layout', () => {
-  const items = [
-    {id: 'a', title: 'Alpha', summary: 'First.'},
-    {id: 'bbb', title: 'Beta', summary: ''},
-  ];
-
-  it('puts one record on each line under a padded first column', () => {
-    expect(
-      records(items, {fields: ['id', 'title', 'summary'], layout: 'inline'}).toString(),
-    ).toBe('a    Alpha - First.\nbbb  Beta');
-  });
-
-  it('wraps a long record under the first column', () => {
-    const out = records([{id: 'a', text: 'word '.repeat(40).trim()}], {
-      layout: 'inline',
-    }).toString();
-    expect(out.split('\n').length).toBeGreaterThan(1);
-    expect(out.split('\n').every(line => line.length <= WRAP_WIDTH)).toBe(true);
-    expect(out.split('\n')[1].startsWith('   word')).toBe(true);
-  });
-
-  it('keeps the first column padded on a record that wraps', () => {
-    const out = records(
-      [
-        {id: 'a', text: 'word '.repeat(40).trim()},
-        {id: 'longer', text: 'x'},
-      ],
-      {layout: 'inline'},
-    ).toString();
-    const lines = out.split('\n');
-    expect(lines[0].startsWith(`a${' '.repeat(7)}word`)).toBe(true);
-    expect(lines[1].startsWith(' '.repeat(8) + 'word')).toBe(true);
-    expect(lines.at(-1)).toBe('longer  x');
-    expect(lines.every(line => line.length <= WRAP_WIDTH)).toBe(true);
-  });
-
-  it('cuts a long record to one line when asked', () => {
-    const out = records([{id: 'a', text: 'word '.repeat(40).trim()}], {
-      layout: 'inline',
-      overflow: 'truncate',
-    }).toString();
-    expect(out.includes('\n')).toBe(false);
-    expect(out.length).toBeLessThanOrEqual(WRAP_WIDTH);
-    expect(out.endsWith('...')).toBe(true);
-  });
-});
-
-describe('wide characters', () => {
-  it('counts CJK characters as two columns', () => {
-    expect(displayWidth('亮/暗模式')).toBe(9);
-  });
-
-  it('wraps CJK text, which has no spaces, by columns', () => {
-    const out = wrapText('中'.repeat(100), {width: 20});
-    expect(out.split('\n').every(line => displayWidth(line) <= 20)).toBe(true);
-    expect(out.split('\n')).toHaveLength(10);
-  });
-
-  it('keeps spaces between Latin words next to CJK', () => {
-    expect(wrapText('运行 astryx docs 查看', {width: 200})).toBe('运行 astryx docs 查看');
-  });
-
-  it('cuts an inline record to columns, not characters', () => {
-    const out = records([{id: 'a', text: '中'.repeat(100)}], {
-      layout: 'inline',
-      overflow: 'truncate',
-    }).toString();
-    expect(displayWidth(out)).toBeLessThanOrEqual(WRAP_WIDTH);
-    expect(out.endsWith('...')).toBe(true);
-  });
-});

package/clients/cli/lib/manifest.mjs

@@ -55,7 +55,7 @@ export const RESPONSE_TYPES = {
     'component.detail.showcase',
     'component.detail.blocks',
   ],
-  docs: ['docs.list', 'docs.index', 'docs.detail', 'docs.detail.section'],
+  docs: ['docs.list', 'docs.detail', 'docs.detail.section'],
   blog: ['blog.list', 'blog.detail'],
   discover: [
     'discover.list',
@@ -105,12 +105,7 @@ const EXAMPLES = {
     'astryx component XDSButton',
     'astryx component XDSButton --props --json',
   ],
-  docs: [
-    'astryx docs',
-    'astryx docs spacing --json',
-    'astryx docs theme --index',
-    'astryx docs theme quick-start',
-  ],
+  docs: ['astryx docs', 'astryx docs spacing --json'],
   discover: ['astryx discover --json'],
   search: [
     'astryx search modal --json',

package/foundation/config/project.mjs

@@ -38,7 +38,6 @@ import {parseConfig} from '../../authoring/config/parse.mjs';
 import {
   loadIntegrations,
   loadLocalIntegration,
-  markProviderConflicts,
 } from '../integrations/integrations.mjs';
 import {autolinkIntegrations} from '../integrations/autolink.mjs';
 import {
@@ -204,11 +203,10 @@ export class Project {
   /** @type {ProjectIntegrationIssue[]} */
   #issues = [];
   /**
-   * Loaded integrations whose issues have already been collected (via a
-   * discovery method or a direct issues() validation), so issues() can fill in
-   * only the ones not yet visited and never double-collect. Keyed by entry, not
-   * label: two entries can share a package name (an alias at another version).
-   * @type {Set<object>}
+   * Package names of integrations whose issues have already been collected
+   * (via a discovery method or a direct issues() validation), so issues() can
+   * fill in only the ones not yet visited and never double-collect.
+   * @type {Set<string>}
    */
   #visitedIssues = new Set();
 
@@ -279,8 +277,6 @@ export class Project {
       loadedIntegrations = await loadIntegrations(integrations, {
         cwd: projectDir,
         fresh,
-        // Provider identity is resolved once, below, over the final set.
-        resolveProviders: false,
       });
     }
 
@@ -314,10 +310,6 @@ export class Project {
       else loadedIntegrations[existing] = localIntegration;
     }
 
-    // Autolinked and local packages can claim a provider ID that a configured
-    // package already holds, so identity is resolved once over the final set.
-    loadedIntegrations = markProviderConflicts(loadedIntegrations);
-
     // The debug recorder resolves its settings synchronously, long before any
     // command gets here, so this is where a project's `debug` block gets a
     // turn. The event is not written until process exit, so settings applied
@@ -444,13 +436,6 @@ export class Project {
    * @returns {string}
    */
   #pkgLabel(integration) {
-    // A set-aside package is labelled name@version, so its issue never reads as
-    // the winner's, even when both share a package name.
-    if (integration?.__providerConflict) {
-      return integration.version
-        ? `${integration.name}@${integration.version}`
-        : (integration.__spec ?? integration.name);
-    }
     return integration?.name ?? integration?.__spec ?? '(integration)';
   }
 
@@ -478,8 +463,8 @@ export class Project {
    */
   async #collectIssues(integration) {
     const pkg = this.#pkgLabel(integration);
-    if (this.#visitedIssues.has(integration)) return;
-    this.#visitedIssues.add(integration);
+    if (this.#visitedIssues.has(pkg)) return;
+    this.#visitedIssues.add(pkg);
     // A manifest that failed to load (throwing import / invalid shape) is
     // recorded as a marker by loadIntegrations — surface it as an issue and
     // skip validation (there's no manifest to validate).

package/foundation/discovery/component-discovery.d.mts

@@ -175,4 +175,4 @@ export function discoverOwnedComponents(coreDir: string, loadedIntegrations?: Ar
     issuesUrl: string | undefined;
 }>;
 /** The owner package name for built-in (core) components. */
-export const CORE_PACKAGE: import("../../authoring/index.js").ProviderId;
+export const CORE_PACKAGE: "@astryxdesign/core";

package/foundation/discovery/component-discovery.mjs

@@ -7,12 +7,11 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {existsCaseExact} from '../fs/paths.mjs';
-import {CORE_PROVIDER_ID} from '../identity/providers.mjs';
 
 const SKIP_DIRS = new Set(['hooks', 'utils', '__tests__', 'node_modules']);
 
 /** The owner package name for built-in (core) components. */
-export const CORE_PACKAGE = CORE_PROVIDER_ID;
+export const CORE_PACKAGE = '@astryxdesign/core';
 
 /** Conventional doc-file suffixes for integration components (same-stem). */
 const INTEGRATION_DOC_SUFFIXES = ['.doc.ts', '.doc.mjs', '.doc.js'];

package/foundation/discovery/docs-discovery.d.mts

@@ -72,10 +72,9 @@ export function discoverIntegrationDocs(integration: {
     errors: Error[];
 }>;
 /**
- * Merge an extension onto a base topic: a section with a stable `id` replaces
- * the base section with the same `id`; legacy sections without IDs fall back to
- * title matching. A section with no match is appended, and title/description
- * are taken from the extension when it states them.
+ * Merge an extension onto a base topic: a section whose title matches one in
+ * the base replaces it, a section the base does not have is appended, and the
+ * title/description are taken from the extension when it states them.
  *
  * Keyed by section TITLE rather than by position, the way the localization
  * overlays are — position keying grafts an overlay onto whichever section
@@ -87,17 +86,12 @@ export function discoverIntegrationDocs(integration: {
  * @returns {any} a new doc; neither input is mutated
  */
 export function mergeTopic(base: any, overlay: any): any;
-export { withSourceTitle };
 /**
  * Owner package recorded for the built-in topics. They ship inside the CLI
  * (assets/docs), not in @astryxdesign/core, so this is the CLI's own name —
  * unlike component discovery, whose built-ins belong to core.
  */
-export const BUILTIN_DOCS_PACKAGE: import("../../authoring/index.js").ProviderId;
-/** Blocks that are valid authoring but require the compiled graph renderer. */
-export const GRAPH_BLOCK_TYPES: Set<string>;
-/** Doc fields only the docs graph reads; a topic that sets one fails to load. */
-export const GRAPH_ONLY_FIELDS: string[];
+export const BUILTIN_DOCS_PACKAGE: "@astryxdesign/cli";
 /**
  * Every topic a project can read, and the relationships between them.
  *
@@ -189,4 +183,3 @@ export type DocsTopicEntry = {
         path: string;
     }>;
 };
-import { withSourceTitle } from './docs-section-key.mjs';