youiyoux 0.1.6 → 0.1.8

package/dist/chunks/{chunk-RHXBYN4W.js → chunk-3HON5Q5K.js}

@@ -12,12 +12,13 @@ import {
 import {
   buildTokens,
   cssValue,
+  cssVariable,
   parseCssColor,
   readRules,
   sameColor,
   splitTopLevel,
   tailwindTheme
-} from "./chunk-VOSWAWKC.js";
+} from "./chunk-FLBRX6Y3.js";
 import {
   AST_GREP_LANGUAGES,
   BUILT_IN_CHECKS,
@@ -50,7 +51,7 @@ import {
   toPosix,
   unifiedDiff,
   writeFileAtomic
-} from "./chunk-DP54SKL4.js";
+} from "./chunk-DWYDHVLZ.js";
 
 // ../scanner/src/parse.ts
 import { Lang, parseAsync } from "@ast-grep/napi";
@@ -764,11 +765,14 @@ async function loadProject(root, options = {}) {
     ...located.commit ? { designCommit: located.commit } : {}
   };
 }
+function withFile(specifier, sourceFile) {
+  return specifier.replace("{file}", sourceFile ? posix.basename(sourceFile).replace(/\.[^.]+$/, "") : "<file>");
+}
 async function isDirectory2(path) {
   return (await stat2(path).catch(() => null))?.isDirectory() ?? false;
 }
-function importSpecifier(config, fromFile) {
-  if (config.importFrom) return config.importFrom;
+function importSpecifier(config, fromFile, sourceFile) {
+  if (config.importFrom) return withFile(config.importFrom, sourceFile);
   if (!fromFile) return config.componentsDir;
   const path = posix.relative(posix.dirname(fromFile), config.componentsDir) || ".";
   return path.startsWith(".") ? path : `./${path}`;
@@ -785,7 +789,7 @@ function buildTokenIndex(tokens, output) {
   const mapped = new Set(Object.keys(output.tailwind.map));
   const entries = [...tailwindTheme(tokens, output)].sort(([a], [b]) => Number(!mapped.has(a)) - Number(!mapped.has(b)));
   for (const [key, entry] of entries) if (entry.token) themeKeys.set(entry.token, [...themeKeys.get(entry.token) ?? [], key]);
-  return { prefix: output.cssVarPrefix, tokens, byVar: new Map(tokens.map((t) => [`--${output.cssVarPrefix}-${t.cssName}`, t])), themeKeys };
+  return { prefix: output.cssVarPrefix, tokens, byVar: new Map(tokens.map((t) => [cssVariable(output.cssVarPrefix, t.cssName), t])), themeKeys };
 }
 function isColor(value) {
   return typeof value === "object" && value !== null && "components" in value;
@@ -799,7 +803,7 @@ function colorSuggestion(literal3, index) {
   const matches = colorTokens(literal3, index);
   if (!matches) return void 0;
   if (matches.length === 0) return "no token has this value: pick the role it plays (system_get_tokens) or propose a token";
-  const listed = matches.slice(0, 3).map((t) => `var(--${index.prefix}-${t.cssName}) (${t.id})`).join(" or ");
+  const listed = matches.slice(0, 3).map((t) => `var(${cssVariable(index.prefix, t.cssName)}) (${t.id})`).join(" or ");
   return `${listed}: same value, check it is the right role`;
 }
 function offsetToPosition(text, offset, start) {
@@ -811,7 +815,7 @@ function stringNodes(module) {
   return module.root.root().findAll({ rule: { any: [{ kind: "string" }, { kind: "template_string" }] } });
 }
 var HEX = /#(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{6}|[0-9a-fA-F]{3,4})(?![0-9a-zA-Z_-])/g;
-var COLOR_FN = /\b(?:rgba?|hsla?)\(\s*-?[\d.]+[^)]*\)/g;
+var COLOR_FN = /\b(?:rgba?|hsla?|oklch)\(\s*-?[\d.]+[^)]*\)/g;
 var NON_COLOR_ATTRIBUTES = /* @__PURE__ */ new Set(["href", "to", "id", "htmlFor", "key", "name", "src", "action", "formAction", "aria-controls", "aria-describedby", "aria-labelledby"]);
 var CSS_VALUE_BEFORE = /(?:\d(?:px|rem|em|%)?|\b(?:solid|dashed|dotted|double|inset|transparent|currentColor))\s+$/;
 function hexInContext(text, index, match) {
@@ -856,7 +860,7 @@ function rawColorsInCss(module, index, isTokenSource) {
         const lineText = lines[declaration.line - 1] ?? "";
         const column = Math.max(1, lineText.indexOf(match[0]) + 1);
         const suggestion = colorSuggestion(match[0], index);
-        findings.push({ file: module.file, line: declaration.line, column, text: `${declaration.property}: ${match[0]}`, message: `Raw colour ${match[0]} in ${declaration.property}; use var(--${index.prefix}-\u2026).`, ...suggestion ? { suggestion } : {} });
+        findings.push({ file: module.file, line: declaration.line, column, text: `${declaration.property}: ${match[0]}`, message: `Raw colour ${match[0]} in ${declaration.property}; use var(${cssVariable(index.prefix, "\u2026")}).`, ...suggestion ? { suggestion } : {} });
       }
     }
   }
@@ -952,7 +956,7 @@ function lookalikes(analysis, elements, config) {
       column: site.column,
       text: `<${site.local}>`,
       message: `${site.local} here is ${site.resolved}, not the design-system ${contract?.name ?? site.resembles}.`,
-      suggestion: `import { ${contract?.name ?? site.local} } from "${importSpecifier(config, site.file)}"`
+      suggestion: `import { ${contract?.name ?? site.local} } from "${importSpecifier(config, site.file, contract?.source.file)}"`
     };
   });
 }
