elcrm 1.1.3 → 1.1.4

package/dist/index.js

@@ -533,19 +533,112 @@ var init_form_aliases = __esm(() => {
   ];
 });
 
-// src/lib/migrate/form-tokens.ts
-import { readFileSync as readFileSync9 } from "fs";
-function removeDecl(css, name) {
-  const re = new RegExp(`\\n?[ \\t]*${name.replace(/-/g, "\\-")}\\s*:[^;\\n}]+;?[ \\t]*`, "g");
+// src/lib/migrate/css-decl.ts
+function removeCssDecl(css, name) {
+  const re = new RegExp(`\\n?[ \\t]*${name.replace(/-/g, "\\-")}(?![\\w-])\\s*:`, "g");
   let n = 0;
-  const next = css.replace(re, () => {
+  const ranges = [];
+  let m;
+  while ((m = re.exec(css)) !== null) {
+    const start = m.index;
+    let i = m.index + m[0].length;
+    let depth = 0;
+    while (i < css.length) {
+      const ch = css[i];
+      if (ch === "(")
+        depth++;
+      else if (ch === ")")
+        depth = Math.max(0, depth - 1);
+      else if ((ch === ";" || ch === "}") && depth === 0) {
+        if (ch === ";")
+          i++;
+        break;
+      }
+      i++;
+    }
+    let s = start;
+    if (s > 0 && css[s - 1] === `
+`)
+      s--;
+    ranges.push({ start: s, end: i });
     n++;
-    return "";
-  });
+  }
+  if (!ranges.length)
+    return { next: css, n: 0 };
+  let next = css;
+  for (let r = ranges.length - 1;r >= 0; r--) {
+    const { start, end } = ranges[r];
+    next = next.slice(0, start) + next.slice(end);
+  }
   return { next: next.replace(/\n{3,}/g, `
 
 `), n };
 }
+
+// src/lib/migrate/css-sanitize.ts
+import { readFileSync as readFileSync9 } from "fs";
+function stripOrphanColorMix(source) {
+  let next = source;
+  let hits = 0;
+  next = next.replace(ORPHAN_MIX_BLOCK_RE, () => {
+    hits++;
+    return `
+`;
+  });
+  const lines = next.split(/\r?\n/);
+  const kept = [];
+  for (const line of lines) {
+    if (/^[ \t]*in\s+(?:srgb|hsl|hwb|lab|lch)\s*,?\s*$/i.test(line) || /^[ \t]*transparent\s*\)\s*;?\s*$/i.test(line) || /^[ \t]*var\([^)]+\)\s*\d+%\s*,?\s*$/i.test(line)) {
+      const prev = kept[kept.length - 1] ?? "";
+      if (!/color-mix\s*\(\s*$/i.test(prev) && !/color-mix\s*\(/i.test(prev)) {
+        hits++;
+        continue;
+      }
+    }
+    kept.push(line);
+  }
+  next = kept.join(`
+`).replace(/\n{3,}/g, `
+
+`);
+  return { next, hits };
+}
+function lineHasOrphanColorMix(line) {
+  const t = line.trim();
+  if (!t || t.startsWith("/*") || t.startsWith("*"))
+    return false;
+  if (/^in\s+(?:srgb|hsl|hwb|lab|lch)\b/i.test(t) && !/color-mix\s*\(/i.test(t)) {
+    return true;
+  }
+  if (/^transparent\s*\)\s*;?\s*$/i.test(t))
+    return true;
+  return false;
+}
+async function migrateCssSanitize(cwd, dry) {
+  const changes = [];
+  const files = projectCodeRoots(cwd).flatMap((r) => walkCodeFiles(r)).filter((f) => f.endsWith(".css"));
+  for (const file of files) {
+    const raw = readFileSync9(file, "utf8");
+    const { next, hits } = stripOrphanColorMix(raw);
+    if (hits === 0 || next === raw)
+      continue;
+    if (writeIfChanged(file, next, dry) || dry) {
+      changes.push({
+        file: rel(cwd, file),
+        detail: `${hits}\xD7 \u0443\u0434\u0430\u043B\u0435\u043D\u044B \u043E\u0441\u0438\u0440\u043E\u0442\u0435\u0432\u0448\u0438\u0435 color-mix/\u0444\u0440\u0430\u0433\u043C\u0435\u043D\u0442\u044B`
+      });
+    }
+  }
+  return changes;
+}
+var ORPHAN_MIX_BLOCK_RE;
+var init_css_sanitize = __esm(() => {
+  init_walk();
+  ORPHAN_MIX_BLOCK_RE = /(?:^|\n)[ \t]*(?:in\s+srgb|in\s+hsl|in\s+hwb|in\s+lab|in\s+lch)[\s\S]*?\n[ \t]*\);?[ \t]*(?=\n|$)/gi;
+});
+
+// src/lib/migrate/form-tokens.ts
+import { readFileSync as readFileSync10 } from "fs";
 function migrateDatePopupShadowDecl(css) {
   let n = 0;
   let next = css;
@@ -600,10 +693,13 @@ function rewriteFormTokens(source) {
     const stillUsed = new RegExp(`var\\(\\s*${name.replace(/-/g, "\\-")}\\s*`, "i").test(next);
     if (stillUsed)
       continue;
-    const rem = removeDecl(next, name);
+    const rem = removeCssDecl(next, name);
     next = rem.next;
     hits += rem.n;
   }
+  const clean = stripOrphanColorMix(next);
+  next = clean.next;
+  hits += clean.hits;
   return { next, hits };
 }
 async function migrateFormTokens(cwd, dry) {
@@ -613,7 +709,7 @@ async function migrateFormTokens(cwd, dry) {
   const changes = [];
   const files = projectCodeRoots(cwd).flatMap((r) => walkCodeFiles(r)).filter((f) => f.endsWith(".css"));
   for (const file of files) {
-    const raw = readFileSync9(file, "utf8");
+    const raw = readFileSync10(file, "utf8");
     const { next, hits } = rewriteFormTokens(raw);
     if (hits === 0 || next === raw)
       continue;
@@ -642,6 +738,7 @@ var VAR_REPLACEMENTS, DECL_REMOVE, FORM_TOKEN_DEPRECATED, DEPRECATED_VAR_RE, DEP
 var init_form_tokens = __esm(() => {
   init_pkg();
   init_walk();
+  init_css_sanitize();
   VAR_REPLACEMENTS = [
     [
       /var\(\s*--field-note-padding-top\s*(?:,[^)]+)?\)/gi,
@@ -689,18 +786,7 @@ var init_form_tokens = __esm(() => {
 });
 
 // src/lib/migrate/components.ts
-import { readFileSync as readFileSync10 } from "fs";
-function removeDecl2(css, name) {
-  const re = new RegExp(`\\n?[ \\t]*${name.replace(/-/g, "\\-")}\\s*:[^;\\n}]+;?[ \\t]*`, "g");
-  let n = 0;
-  const next = css.replace(re, () => {
-    n++;
-    return "";
-  });
-  return { next: next.replace(/\n{3,}/g, `
-
-`), n };
-}
+import { readFileSync as readFileSync11 } from "fs";
 function rewriteComponentsCss(source) {
   let next = source;
   let hits = 0;
@@ -711,10 +797,10 @@ function rewriteComponentsCss(source) {
     });
   }
   for (const name of COMPONENTS_TOKEN_DEPRECATED) {
-    const stillUsed = new RegExp(`var\\(\\s*${name.replace(/-/g, "\\-")}\\s*`, "i").test(next);
+    const stillUsed = new RegExp(`var\\(\\s*${name.replace(/-/g, "\\-")}(?![\\w-])`, "i").test(next);
     if (stillUsed)
       continue;
-    const rem = removeDecl2(next, name);
+    const rem = removeCssDecl(next, name);
     next = rem.next;
     hits += rem.n;
   }
@@ -866,13 +952,14 @@ async function migrateComponents(cwd, dry) {
   const changes = [];
   const files = projectCodeRoots(cwd).flatMap((r) => walkCodeFiles(r));
   for (const file of files) {
-    const raw = readFileSync10(file, "utf8");
+    const raw = readFileSync11(file, "utf8");
     let next = raw;
     let hits = 0;
     if (file.endsWith(".css")) {
       const r = rewriteComponentsCss(raw);
-      next = r.next;
-      hits = r.hits;
+      const clean = stripOrphanColorMix(r.next);
+      next = clean.next;
+      hits = r.hits + clean.hits;
     } else if (/\.(tsx?|jsx?|mdx?)$/.test(file)) {
       const r = rewriteComponentsTsx(raw);
       next = fixStackDirectionSpacing(r.next);
@@ -907,6 +994,7 @@ var VAR_REPLACEMENTS2, COMPONENTS_TOKEN_DEPRECATED, DEPRECATED_VAR_RE2, DEPRECAT
 var init_components = __esm(() => {
   init_pkg();
   init_walk();
+  init_css_sanitize();
   VAR_REPLACEMENTS2 = [
     [/var\(\s*--layout-background\s*(?:,[^)]+)?\)/gi, "var(--shell-background-muted)"],
     [/var\(\s*--header-background\s*(?:,[^)]+)?\)/gi, "var(--shell-background)"],
@@ -955,7 +1043,14 @@ var init_components = __esm(() => {
     [/var\(\s*--item-radius\s*(?:,[^)]+)?\)/gi, "var(--shell-radius)"],
     [/var\(\s*--block-gap\s*(?:,[^)]+)?\)/gi, "var(--shell-gap)"],
     [/var\(\s*--row-gap\s*(?:,[^)]+)?\)/gi, "var(--shell-gap)"],
-    [/var\(\s*--column-gap\s*(?:,[^)]+)?\)/gi, "var(--shell-gap)"]
+    [/var\(\s*--column-gap\s*(?:,[^)]+)?\)/gi, "var(--shell-gap)"],
+    [/var\(\s*--page-gap\s*(?:,[^)]+)?\)/gi, "var(--shell-gap)"],
+    [/var\(\s*--page-pad\s*(?:,[^)]+)?\)/gi, "var(--shell-padding)"],
+    [/var\(\s*--page-pad-x\s*(?:,[^)]+)?\)/gi, "var(--shell-padding-inline)"],
+    [/var\(\s*--page-pad-y\s*(?:,[^)]+)?\)/gi, "var(--shell-padding-block)"],
+    [/var\(\s*--card-radius\s*(?:,[^)]+)?\)/gi, "var(--shell-radius)"],
+    [/var\(\s*--section-description-size\s*(?:,[^)]+)?\)/gi, "0.95rem"],
+    [/var\(\s*--section-title-size\s*(?:,[^)]+)?\)/gi, "1.5rem"]
   ];
   COMPONENTS_TOKEN_DEPRECATED = [
     "--layout-background",
@@ -1067,10 +1162,13 @@ var init_components = __esm(() => {
     "--empty-state-actions-margin-top",
     "--radio-group-gap",
     "--page-pad",
-    "--page-gap"
+    "--page-pad-x",
+    "--page-pad-y",
+    "--page-gap",
+    "--card-radius"
   ];
-  DEPRECATED_VAR_RE2 = new RegExp(`var\\(\\s*(?:${COMPONENTS_TOKEN_DEPRECATED.map((n) => n.replace(/-/g, "\\-")).join("|")})\\s*`, "i");
-  DEPRECATED_DECL_RE2 = new RegExp(`(?:${COMPONENTS_TOKEN_DEPRECATED.map((n) => n.replace(/-/g, "\\-")).join("|")})\\s*:`);
+  DEPRECATED_VAR_RE2 = new RegExp(`var\\(\\s*(?:${COMPONENTS_TOKEN_DEPRECATED.map((n) => n.replace(/-/g, "\\-")).join("|")})(?![\\w-])`, "i");
+  DEPRECATED_DECL_RE2 = new RegExp(`(?:${COMPONENTS_TOKEN_DEPRECATED.map((n) => n.replace(/-/g, "\\-")).join("|")})(?![\\w-])\\s*:`);
 });
 
 // src/lib/migrate/front.ts
