@astryxdesign/cli 0.6.3-canary.f22695a → 0.6.3

package/foundation/discovery/docs-discovery.test.mjs

@@ -31,9 +31,7 @@ function topic(fields) {
     name: 'deploying',
     title: 'Deploying',
     description: 'How to ship it.',
-    sections: [
-      {title: 'Overview', content: [{type: 'prose', text: 'Ship it.'}]},
-    ],
+    sections: [{title: 'Overview', content: [{type: 'prose', text: 'Ship it.'}]}],
     ...fields,
   };
 }
@@ -99,9 +97,7 @@ describe('discoverIntegrationDocs', () => {
       }),
     );
     expect(errors).toEqual([]);
-    expect(
-      records.map(r => [r.name, r.package, r.replaces, r.extendsTopic]),
-    ).toEqual([
+    expect(records.map(r => [r.name, r.package, r.replaces, r.extendsTopic])).toEqual([
       ['deploying', '@acme/widgets', undefined, undefined],
       ['getting-started', '@acme/widgets', 'getting-started', undefined],
       ['theme-extra', '@acme/widgets', undefined, 'theme'],
@@ -130,9 +126,7 @@ describe('discoverIntegrationDocs', () => {
 
   it('reports a doc that exports nothing, rather than skipping it silently', async () => {
     const {records, errors} = await discoverIntegrationDocs(
-      integration('@acme/empty', {
-        'deploying.doc.mjs': 'export const nope = 1;\n',
-      }),
+      integration('@acme/empty', {'deploying.doc.mjs': 'export const nope = 1;\n'}),
     );
     expect(records).toEqual([]);
     expect(errors).toHaveLength(1);
@@ -159,49 +153,6 @@ describe('discoverIntegrationDocs', () => {
     expect(records).toEqual([]);
     expect(errors[0].message).toContain('declares both');
   });
-
-  it('rejects graph blocks at the legacy topic-reader boundary', async () => {
-    const {records, errors} = await discoverIntegrationDocs(
-      integration('@acme/graph-block', {
-        'deploying.doc.mjs': topic({
-          sections: [
-            {
-              id: 'steps',
-              title: 'Steps',
-              content: [
-                {
-                  type: 'workflow',
-                  steps: [{title: 'Install', description: 'Run install.'}],
-                },
-              ],
-            },
-          ],
-        }),
-      }),
-    );
-    expect(records).toEqual([]);
-    expect(errors[0].message).toContain('requires the compiled graph renderer');
-  });
-
-  it('names a namespace doc instead of listing topic fields it lacks', async () => {
-    const {records, errors} = await discoverIntegrationDocs(
-      integration('@acme/namespace', {
-        'guides.doc.mjs': {
-          type: 'namespace',
-          name: 'guides',
-          title: 'Guides',
-          summary: 'Every guide.',
-          slots: {guides: {title: 'Guides', accepts: {kinds: ['generic']}}},
-        },
-      }),
-    );
-    expect(records).toEqual([]);
-    expect(errors).toHaveLength(1);
-    expect(errors[0].message).toContain(
-      '"guides" is a namespace doc. Only the docs graph reads namespace docs',
-    );
-    expect(errors[0].message).not.toContain('sections:');
-  });
 });
 
 describe('problemsInTopic', () => {
@@ -219,11 +170,7 @@ describe('problemsInTopic', () => {
     // A misspelled required field: the block renders nothing at all.
     expect(
       problemsInTopic(
-        topic({
-          sections: [
-            {title: 'Overview', content: [{type: 'prose', txt: 'oops'}]},
-          ],
-        }),
+        topic({sections: [{title: 'Overview', content: [{type: 'prose', txt: 'oops'}]}]}),
       ),
     ).toEqual([
       'sections[0].content[0].text: required for a prose block',
@@ -233,12 +180,7 @@ describe('problemsInTopic', () => {
     expect(
       problemsInTopic(
         topic({
-          sections: [
-            {
-              title: 'Overview',
-              content: [{type: 'heading', level: 2, text: 'x'}],
-            },
-          ],
+          sections: [{title: 'Overview', content: [{type: 'heading', level: 2, text: 'x'}]}],
         }),
       ),
     ).toContain('sections[0].content[0].level: 2 is not one of 3, 4, 5, 6');
@@ -254,27 +196,11 @@ describe('problemsInTopic', () => {
           ],
         }),
       ),
-    ).toContain(
-      'sections[0].content[0].rows[0]: has 1 cells but the table has 2 headers',
-    );
-  });
-
-  it('rejects graph metadata at the legacy topic-reader boundary', () => {
-    for (const fields of [
-      {placement: {parent: 'namespace:cli'}},
-      {aliases: ['setup']},
-      {audience: 'internal'},
-    ]) {
-      expect(problemsInTopic(topic(fields)).join('\n')).toContain(
-        'requires the compiled graph reader',
-      );
-    }
+    ).toContain('sections[0].content[0].rows[0]: has 1 cells but the table has 2 headers');
   });
 
   it('rejects a name that is not URL-safe', () => {
-    expect(problemsInTopic(topic({name: 'not a topic'})).join('\n')).toContain(
-      'URL-safe',
-    );
+    expect(problemsInTopic(topic({name: 'not a topic'})).join('\n')).toContain('URL-safe');
   });
 });
 
@@ -302,23 +228,11 @@ describe('DocsCatalog', () => {
     expect(catalog.resolve('deploying').package).toBe('@acme/widgets');
   });
 
-  it('treats topic identities case-insensitively without losing display case', () => {
-    const catalog = DocsCatalog.fromBuiltins();
-    expect(catalog.add(record({name: 'Deploying'}))).toBeNull();
-    expect(catalog.resolve('deploying').name).toBe('Deploying');
-    expect(catalog.resolve('DEPLOYING').name).toBe('Deploying');
-
-    const issue = catalog.add(
-      record({name: 'deploying', package: '@acme/duplicate'}),
-    );
-    expect(issue).toMatchObject({code: 'invalid_doc', severity: 'error'});
-  });
-
   it('refuses to shadow an existing topic by name alone', () => {
     const catalog = DocsCatalog.fromBuiltins({tokens: '/cli/tokens.doc.mjs'});
     const issue = catalog.add(record({name: 'tokens'}));
     expect(issue).toMatchObject({code: 'invalid_doc', severity: 'error'});
-    expect(issue.message).toContain('already provided by @astryxdesign/cli');
+    expect(issue.message).toContain("already provided by @astryxdesign/cli");
     expect(issue.message).toContain("replaces: 'tokens'");
     // The built-in topic is untouched.
     expect(catalog.resolve('tokens').package).toBe(BUILTIN_DOCS_PACKAGE);
@@ -330,9 +244,7 @@ describe('DocsCatalog', () => {
       tokens: '/cli/tokens.doc.mjs',
     });
     expect(
-      catalog.add(
-        record({name: 'getting-started', replaces: 'getting-started'}),
-      ),
+      catalog.add(record({name: 'getting-started', replaces: 'getting-started'})),
     ).toBeNull();
     expect(catalog.names()).toEqual(['getting-started', 'tokens']);
     const entry = catalog.resolve('getting-started');
@@ -364,16 +276,12 @@ describe('DocsCatalog', () => {
 
   it('warns, and lets the later package win, when two replace one topic', () => {
     const catalog = DocsCatalog.fromBuiltins({tokens: '/cli/tokens.doc.mjs'});
-    expect(
-      catalog.add(record({name: 'tokens', replaces: 'tokens'})),
-    ).toBeNull();
+    expect(catalog.add(record({name: 'tokens', replaces: 'tokens'}))).toBeNull();
     const issue = catalog.add(
       record({name: 'tokens', package: '@acme/later', replaces: 'tokens'}),
     );
     expect(issue).toMatchObject({code: 'duplicate_doc', severity: 'warning'});
-    expect(issue.message).toContain(
-      '@acme/later is configured later, so it wins',
-    );
+    expect(issue.message).toContain('@acme/later is configured later, so it wins');
     expect(catalog.resolve('tokens').package).toBe('@acme/later');
   });
 
@@ -419,189 +327,15 @@ describe('mergeTopic', () => {
         {title: 'Internal', content: [{type: 'prose', text: 'the meta way'}]},
       ],
     });
-    expect(merged.sections.map(s => s.title)).toEqual([
-      'Install',
-      'Tokens',
-      'Internal',
-    ]);
+    expect(merged.sections.map(s => s.title)).toEqual(['Install', 'Tokens', 'Internal']);
     expect(merged.sections[0].content[0].text).toBe('yarn add');
     expect(merged.sections[1].content[0].text).toBe('use tokens');
     // The base is untouched.
     expect(base.sections[0].content[0].text).toBe('npm i');
   });
 
-  it('replaces a section by stable ID even when its title changes', () => {
-    const merged = mergeTopic(
-      {
-        ...base,
-        sections: [
-          {id: 'install', title: 'Install', content: []},
-          {id: 'tokens', title: 'Tokens', content: []},
-        ],
-      },
-      {
-        sections: [{id: 'install', title: 'Setup', content: []}],
-      },
-    );
-    expect(merged.sections.map(section => [section.id, section.title])).toEqual(
-      [
-        ['install', 'Setup'],
-        ['tokens', 'Tokens'],
-      ],
-    );
-  });
-
-  it('migrates a legacy section to a stable ID without duplicating it', () => {
-    const merged = mergeTopic(base, {
-      sections: [
-        {
-          id: 'install',
-          title: 'Install',
-          content: [{type: 'prose', text: 'yarn add'}],
-        },
-      ],
-    });
-    expect(
-      merged.sections.map(section => [section.id ?? null, section.title]),
-    ).toEqual([
-      ['install', 'Install'],
-      [null, 'Tokens'],
-    ]);
-    expect(merged.sections[0].content[0].text).toBe('yarn add');
-  });
-
-  it('lets a legacy extension replace a section that has since gained an ID', () => {
-    const merged = mergeTopic(
-      {
-        ...base,
-        sections: [
-          {id: 'setup-steps', title: 'Install', content: []},
-          {title: 'Tokens', content: []},
-        ],
-      },
-      {
-        sections: [
-          {title: 'Install', content: [{type: 'prose', text: 'yarn add'}]},
-        ],
-      },
-    );
-    expect(
-      merged.sections.map(section => [section.id ?? null, section.title]),
-    ).toEqual([
-      ['setup-steps', 'Install'],
-      [null, 'Tokens'],
-    ]);
-    expect(merged.sections[0].content[0].text).toBe('yarn add');
-  });
-
-  it('keeps two different authored IDs distinct under one title', () => {
-    const merged = mergeTopic(
-      {...base, sections: [{id: 'install', title: 'Install', content: []}]},
-      {sections: [{id: 'install-yarn', title: 'Install', content: []}]},
-    );
-    expect(merged.sections.map(section => section.id)).toEqual([
-      'install',
-      'install-yarn',
-    ]);
-  });
-
   it('takes the title and description only when the overlay states them', () => {
     expect(mergeTopic(base, {sections: []}).title).toBe('Theme');
-    expect(mergeTopic(base, {title: 'Theming', sections: []}).title).toBe(
-      'Theming',
-    );
-  });
-});
-
-describe('problemsInTopic section keys', () => {
-  /** @param {object[]} sections */
-  const doc = sections => ({
-    type: 'generic',
-    name: 'keys',
-    title: 'Keys',
-    description: 'Section keys.',
-    sections: sections.map(s => ({
-      content: [{type: 'prose', text: 'x'}],
-      ...s,
-    })),
-  });
-
-  it('rejects two sections that derive the same key', () => {
-    expect(
-      problemsInTopic(doc([{title: 'Quick Start'}, {title: 'Quick-start'}])),
-    ).toEqual([
-      expect.stringContaining('"quick-start" is already used by sections[0]'),
-    ]);
-  });
-
-  it('rejects an unsafe id', () => {
-    expect(
-      problemsInTopic(doc([{id: 'Quick Start', title: 'Quick Start'}])),
-    ).toEqual([expect.stringContaining('is not a stable key')]);
-  });
-
-  it('rejects a title no key derives from, unless it has an id', () => {
-    expect(problemsInTopic(doc([{title: '亮/暗模式'}]))).toEqual([
-      expect.stringContaining('Give the section an id'),
-    ]);
-    expect(
-      problemsInTopic(doc([{id: 'light-dark', title: '亮/暗模式'}])),
-    ).toEqual([]);
-  });
-});
-
-describe('mergeTopic by section key', () => {
-  const base = {
-    title: 'Theme',
-    sections: [
-      {title: 'Quick Start', content: [{type: 'prose', text: 'base'}]},
-      {title: 'Light/Dark Mode', content: [{type: 'prose', text: 'base'}]},
-    ],
-  };
-  const titles = doc =>
-    doc.sections.map(s => [s.id ?? null, s.title, s.content[0].text]);
-
-  it('replaces the section whose derived key an extension id names', () => {
-    const merged = mergeTopic(base, {
-      sections: [
-        {
-          id: 'quick-start',
-          title: 'Quick Start with Acme',
-          content: [{type: 'prose', text: 'acme'}],
-        },
-      ],
-    });
-    expect(titles(merged)).toEqual([
-      ['quick-start', 'Quick Start with Acme', 'acme'],
-      [null, 'Light/Dark Mode', 'base'],
-    ]);
-  });
-
-  it('replaces the section a title variant derives the same key as', () => {
-    const merged = mergeTopic(base, {
-      sections: [
-        {title: 'Light-Dark Mode', content: [{type: 'prose', text: 'acme'}]},
-      ],
-    });
-    expect(titles(merged)).toEqual([
-      [null, 'Quick Start', 'base'],
-      [null, 'Light-Dark Mode', 'acme'],
-    ]);
-  });
-
-  it('prefers the key over a legacy title for an extension with an id', () => {
-    const merged = mergeTopic(base, {
-      sections: [
-        {
-          id: 'light-dark-mode',
-          title: 'Quick Start',
-          content: [{type: 'prose', text: 'acme'}],
-        },
-      ],
-    });
-    expect(titles(merged)).toEqual([
-      [null, 'Quick Start', 'base'],
-      ['light-dark-mode', 'Quick Start', 'acme'],
-    ]);
+    expect(mergeTopic(base, {title: 'Theming', sections: []}).title).toBe('Theming');
   });
 });

package/foundation/discovery/template-adapter.mjs

@@ -27,11 +27,10 @@ import {createJiti} from 'jiti';
 import {loadModuleWithParser} from '../fs/module-loader.mjs';
 import {parseTemplate} from '../../authoring/doctypes/template/parse.mjs';
 import {CLI_ROOT, discoverExternalPackages} from '../fs/paths.mjs';
-import {CORE_PROVIDER_ID} from '../identity/providers.mjs';
 import {Project} from '../config/project.mjs';
 
 /** Identity used for core (built-in) templates in package-scoped listings. */
-const CORE_PACKAGE = CORE_PROVIDER_ID;
+const CORE_PACKAGE = '@astryxdesign/core';
 
 /**
  * Identity for a template in package-scoped views. Core (built-in) templates

package/foundation/integrations/autolink.mjs

@@ -234,13 +234,7 @@ export async function autolinkIntegrations({
 
   /** @type {import('./integrations.mjs').LoadedIntegration[]} */
   const autolinked = [];
-  // One package reached twice (an alias beside the package it aliases, at the
-  // same version) loads once. The same name at another version is kept, so the
-  // provider-identity pass in Project.load reports it instead of dropping it.
-  /** @param {{name: string, version?: string}} integration */
-  const identity = integration =>
-    `${integration.name}\u0000${integration.version ?? ''}`;
-  const seen = new Set(loaded.map(identity));
+  const names = new Set(loaded.map(integration => integration.name));
 
   for (const candidate of candidates) {
     /** @type {import('./integrations.mjs').LoadedIntegration|undefined} */
@@ -256,11 +250,10 @@ export async function autolinkIntegrations({
       continue;
     }
     if (!integration || integration.__loadError) continue;
-    // Identity is the resolved package's own name and version, so an alias and
-    // the package it aliases collapse here even when they are two directories
-    // on disk.
-    if (seen.has(identity(integration))) continue;
-    seen.add(identity(integration));
+    // Identity is the resolved package's own name, so an alias and the package
+    // it aliases collapse here even when they are two directories on disk.
+    if (names.has(integration.name)) continue;
+    names.add(integration.name);
     autolinked.push({
       ...integration,
       __autolinked: true,

package/foundation/integrations/integration-warnings.mjs

@@ -41,12 +41,6 @@ export async function warnOnIntegrationIssues(loadedIntegrations, {json = false}
     }
     for (const integration of loadedIntegrations) {
       if (!integration || typeof integration !== 'object') continue;
-      // A package set aside for a provider-ID conflict is fine in isolation,
-      // so `doctor integration validate` would not explain it. Say it here.
-      if (integration.__providerConflict) {
-        console.error(`Warning: ${integration.__providerConflict.message}`);
-        continue;
-      }
       let issues;
       try {
         issues = await validateLoadedIntegration(integration);

package/foundation/integrations/integrations.d.mts

@@ -1,23 +1,6 @@
 // @generated by scripts/sync-api-types.mjs from the JSDoc in foundation/**/*.mjs.
 // DO NOT EDIT — run `pnpm sync:api-types` to regenerate.
 
-/**
- * Resolve provider identity across loaded integrations, in precedence order.
- *
- * Artifact and document IDs are provider-scoped, so two packages cannot both
- * contribute under one provider ID. The same package reached twice (an npm
- * alias beside the package it aliases, with the same name and version) loads
- * once. Any other later claimant, including the same package at another
- * version, stays as an inert entry that carries the conflict. The package being
- * authored claims its ID before precedence order is considered, because the
- * source being edited is authoritative. The winner still contributes; Project
- * issues, Doctor, and the per-command warning name the one set aside instead of
- * dropping it without a word.
- *
- * @param {LoadedIntegration[]} integrations in precedence order
- * @returns {LoadedIntegration[]}
- */
-export function markProviderConflicts(integrations: LoadedIntegration[]): LoadedIntegration[];
 /**
  * Return the conventional root manifest paths present in `dir`, in
  * load-precedence order. Unlike {@link resolveManifestPath} this never throws —
@@ -92,15 +75,12 @@ export function loadLocalIntegration(packageDir: string, { fresh }?: {
  * Load configured integrations.
  *
  * @param {string[]} [specs] package names
- * @param {{cwd?: string, fresh?: boolean, resolveProviders?: boolean}} [options]
- *   `resolveProviders: false` leaves provider identity to a caller that
- *   resolves it once over a larger set (Project.load)
+ * @param {{cwd?: string, fresh?: boolean}} [options]
  * @returns {Promise<LoadedIntegration[]>}
  */
-export function loadIntegrations(specs?: string[], { cwd, fresh, resolveProviders }?: {
+export function loadIntegrations(specs?: string[], { cwd, fresh }?: {
     cwd?: string;
     fresh?: boolean;
-    resolveProviders?: boolean;
 }): Promise<LoadedIntegration[]>;
 /**
  * A fully-resolved, loaded integration. Identity (`name`, `version`) comes from
@@ -109,10 +89,6 @@ export function loadIntegrations(specs?: string[], { cwd, fresh, resolveProvider
  * are internal bookkeeping used by Doctor integration validation and Project.
  * @typedef {object} LoadedIntegration
  * @property {string} name
- * @property {import('../../authoring/identity/type').ProviderId} [providerId]
- *   normalized stable provider identity; absent only for a legacy unnamed local
- *   package. Unique among contributing integrations: a later claimant is kept
- *   inert with `__providerConflict` (see {@link markProviderConflicts})
  * @property {string} [version]
  * @property {string} [components]
  * @property {string} [templates]
@@ -131,10 +107,6 @@ export function loadIntegrations(specs?: string[], { cwd, fresh, resolveProvider
  * @property {string} __manifestFile
  * @property {string} [__loadError] set when the manifest failed to load/validate;
  *   such an integration contributes nothing and is surfaced via Project.issues()
- * @property {{providerId: import('../../authoring/identity/type').ProviderId, claimedBy: string, message: string}} [__providerConflict]
- *   set on a package whose provider ID an earlier-loaded package already
- *   claims; it contributes nothing and is reported as a `duplicate_provider`
- *   warning
  * @property {string[]} [__unknownKeys] manifest keys this CLI does not know —
  *   surfaced as a warning; the rest of the manifest still contributes
  * @property {boolean} [__autolinked] loaded because the project declares the
@@ -162,12 +134,6 @@ export const MANIFEST_BASENAMES: string[];
  */
 export type LoadedIntegration = {
     name: string;
-    /**
-     * normalized stable provider identity; absent only for a legacy unnamed local
-     * package. Unique among contributing integrations: a later claimant is kept
-     * inert with `__providerConflict` (see {@link markProviderConflicts})
-     */
-    providerId?: import("../../authoring/identity/type").ProviderId | undefined;
     version?: string | undefined;
     components?: string | undefined;
     templates?: string | undefined;
@@ -197,16 +163,6 @@ export type LoadedIntegration = {
      * such an integration contributes nothing and is surfaced via Project.issues()
      */
     __loadError?: string | undefined;
-    /**
-     * set on a package whose provider ID an earlier-loaded package already
-     * claims; it contributes nothing and is reported as a `duplicate_provider`
-     * warning
-     */
-    __providerConflict?: {
-        providerId: import("../../authoring/identity/type").ProviderId;
-        claimedBy: string;
-        message: string;
-    } | undefined;
     /**
      * manifest keys this CLI does not know —
      * surfaced as a warning; the rest of the manifest still contributes