@@ -1701,7 +1705,7 @@ function resolveClasses(classes, tag, theme, rules) {
 }
 
 // ../scanner/src/drift.ts
-var cssVar = (token, index) => `var(${[...index.byVar].find(([, t]) => t === token)?.[0] ?? `--${index.prefix}-${token.cssName}`})`;
+var cssVar = (token, index) => `var(${[...index.byVar].find(([, t]) => t === token)?.[0] ?? cssVariable(index.prefix, token.cssName)})`;
 var tokenList = (tokens) => tokens.slice(0, 3).map((t) => t.id).join(" or ");
 function utilityBefore(lineText, column) {
   return /(?:^|[\s"'`:])!?(-?[a-z][a-z0-9]*(?:-[a-z][a-z0-9]*)*)-\[$/.exec(lineText.slice(0, column - 1))?.[1] ?? null;
@@ -1729,7 +1733,7 @@ function arbitraryFindings(module, index, added) {
     const start = node2.range().start;
     for (const match of text.matchAll(ARBITRARY)) {
       const [whole, utility, value] = match;
-      if (value.startsWith("#") || /^(rgb|hsl)a?\(/.test(value)) continue;
+      if (value.startsWith("#") || /^(?:(?:rgb|hsl)a?|oklch)\(/.test(value)) continue;
       const offset = match.index + whole.indexOf(`${utility}-[`);
       const at = offsetToPosition(text, offset, start);
       if (!added(module.file, at.line)) continue;
@@ -3354,7 +3358,7 @@ function tokenClosure(tokens, tokenId) {
   return reached;
 }
 function useNames(token, prefix, themeKeys) {
-  const variables = [`--${prefix}-${token.cssName}`, ...themeKeys.map((key) => `--${key}`)];
+  const variables = [cssVariable(prefix, token.cssName), ...themeKeys.map((key) => `--${key}`)];
   const utilities = themeKeys.filter((key) => !key.includes("--")).flatMap((key) => {
     const [namespace, users] = UTILITIES.find(([ns]) => key.startsWith(`${ns}-`)) ?? [key.split("-")[0], [key.split("-")[0]]];
     const name = key.slice(namespace.length + 1);
@@ -3747,7 +3751,7 @@ function findContract2(project, query) {
 }
 function importLine(project, contract) {
   const names = [contract.source.export, ...contract.source.also].join(", ");
-  return `import { ${names} } from "${project.config.importFrom ?? `<relative path to ${project.config.componentsDir}>`}";`;
+  return `import { ${names} } from "${project.config.importFrom ? withFile(project.config.importFrom, contract.source.file) : `<relative path to ${project.config.componentsDir}>`}";`;
 }
 var MAX_PROP_TEXT = 40;
 function formatProps(props, spread = false, keep) {
@@ -3887,7 +3891,7 @@ function tokenRows(tokens, group, limit = 60) {
     const dark = cssValue(t.type, t.dark);
     const key = tokens.themeKeys.get(t.id)?.[0];
     const utility = key ? utilityExample(key) : "";
-    return [t.id, `--${tokens.prefix}-${t.cssName}`, t.aliasOf ? `{${t.aliasOf}}` : light, dark === light || t.aliasOf ? "" : dark, utility];
+    return [t.id, cssVariable(tokens.prefix, t.cssName), t.aliasOf ? `{${t.aliasOf}}` : light, dark === light || t.aliasOf ? "" : dark, utility];
   });
   return { columns: ["id", "cssVar", "light", "dark", "utility"], rows: rows.slice(0, limit), total: rows.length, truncated: rows.length > limit };
 }
@@ -7918,7 +7922,7 @@ var Eyes = class {
   }
   async open() {
     if (this.browser) return this.browser;
-    const { launchBrowser } = await import("./src-YYI52B5R.js");
+    const { launchBrowser } = await import("./src-ZG7JU6YJ.js");
     try {
       this.browser = await launchBrowser(this.options.executablePath, { purpose: { what: "youiyoux render", command: "youiyoux render" }, ...this.options.download === false ? { download: false } : {}, ...this.options.log ? { log: this.options.log } : {} });
     } catch (error) {
@@ -8729,6 +8733,7 @@ export {
   ProjectRootError,
   ROOT_HINT,
   loadProject,
+  withFile,
   importSpecifier,
   emptyRootProblem,
   buildTokenIndex,

package/dist/chunks/{chunk-XAO3LS7M.js → chunk-6GITMASZ.js}

@@ -8,7 +8,7 @@ import {
   sha256,
   shortHash,
   writeFileAtomic
-} from "./chunk-DP54SKL4.js";
+} from "./chunk-DWYDHVLZ.js";
 
 // ../discover/src/aliases.ts
 var CONCEPTS = [