elcrm 1.1.6 → 1.1.8

package/dist/vite/minify-css-vars.d.ts

@@ -3,7 +3,7 @@
  * @see minifyCssVars
  */
 export type MinifyCssVarsOptions = {
-  /** Длина короткого `--xx` (`2` → `--ab`). По умолчанию 3 */
+  /** Длина короткого `--xx` (`2` → `--aa`, `--ab`). По умолчанию 2 */
   var?: number;
   /** Длина суффикса класса после prefix (`3` + prefix `x` → `xabc`) */
   name?: number;
@@ -21,8 +21,32 @@ export type MinifyCssVarsOptions = {
   css?: boolean;
 };
 
+export declare function toIndex(value: unknown, fallback?: number): number;
+
 export declare function encodeName(index: number, length: number): string;
 
+export declare function namespaceSize(length: number): number;
+
+/**
+ * Короткие имена без коллизий: пропускает `reserved`, не выдаёт одно `to` дважды.
+ */
+export declare function allocateUnique(
+  originals: string[],
+  reserved: Set<string>,
+  make: (index: number) => string,
+  start: number,
+  capacity: number,
+  kind: string,
+): Map<string, string>;
+
+export declare function replaceCssVarToken(
+  text: string,
+  from: string,
+  to: string,
+): string;
+
+export declare function isVendorJsChunk(code: string): boolean;
+
 export declare function minifyCssVars(
   options?: MinifyCssVarsOptions,
 ): import("vite").Plugin;

package/dist/vite/minify-css-vars.js

@@ -24,16 +24,22 @@ function collectJsVars(texts) {
     let m;
     while (m = VAR_IN_JS_RE.exec(text)) {
       const name = m[1] ?? m[2];
-      if (name)
+      if (name && !/^--[a-zA-Z_]{1,3}$/.test(name))
         set.add(name);
     }
   }
   return set;
 }
