onsystem 0.9.0 → 0.10.0

package/dist/eslint-worker.d.ts

@@ -1,4 +1,4 @@
-import { h as DesignSystemModel, i as ResolvedConfig } from "./config-B98w8bcg.js";
+import { h as DesignSystemModel, i as ResolvedConfig } from "./config-BbTW1jKU.js";
 import { MessagePort } from "node:worker_threads";
 //#region src/eslint/worker.d.ts
 export interface LoadRequest {

package/dist/eslint-worker.js

@@ -1,5 +1,5 @@
-import { At as relativePath, i as componentFiles, r as buildModel, rt as excludedBy } from "./design-system-Bykei5W0.js";
-import { r as loadTarget } from "./workspace-Dp1q8qZ8.js";
+import { Mt as relativePath, at as excludedBy, i as componentFiles, r as buildModel } from "./design-system-D53Jxybo.js";
+import { r as loadTarget } from "./workspace-DAa_08uB.js";
 import fs from "node:fs";
 import path from "node:path";
 import { parentPort } from "node:worker_threads";

package/dist/eslint.js

@@ -1,4 +1,4 @@
-import { At as relativePath, N as RULES, Q as DEFAULT_TEST_FOLDERS, X as DEFAULT_SEVERITY, Z as DEFAULT_TEST_EXCLUDE, t as DesignSystem, v as NAME, y as VERSION } from "./design-system-Bykei5W0.js";
+import { Mt as relativePath, N as RULES, Q as DEFAULT_TEST_FOLDERS, X as DEFAULT_SEVERITY, Z as DEFAULT_TEST_EXCLUDE, t as DesignSystem, v as NAME, y as VERSION } from "./design-system-D53Jxybo.js";
 import path from "node:path";
 import { MessageChannel, Worker, receiveMessageOnPort } from "node:worker_threads";
 //#region src/eslint/bridge.ts

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { C as TOKEN_CATEGORIES, D as VariantInfo, E as TokenCategory, O as ImportMapping, S as SourceLocation, T as Token, _ as DocSection, a as ResolvedRule, b as PropInfo, c as configJsonSchema, d as CheckResult, f as ComponentDocs, g as Diagnostic, h as DesignSystemModel, i as ResolvedConfig, l as defineConfig, m as CompoundVariantInfo, n as LoadConfigOptions, o as RuleId, p as ComponentInfo, r as RULE_IDS, s as RuleOptions, t as Config, u as loadConfig, v as ExampleInfo, w as TextEdit, x as Severity, y as InheritedProps } from "./config-B98w8bcg.js";
+import { C as TOKEN_CATEGORIES, D as VariantInfo, E as TokenCategory, O as ImportMapping, S as SourceLocation, T as Token, _ as DocSection, a as ResolvedRule, b as PropInfo, c as configJsonSchema, d as CheckResult, f as ComponentDocs, g as Diagnostic, h as DesignSystemModel, i as ResolvedConfig, l as defineConfig, m as CompoundVariantInfo, n as LoadConfigOptions, o as RuleId, p as ComponentInfo, r as RULE_IDS, s as RuleOptions, t as Config, u as loadConfig, v as ExampleInfo, w as TextEdit, x as Severity, y as InheritedProps } from "./config-BbTW1jKU.js";
 import ts from "typescript";
 import { Oklch } from "culori";
 import { McpServer, Transport } from "@modelcontextprotocol/server";
@@ -663,10 +663,10 @@ export declare class DesignSystemHost {
   /** Watches the component, token and docs locations, the config and the tsconfig chain. */
   watch(): void;
   /**
-   * Watches the config file, the tsconfig and the tsconfigs it extends through
-   * their directories: editors save by renaming a new file over the old one,
-   * which ends a watch on the file. Called again after each build, so a new
-   * `extends` target is picked up.
+   * Watches the config file, the config a design-system package declares, which a project with
+   * a config of its own reads under that one, the tsconfig and the tsconfigs it extends through
+   * their directories: editors save by renaming a new file over the old one, which ends a watch
+   * on the file. Called again after each build, so a new `extends` target is picked up.
    */
   private watchConfigFiles;
   private changed;

package/dist/index.js

@@ -1,3 +1,3 @@
-import { F as loadTokens, G as parseDoc, H as parseDesignMd, I as mergeTokens, K as extractComponents, L as toDesignMd, N as RULES, P as TokenIndex, R as toDtcg, U as parseCssTokens, V as parseDtcgTokens, W as attachDocs, _ as formatDiagnostics, a as fingerprint, at as loadConfig, et as RULE_IDS, f as searchComponents, lt as findVariantDefinitions, m as checkSource, n as DesignSystemHost, nt as defineConfig, o as loadDesignSystem, p as applyFixes, r as buildModel, t as DesignSystem, tt as configJsonSchema, y as VERSION } from "./design-system-Bykei5W0.js";
-import { n as INSTRUCTIONS, r as createServer, t as serveStdio } from "./stdio-B7u6dqLd.js";
+import { F as loadTokens, G as parseDoc, H as parseDesignMd, I as mergeTokens, K as extractComponents, L as toDesignMd, N as RULES, P as TokenIndex, R as toDtcg, U as parseCssTokens, V as parseDtcgTokens, W as attachDocs, _ as formatDiagnostics, a as fingerprint, dt as findVariantDefinitions, f as searchComponents, it as defineConfig, m as checkSource, n as DesignSystemHost, nt as RULE_IDS, o as loadDesignSystem, p as applyFixes, r as buildModel, rt as configJsonSchema, st as loadConfig, t as DesignSystem, y as VERSION } from "./design-system-D53Jxybo.js";
+import { n as INSTRUCTIONS, r as createServer, t as serveStdio } from "./stdio-ha4IF0CU.js";
 export { DesignSystem, DesignSystemHost, INSTRUCTIONS, RULES, RULE_IDS, TokenIndex, VERSION, applyFixes, attachDocs, buildModel, checkSource, configJsonSchema, createServer, defineConfig, extractComponents, findVariantDefinitions, fingerprint, formatDiagnostics, loadConfig, loadDesignSystem, loadTokens, mergeTokens, parseCssTokens, parseDesignMd, parseDoc, parseDtcgTokens, searchComponents, serveStdio, toDesignMd, toDtcg };

package/dist/{stdio-B7u6dqLd.js → stdio-ha4IF0CU.js}

@@ -1,5 +1,5 @@
-import { $ as LEGACY_CONFIG_FILES, At as relativePath, Ct as closest, Dt as SCRIPT_FILE, Et as unique, Mt as defaultProjectConfig, Ot as isInside, Tt as truncate, X as DEFAULT_SEVERITY, _t as detectProject, at as loadConfig, ct as formatPx, d as descriptionOf, dt as LIBRARY_IDS, et as RULE_IDS, f as searchComponents, ft as libraryTitle, h as uncheckedNotice, n as DesignSystemHost, pt as notReadYet, q as CONFIG_FILES, rt as excludedBy, u as buildSearchIndex, ut as LIBRARIES, v as NAME, vt as findDesignSystemPackage, wt as plural, y as VERSION, z as TOKEN_CATEGORIES } from "./design-system-Bykei5W0.js";
-import { n as hasProjectMarker, r as loadTarget, t as findProjectRoot } from "./workspace-Dp1q8qZ8.js";
+import { At as isInside, Dt as truncate, Et as plural, Mt as relativePath, Ot as unique, Pt as defaultProjectConfig, Tt as closest, X as DEFAULT_SEVERITY, at as excludedBy, bt as findDesignSystemPackage, d as descriptionOf, f as searchComponents, ft as LIBRARIES, h as uncheckedNotice, ht as notReadYet, kt as SCRIPT_FILE, mt as libraryTitle, n as DesignSystemHost, nt as RULE_IDS, pt as LIBRARY_IDS, q as CONFIG_FILES, st as loadConfig, tt as LEGACY_CONFIG_FILES, u as buildSearchIndex, ut as formatPx, v as NAME, y as VERSION, yt as detectProject, z as TOKEN_CATEGORIES } from "./design-system-D53Jxybo.js";
+import { n as hasProjectMarker, r as loadTarget, t as findProjectRoot } from "./workspace-DAa_08uB.js";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -19,7 +19,7 @@ function explainProject(ds, cwd, indent = "") {
 	const out = (line = "") => lines.push(line ? `${indent}${line}` : "");
 	out("How the design system was found");
 	for (const step of packageSteps(config, cwd)) out(`  ${(step.accepted ? "found" : "no").padEnd(6)} ${step.candidate}: ${step.reason}`);
-	if (config.configured) out(`  components come from ${config.configFile ? display(cwd, config.configFile) : "--components"}, so zero config did not look`);
+	if (config.configured) out(`  components come from ${config.inherits && config.designSystemPackage ? display(cwd, config.designSystemPackage.config) : config.configFile ? `${display(cwd, config.configFile)}${over(config, cwd)}` : "--components"}, so zero config did not look`);
 	else {
 		const steps = [];
 		detectProject(config.root, config.tsconfig, steps, config.designSystemPackage);
@@ -37,7 +37,7 @@ function explainProject(ds, cwd, indent = "") {
 	out("Resolved config");
 	const field = (name, value) => out(`  ${name.padEnd(12)} ${value}`);
 	field("root", config.root);
-	field("config", config.configFile ? `${display(cwd, config.configFile)}${config.designSystemPackage ? ` (declared by ${config.designSystemPackage.name})` : ""}` : "(none)");
+	field("config", config.configFile ? `${display(cwd, config.configFile)}${over(config, cwd)}${config.designSystemPackage ? ` (declared by ${config.designSystemPackage.name})` : ""}` : "(none)");
 	field("components", listOf$3(config.components) || "(none)");
 	field("exclude", listOf$3(config.exclude));
 	field("tokens", listOf$3(config.tokens.map((t) => `${t.path}${t.prefix ? ` (prefix ${t.prefix})` : ""}${t.fallback ? " (when nothing else is found)" : ""}`)));
@@ -111,20 +111,34 @@ function nodeModulesFor(dir) {
 		if (current === path.dirname(current)) return void 0;
 	}
 }
+/** `, over packages/ui/onsystem.config.json` for a config read over a design-system package's. */
+function over(config, cwd) {
+	const declared = config.designSystemPackage;
+	return declared && config.configFile !== declared.config ? `, over ${display(cwd, declared.config)}` : "";
+}
 function display(cwd, file) {
 	const rel = relativePath(cwd, file);
 	return rel && !rel.startsWith("..") ? rel : file;
 }
 /**
-* Whether a dependency's declared config was taken on, for a project without a config of its
-* own: the package it came from and the others that declare one, or that none does.
+* Whether a dependency's declared config was read, taken on by a project without a config of its
+* own or under the one it has: the package it came from and the others that declare one, or that
+* none does.
 */
 function packageSteps(config, cwd) {
 	const declared = config.designSystemPackage;
-	if (config.configFile && !declared) return [];
+	const candidate = "a design-system package's config";
+	if (config.configFile && !declared) {
+		const found = config.extendsOff ? findDesignSystemPackage(config.root)?.found : void 0;
+		if (!found) return [];
+		return [{
+			candidate,
+			accepted: false,
+			reason: `${found.name} (${found.installed ? "installed" : "a workspace package"}) declares ${display(cwd, found.config)}, not read: "extends": false in ${display(cwd, config.configFile)} reads it alone`
+		}];
+	}
 	const lookup = findDesignSystemPackage(config.root);
 	if (!lookup) return [];
-	const candidate = "a design-system package's config";
 	const skipped = lookup.skipped.length ? `; ${lookup.skipped.map((p) => p.name).join(", ")} ${lookup.skipped.length === 1 ? "declares one" : "declare one"} that cannot be read, skipped since installed` : "";
 	if (!declared) return [{
 		candidate,
@@ -134,7 +148,7 @@ function packageSteps(config, cwd) {
 	return [{
 		candidate,
 		accepted: true,
-		reason: `${declared.name} (${declared.installed ? "installed" : "a workspace package"}) declares ${display(cwd, declared.config)}, which this project takes on, with its paths from ${display(cwd, declared.dir)}${lookup.others.length ? `; ${lookup.others.join(", ")} also declare one, not read: one config is taken on, from the package the code imports most` : ""}${skipped}`
+		reason: `${declared.name} (${declared.installed ? "installed" : "a workspace package"}) declares ${display(cwd, declared.config)}, which this project ${config.configFile === declared.config ? "takes on" : `reads under ${display(cwd, config.configFile ?? "")}`}, with its paths from ${display(cwd, declared.dir)}${lookup.others.length ? `; ${lookup.others.join(", ")} also declare one, not read: one config is taken on, from the package the code imports most` : ""}${skipped}`
 	}];
 }
 //#endregion
@@ -327,11 +341,16 @@ function listTail(listed) {
 	if (listed.omitted) lines.push("", `${listed.omitted.toLocaleString("en-US")} more not shown: pass a higher \`limit\`, or a \`query\`.`);
 	return lines;
 }
+/** The shared explanation when a project has no design-system components to show. */
+function noComponentsMessage(root, project, monorepo = false) {
+	if (monorepo) return `No design-system components found in any project of this monorepo (root: ${root}). Check the "components" globs in the config. Run \`onsystem inspect\` there to see what was looked at.`;
+	return `No design-system components found${project ? ` in ${project}` : ""}. Check the "components" globs in the config (root: ${root}).`;
+}
 /** `project`: the folder of a workspace root's project the list is for. */
 function renderComponentList(ds, project, filter = {}) {
 	const roots = ds.roots();
 	const where = project ? ` in ${project}` : "";
-	if (!roots.length) return `No components found${where}. Check the "components" globs in the config (root: ${ds.root}).`;
+	if (!roots.length) return noComponentsMessage(ds.root, project);
 	const listed = listComponents(roots, (c) => c, filter);
 	if (!listed.matched) return `No components match ${filterText(filter)}${where} (${roots.length} in all). Call list_components without filters to see them.`;
 	const parts = ds.components.length - roots.length;
@@ -374,7 +393,7 @@ const PICK_PROJECT = "This is a monorepo root: pass `path`, the file you are edi
 /** Every project's components at a workspace root, grouped by the package they come from. */
 function renderCatalogList(catalog, filter = {}) {
 	const roots = catalog.roots();
-	if (!roots.length) return `No components found in any project of this monorepo (root: ${catalog.root}). Run \`onsystem inspect\` there to see what was looked at.`;
+	if (!roots.length) return noComponentsMessage(catalog.root, void 0, true);
 	const listed = listComponents(roots, (e) => e.component, filter, (e) => e.package);
 	if (!listed.matched) return `No components match ${filterText(filter)} in any project (${roots.length} in all). Call list_components without filters to see them.`;
 	const packages = new Set(roots.map((e) => e.package));
@@ -1086,6 +1105,7 @@ function createServer({ getDesignSystem, getProjects }) {
 			const matches = catalog.find(name);
 			const [entry] = matches;
 			if (!entry) {
+				if (!catalog.roots().length) return errorResult(noComponentsMessage(catalog.root, void 0, true));
 				const guess = catalog.suggest(name);
 				const names = [...new Set(catalog.roots().map((e) => e.component.name))];
 				return errorResult(`No component named "${name}" in any project.` + (guess ? ` Did you mean "${guess}"?` : "") + ` Available: ${names.join(", ")}.`);
@@ -1109,6 +1129,13 @@ function createServer({ getDesignSystem, getProjects }) {
 		const { ds } = found;
 		const component = ds.getComponent(name);
 		if (!component) {
+			if (!ds.roots().length) return {
+				isError: true,
+				content: [{
+					type: "text",
+					text: noComponentsMessage(ds.root, found.project?.dir)
+				}]
+			};
 			const guess = ds.suggestComponent(name);
 			return {
 				isError: true,

package/dist/{workspace-Dp1q8qZ8.js → workspace-DAa_08uB.js}

@@ -1,4 +1,4 @@
-import { $ as LEGACY_CONFIG_FILES, At as relativePath, Ot as isInside, St as workspacePatterns, at as loadConfig, bt as isWorkspaceRoot, ht as PackageFinder, i as componentFiles, it as hasOwnConfig, ot as loadConfigWith, q as CONFIG_FILES, vt as findDesignSystemPackage, xt as workspacePackageDirs } from "./design-system-Bykei5W0.js";
+import { At as isInside, Ct as workspacePackageDirs, Mt as relativePath, St as isWorkspaceRoot, _t as PackageFinder, bt as findDesignSystemPackage, ct as loadConfigWith, i as componentFiles, ot as hasOwnConfig, q as CONFIG_FILES, st as loadConfig, tt as LEGACY_CONFIG_FILES, wt as workspacePatterns } from "./design-system-D53Jxybo.js";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
@@ -121,7 +121,7 @@ async function discoverWorkspace(rootConfig, options) {
 	for (const dir of workspacePackageDirs(root)) {
 		const config = await loadProjectConfig(dir, root, rootConfig.configFile, options);
 		const files = (await componentFiles(config)).length;
-		const own = config.configFile !== void 0 && config.configFile !== rootConfig.configFile;
+		const own = config.configFile !== void 0 && config.configFile !== rootConfig.configFile || config.designSystemPackage !== void 0;
 		const library = config.libraries?.some((l) => l.dir !== void 0) ?? false;
 		if (files || own || library) projects.push({
 			root: dir,
@@ -138,10 +138,11 @@ async function discoverWorkspace(rootConfig, options) {
 	return new Workspace(root, source, projects, others, rootConfig.configFile, options, rootConfig, otherConfigs);
 }
 /**
-* A project's config: its own config file, else the config its design-system package declares
-* (a dependency with `"onsystem"` in its package.json), else the workspace root's, with paths
-* relative to the workspace root, else zero config. `loadConfig` from the project's folder finds
-* the first two the same way. CLI flags that apply to every project carry over.
+* A project's config: its own config file, else the workspace root's, with paths relative to
+* the workspace root, read over the config its design-system package declares (a dependency with
+* `"onsystem"` in its package.json), else zero config. `loadConfig` from the project's folder
+* finds its own config and the package's the same way. CLI flags that apply to every project
+* carry over.
 */
 function loadProjectConfig(dir, workspaceRoot, rootConfigFile, options) {
 	const shared = {
@@ -155,7 +156,7 @@ function loadProjectConfig(dir, workspaceRoot, rootConfigFile, options) {
 		root: dir
 	}, { packages });
 	const lookup = findDesignSystemPackage(dir, packages);
-	if (lookup?.found || lookup?.problems.length) return loadConfigWith({
+	if (lookup?.problems.length) return loadConfigWith({
 		...shared,
 		root: dir
 	}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onsystem",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "mcpName": "io.github.dgesteves/onsystem",
   "description": "Keeps coding agents on your design system: catches palette colors, native elements and APIs your system lacks, at every edit and pull request, with the fix. Set it up once in your design-system package; every app in your monorepo gets it.",
   "keywords": [

package/schema.json

@@ -7,6 +7,10 @@
     "$schema": {
       "type": "string"
     },
+    "extends": {
+      "description": "Whether this config builds on the one a design-system package declares (\"onsystem\" in the package.json of a dependency, found from the dependencies): its rules apply over the package's, and, unless it sets components of its own, what it leaves out comes from the package's (components with their importPath, docs, elements, tokens and libraries). Default: true. false reads this config alone.",
+      "type": "boolean"
+    },
     "components": {
       "description": "Globs for component source files, relative to the root.",
       "anyOf": [
@@ -103,7 +107,7 @@
       "type": "string"
     },
     "importPath": {
-      "description": "Package name components are imported from, e.g. \"@acme/ui\", or a pattern for packages imported by path: \"@acme/ui/{path}\" is @acme/ui/primitives/button for primitives/button.tsx in the package. Default: inferred from package exports and tsconfig paths.",
+      "description": "Package name components are imported from, e.g. \"@acme/ui\", or a pattern for packages imported by path: \"@acme/ui/{path}\" is @acme/ui/primitives/button for primitives/button.tsx in the package. An installed dependency it names exactly, whose component sources the project does not read, is read from its type declarations (.d.ts). Default: inferred from package exports and tsconfig paths.",
       "type": "string"
     },
     "elements": {