@knapsack/source-conflicts-adapter 4.89.11 → 4.89.12--canary.7237.e7e94a1.0

package/README.md

@@ -13,7 +13,7 @@ When the same entity (e.g. `button.react.mdx` or `global.tokens.json`) is contri
 3. **Detects** conflicts by comparing content across sources:
    - **MDX/MD**: parses into anchored sections, applies a chain of canonicalization rules
    - **JSON (W3C Design Token)**: flattens token leaves (`$value`) to anchors, compares by exact hash
-4. **Reports** per-anchor verdicts: `ALL_SAME`, `DIFFERENT`, or `MISSING`
+4. **Reports** per-anchor verdicts: `DIFFERENT` or `MISSING` (only conflicting anchors are included — `ALL_SAME` anchors are filtered out)
 
 ### Entity file layout
 
@@ -39,27 +39,25 @@ This package lives in the monorepo at `libs/ingest-pipeline/adapters/source-conf
 
 ---
 
-## Quick start — standalone analyzer
+## Quick start — `run()`
 
-The fastest way to detect conflicts without running the full pipeline is via the `analyzer` interface:
+The fastest way to detect conflicts without running the full pipeline is via `run()`:
 
 ```typescript
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { analyze } from '@knapsack/source-conflicts-adapter';
+import { run } from '@knapsack/source-conflicts-adapter';
 import { createLogger } from '@knapsack/utils';
 
-const entitiesRootAbs = '/absolute/path/to/entities';
-const outputFile = path.join(entitiesRootAbs, 'source-conflicts-result.json');
-const logger = createLogger('source-conflicts');
-
-const result = await analyze({ entitiesRootAbs }, { logger });
+const report = await run({
+  entitiesRootAbs: '/absolute/path/to/entities',
+  outputPath: '/absolute/path/to/output.json', // optional
+  logger: createLogger('source-conflicts'),
+});
 
