youiyoux 0.1.8 → 0.1.9

package/dist/chunks/{chunk-BARSW3JO.js → chunk-E5OHZJBS.js}

@@ -2357,14 +2357,26 @@ function moveDeclarations(css, blocks, moved, importPath) {
   const rules = readRules(css).filter((r) => blocks.some((b) => r.preludes.at(-1) === b.selector && (b.outer ? r.preludes.length === 2 && r.preludes[0] === b.outer : r.preludes.length === 1)));
   if (rules.length === 0) return null;
   const lines = css.split("\n");
+  const byLine = /* @__PURE__ */ new Map();
+  for (const rule2 of rules) for (const d of rule2.declarations) if (moved.has(d.property.slice(2))) byLine.set(d.line - 1, (byLine.get(d.line - 1) ?? /* @__PURE__ */ new Set()).add(d.property));
+  let count = 0;
+  const kept = [];
   const drop = /* @__PURE__ */ new Set();
-  for (const rule2 of rules) {
-    for (const d of rule2.declarations) {
-      const line = lines[d.line - 1] ?? "";
-      if (moved.has(d.property.slice(2)) && new RegExp(`^\\s*${d.property.replace(/[-]/g, "\\-")}\\s*:[^;]*;?\\s*$`).test(line)) drop.add(d.line - 1);
-    }
+  for (const [index, properties] of byLine) {
+    const segments = lines[index].split(";");
+    const left = segments.filter((segment) => {
+      const property = /^\s*(--[\w-]+)\s*:/.exec(segment)?.[1];
+      if (property === void 0 || !properties.has(property)) return true;
+      properties.delete(property);
+      count++;
+      return false;
+    });
+    kept.push(...[...properties].map((p) => p.slice(2)));
+    const text = left.join(";");
+    if (text.trim() === "") drop.add(index);
+    else lines[index] = /^\s/.test(text) || index === 0 ? text : `${lines[index].match(/^\s*/)[0]}${text.trimStart()}`;
   }
-  if (drop.size === 0) return null;
+  if (count === 0) return null;
   let content = lines.filter((_, i) => !drop.has(i)).join("\n");
   for (const block of blocks) content = content.replace(new RegExp(`(^|\\n)[ \\t]*${block.selector.replace(/[.[\]()"=:]/g, "\\$&")}\\s*\\{\\s*\\}[ \\t]*(?=\\n|$)`, "g"), "");
   for (const outer of new Set(blocks.flatMap((b) => b.outer ? [b.outer] : []))) content = content.replace(new RegExp(`(^|\\n)[ \\t]*${outer.replace(/[.[\]()"=:]/g, "\\$&")}\\s*\\{\\s*\\}[ \\t]*(?=\\n|$)`, "g"), "");
@@ -2374,7 +2386,7 @@ function moveDeclarations(css, blocks, moved, importPath) {
   content = at > 0 ? `${content.slice(0, at)}
 ${statement}${content.slice(at)}` : `${statement}
 ${content}`;
-  return { content: content.replace(/\n{3,}/g, "\n\n"), moved: drop.size };
+  return { content: content.replace(/\n{3,}/g, "\n\n"), moved: count, kept: [...new Set(kept)].sort() };
 }
 async function planAdoption(options) {
   const root = options.root;
@@ -2470,6 +2482,10 @@ async function planAdoption(options) {
   const rewritten = moving && found.forked ? { ...moving, content: moving.content.split("\n").filter((line) => !line.includes(GENERATED_MARK) && !/^\/\* Built with Terrazzo/.test(line)).join("\n") } : moving;
   if (found.forked) notes.push(`forked from ${found.forked.system ?? "the System"}${found.forked.version ? ` v${found.forked.version}` : ""}: this product's System starts from the ${found.forked.count} variables it generated into ${found.forked.file}, and the product no longer follows ${found.forked.system ?? "it"}`);
   if (css && moved.size > 0 && !rewritten) notes.push(`${stylesheet}'s variables were copied, not moved (their blocks are nested or share lines): import ${OUT_DIR}/tokens.css from it and remove them by hand`);
+  const read = [":root", ...darkBlocks.map((b) => [b.outer, b.selector].filter(Boolean).join(" > "))];
+  const others = css ? [...new Set(readRules(css).filter((r) => !read.includes(r.preludes.join(" > ")) && !r.preludes.at(-1).startsWith("@") && r.declarations.some((d) => d.property.startsWith("--"))).map((r) => r.preludes.join(" > ").replace(/\s+/g, " ")))] : [];
+  if (others.length > 0) notes.push(`${plural(others.length, "other block")} in ${stylesheet} set${others.length === 1 ? "s" : ""} variables too and stay${others.length === 1 ? "s" : ""} there, as ${others.length === 1 ? "it was" : "they were"} (${others.slice(0, 4).join(" \xB7 ")}${others.length > 4 ? " \xB7 \u2026" : ""}): the System holds the :root${darkBlocks.length > 0 ? " and dark" : ""} values only`);
+  if (rewritten && rewritten.kept.length > 0) notes.push(`${plural(rewritten.kept.length, "variable")} ${rewritten.kept.length === 1 ? "stays" : "stay"} in ${stylesheet} too, written where adopt cannot take them out alone (beside a selector): ${rewritten.kept.slice(0, 4).map((n) => `--${n}`).join(", ")}${rewritten.kept.length > 4 ? ", \u2026" : ""}; they hold the same values, so remove them by hand`);
   for (const [rule2, content] of starterRules(id, componentsDir)) out.push({ path: `design/rules/${rule2}.rule.yaml`, content });
   out.push({
     path: "design/design.md",

package/dist/youi.js

@@ -2,7 +2,7 @@
 import { createRequire as __youiRequire } from "node:module"; import { dirname as __youiDir } from "node:path"; import { fileURLToPath as __youiPath } from "node:url"; const require = __youiRequire(import.meta.url); const __youiDirname = __youiDir(__youiPath(import.meta.url));
 import {
   main
-} from "./chunks/chunk-BARSW3JO.js";
+} from "./chunks/chunk-E5OHZJBS.js";
 import "./chunks/chunk-3HON5Q5K.js";
 import "./chunks/chunk-42YJX3W5.js";
 import "./chunks/chunk-HDJ2TOWZ.js";

package/dist/youiyoux.js

@@ -3,7 +3,7 @@ import { createRequire as __youiRequire } from "node:module"; import { dirname a
 import {
   COMMAND_NAMES,
   main
-} from "./chunks/chunk-BARSW3JO.js";
+} from "./chunks/chunk-E5OHZJBS.js";
 import "./chunks/chunk-3HON5Q5K.js";
 import "./chunks/chunk-42YJX3W5.js";
 import "./chunks/chunk-HDJ2TOWZ.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "youiyoux",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Your agent rebuilds components you already have. youiyoux catches it: npx youiyoux turns any repo into a shareable report of near-duplicate components, hardcoded token values and off-library imports, with the fixes.",
   "license": "MIT",
   "repository": {
@@ -46,9 +46,9 @@
     "typescript": "6.0.3"
   },
   "devDependencies": {
-    "@youiyoux/cli": "0.1.8",
-    "@youiyoux/core": "0.1.8",
-    "@youiyoux/scanner": "0.1.8"
+    "@youiyoux/cli": "0.1.9",
+    "@youiyoux/core": "0.1.9",
+    "@youiyoux/scanner": "0.1.9"
   },
   "exports": {
     "./package.json": "./package.json"