@@ -1100,6 +1198,7 @@ var init_front = __esm(() => {
   init_form_aliases();
   init_form_tokens();
   init_components();
+  init_css_sanitize();
   FRONT_MIGRATIONS = {
     "size-sml": migrateSizeSml,
     "field-border": migrateFieldBorder,
@@ -1107,6 +1206,7 @@ var init_front = __esm(() => {
     "form-aliases": migrateFormAliases,
     "form-tokens": migrateFormTokens,
     components: migrateComponents,
+    "css-sanitize": migrateCssSanitize,
     "legacy-hacks": migrateLegacyReactHack,
     "socket-server": migrateSocketServer
   };
@@ -1114,6 +1214,7 @@ var init_front = __esm(() => {
     "form-aliases",
     "form-tokens",
     "components",
+    "css-sanitize",
     "size-sml",
     "field-border",
     "modal-create",
@@ -1122,7 +1223,7 @@ var init_front = __esm(() => {
 });
 
 // src/index.ts
-import { readFileSync as readFileSync20 } from "fs";
+import { readFileSync as readFileSync21 } from "fs";
 import { dirname as dirname4, join as join18 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -1242,6 +1343,17 @@ function installDeps(cwd = process.cwd()) {
   });
   return r.status === 0;
 }
+function installGlobalElcrm() {
+  const bun = spawnSync("bun", ["--version"], { encoding: "utf8" });
+  const cmd = bun.status === 0 ? "bun" : "npm";
+  const args = ["i", "-g", "elcrm@latest"];
+  console.log(`CLI: ${cmd} ${args.join(" ")}`);
+  const r = spawnSync(cmd, args, {
+    stdio: "inherit",
+    env: process.env
+  });
+  return r.status === 0;
+}
 
 // src/commands/update.ts
 init_pkg();
@@ -1265,6 +1377,7 @@ var c = {
 
 // src/commands/update.ts
 init_front();
+init_css_sanitize();
 
 // src/lib/cssSync.ts
 init_form_tokens();
@@ -1272,7 +1385,7 @@ init_components();
 import {
   existsSync as existsSync6,
   readdirSync as readdirSync3,
-  readFileSync as readFileSync11,
+  readFileSync as readFileSync12,
   statSync as statSync3,
   writeFileSync as writeFileSync4
 } from "fs";
@@ -1401,7 +1514,7 @@ function resolvePkgRoot(pkgName, cwd) {
 }
 function readPkgJson(dir) {
   try {
-    return JSON.parse(readFileSync11(join6(dir, "package.json"), "utf8"));
+    return JSON.parse(readFileSync12(join6(dir, "package.json"), "utf8"));
   } catch {
     return null;
   }
@@ -1457,7 +1570,7 @@ function collectPkgTokens(pkgName, cwd) {
   const acc = [];
   const seen = new Set;
   for (const file of files) {
-    const css = readFileSync11(file, "utf8");
+    const css = readFileSync12(file, "utf8");
     const kind = fileKind(file);
     if (kind !== "mixed") {
       for (const [name, value] of parseCustomProps(css)) {
@@ -1625,7 +1738,7 @@ function syncElcrmCss(options) {
     const file = fileFor(bucket);
     if (!existsSync6(file))
       continue;
-    let css = readFileSync11(file, "utf8");
+    let css = readFileSync12(file, "utf8");
     const have = existingTokenNames(css);
     const missing = allDefs.filter((d) => d.bucket === bucket && !have.has(d.name) && !TOKEN_DEPRECATED.has(d.name));
     const uniq = [];
@@ -1650,7 +1763,7 @@ function syncElcrmCss(options) {
       writeFileSync4(file, next, "utf8");
   }
   if (existsSync6(paths.elcrm)) {
-    let css = readFileSync11(paths.elcrm, "utf8");
+    let css = readFileSync12(paths.elcrm, "utf8");
     for (const exp of cssExports) {
       const specs = [];
       if (exp.light)
@@ -1677,7 +1790,7 @@ function syncElcrmCss(options) {
 import { resolve } from "path";
 
 // src/lib/test/detect.ts
-import { existsSync as existsSync7, readdirSync as readdirSync4, readFileSync as readFileSync12, statSync as statSync4 } from "fs";
+import { existsSync as existsSync7, readdirSync as readdirSync4, readFileSync as readFileSync13, statSync as statSync4 } from "fs";
 import { join as join7 } from "path";
 function hasElcrmServer(pkg) {
   for (const section of [
@@ -1732,17 +1845,18 @@ function readPkgAt(dir) {
   if (!existsSync7(path))
     return null;
   try {
-    return JSON.parse(readFileSync12(path, "utf8"));
+    return JSON.parse(readFileSync13(path, "utf8"));
   } catch {
     return null;
   }
 }
 
 // src/lib/test/front.ts
-import { existsSync as existsSync8, readdirSync as readdirSync5, readFileSync as readFileSync13, statSync as statSync5 } from "fs";
+import { existsSync as existsSync8, readdirSync as readdirSync5, readFileSync as readFileSync14, statSync as statSync5 } from "fs";
 import { join as join8, relative as relative2 } from "path";
 init_form_tokens();
 init_components();
+init_css_sanitize();
 var SKIP = new Set(["node_modules", "dist", ".git", "coverage", ".bun"]);
 function isThemeTokenFile(rel2) {
   const n = rel2.replace(/\\/g, "/");
@@ -1887,7 +2001,7 @@ function collectFrontIssues(cwd, pkg) {
       files.push(inSrc);
   }
   for (const file of files) {
-    const text = readFileSync13(file, "utf8");
+    const text = readFileSync14(file, "utf8");
     const rel2 = relative2(cwd, file);
     const skipHardColor = isLib || isThemeTokenFile(rel2) || isGeneratedIcons(rel2);
     if (DEPRECATED_SOCKET_IMPORT_RE.test(text)) {
@@ -2005,6 +2119,16 @@ function collectFrontIssues(cwd, pkg) {
           fixable: true
         });
       }
+      if (lineHasOrphanColorMix(line)) {
+        issues.push({
+          level: "error",
+          code: "css-orphan-mix",
+          message: "\u043E\u0441\u0438\u0440\u043E\u0442\u0435\u0432\u0448\u0438\u0439 \u0445\u0432\u043E\u0441\u0442 color-mix (in srgb\u2026) \u2014 elcrm migrate css-sanitize",
+          file: rel2,
+          line: i + 1,
+          fixable: true
+        });
+      }
       if (/\b(Block|Row|Column)\b/.test(line) && /@elcrm\/components/.test(text) && /from\s+["']@elcrm\/components/.test(text)) {
         if (/import\s*\{[^}]*\b(Block|Row|Column)\b/.test(line) || /<\/?(?:Block|Row|Column)\b/.test(line)) {
           issues.push({
@@ -2044,7 +2168,7 @@ function collectFrontIssues(cwd, pkg) {
   return issues;
 }
 async function runPkgScript(cwd, script) {
-  const pkg = JSON.parse(readFileSync13(join8(cwd, "package.json"), "utf8"));
+  const pkg = JSON.parse(readFileSync14(join8(cwd, "package.json"), "utf8"));
   if (!pkg.scripts?.[script])
     return { ran: false, ok: true };
   console.log(`\u2192 bun run ${script}`);
@@ -2087,7 +2211,7 @@ function printIssues(issues, title) {
 }
 
 // src/lib/test/serverScan.ts
-import { existsSync as existsSync9, readdirSync as readdirSync6, readFileSync as readFileSync14, statSync as statSync6 } from "fs";
+import { existsSync as existsSync9, readdirSync as readdirSync6, readFileSync as readFileSync15, statSync as statSync6 } from "fs";
 import { join as join9, relative as relative3 } from "path";
 
 // src/lib/test/serverRules.ts
@@ -2489,7 +2613,7 @@ function scanServerProject(root) {
   walkFiles2(root, root, files);
   const findings = [];
   for (const file of files) {
-    const text = readFileSync14(file, "utf8");
+    const text = readFileSync15(file, "utf8");
     if (file.endsWith("package.json")) {
       findings.push(...scanPackageJson(root, file, text));
     } else {
@@ -2599,6 +2723,17 @@ elcrm test: ok`));
 // src/commands/update.ts
 async function cmdUpdate(parsed) {
   const cwd = process.cwd();
+  const dry = hasFlag(parsed, "dry");
+  const useCore = hasFlag(parsed, "core");
+  const noInstall = hasFlag(parsed, "no-install");
+  const doFix = hasFlag(parsed, "fix");
+  const doTest = hasFlag(parsed, "test");
+  if (dry) {
+    console.log(`${c.gray("[dry]")} bun/npm i -g elcrm@latest`);
+  } else if (!installGlobalElcrm()) {
+    console.error("\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0439 elcrm.");
+    process.exit(1);
+  }
   const pkg = readPackageJson(cwd);
   if (!pkg) {
     console.error("package.json \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u0432 \u0442\u0435\u043A\u0443\u0449\u0435\u043C \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0435.");
@@ -2609,11 +2744,6 @@ async function cmdUpdate(parsed) {
     console.log("\u0417\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0435\u0439 @elcrm/* \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E.");
     return;
   }
-  const dry = hasFlag(parsed, "dry");
-  const useCore = hasFlag(parsed, "core");
-  const noInstall = hasFlag(parsed, "no-install");
-  const doFix = hasFlag(parsed, "fix");
-  const doTest = hasFlag(parsed, "test");
   const names = uniqueElcrmNames(deps);
   console.log(`\u041D\u0430\u0439\u0434\u0435\u043D\u043E @elcrm/*: ${names.length}`);
   let versions;
@@ -2734,6 +2864,12 @@ package.json \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D (${changed}).`);
       if (added === 0 && css.imports.length === 0) {
         console.log("  \u0422\u043E\u043A\u0435\u043D\u044B \u0443\u0436\u0435 \u043D\u0430 \u043C\u0435\u0441\u0442\u0435.");
       }
+      const cleaned = await migrateCssSanitize(cwd, false);
+      if (cleaned.length) {
+        console.log("  css-sanitize:");
+        for (const ch of cleaned)
+          console.log(`    ${ch.file}: ${ch.detail}`);
+      }
     } catch (e) {
       console.log(`  ${c.gray("css sync \u043F\u0440\u043E\u043F\u0443\u0449\u0435\u043D:")} ${e instanceof Error ? e.message : e}`);
     }
@@ -2758,7 +2894,7 @@ import {
   existsSync as existsSync11,
   mkdirSync,
   readdirSync as readdirSync7,
-  readFileSync as readFileSync15,
+  readFileSync as readFileSync16,
   statSync as statSync7,
   writeFileSync as writeFileSync5
 } from "fs";
@@ -2802,7 +2938,7 @@ function isEmptyDir(dir) {
 function writePkgName(pkgPath, name) {
   if (!existsSync11(pkgPath))
     return;
-  const pkg = JSON.parse(readFileSync15(pkgPath, "utf8"));
+  const pkg = JSON.parse(readFileSync16(pkgPath, "utf8"));
   pkg.name = name;
   pkg.version = pkg.version ?? "0.0.0";
   writeFileSync5(pkgPath, JSON.stringify(pkg, null, 2) + `
@@ -2969,7 +3105,7 @@ async function cmdMigrate(parsed) {
   console.log(dry ? `
 --dry: ${changes.length} \u043F\u043E\u0442\u0435\u043D\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0445 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439.` : `
 \u041F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u043E: ${changes.length}.`);
-  if (name === "front" || name === "ui" || name === "size-sml" || name === "form-tokens" || name === "components") {
+  if (name === "front" || name === "ui" || name === "size-sml" || name === "form-tokens" || name === "components" || name === "css-sanitize") {
     console.log("\u0414\u0430\u043B\u044C\u0448\u0435: elcrm css && elcrm audit");
   }
 }
@@ -3164,7 +3300,7 @@ import { resolve as resolve3 } from "path";
 import {
   existsSync as existsSync13,
   readdirSync as readdirSync9,
-  readFileSync as readFileSync17,
+  readFileSync as readFileSync18,
   rmSync,
   statSync as statSync8,
   writeFileSync as writeFileSync7
@@ -3172,7 +3308,7 @@ import {
 import { join as join13 } from "path";
 
 // src/vite/concat-css.ts
-import { readdirSync as readdirSync8, readFileSync as readFileSync16, writeFileSync as writeFileSync6 } from "fs";
+import { readdirSync as readdirSync8, readFileSync as readFileSync17, writeFileSync as writeFileSync6 } from "fs";
 import { join as join12 } from "path";
 var SKIP_CSS = new Set([
   "index.css",
@@ -3189,7 +3325,7 @@ function concatDistCss(options) {
     ...options.skip ?? []
   ]);
   const files = readdirSync8(options.distDir).filter((f) => f.endsWith(".css") && !skip.has(f)).sort();
-  const css = files.map((f) => readFileSync16(join12(options.distDir, f), "utf8")).join(`
+  const css = files.map((f) => readFileSync17(join12(options.distDir, f), "utf8")).join(`
 `);
   const outPath = join12(options.distDir, outFile);
   writeFileSync6(outPath, css);
@@ -3220,7 +3356,7 @@ function postbuildLib(options) {
     const flat = join13(dist, `${name}.d.ts`);
     const src = existsSync13(impl) ? impl : existsSync13(nestedIndex) ? nestedIndex : null;
     if (src) {
-      const text = readFileSync17(src, "utf8").replace(/from ['"]\.\.\/([^'"]+)['"]/g, `from './$1'`);
+      const text = readFileSync18(src, "utf8").replace(/from ['"]\.\.\/([^'"]+)['"]/g, `from './$1'`);
       writeFileSync7(flat, text);
       console.log(`[postbuild] types \u2192 ${name}.d.ts`);
     }
@@ -3239,6 +3375,7 @@ async function cmdPostbuild(parsed) {
 
 // src/commands/css.ts
 init_pkg();
+init_css_sanitize();
 async function cmdCss(parsed) {
   const cwd = parsed.options.dir || process.cwd();
   const pkg = readPackageJson(cwd);
@@ -3280,6 +3417,14 @@ async function cmdCss(parsed) {
     } else if (dry) {
       console.log("\u0417\u0430\u043F\u0438\u0441\u044C \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u043B\u0430\u0441\u044C (--dry).");
     }
+    const cleaned = await migrateCssSanitize(cwd, dry);
+    if (cleaned.length) {
+      console.log(dry ? `
+[dry] css-sanitize: ${cleaned.length} \u0444\u0430\u0439\u043B(\u043E\u0432)` : `
+css-sanitize: \u043F\u043E\u0447\u0438\u043D\u0435\u043D\u043E ${cleaned.length} \u0444\u0430\u0439\u043B(\u043E\u0432)`);
+      for (const ch of cleaned)
+        console.log(`  ${ch.file}: ${ch.detail}`);
+    }
   } catch (e) {
     console.error(e instanceof Error ? e.message : e);
     process.exit(1);
@@ -3287,13 +3432,14 @@ async function cmdCss(parsed) {
 }
 
 // src/commands/audit.ts
-import { existsSync as existsSync14, readFileSync as readFileSync18 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync19 } from "fs";
 import { join as join14, relative as relative4 } from "path";
 init_pkg();
 init_walk();
 init_front();
 init_form_tokens();
 init_components();
+init_css_sanitize();
 function scan(cwd) {
   const out = [];
   const pkg = readPackageJson(cwd);
@@ -3324,7 +3470,7 @@ function scan(cwd) {
   }
   const files = projectCodeRoots(cwd).flatMap((r) => walkCodeFiles(r));
   for (const file of files) {
-    const text = readFileSync18(file, "utf8");
+    const text = readFileSync19(file, "utf8");
     const rel2 = relative4(cwd, file);
     const lines = text.split(/\r?\n/);
     lines.forEach((line, i) => {
@@ -3406,7 +3552,7 @@ function scan(cwd) {
       return false;
     if (/theme(-light|-dark)?\.css$/.test(f))
       return false;
-    const t = readFileSync18(f, "utf8");
+    const t = readFileSync19(f, "utf8");
     return t.includes("--search-border:") && t.includes("--button-secondary-bg:") && t.includes("transparent");
   });
   if (toolbarMarkers.length > 1) {
@@ -3433,7 +3579,7 @@ function scan(cwd) {
       "theme-dark.css",
       "theme.css"
     ].map((f) => join14(styleDir, f));
-    const themeText = themeFiles.filter(existsSync14).map((f) => readFileSync18(f, "utf8")).join(`
+    const themeText = themeFiles.filter(existsSync14).map((f) => readFileSync19(f, "utf8")).join(`
 `);
     if (themeText && !/--popup-shadow\s*:/.test(themeText) && /--date-popup-shadow\s*:|--select-background\s*:/.test(themeText)) {
       out.push({
@@ -3455,7 +3601,7 @@ function scan(cwd) {
   for (const file of files) {
     if (!file.endsWith(".css"))
       continue;
-    const text = readFileSync18(file, "utf8");
+    const text = readFileSync19(file, "utf8");
     const relPath = relative4(cwd, file);
     const lines = text.split(/\r?\n/);
     lines.forEach((line, i) => {
@@ -3481,6 +3627,16 @@ function scan(cwd) {
           fix: "elcrm migrate components"
         });
       }
+      if (lineHasOrphanColorMix(line)) {
+        out.push({
+          level: "error",
+          code: "css-orphan-mix",
+          message: "\u0431\u0438\u0442\u044B\u0439 CSS: \u0445\u0432\u043E\u0441\u0442 color-mix \u0431\u0435\u0437 \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430 (in srgb / transparent))",
+          file: relPath,
+          line: i + 1,
+          fix: "elcrm migrate css-sanitize"
+        });
+      }
     });
   }
   return out;
@@ -3594,7 +3750,7 @@ import {
   existsSync as existsSync15,
   mkdirSync as mkdirSync2,
   readdirSync as readdirSync10,
-  readFileSync as readFileSync19,
+  readFileSync as readFileSync20,
   writeFileSync as writeFileSync8
 } from "fs";
 import { dirname as dirname3, join as join15 } from "path";
@@ -3612,7 +3768,7 @@ function readBundled(relPath) {
   if (!existsSync15(full)) {
     throw new Error(`\u0428\u0430\u0431\u043B\u043E\u043D \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D: ${relPath}`);
   }
-  return readFileSync19(full, "utf8");
+  return readFileSync20(full, "utf8");
 }
 
 // src/commands/docs.ts
@@ -3682,23 +3838,6 @@ async function cmdCursor(parsed) {
   console.log(c.gray("\u0410\u0433\u0435\u043D\u0442: AGENTS.md + rules (\u0443\u0437\u043A\u0438\u0435 glob) + .cursor/docs. \u0421\u0434\u0430\u0447\u0430: elcrm test."));
 }
 
-// src/commands/upd.ts
-import { spawnSync as spawnSync2 } from "child_process";
-async function cmdUpd() {
-  const bun = spawnSync2("bun", ["--version"], { encoding: "utf8" });
-  const cmd = bun.status === 0 ? "bun" : "npm";
-  const args = ["i", "-g", "elcrm@latest"];
-  console.log(`${c.cyan("\u2192")} ${cmd} ${args.join(" ")}`);
-  const r = spawnSync2(cmd, args, {
-    stdio: "inherit",
-    env: process.env
-  });
-  if (r.status !== 0) {
-    process.exit(r.status ?? 1);
-  }
-  console.log(c.green("CLI \u043E\u0431\u043D\u043E\u0432\u043B\u0451\u043D. \u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430: elcrm -v"));
-}
-
 // src/index.ts
 function cliVersion() {
   const here = dirname4(fileURLToPath2(import.meta.url));
@@ -3707,7 +3846,7 @@ function cliVersion() {
     join18(here, "package.json")
   ]) {
     try {
-      const v = JSON.parse(readFileSync20(p, "utf8")).version;
+      const v = JSON.parse(readFileSync21(p, "utf8")).version;
       if (typeof v === "string" && v)
         return v;
     } catch {}
@@ -3724,11 +3863,9 @@ function showHelp() {
   elcrm <\u043A\u043E\u043C\u0430\u043D\u0434\u0430> [\u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B] [\u0444\u043B\u0430\u0433\u0438]
 
 \u041A\u043E\u043C\u0430\u043D\u0434\u044B:
-  upd
-      \u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u0430\u043C CLI: bun i -g elcrm@latest (\u0431\u0435\u0437 bun \u2014 npm)
-
   update [--dry] [--core] [--no-install] [--fix] [--test]
-      \u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0432\u0441\u0435 @elcrm/* \u0434\u043E latest; --fix = migrate front; --test = elcrm test
+      CLI (bun i -g elcrm@latest) + \u0432\u0441\u0435 @elcrm/* \u0432 \u043F\u0440\u043E\u0435\u043A\u0442\u0435 \u0434\u043E latest
+      --fix = migrate front; --test = elcrm test
       \u0420\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F: elcrm update --fix --test
 
   create <name> [--template app|lib|panel] [--no-install]
@@ -3740,7 +3877,7 @@ function showHelp() {
 
   migrate <name> [--dry]
   migrate --list
-      \u041C\u0438\u0433\u0440\u0430\u0446\u0438\u0438: front|ui, form-aliases, form-tokens, components, size-sml, field-border, modal-create, legacy-hacks, socket-server
+      \u041C\u0438\u0433\u0440\u0430\u0446\u0438\u0438: front|ui, form-aliases, form-tokens, components, css-sanitize, size-sml, field-border, modal-create, legacy-hacks, socket-server
 
       audit [--fix] [--dry] [--dir=\u2026]
       \u0423\u0441\u0442\u0430\u0440\u0435\u0432\u0448\u0438\u0439 API + CSS-\u0442\u043E\u043A\u0435\u043D\u044B form (padding-\u0430\u043B\u0438\u0430\u0441\u044B, popup-shadow, border shorthand)
@@ -3784,7 +3921,6 @@ function showHelp() {
 
 \u041F\u0440\u0438\u043C\u0435\u0440\u044B:
   elcrm -v
-  elcrm upd
   elcrm update
   elcrm update --dry
   elcrm update --fix --test
@@ -3823,9 +3959,6 @@ async function main() {
     console.log("parseArgs:", JSON.stringify(parsed, null, 2));
   }
   switch (parsed.command) {
-    case "upd":
-      await cmdUpd();
-      break;
     case "update":
       await cmdUpdate(parsed);
       break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elcrm",
-  "version": "1.1.3",
-  "description": "CLI @elcrm/*: update, create, migrate front/components, audit, doctor, test, build, css",
+  "version": "1.1.4",
+  "description": "CLI @elcrm/*: update, create, migrate front/components/css-sanitize, audit, doctor, test, build, css",
   "type": "module",
   "license": "MIT",
   "author": "MaSkal <dev@elcrm.online>",

package/templates/elcrm-cursor/rules/elcrm-packages.mdc

@@ -13,7 +13,7 @@ alwaysApply: true
 
 | Файл                     | Пакет                  | Делать так                                              |
 | ------------------------ | ---------------------- | ------------------------------------------------------- |
-| `CLI.elCRM.md`           | `elcrm`                | `upd` (сам CLI), `update --fix --test`, docs, cursor |
+| `CLI.elCRM.md`           | `elcrm`                | `update --fix --test` (CLI + пакеты), docs, cursor |
 | `API.elCRM.md`           | `@elcrm/api`           | `Api.create` + `Api.query("router/method", body)`       |
 | `ALERT.elCRM.md`         | `@elcrm/alert`         | `<Alert.Init />`, `Alert.Send` / `Confirm`              |
 | `BUTTON.elCRM.md`        | `@elcrm/button`        | `<Button onSend>`, size s/m/l, не `<button>`            |

package/templates/elcrm-docs/CLI.elCRM.md

@@ -2,7 +2,7 @@
 
 # `elcrm` CLI
 
-Глобально: `bun i -g elcrm` или `elcrm upd` (latest). В приложении — после смены `@elcrm/*`:
+Глобально: `bun i -g elcrm`. В приложении — пакеты и CLI одной командой:
 
 ```bash
 elcrm update --fix --test
@@ -13,8 +13,7 @@ elcrm cursor
 
 | Команда | Зачем |
 | --- | --- |
-| `upd` | сам CLI → latest (`bun i -g elcrm@latest`) |
-| `update [--dry] [--core] [--fix] [--test]` | latest `@elcrm/*` в проекте; `--fix` = migrate front + css; `--test` = elcrm test |
+| `update [--dry] [--core] [--fix] [--test]` | `bun i -g elcrm@latest` + `@elcrm/*` в проекте; `--fix` = migrate front + css; `--test` = elcrm test |
 | `create` / `init` | шаблоны `app` \| `lib` \| `panel` |
 | `migrate <name> [--dry]` | `front` (пакет), `form-aliases`, `form-tokens`, `components`, `size-sml`, `field-border`, `modal-create`, `legacy-hacks`, `socket-server` |
 | `audit [--fix]` | старые API; `--fix` = migrate front |