-await fs.writeFile(outputFile, JSON.stringify(result, null, 2), 'utf8');
-console.log(`Wrote results to ${outputFile}`);
+console.log(`Entities: ${report.summary.entityCount}`);
+console.log(`Conflicts: ${report.summary.totalConflicts}`);
 ```
 
-The output file contains the full `SourceConflictsAnalysisResult` as JSON — `groupResults` with per-anchor verdicts and previews, plus `skippedGroupKeys` for any groups that were excluded.
+`run()` scans the entities directory, detects all conflicts, and returns a `ConflictReport`. When `outputPath` is provided, the report is also written as JSON.
 
 ---
 
@@ -108,9 +106,35 @@ const result = await sourceConflictsAdapter.analyzer!.analyze(config, {
 
 ---
 
-## Result shape
+## Result shapes
 
-### `SourceConflictsAnalysisResult`
+### `ConflictReport` (from `run()`)
+
+```typescript
+type ConflictReport = {
+  generatedAt: string;
+  entitiesRootAbs: string;
+  entities: ConflictReportEntity[];
+  summary: {
+    entityCount: number;
+    totalConflicts: number;
+    differentCount: number;
+    missingCount: number;
+  };
+};
+
+type ConflictReportEntity = {
+  entityKey: string;
+  entityType: EntityKind;
+  entityRelPath: string;
+  /** Source key URIs of all sources involved in this entity. */
+  sources: string[];
+  /** DIFFERENT and MISSING anchors only. */
+  conflicts: AnchorDiffView[];
+};
+```
+
+### `SourceConflictsAnalysisResult` (from `analyze()`)
 
 ```typescript
 type SourceConflictsAnalysisResult = {
@@ -125,24 +149,63 @@ type SourceConflictsAnalysisResult = {
 
 ```typescript
 type ConflictGroupResult = {
-  group: ConflictGroup; // entityKind, relPath, artifacts[]
-  bundle: ConflictBundle; // source-agnostic per-anchor snapshot (serializable — store in DB)
-  baselineSourceKey: string; // frontmatter URI of the baseline source, e.g. "knapsack://patterns/button"
-  compareSourceKeys: string[]; // frontmatter URIs of compare sources (up to MAX_COMPARE_SOURCES)
-  verdicts: AnchorVerdictView[]; // per-anchor verdict derived from bundle for this baseline/compare
+  group: ConflictGroup;        // entityType, relPath, artifacts[]
+  bundle: ConflictBundle;      // source-agnostic per-anchor snapshot (serializable — store in DB)
+  anchors: AnchorDiffView[];   // DIFFERENT and MISSING anchors only
 };
 ```
 
-`bundle` is a fully-serializable JSON snapshot — no functions, no circular refs. Storing it once and calling `computeVerdictsForBaselineCompare` with different baseline/compare args is the recommended pattern (see [Option A](#option-a--bundle-first-pattern)).
+`bundle` is a fully-serializable JSON snapshot — no functions, no circular refs.
+
+### `AnchorDiffView`
+
+```typescript
+type AnchorDiffView = {
+  readonly anchor: string;
+  readonly verdict: 'DIFFERENT' | 'MISSING';
+  /**
+   * One entry per distinct canonical form — sources that share the same hash are grouped.
+   * Present when verdict is DIFFERENT or MISSING (and at least one source has a value).
+   */
+  readonly variants?: AnchorVariant[];
+  /**
+   * All pairwise unified diffs (n*(n-1)/2 pairs).
+   * Present when verdict is DIFFERENT and text values are available.
+   */
+  readonly diffs?: AnchorPairDiff[];
+  /**
+   * Source key URIs of sources that have no definition for this anchor.
+   * Present when verdict is MISSING.
+   */
+  readonly missingSourceKeys?: string[];
+};
+
+type AnchorVariant = {
+  /** Source key URIs that share this canonical form. */
+  readonly sourceKeys: string[];
+  /** Canonical text (may be truncated by PreviewBounds). */
+  readonly text: string;
+  /** Language hint for syntax highlighting. Present for code fence anchors. */
+  readonly lang?: string;
+};
+
+type AnchorPairDiff = {
+  readonly fromSourceKeys: string[];
+  readonly toSourceKeys: string[];
+  /** Unified diff string (GNU patch format). */
+  readonly unifiedDiff: string;
+};
+```
 
 ### `ConflictItemRecord` (inside `ConflictBundle.items`)
 
 ```typescript
 type ConflictItemRecord = {
   fingerprint: string;
-  sourceType: SourceType; // filename-parsed, e.g. "KNAPSACK" — used internally for matching
-  sourceKey: string; // URI, e.g. "knapsack://patterns/button" — use this for display and storage
-                     // MDX: read from YAML frontmatter; JSON: read from $extensions.pcif.sourceKey
+  /** Filename-parsed source type (e.g. "KNAPSACK"). Used internally for matching. */
+  sourceType: SourceType;
+  /** URI, e.g. "knapsack://patterns/button". The authoritative source identifier. */
+  sourceKey: string;
   frontmatterSchemaVersion: number;
   frontmatter: Record<string, unknown>; // MDX: YAML frontmatter; JSON: $extensions.pcif contents
 };
@@ -150,61 +213,38 @@ type ConflictItemRecord = {
 
 ### Verdicts
 
-| Value       | Meaning                                                               |
-| ----------- | --------------------------------------------------------------------- |
-| `ALL_SAME`  | All sources agree (or content was unified by a canonicalization rule) |
-| `DIFFERENT` | At least one source has different content for this anchor             |
-| `MISSING`   | At least one source does not contain this anchor                      |
-
----
+| Value       | Meaning                                                           |
+| ----------- | ----------------------------------------------------------------- |
+| `DIFFERENT` | At least one source has different content for this anchor         |
+| `MISSING`   | At least one source does not contain this anchor                  |
 
-## Option A — bundle-first pattern
+`ALL_SAME` anchors (where all sources agree) are excluded from `anchors` / `conflicts` output.
 
-`ConflictBundle` is the stable stored artifact. `computeVerdictsForBaselineCompare` is a pure function that derives verdicts from any stored bundle with no I/O or re-parsing.
+---
 
-### Recommended DB/GraphQL pattern
+## Bundle-first pattern
 
-1. **Store** the bundle when running the detection pipeline.
-2. **Load** the bundle from storage when serving a request.
-3. **Call** `computeVerdictsForBaselineCompare` with the caller-specified baseline/compare source URIs.
+`ConflictBundle` is the stable stored artifact. `computeDiffsForAllSources` is a pure function that derives diffs from any stored bundle with no I/O or re-parsing.
 
 ```typescript
 import {
-  computeVerdictsForBaselineCompare,
+  computeDiffsForAllSources,
   getAvailableSourceKeysFromBundle,
 } from '@knapsack/source-conflicts-adapter';
 import type { ConflictBundle } from '@knapsack/source-conflicts-adapter';
 
-// Load stored bundle from DB (JSON column → parse → use directly, no re-detection)
+// Load stored bundle from DB (JSON column → parse → use directly)
 const bundle: ConflictBundle = JSON.parse(row.bundleJson);
 
-// Discover which source URIs are available without re-detecting
+// Discover which source URIs are available
 const available = getAvailableSourceKeysFromBundle(bundle);
 // e.g. ["knapsack://patterns/button", "storybook://components/button"]
 
-// Derive verdicts for any baseline/compare combination — instant, no I/O
-const verdicts = computeVerdictsForBaselineCompare(
-  bundle,
-  'knapsack://patterns/button', // baseline URI
-  ['storybook://components/button'], // compare URIs
-);
-
-// Swap baseline without re-detecting — just call again
-const swappedVerdicts = computeVerdictsForBaselineCompare(
-  bundle,
-  'storybook://components/button',
-  ['knapsack://patterns/button'],
-);
-```
-
-### `getAvailableSourceKeysFromBundle`
-
-```typescript
-function getAvailableSourceKeysFromBundle(bundle: ConflictBundle): string[];
+// Derive diffs across all sources — instant, no I/O
+const anchors = computeDiffsForAllSources(bundle);
+// Returns only DIFFERENT and MISSING anchors
 ```
 
-Returns the frontmatter source URI (`sourceKey`) for every item in the bundle. Any of these can be passed as `baselineSourceKey` to `computeVerdictsForBaselineCompare` without re-running detection. Sources in `bundle.excludedSourceKeys` (if any, when `MAX_COMPARE_SOURCES` is exceeded) are **not** in the bundle and cannot be used as baseline without a full re-detect.
-
 ---
 
 ## Comparison rules
@@ -256,19 +296,21 @@ src/
 ├── index.ts              # Adapter export + public API re-exports
 ├── types.ts              # Shared types: SourceConflictsConfig, ArtifactRef, ConflictGroup,
 │                         #   ConflictBundle, ConflictRecord, ConflictItemRecord,
-│                         #   AgnosticDefinition, AnchorDefinitionsRecord, AnchorVerdictView,
-│                         #   VERDICT, Rule, CanonicalizeContext, PreviewBounds
+│                         #   AgnosticDefinition, AnchorDefinitionsRecord,
+│                         #   AnchorDiffView, AnchorVariant, AnchorPairDiff,
+│                         #   ConflictReport, ConflictReportEntity, VERDICT, Rule,
+│                         #   CanonicalizeContext, PreviewBounds
 ├── validator.ts          # validateConfig / validateFull
 ├── parser.ts             # parse() — indexes entities, writes manifest
 ├── transformer.ts        # transform() — runs detection, writes verdict bundles
-├── analyzer.ts           # analyze() — in-process detection, returns typed result
+├── analyzer.ts           # analyze() / run() — in-process detection, returns typed result
 ├── detect.ts             # indexEntitiesDir / findConflictGroups (filesystem)
 ├── parse.ts              # parseEntityKind / parseSourceType (filename parsing)
 ├── multiSourceCompare.ts # compareAnchorMultiSource (rule engine)
 ├── compare/
 │   └── preview.ts        # Preview/truncation helpers
 ├── mdx/
-│   ├── mdxConflicts.ts   # detectMdxConflictBundle / computeVerdictsForBaselineCompare
+│   ├── mdxConflicts.ts   # detectMdxConflictBundle / computeDiffsForAllSources
 │   ├── mdxRules.ts       # Built-in canonicalization rules
 │   ├── tableMdx.ts       # Table parsing / canonicalization
 │   └── sharedProcessor.ts # Shared remark processor
@@ -276,6 +318,8 @@ src/
 │   └── jsonConflicts.ts  # detectJsonConflictBundle / flattenTokenAnchors / extractJsonSourceKey
 └── utils/
     ├── canonicalCache.ts  # In-memory canonical result cache (sha256)
+    ├── entityKey.ts       # parseGroupKey — shared entity key parsing for MDX and JSON
+    ├── fingerprint.ts     # computeFingerprintV1 — entity-level fingerprint
     └── frontmatter.ts     # Frontmatter parsing helpers
 ```
 

package/dist/analyzer.d.ts

@@ -1,29 +1,21 @@
 import type { Logger } from '@knapsack/adapter-core';
-import type { SourceConflictsConfig } from './types.js';
-import type { AnchorVerdictView, ConflictBundle } from './types.js';
-import type { ConflictGroup } from './types.js';
-export type ConflictGroupResult = {
-    group: ConflictGroup;
-    bundle: ConflictBundle;
-    /** Frontmatter sourceKey URI of the baseline source (e.g. "knapsack://patterns/button"). */
-    baselineSourceKey: string;
-    /** Frontmatter sourceKey URIs of the compare sources. */
-    compareSourceKeys: string[];
-    verdicts: AnchorVerdictView[];
-};
-export type SourceConflictsAnalysisResult = {
-    groupResults: ConflictGroupResult[];
-    /** Groups that were skipped (non-MDX or not enough sources). */
-    skippedGroupKeys: string[];
+import type { SourceConflictsConfig, ConflictBundle, SourceConflictsAnalysisResult, ConflictReport } from './types.js';
+export type RunOptions = SourceConflictsConfig & {
+    readonly logger: Logger;
+    /** When provided, the report JSON is written to this path. */
+    readonly outputPath?: string;
 };
 export declare function analyze(config: SourceConflictsConfig, deps: Pick<{
     logger: Logger;
 }, 'logger'>): Promise<SourceConflictsAnalysisResult>;
 /**
- * Returns the source keys present in a stored bundle.
- * Any of these can be passed as `baselineSourceKey` to
- * `computeVerdictsForBaselineCompare` without re-running detection.
- * Sources in `bundle.excludedSourceKeys` are NOT available.
+ * Returns the source keys of all sources present in a stored bundle.
+ * Useful for inspecting which sources contributed to a previously detected conflict.
  */
 export declare function getAvailableSourceKeysFromBundle(bundle: ConflictBundle): string[];
+/**
+ * Scan an entities directory, detect all conflicts, and return a structured report.
+ * Optionally writes the report as JSON to outputPath.
+ */
+export declare function run(options: RunOptions): Promise<ConflictReport>;
 //# sourceMappingURL=analyzer.d.ts.map

package/dist/analyzer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAQxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,cAAc,CAAC;IACvB,4FAA4F;IAC5F,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yDAAyD;IACzD,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,YAAY,EAAE,mBAAmB,EAAE,CAAC;IACpC,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,IAAI,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,QAAQ,CAAC,GACvC,OAAO,CAAC,6BAA6B,CAAC,CA4ExC;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,cAAc,GACrB,MAAM,EAAE,CAEV"}
+{"version":3,"file":"analyzer.d.ts","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EACV,qBAAqB,EACrB,cAAc,EAEd,6BAA6B,EAC7B,cAAc,EAEf,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,UAAU,GAAG,qBAAqB,GAAG;IAC/C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,8DAA8D;IAC9D,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,IAAI,EAAE,IAAI,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,QAAQ,CAAC,GACvC,OAAO,CAAC,6BAA6B,CAAC,CAiDxC;AAED;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,cAAc,GACrB,MAAM,EAAE,CAEV;AAED;;;GAGG;AACH,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAkCtE"}

package/dist/analyzer.js

@@ -1,5 +1,6 @@
+import * as fs from 'node:fs/promises';
 import { indexEntitiesDir, findConflictGroups } from './detect.js';
-import { detectMdxConflictBundle, computeVerdictsForBaselineCompare, MAX_COMPARE_SOURCES, MIN_COMPARE_SOURCES, } from './mdx/mdxConflicts.js';
+import { detectMdxConflictBundle, computeDiffsForAllSources, } from './mdx/mdxConflicts.js';
 import { detectJsonConflictBundle } from './json/jsonConflicts.js';
 export async function analyze(config, deps) {
     const { logger } = deps;
@@ -14,20 +15,15 @@ export async function analyze(config, deps) {
             skippedGroupKeys.push(group.key);
             continue;
         }
-        const sources = [
-            ...new Set(group.artifacts.map((a) => a.sourceKey)),
-        ].sort();
-        if (sources.length < 1 + MIN_COMPARE_SOURCES) {
+        // Require at least 2 distinct source types. No upper limit — all sources are compared equally.
+        const uniqueSources = new Set(group.artifacts.map((a) => a.sourceType));
+        if (uniqueSources.size < 2) {
             skippedGroupKeys.push(group.key);
             continue;
         }
-        const baselineSourceKey = sources[0];
-        const compareSourceKeys = sources.slice(1, 1 + MAX_COMPARE_SOURCES);
         const detectArgs = {
             groupKey: group.key,
             artifacts: group.artifacts,
-            baselineSourceKey,
-            compareSourceKeys,
             siteId: config.siteId,
             userId: config.userId,
             configId: config.configId,
@@ -40,28 +36,48 @@ export async function analyze(config, deps) {
             skippedGroupKeys.push(group.key);
             continue;
         }
-        // Map filename-parsed SourceType → frontmatter URI using bundle.items.
-        const getUri = (st) => bundle.items.find((i) => i.sourceType === st)?.sourceKey ?? st;
-        const baselineUri = getUri(baselineSourceKey);
-        const compareUris = compareSourceKeys.map(getUri);
-        const verdicts = computeVerdictsForBaselineCompare(bundle, baselineUri, compareUris);
-        groupResults.push({
-            group,
-            bundle,
-            baselineSourceKey: baselineUri,
-            compareSourceKeys: compareUris,
-            verdicts,
-        });
+        const anchors = computeDiffsForAllSources(bundle);
+        groupResults.push({ group, bundle, anchors });
     }
     return { groupResults, skippedGroupKeys };
 }
 /**
- * Returns the source keys present in a stored bundle.
- * Any of these can be passed as `baselineSourceKey` to
- * `computeVerdictsForBaselineCompare` without re-running detection.
- * Sources in `bundle.excludedSourceKeys` are NOT available.
+ * Returns the source keys of all sources present in a stored bundle.
+ * Useful for inspecting which sources contributed to a previously detected conflict.
  */
 export function getAvailableSourceKeysFromBundle(bundle) {
     return bundle.items.map((item) => item.sourceKey);
 }
+/**
+ * Scan an entities directory, detect all conflicts, and return a structured report.
+ * Optionally writes the report as JSON to outputPath.
+ */
+export async function run(options) {
+    const { logger, outputPath, ...config } = options;
+    const { groupResults } = await analyze(config, { logger });
+    const entities = groupResults.map(({ group, bundle, anchors }) => ({
+        entityKey: group.key,
+        entityType: group.entityType,
+        entityRelPath: group.relPath,
+        sources: bundle.items.map((i) => i.sourceKey).sort(),
+        conflicts: anchors,
+    }));
+    const allConflicts = entities.flatMap((e) => e.conflicts);
+    const report = {
+        generatedAt: new Date().toISOString(),
+        entitiesRootAbs: config.entitiesRootAbs,
+        entities,
+        summary: {
+            conflictingEntityCount: entities.length,
+            totalConflicts: allConflicts.length,
+            differentCount: allConflicts.filter((c) => c.verdict === 'DIFFERENT')
+                .length,
+            missingCount: allConflicts.filter((c) => c.verdict === 'MISSING').length,
+        },
+    };
+    if (outputPath) {
+        await fs.writeFile(outputPath, JSON.stringify(report, null, 2), 'utf8');
+    }
+    return report;
+}
 //# sourceMappingURL=analyzer.js.map

package/dist/analyzer.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer.js","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyzer.js","sourceRoot":"","sources":["../src/analyzer.ts"],"names":[],"mappings":"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"}

package/dist/analyzer.vitest.js

@@ -1,5 +1,9 @@
-import { describe, it, expect } from 'vitest';
-import { getAvailableSourceKeysFromBundle } from './analyzer.js';
+import { describe, it, expect, vi } from 'vitest';
+import { getAvailableSourceKeysFromBundle, run } from './analyzer.js';
+vi.mock('./detect.js', () => ({
+    indexEntitiesDir: vi.fn().mockResolvedValue([]),
+    findConflictGroups: vi.fn().mockReturnValue([]),
+}));
 function makeBundle(items) {
     return {
         conflict: {
@@ -14,6 +18,31 @@ function makeBundle(items) {
         anchorDefinitions: [],
     };
 }
+const silentLogger = {
+    debug: () => { },
+    info: () => { },
+    warn: () => { },
+    error: () => { },
+};
+describe('run() summary', () => {
+    it('returns zero counts when there are no conflicting groups', async () => {
+        const report = await run({
+            entitiesRootAbs: '/fake/entities',
+            logger: silentLogger,
+        });
+        expect(report.summary.conflictingEntityCount).toBe(0);
+        expect(report.summary.totalConflicts).toBe(0);
+        expect(report.summary.differentCount).toBe(0);
+        expect(report.summary.missingCount).toBe(0);
+    });
+    it('totalConflicts equals differentCount + missingCount', async () => {
+        const report = await run({
+            entitiesRootAbs: '/fake/entities',
+            logger: silentLogger,
+        });
+        expect(report.summary.totalConflicts).toBe(report.summary.differentCount + report.summary.missingCount);
+    });
+});
 describe('getAvailableSourceKeysFromBundle', () => {
     it('returns URI sourceKeys for all items in the bundle', () => {
         const bundle = makeBundle([

package/dist/analyzer.vitest.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer.vitest.js","sourceRoot":"","sources":["../src/analyzer.vitest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,gCAAgC,EAAE,MAAM,eAAe,CAAC;AAEjE,SAAS,UAAU,CAAC,KAA8B;IAChD,OAAO;QACL,QAAQ,EAAE;YACR,SAAS,EAAE,wBAAwB;YACnC,UAAU,EAAE,WAAW;YACvB,aAAa,EAAE,cAAc;YAC7B,WAAW,EAAE,WAAW;YACxB,SAAS,EAAE,sBAAsB;YACjC,SAAS,EAAE,sBAAsB;SAClC;QACD,KAAK;QACL,iBAAiB,EAAE,EAAE;KACtB,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,MAAM,GAAG,UAAU,CAAC;YACxB;gBACE,WAAW,EAAE,KAAK;gBAClB,UAAU,EAAE,UAAU;gBACtB,SAAS,EAAE,4BAA4B;gBACvC,wBAAwB,EAAE,CAAC;gBAC3B,WAAW,EAAE,EAAE;aAChB;YACD;gBACE,WAAW,EAAE,KAAK;gBAClB,UAAU,EAAE,WAAW;gBACvB,SAAS,EAAE,+BAA+B;gBAC1C,wBAAwB,EAAE,CAAC;gBAC3B,WAAW,EAAE,EAAE;aAChB;SACF,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,gCAAgC,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,4BAA4B;YAC5B,+BAA+B;SAChC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,MAAM,GAAG,UAAU,CAAC;YACxB;gBACE,WAAW,EAAE,KAAK;gBAClB,UAAU,EAAE,UAAU;gBACtB,SAAS,EAAE,4BAA4B;gBACvC,wBAAwB,EAAE,CAAC;gBAC3B,WAAW,EAAE,EAAE;aAChB;SACF,CAAC,CAAC;QACH,MAAM,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACvD,4BAA4B;SAC7B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"analyzer.vitest.js","sourceRoot":"","sources":["../src/analyzer.vitest.ts"],"names":[],"mappings":"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"}

package/dist/detect.d.ts

@@ -2,10 +2,10 @@ import type { Logger } from '@knapsack/adapter-core';
 import type { ArtifactRef, ConflictGroup } from './types.js';
 export type { ArtifactRef, ConflictGroup } from './types.js';
 /**
- * Index filesystem artifacts by (entityKind + canonical relPath).
+ * Index filesystem artifacts by (entityType + canonical relPath).
  *
- * Expected layout: entities/<entityKind>/<base>.<sourceType>-<hash>.<ext>
- * Same entity = same entityKind + same base name (e.g. button.react.mdx or button.react.md);
+ * Expected layout: entities/<entityType>/<base>.<sourceType>-<hash>.<ext>
+ * Same entity = same entityType + same base name (e.g. button.react.mdx or button.react.md);
  * sourceType and hash are read from the filename.
  */
 export declare function indexEntitiesDir(entitiesRootAbs: string, logger: Logger): Promise<Map<string, ArtifactRef[]>>;

package/dist/detect.js

@@ -32,18 +32,18 @@ function parseArtifactFilename(filename) {
     const hash = sourceTypeHash.slice(dashIdx + 1);
     if (!rawSourceType || !hash)
         return null;
-    const sourceKey = parseSourceType(rawSourceType);
-    if (!sourceKey)
+    const sourceType = parseSourceType(rawSourceType);
+    if (!sourceType)
         return null;
     const base = parts.join('.');
     const relPath = `${base}.${ext}`;
-    return { relPath, sourceKey, hash };
+    return { relPath, sourceType, hash };
 }
 /**
- * Index filesystem artifacts by (entityKind + canonical relPath).
+ * Index filesystem artifacts by (entityType + canonical relPath).
  *
- * Expected layout: entities/<entityKind>/<base>.<sourceType>-<hash>.<ext>
- * Same entity = same entityKind + same base name (e.g. button.react.mdx or button.react.md);
+ * Expected layout: entities/<entityType>/<base>.<sourceType>-<hash>.<ext>
+ * Same entity = same entityType + same base name (e.g. button.react.mdx or button.react.md);
  * sourceType and hash are read from the filename.
  */
 export async function indexEntitiesDir(entitiesRootAbs, logger) {
@@ -54,8 +54,8 @@ export async function indexEntitiesDir(entitiesRootAbs, logger) {
     for (const etEnt of entityTypeDirs) {
         if (!etEnt.isDirectory())
             continue;
-        const entityKind = parseEntityKind(etEnt.name);
-        if (!entityKind)
+        const entityType = parseEntityKind(etEnt.name);
+        if (!entityType)
             continue;
         const etDir = path.join(entitiesRootAbs, etEnt.name);
         const files = await walkFiles(etDir);
@@ -64,10 +64,10 @@ export async function indexEntitiesDir(entitiesRootAbs, logger) {
             const parsed = parseArtifactFilename(filename);
             if (!parsed)
                 continue;
-            const key = `${entityKind}::${parsed.relPath}`;
+            const key = `${entityType}::${parsed.relPath}`;
             const ref = {
-                sourceKey: parsed.sourceKey,
-                entityKind,
+                sourceType: parsed.sourceType,
+                entityType,
                 relPath: parsed.relPath,
                 absPath,
             };
@@ -88,9 +88,9 @@ export function findConflictGroups(index, logger) {
     for (const [key, artifacts] of index.entries()) {
         if (artifacts.length < 2)
             continue;
-        // all same entityKind/relPath by construction
-        const { entityKind, relPath } = artifacts[0];
-        conflicts.push({ key, entityKind, relPath, artifacts });
+        // all same entityType/relPath by construction
+        const { entityType, relPath } = artifacts[0];
+        conflicts.push({ key, entityType, relPath, artifacts });
     }
     conflicts.sort((a, b) => a.key.localeCompare(b.key)); // stable order for deterministic output
     logger.info('Conflict groups', {

package/dist/detect.js.map

@@ -1 +1 @@
-{"version":3,"file":"detect.js","sourceRoot":"","sources":["../src/detect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"detect.js","sourceRoot":"","sources":["../src/detect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAK9D,KAAK,UAAU,SAAS,CAAC,GAAW;IAClC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/D,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;YACtB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;aAAM,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAWD;;;GAGG;AACH,SAAS,qBAAqB,CAC5B,QAAgB;IAEhB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;IACxB,MAAM,cAAc,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC;IACnC,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1E,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,CAAC;IAClD,IAAI,CAAC,UAAU;QAAE,OAAO,IAAI,CAAC;IAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,eAAuB,EACvB,MAAc;IAEd,MAAM,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE/C,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE;QACvD,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IACH,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAAE,SAAS;QAEnC,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU;YAAE,SAAS;QAE1B,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;QACrC,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,MAAM,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM;gBAAE,SAAS;YAEtB,MAAM,GAAG,GAAG,GAAG,UAAU,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;YAC/C,MAAM,GAAG,GAAgB;gBACvB,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,UAAU;gBACV,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,OAAO;aACR,CAAC;YACF,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,QAAQ;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;;gBAC5B,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE;QAC9B,QAAQ,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,CAAC,IAAI,EAAE;KAC1E,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,KAAiC,EACjC,MAAc;IAEd,MAAM,SAAS,GAAoB,EAAE,CAAC;IAEtC,KAAK,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;QAC/C,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAEnC,8CAA8C;QAC9C,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,CAAC,CAAE,CAAC;QAC9C,SAAS,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,wCAAwC;IAC9F,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC7B,QAAQ,EAAE;YACR,SAAS,EAAE,iCAAiC;YAC5C,KAAK,EAAE,SAAS,CAAC,MAAM;SACxB;KACF,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC"}