onsystem 0.11.0 → 0.11.1

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { $ as DEFAULT_TOKENS, A as unrecordedRules, At as relativePath, B as statusKinds, C as countBaseline, D as pruneBaseline, Dt as isInside, E as onLines, Et as SCRIPT_FILE, It as unique, J as ConfigError, L as toDesignMd, M as writeBaseline, O as readBaseline, Ot as matchesGlob, Pt as plural, R as toDtcg, Rt as readProjectConfig, S as applyBaseline, St as isDesignSystemName, T as goneFiles, Y as DEFAULT_DOCS, _ as formatDiagnostics, _t as PACKAGE_FIELD, b as BASELINE_FILE, bt as detectProject, c as silentLogger, et as FALLBACK_TOKENS, g as escapeData, gt as notReadYet, h as uncheckedNotice, ht as libraryTitle, i as componentFiles, j as updateBaseline, jt as toPosix, k as rulesRun, l as stderrLogger, o as loadDesignSystem, ot as excludedBy, q as CONFIG_FILES, rt as RULE_IDS, s as tokenFiles, tt as LEGACY_CONFIG_FILES, ut as rulesFor, v as NAME, w as findMoves, x as LEGACY_BASELINE_FILE, y as VERSION, yt as declaredConfig } from "./design-system-Csqts7Eq.js";
-import { a as notReadNotices, i as missingDependencies, o as explainProject, s as librariesLeftOut, t as serveStdio } from "./stdio-0TpyqZaD.js";
-import { r as loadTarget } from "./workspace-Dbxubo9n.js";
+import { $ as DEFAULT_TOKENS, A as unrecordedRules, At as relativePath, B as statusKinds, C as countBaseline, D as pruneBaseline, Dt as isInside, E as onLines, Et as SCRIPT_FILE, It as unique, J as ConfigError, L as toDesignMd, M as writeBaseline, O as readBaseline, Ot as matchesGlob, Pt as plural, R as toDtcg, Rt as readProjectConfig, S as applyBaseline, St as isDesignSystemName, T as goneFiles, Y as DEFAULT_DOCS, _ as formatDiagnostics, _t as PACKAGE_FIELD, b as BASELINE_FILE, bt as detectProject, c as silentLogger, et as FALLBACK_TOKENS, g as escapeData, gt as notReadYet, h as uncheckedNotice, ht as libraryTitle, i as componentFiles, j as updateBaseline, jt as toPosix, k as rulesRun, l as stderrLogger, o as loadDesignSystem, ot as excludedBy, q as CONFIG_FILES, rt as RULE_IDS, s as tokenFiles, tt as LEGACY_CONFIG_FILES, ut as rulesFor, v as NAME, w as findMoves, x as LEGACY_BASELINE_FILE, y as VERSION, yt as declaredConfig } from "./design-system-D7ppJYbd.js";
+import { a as notReadNotices, i as missingDependencies, o as explainProject, s as librariesLeftOut, t as serveStdio } from "./stdio-c3Y34to3.js";
+import { r as loadTarget } from "./workspace-DUgzMLGs.js";
 import fs from "node:fs";
 import path from "node:path";
 import { escapePath, glob } from "tinyglobby";

package/dist/{design-system-Csqts7Eq.js → design-system-D7ppJYbd.js}

@@ -678,7 +678,8 @@ const APP_STYLESHEETS = [
 *    from a registry is read through its `exports` alone, when they point at the
 *    component sources it publishes, not from `dist/` back to `src/`.
 * 4. A flat folder of components that wrap a primitives library, the way React
-*    Aria's Tailwind starter ships them (`src/Button.tsx`, `src/Checkbox.tsx`).
+*    Aria's Tailwind starter ships them (`src/Button.tsx`, `src/Checkbox.tsx`), or the
+*    same files copied into an app's `src/components/`, `components/` or `app/components/`.
 *
 * With more than one design system, the one the root's code imports most comes first
 * (`designSystems`). A candidate whose globs match no file is skipped. Returns undefined
@@ -818,7 +819,7 @@ function detectProject(root, tsconfig, trace, declared, packages = new PackageFi
 		};
 	}
 	let flatWhy = "no package.json";