+function toIndex(value, fallback = 0) {
+  const n = typeof value === "number" ? value : Number(value);
+  if (!Number.isFinite(n) || n < 0)
+    return fallback;
+  return Math.floor(n);
+}
 function encodeName(index, length) {
   const n = LETTERS.length;
   const len = Math.max(1, Math.min(8, Math.floor(length)));
-  let i = Math.max(0, Math.floor(index));
+  let i = toIndex(index, 0);
   let s = "";
   for (let k = 0;k < len; k++) {
     s = LETTERS[i % n] + s;
@@ -55,30 +61,80 @@ function shouldMinifyClass(name, minLen, prefix) {
     return false;
   return /[-_]/.test(name);
 }
+function namespaceSize(length) {
+  const len = Math.max(1, Math.min(8, Math.floor(length)));
+  let n = 1;
+  for (let i = 0;i < len; i++)
+    n *= LETTERS.length;
+  return n;
+}
+function allocateUnique(originals, reserved, make, start, capacity, kind) {
+  const taken = new Set(reserved);
+  const out = new Map;
+  let cursor = start;
+  for (const from of originals) {
+    if (out.has(from))
+      continue;
+    let found;
+    for (let n = 0;n < capacity; n++) {
+      const candidate = make(cursor);
+      cursor++;
+      if (taken.has(candidate) || candidate === from)
+        continue;
+      found = candidate;
+      break;
+    }
+    if (!found) {
+      throw new Error(`[minify-css-vars] нет свободных имён для ${kind}: нужно ${originals.length}, ёмкость ${capacity}, занято ${taken.size}. Увеличьте var/name или сдвиньте start.`);
+    }
+    out.set(from, found);
+    taken.add(found);
+  }
+  const used = new Set;
+  for (const [from, to] of out) {
+    if (used.has(to)) {
+      throw new Error(`[minify-css-vars] коллизия ${kind}: «${from}» и ещё одно имя → «${to}»`);
+    }
+    used.add(to);
+    if (reserved.has(to)) {
+      throw new Error(`[minify-css-vars] «${from}» → «${to}» затирает существующее имя ${kind}`);
+    }
+  }
+  return out;
+}
+function escapeRe(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function replaceCssVarToken(text, from, to) {
+  return text.replace(new RegExp(`${escapeRe(from)}(?![\\w-])`, "g"), to);
+}
 function replaceVarsInCss(text, map) {
   let out = text;
   for (const [from, to] of map)
-    out = out.split(from).join(to);
+    out = replaceCssVarToken(out, from, to);
   return out;
 }
 function replaceVarsInJs(text, map) {
   let out = text;
   for (const [from, to] of map) {
-    const esc = from.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    out = out.replace(new RegExp(`var\\(\\s*${esc}\\b`, "g"), (m) => m.replace(from, to));
+    const esc = escapeRe(from);
+    out = out.replace(new RegExp(`var\\(\\s*${esc}(?=[\\s,)])`, "g"), (m) => m.replace(from, to));
     out = out.replace(new RegExp(`(["'])${esc}\\1`, "g"), `$1${to}$1`);
   }
   return out;
 }
+function isVendorJsChunk(code) {
+  return /ZipFileWorker|\bJSZip\b|pako deflate|readable-stream/.test(code);
+}
 function replaceClasses(text, map, inCss) {
   let out = text;
   for (const [from, to] of map) {
+    const esc = escapeRe(from);
     if (inCss) {
-      out = out.split(`.${from}`).join(`.${to}`);
+      out = out.replace(new RegExp(`\\.${esc}(?![\\w-])`, "g"), `.${to}`);
       continue;
     }
-    const re = new RegExp(`(^|[^\\w-])(${from.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")})(?=[^\\w-]|$)`, "g");
-    out = out.replace(re, `$1${to}`);
+    out = out.replace(new RegExp(`(^|[^\\w-])(${esc})(?=[^\\w-]|$)`, "g"), `$1${to}`);
   }
   return out;
 }
@@ -99,14 +155,14 @@ function pct(before, after) {
 }
 function normalizeOpts(raw) {
   const o = raw ?? {};
-  const varLen = o.var ?? 3;
+  const varLen = o.var ?? 2;
   const nameLen = o.name ?? 2;
-  const start = o.start ?? 0;
+  const start = toIndex(o.start, 0);
   return {
     varLen,
     nameLen,
-    varStart: o.varStart ?? start,
-    nameStart: o.nameStart ?? start,
+    varStart: toIndex(o.varStart, start),
+    nameStart: toIndex(o.nameStart, start),
     vars: o.vars !== false,
     classes: o.classes !== false,
     minVar: o.minVar ?? Math.max(4, varLen + 2),
@@ -143,37 +199,44 @@ function minifyCssVars(options) {
           ...collect(cssTexts, VAR_RE),
           ...collectJsVars(jsTexts)
         ]);
-        let vi = 0;
-        for (const name of byLongest(names)) {
-          if (alreadyShortVar(name, opt.varLen))
-            continue;
-          if (/^--[a-zA-Z_]$/.test(name))
+        const remap = [];
+        const reserved = new Set;
+        for (const name of names) {
+          if (alreadyShortVar(name, opt.varLen) || /^--[a-zA-Z_]$/.test(name) || name.length < opt.minVar) {
+            reserved.add(name);
             continue;
-          if (name.length < opt.minVar)
-            continue;
-          varMap.set(name, `--${encodeName(opt.varStart + vi, opt.varLen)}`);
-          vi++;
+          }
+          remap.push(name);
         }
+        const cap = namespaceSize(opt.varLen);
+        const allocated = allocateUnique([...remap].sort(), reserved, (i) => `--${encodeName(i, opt.varLen)}`, opt.varStart, cap, "vars");
+        for (const [k, v] of allocated)
+          varMap.set(k, v);
       }
       const classMap = new Map;
       if (opt.classes) {
-        const classNames = new Set;
+        const allClasses = new Set;
         for (const file of files) {
           if (!file.isCss)
             continue;
           CLASS_SEL_RE.lastIndex = 0;
           let m;
-          while (m = CLASS_SEL_RE.exec(file.raw)) {
-            if (shouldMinifyClass(m[1], opt.minClass, opt.classPrefix)) {
-              classNames.add(m[1]);
-            }
-          }
+          while (m = CLASS_SEL_RE.exec(file.raw))
+            allClasses.add(m[1]);
         }
-        let ci = 0;
-        for (const name of byLongest(classNames)) {
-          classMap.set(name, `${opt.classPrefix}${encodeName(opt.nameStart + ci, opt.nameLen)}`);
-          ci++;
+        const remap = [];
+        const reserved = new Set;
+        for (const name of allClasses) {
+          if (shouldMinifyClass(name, opt.minClass, opt.classPrefix)) {
+            remap.push(name);
+          } else {
+            reserved.add(name);
+          }
         }
+        const cap = namespaceSize(opt.nameLen);
+        const allocated = allocateUnique([...remap].sort(), reserved, (i) => `${opt.classPrefix}${encodeName(i, opt.nameLen)}`, opt.nameStart, cap, "classes");
+        for (const [k, v] of allocated)
+          classMap.set(k, v);
       }
       if (!varMap.size && !classMap.size) {
         if (opt.report) {
@@ -181,17 +244,18 @@ function minifyCssVars(options) {
         }
         return;
       }
-      const varEntries = [...varMap.entries()];
+      const varEntries = byLongest(varMap.keys()).map((k) => [k, varMap.get(k)]);
       let beforeAll = 0;
       let afterAll = 0;
       const rows = [];
       for (const file of files) {
         const before = bytes(file.raw);
         let next = file.raw;
-        if (varMap.size) {
+        const skipJsVendor = file.isJs && isVendorJsChunk(next);
+        if (varMap.size && !skipJsVendor) {
           next = file.isCss ? replaceVarsInCss(next, varEntries) : replaceVarsInJs(next, varEntries);
         }
-        if (classMap.size) {
+        if (classMap.size && !skipJsVendor) {
           next = replaceClasses(next, classMap, file.isCss);
         }
         const after = bytes(next);
@@ -218,6 +282,11 @@ function minifyCssVars(options) {
   };
 }
 export {
+  toIndex,
+  replaceCssVarToken,
+  namespaceSize,
   minifyCssVars,
-  encodeName
+  isVendorJsChunk,
+  encodeName,
+  allocateUnique
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elcrm",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "CLI @elcrm/*: update --fix --test, css (prune imports), docs, cursor, migrate, audit",
   "type": "module",
   "license": "MIT",

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

@@ -90,6 +90,23 @@ elcrm test                   # статический анализ + scripts п
 elcrm test --front|--server|--no-scripts
 ```
 
+### Vite-плагины из пакета `elcrm`
+
+Нужен **elcrm ≥ 1.1.6** в `devDependencies` приложения (не только глобальный `bun i -g`). Иначе Vite: `Missing "./vite/minify-css-vars" specifier`.
+
+```js
+import { minifyCssVars } from "elcrm/vite/minify-css-vars";
+
+// только command === "build"
+minifyCssVars({ var: 2, name: 3, classPrefix: "x" })
+```
+
+`nameStart` / `varStart` — **числа** (индекс алфавита), не `"x"`. Префикс класса — `classPrefix`. В JS плагин не трогает декремент `--n` (иначе `aqt is not defined`).
+
+Короткие имена **уникальны и подряд**: `--aa`, `--ab`, `--ac`… Занятые слоты пропускаются; `--field` не затирает `--field-border`. Чанки JSZip не минифицируются (декремент `--n`). Если слотов нет — сборка падает.
+
+Также: `elcrm/vite/plugin-css-scoped`, `discover-lib`, `concat-css`, `check-tokens`, `postbuild`.
+
 ### Прочее
 
 ```bash