-	const flat = own ? fromFlatFolder(root, own, (r) => {
+	const flat = own ? fromFlatFolder(root, own, "src", (r) => {
 		flatWhy = r;
 	}) : void 0;
 	if (flat && matchesAny(root, flat)) {
@@ -826,6 +827,19 @@ function detectProject(root, tsconfig, trace, declared, packages = new PackageFi
 		return detection(root, [flat], false, flat.source);
 	}
 	step("a flat src/ of components", false, flatWhy);
+	if (!own || !primitivesDependencies(own).length) return void 0;
+	for (const folder of COMPONENT_FOLDERS) {
+		if (!fs.existsSync(path.join(root, folder))) continue;
+		let why = "";
+		const inFolder = fromFlatFolder(root, own, folder, (r) => {
+			why = r;
+		});
+		if (inFolder && matchesAny(root, inFolder)) {
+			step(`a flat ${folder}/ of components`, true, inFolder.source);
+			return detection(root, [inFolder], true, inFolder.source);
+		}
+		step(`a flat ${folder}/ of components`, false, why || "its components match no file");
+	}
 }
 /** `12 component files`, for the trace. */
 function countFiles(root, found) {
@@ -850,8 +864,11 @@ function componentGlob(root, patterns) {
 function plural(n, one, many = `${one}s`) {
 	return `${n.toLocaleString("en-US")} ${n === 1 ? one : many}`;
 }
-/** Libraries of unstyled primitives that design systems wrap. */
-const PRIMITIVES = /^(?:react-aria-components|react-aria|radix-ui|@radix-ui\/react-[\w-]+|@base-ui-components\/react|@base-ui\/react|@headlessui\/react|@ark-ui\/react)(?:\/|$)/;
+/**
+* Libraries of unstyled primitives that design systems wrap. Not Radix's icons
+* (`@radix-ui/react-icons`), which an app's own components import as much as a design system's.
+*/
+const PRIMITIVES = /^(?:react-aria-components|react-aria|radix-ui|@radix-ui\/react-(?!icons(?:\/|$))[\w-]+|@base-ui-components\/react|@base-ui\/react|@headlessui\/react|@ark-ui\/react)(?:\/|$)/;
 /** Files that make `src/` an app rather than a library: entries and route folders. */
 const APP_ENTRIES = /^(?:main|index|App|app|root|entry-client|entry-server)\.[jt]sx?$/;
 const APP_FOLDERS = /* @__PURE__ */ new Set([
@@ -859,41 +876,62 @@ const APP_FOLDERS = /* @__PURE__ */ new Set([
 	"pages",
 	"routes"
 ]);
-/** Fewer PascalCase files than this in `src/` are an app's, not a component library. */
+/** Fewer PascalCase files than this in the folder are an app's, not a component library. */
 const MIN_FLAT_COMPONENTS = 5;
 /**
-* A flat `src/` of components, as React Aria's Tailwind starter has it. It needs all of:
-* a dependency on a primitives library, no app entry (`main.tsx`, `App.tsx`) or route
-* folder in `src/`, and at least five PascalCase `.tsx`/`.jsx` files at its top level, four
-* in five of which import the primitives library. An app whose `src/` holds pages or
-* features imports its own components, not primitives, so it does not qualify.
+* An app's folders of components, read like a flat `src/` when they are one: React Aria's
+* starter copied into an app (`src/components/Button.tsx` next to `src/App.tsx`), or into a
+* Next.js app's `components/` or `app/components/`.
 */
-function fromFlatFolder(root, pkg, note = ignore) {
-	const dependencies = Object.keys({
+const COMPONENT_FOLDERS = [
+	"src/components",
+	"components",
+	"app/components"
+];
+/** The primitives libraries among a package's dependencies. */
+function primitivesDependencies(pkg) {
+	return Object.keys({
 		...asRecord(pkg.dependencies),
 		...asRecord(pkg.devDependencies),
 		...asRecord(pkg.peerDependencies)
 	}).filter((name) => PRIMITIVES.test(name));
+}
+/** `react-aria-components`, or `a primitives library (@radix-ui/react-dialog, @radix-ui/react-slot)`. */
+function primitivesNamed(dependencies) {
+	if (dependencies.length <= 1) return dependencies[0] ?? "a primitives library";
+	const shown = dependencies.slice(0, 3).join(", ");
+	const more = dependencies.length - 3;
+	return `a primitives library (${more > 0 ? `${shown} and ${String(more)} more` : shown})`;
+}
+/**
+* A flat folder of components, as React Aria's Tailwind starter has `src/`. It needs all of:
+* a dependency on a primitives library, at least five PascalCase `.tsx`/`.jsx` files at the
+* folder's top level, four in five of which import the primitives library, and, for `src/`,
+* no app entry (`main.tsx`, `App.tsx`) or route folder in it. An app whose folder holds pages
+* or features imports its own components, not primitives, so it does not qualify.
+*/
+function fromFlatFolder(root, pkg, folder, note = ignore) {
+	const dependencies = primitivesDependencies(pkg);
 	if (!dependencies.length) {
 		note("no dependency on a primitives library (React Aria, Radix, Base UI, Headless UI, Ark UI)");
 		return;
 	}
-	const dir = path.join(root, "src");
+	const dir = path.join(root, folder);
 	let entries;
 	try {
 		entries = fs.readdirSync(dir, { withFileTypes: true });
 	} catch {
-		note("no src/ folder");
+		note(`no ${folder}/ folder`);
 		return;
 	}
-	const app = entries.find((e) => e.isFile() && APP_ENTRIES.test(e.name) || e.isDirectory() && APP_FOLDERS.has(e.name));
+	const app = folder === "src" ? entries.find((e) => e.isFile() && APP_ENTRIES.test(e.name) || e.isDirectory() && APP_FOLDERS.has(e.name)) : void 0;
 	if (app) {
 		note(`src/${app.name} makes src/ an app`);
 		return;
 	}
 	const files = entries.filter((e) => e.isFile() && /^[A-Z][A-Za-z0-9]*\.[jt]sx$/.test(e.name)).map((e) => e.name);
 	if (files.length < MIN_FLAT_COMPONENTS) {
-		note(`${plural(files.length, "PascalCase .tsx file")} in src/, fewer than ${MIN_FLAT_COMPONENTS}`);
+		note(`${plural(files.length, "PascalCase .tsx file")} in ${folder}/, fewer than ${MIN_FLAT_COMPONENTS}`);
 		return;
 	}
 	const libraries = /* @__PURE__ */ new Map();
@@ -914,17 +952,17 @@ function fromFlatFolder(root, pkg, note = ignore) {
 		for (const library of used) libraries.set(library, (libraries.get(library) ?? 0) + 1);
 	}
 	if (wrapping * 5 < files.length * 4) {
-		note(`${wrapping} of ${files.length} files in src/ import ${dependencies[0] ?? "a primitives library"}, fewer than four in five`);
+		note(`${wrapping} of ${files.length} files in ${folder}/ import ${primitivesNamed(dependencies)}, fewer than four in five`);
 		return;
 	}
 	const library = [...libraries].sort((a, b) => b[1] - a[1])[0]?.[0] ?? dependencies[0] ?? "";
-	const stylesheet = STYLESHEETS.map((f) => path.join(root, f)).find((f) => fs.existsSync(f));
+	const stylesheet = folder === "src" ? STYLESHEETS.map((f) => path.join(root, f)).find((f) => fs.existsSync(f)) : void 0;
 	return {
-		components: ["src/*.{tsx,jsx}"],
+		components: [`${folder}/*.{tsx,jsx}`],
 		tokens: stylesheet ? [escapePath(relativePath(root, stylesheet))] : [],
 		imports: [],
 		dirs: [dir],
-		source: `src/ (${String(files.length)} components wrapping ${library})`
+		source: `${folder}/ (${String(files.length)} components wrapping ${library})`
 	};
 }
 function detection(root, found, withDefaults, source) {
@@ -12308,7 +12346,7 @@ function isObject(value) {
 // package.json
 var name = "onsystem";
 // src/version.ts
-const VERSION = "0.11.0";
+const VERSION = "0.11.1";
 const NAME = name;
 // src/lint/sarif.ts
 const SCHEMA = "https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json";

package/dist/eslint-worker.js

@@ -1,5 +1,5 @@
-import { At as relativePath, a as fingerprint, i as componentFiles, ot as excludedBy, r as buildModel } from "./design-system-Csqts7Eq.js";
-import { r as loadTarget } from "./workspace-Dbxubo9n.js";
+import { At as relativePath, a as fingerprint, i as componentFiles, ot as excludedBy, r as buildModel } from "./design-system-D7ppJYbd.js";
+import { r as loadTarget } from "./workspace-DUgzMLGs.js";
 import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";

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, m as checkSource, rt as RULE_IDS, t as DesignSystem, ut as rulesFor, v as NAME, y as VERSION } from "./design-system-Csqts7Eq.js";
+import { At as relativePath, N as RULES, Q as DEFAULT_TEST_FOLDERS, X as DEFAULT_SEVERITY, Z as DEFAULT_TEST_EXCLUDE, m as checkSource, rt as RULE_IDS, t as DesignSystem, ut as rulesFor, v as NAME, y as VERSION } from "./design-system-D7ppJYbd.js";
 import path from "node:path";
 import { MessageChannel, Worker, receiveMessageOnPort } from "node:worker_threads";
 // src/eslint/bridge.ts

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 defineConfig, ct as loadConfig, f as searchComponents, ft as findVariantDefinitions, it as configJsonSchema, m as checkSource, n as DesignSystemHost, o as loadDesignSystem, p as applyFixes, r as buildModel, rt as RULE_IDS, t as DesignSystem, y as VERSION } from "./design-system-Csqts7Eq.js";
-import { n as INSTRUCTIONS, r as createServer, t as serveStdio } from "./stdio-0TpyqZaD.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, at as defineConfig, ct as loadConfig, f as searchComponents, ft as findVariantDefinitions, it as configJsonSchema, m as checkSource, n as DesignSystemHost, o as loadDesignSystem, p as applyFixes, r as buildModel, rt as RULE_IDS, t as DesignSystem, y as VERSION } from "./design-system-D7ppJYbd.js";
+import { n as INSTRUCTIONS, r as createServer, t as serveStdio } from "./stdio-c3Y34to3.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-0TpyqZaD.js → stdio-c3Y34to3.js}

@@ -1,5 +1,5 @@
-import { At as relativePath, Ct as isWorkspaceRoot, Dt as isInside, Et as SCRIPT_FILE, Ft as truncate, It as unique, J as ConfigError, Lt as defaultProjectConfig, Mt as closest, Nt as json, Pt as plural, X as DEFAULT_SEVERITY, bt as detectProject, ct as loadConfig, d as descriptionOf, dt as formatPx, f as searchComponents, gt as notReadYet, h as uncheckedNotice, ht as libraryTitle, kt as pathOf, mt as LIBRARY_IDS, n as DesignSystemHost, ot as excludedBy, pt as LIBRARIES, q as CONFIG_FILES, r as buildModel, rt as RULE_IDS, tt as LEGACY_CONFIG_FILES, u as buildSearchIndex, v as NAME, xt as findDesignSystemPackage, y as VERSION, z as TOKEN_CATEGORIES } from "./design-system-Csqts7Eq.js";
-import { i as projectDirOf, n as hasProjectMarker, r as loadTarget, t as findProjectRoot } from "./workspace-Dbxubo9n.js";
+import { At as relativePath, Ct as isWorkspaceRoot, Dt as isInside, Et as SCRIPT_FILE, Ft as truncate, It as unique, J as ConfigError, Lt as defaultProjectConfig, Mt as closest, Nt as json, Pt as plural, X as DEFAULT_SEVERITY, bt as detectProject, ct as loadConfig, d as descriptionOf, dt as formatPx, f as searchComponents, gt as notReadYet, h as uncheckedNotice, ht as libraryTitle, kt as pathOf, mt as LIBRARY_IDS, n as DesignSystemHost, ot as excludedBy, pt as LIBRARIES, q as CONFIG_FILES, r as buildModel, rt as RULE_IDS, tt as LEGACY_CONFIG_FILES, u as buildSearchIndex, v as NAME, xt as findDesignSystemPackage, y as VERSION, z as TOKEN_CATEGORIES } from "./design-system-D7ppJYbd.js";
+import { i as projectDirOf, n as hasProjectMarker, r as loadTarget, t as findProjectRoot } from "./workspace-DUgzMLGs.js";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";

package/dist/{workspace-Dbxubo9n.js → workspace-DUgzMLGs.js}

@@ -1,4 +1,4 @@
-import { At as relativePath, Ct as isWorkspaceRoot, Dt as isInside, Tt as workspacePatterns, ct as loadConfig, i as componentFiles, lt as loadConfigWith, nt as PROJECT_MARKERS, st as hasOwnConfig, vt as PackageFinder, wt as workspacePackageDirs, xt as findDesignSystemPackage } from "./design-system-Csqts7Eq.js";
+import { At as relativePath, Ct as isWorkspaceRoot, Dt as isInside, Tt as workspacePatterns, ct as loadConfig, i as componentFiles, lt as loadConfigWith, nt as PROJECT_MARKERS, st as hasOwnConfig, vt as PackageFinder, wt as workspacePackageDirs, xt as findDesignSystemPackage } from "./design-system-D7ppJYbd.js";
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onsystem",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "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": [