@projectwallace/format-css 2.1.1 → 2.2.0

package/dist/format-css.js

@@ -1,196 +1,218 @@
-import d from "css-tree/parser";
-const a = " ", c = "", $ = ":", x = ";", g = '"', I = "(", v = ")", ee = "[", te = "]", V = "{", W = "}", re = "{}", Z = ",", j = "Atrule", F = "Rule", G = "Block", Q = "SelectorList", Y = "Selector", w = "Declaration", B = "Operator";
-function C(y) {
-  return /[A-Z]/.test(y) ? y.toLowerCase() : y;
-}
-function ne(y, {
-  minify: O = !1,
-  tab_size: S = void 0
-} = /* @__PURE__ */ Object.create(null)) {
-  if (S !== void 0 && Number(S) < 1)
+import { parse as X, NODE_TYPES as l, ATTR_FLAG_CASE_INSENSITIVE as z, ATTR_FLAG_CASE_SENSITIVE as tt, ATTR_OPERATOR_EQUAL as et, ATTR_OPERATOR_STAR_EQUAL as rt, ATTR_OPERATOR_DOLLAR_EQUAL as st, ATTR_OPERATOR_CARET_EQUAL as it, ATTR_OPERATOR_PIPE_EQUAL as lt, ATTR_OPERATOR_TILDE_EQUAL as nt } from "@projectwallace/css-parser";
+const f = " ", c = "", k = ":", b = ";", $ = '"', P = "(", N = ")", ut = "[", ct = "]", w = "{", g = "}", D = ",";
+function pt(R, { minify: O = !1, tab_size: L = void 0 } = /* @__PURE__ */ Object.create(null)) {
+  if (L !== void 0 && Number(L) < 1)
     throw new TypeError("tab_size must be a number greater than 0");
-  let T = [], k = d(y, {
-    positions: !0,
-    parseAtrulePrelude: !1,
-    parseCustomProperty: !0,
-    parseValue: !0,
-    onComment: (n, e) => {
-      T.push(e.start.offset, e.end.offset);
+  const E = O ? c : `
+`, p = O ? c : f, M = O ? c : b;
+  let A = [], d = X(R, {
+    on_comment: ({ start: t, end: e }) => {
+      A.push(t, e);
     }
-  });
-  const u = O ? c : `
-`, p = O ? c : a, h = O ? c : x;
-  let s = 0;
-  function i(n) {
-    return O === !0 ? c : S !== void 0 ? a.repeat(S * n) : "	".repeat(n);
-  }
-  function P(n) {
-    let e = n.loc;
-    return e == null ? c : y.slice(e.start.offset, e.end.offset);
+  }), a = 0;
+  function o(t) {
+    return O === !0 ? c : L !== void 0 ? f.repeat(L * t) : "	".repeat(t);
   }
-  function b(n) {
-    return /** @type {import('css-tree').CssLocation} */ n.loc.start.offset;
+  function _(t, e, r = a) {
+    if (O || t === void 0 || e === void 0)
+      return c;
+    let s = c;
+    for (let i = 0; i < A.length; i += 2) {
+      let n = A[i];
+      if (n === void 0 || n < t) continue;
+      let u = A[i + 1];
+      if (u === void 0 || u > e) break;
+      s.length > 0 && (s += E + o(r)), s += R.slice(n, u);
+    }
+    return s;
+  }
+  function Q(t) {
+    return t.replace(/(?:^['"])|(?:['"]$)/g, c);
+  }
+  function m(t) {
+    return t = (t == null ? void 0 : t.toString()) || "", $ + Q(t) + $;
+  }
+  function B(t) {
+    let e = [], r = t.text, s = r.charCodeAt(0);
+    return s === 43 || s === 45 ? e.push(f) : s !== 44 && e.push(p), e.push(r), s === 43 || s === 45 ? e.push(f) : e.push(p), e.join(c);
+  }
+  function S(t) {
+    var r, s;
+    let e = [];
+    for (let i of t) {
+      if (i.type === l.FUNCTION) {
+        let n = i.name.toLowerCase();
+        e.push(n, P), e.push(S(i.children)), e.push(N);
+      } else i.type === l.DIMENSION ? e.push(i.value, (r = i.unit) == null ? void 0 : r.toLowerCase()) : i.type === l.STRING ? e.push(m(i.text)) : i.type === l.OPERATOR ? e.push(B(i)) : i.type === l.PARENTHESIS ? e.push(P, S(i.children), N) : i.type === l.URL && typeof i.value == "string" ? (e.push("url("), e.push(m(i.value)), e.push(N)) : e.push(i.text);
+      i.type !== l.OPERATOR && i.has_next && ((s = i.next_sibling) == null ? void 0 : s.type) !== l.OPERATOR && e.push(f);
+    }
+    return e.join(c);
   }
-  function E(n) {
-    return /** @type {import('css-tree').CssLocation} */ n.loc.end.offset;
+  function H(t) {
+    return t === null ? c : S(t);
   }
-  function m(n, e) {
-    if (O === !0 || n === void 0 || e === void 0)
-      return c;
-    let t = "";
-    for (let r = 0; r < T.length; r += 2) {
-      let l = T[r];
-      if (l === void 0 || l < n) continue;
-      let f = T[r + 1];
-      if (f === void 0 || f > e) break;
-      t.length > 0 && (t += u + i(s)), t += y.slice(l, f);
+  function F(t) {
+    let e = [];
+    if (t.is_important) {
+      let i = t.text, n = i.endsWith(b), u = i.lastIndexOf("!"), T = n ? -1 : void 0;
+      e.push(p, i.slice(u, T).toLowerCase());
+    }
+    let r = H(t.value), s = t.property;
+    return s === "font" && (r = r.replace(/\s*\/\s*/, "/")), r === c && O === !0 && (r += f), s.startsWith("--") || (s = s.toLowerCase()), s + k + p + r + e.join(c);
+  }
+  function G(t) {
+    switch (t) {
+      case nt:
+        return "~=";
+      case lt:
+        return "|=";
+      case it:
+        return "^=";
+      case st:
+        return "$=";
+      case rt:
+        return "*=";
+      case et:
+      default:
+        return "=";
     }
-    return t;
-  }
-  function M(n) {
-    let e, t = n.prelude, r = n.block;
-    t.type === Q && (e = q(t));
-    let l = m(E(t), b(r));
-    return l && (e += u + i(s) + l), r.type === G && (e += K(r)), e;
-  }
-  function q(n) {
-    let e = c;
-    return n.children.forEach((t, r) => {
-      t.type === Y && (e += i(s) + A(t)), r.next !== null && (e += Z + u);
-      let l = r.next !== null ? b(r.next.data) : E(n), f = m(E(t), l);
-      f && (e += i(s) + f + u);
-    }), e;
-  }
-  function A(n) {
-    let e = c;
-    return (n.children || []).forEach((r) => {
-      switch (r.type) {
-        case "TypeSelector": {
-          e += C(r.name);
-          break;
-        }
-        case "Combinator": {
-          e += a, r.name !== " " && (e += r.name + a);
-          break;
-        }
-        case "PseudoClassSelector":
-        case "PseudoElementSelector": {
-          e += $;
-          let l = C(r.name);
-          (l === "before" || l === "after" || r.type === "PseudoElementSelector") && (e += $), e += l, r.children !== null && (e += I + A(r) + v);
-          break;
-        }
-        case Q: {
-          r.children.forEach((l, f) => {
-            l.type === Y && (e += A(l)), f.next !== null && f.next.data.type === Y && (e += Z + p);
-          });
-          break;
-        }
-        case "Nth": {
-          let l = r.nth;
-          if (l.type === "AnPlusB") {
-            let f = l.a, o = l.b;
-            f !== null && (e += f + "n"), f !== null && o !== null && (e += a), o !== null && (f !== null && !o.startsWith("-") && (e += "+" + a), e += o);
-          } else
-            e += P(l);
-          r.selector !== null && (e += a + "of" + a + A(r.selector));
-          break;
-        }
-        case "AttributeSelector": {
-          e += ee, e += r.name.name, r.matcher !== null && r.value !== null && (e += r.matcher, e += g, r.value.type === "String" ? e += r.value.value : r.value.type === "Identifier" && (e += r.value.name), e += g), r.flags !== null && (e += a + r.flags), e += te;
-          break;
-        }
-        case "NestingSelector": {
-          e += "&";
-          break;
-        }
-        default: {
-          e += P(r);
-          break;
-        }
+  }
+  function I(t) {
+    let e = [], r = t.nth_a, s = t.nth_b;
+    return r && e.push(r), r && s && e.push(p), s && (r && !s.startsWith("-") && e.push("+", p), e.push(parseFloat(s))), e.join(c);
+  }
+  function Y(t) {
+    var r, s;
+    let e = [];
+    return ((r = t.children[0]) == null ? void 0 : r.type) === l.NTH_SELECTOR && (e.push(I(t.children[0])), e.push(f, "of", f)), ((s = t.children[1]) == null ? void 0 : s.type) === l.SELECTOR_LIST && e.push(y(t.children[1])), e.join(c);
+  }
+  function W(t, e = !1) {
+    switch (t.type) {
+      case l.TYPE_SELECTOR:
+        return t.name.toLowerCase();
+      case l.COMBINATOR: {
+        let r = t.text;
+        return /^\s+$/.test(r) ? f : (e ? c : p) + r + p;
+      }
+      case l.PSEUDO_ELEMENT_SELECTOR:
+      case l.PSEUDO_CLASS_SELECTOR: {
+        let r = [k], s = t.name.toLowerCase();
+        return (s === "before" || s === "after" || t.type === l.PSEUDO_ELEMENT_SELECTOR) && r.push(k), r.push(s), t.has_children && (r.push(P), t.children.length > 0 && (s === "highlight" ? r.push(S(t.children)) : r.push(y(t))), r.push(N)), r.join(c);
       }
-    }), e;
+      case l.ATTRIBUTE_SELECTOR: {
+        let r = [ut, t.name.toLowerCase()];
+        return t.attr_operator && (r.push(G(t.attr_operator)), typeof t.value == "string" && r.push(m(t.value)), t.attr_flags === z ? r.push(f, "i") : t.attr_flags === tt && r.push(f, "s")), r.push(ct), r.join(c);
+      }
+      default:
+        return t.text;
+    }
   }
-  function K(n) {
-    let e = n.children, t = p;
-    if (e.isEmpty) {
-      let f = m(b(n), E(n));
-      return f ? (t += V + u, t += i(s + 1) + f, t += u + i(s) + W, t) : t + re;
+  function v(t) {
+    if (t.type === l.NTH_SELECTOR)
+      return I(t);
+    if (t.type === l.NTH_OF_SELECTOR)
+      return Y(t);
+    if (t.type === l.SELECTOR_LIST)
+      return y(t);
+    if (t.type === l.LANG_SELECTOR)
+      return m(t.text);
+    let e = [];
+    return t.children.forEach((r, s) => {
+      const i = W(r, s === 0);
+      e.push(i);
+    }), e.join(c);
+  }
+  function y(t) {
+    let e = [];
+    for (let r of t)
+      e.push(v(r)), r.has_next && e.push(D, p);
+    return e.join(c);
+  }
+  function K(t) {
+    let e = [], r;
+    for (let s of t) {
+      if (r !== void 0) {
+        let n = _(r, s.start);
+        n && e.push(o(a) + n);
+      }
+      let i = v(s);
+      s.has_next && (i += D), e.push(o(a) + i), r = s.end;
     }
-    t += V + u, s++;
-    let r = m(b(n), b(
-      /** @type {import('css-tree').CssNode} */
-      e.first
-    ));
-    r && (t += i(s) + r + u), e.forEach((f, o) => {
-      if (o.prev !== null) {
-        let H = m(E(o.prev.data), b(f));
-        H && (t += i(s) + H + u);
+    return e.join(E);
+  }
+  function x(t) {
+    var T;
+    let e = [];
+    a++;
+    let r = t.children;
+    if (r.length === 0) {
+      let h = _(t.start, t.end);
+      if (h)
+        return e.push(o(a) + h), a--, e.push(o(a) + g), e.join(E);
+    }
+    let s = r[0], i = _(t.start, s == null ? void 0 : s.start);
+    i && e.push(o(a) + i);
+    let n;
+    for (let h of r) {
+      if (n !== void 0) {
+        let C = _(n, h.start);
+        C && e.push(o(a) + C);
       }
-      f.type === w ? (t += X(f), o.next === null ? t += h : t += x) : (o.prev !== null && o.prev.data.type === w && (t += u), f.type === F ? t += M(f) : f.type === j ? t += U(f) : t += R(f, s)), o.next !== null && (t += u, f.type !== w && (t += u));
-    });
-    let l = m(E(
-      /** @type {import('css-tree').CssNode} */
-      e.last
-    ), E(n));
-    return l && (t += u + i(s) + l), s--, t += u + i(s) + W, t;
-  }
-  function U(n) {
-    let e = i(s) + "@", t = n.prelude, r = n.block;
-    return e += C(n.name), t !== null && (e += a + J(t)), r === null ? e += x : r.type === G && (e += K(r)), e;
-  }
-  function J(n) {
-    let e = P(n);
-    return e.replace(/\s*([:,])/g, e.toLowerCase().includes("selector(") ? "$1" : "$1 ").replace(/\)([a-zA-Z])/g, ") $1").replace(/\s*(=>|<=)\s*/g, " $1 ").replace(/([^<>=\s])([<>])([^<>=\s])/g, `$1${p}$2${p}$3`).replace(/\s+/g, p).replace(/calc\(\s*([^()+\-*/]+)\s*([*/+-])\s*([^()+\-*/]+)\s*\)/g, (t, r, l, f) => {
-      let o = l === "+" || l === "-" ? a : p;
-      return `calc(${r.trim()}${o}${l}${o}${f.trim()})`;
-    }).replace(/selector|url|supports|layer\(/ig, (t) => C(t));
-  }
-  function X(n) {
-    let e = n.property;
-    e.charCodeAt(0) === 45 && e.charCodeAt(1) === 45 || (e = C(e));
-    let t = D(n.value);
-    return e === "font" && (t = t.replace(/\s*\/\s*/, "/")), t === c && O === !0 && (t += a), n.important === !0 ? t += p + "!important" : typeof n.important == "string" && (t += p + "!" + C(n.important)), i(s) + e + $ + p + t;
-  }
-  function N(n) {
-    let e = c;
-    return n.forEach((t, r) => {
-      t.type === "Identifier" ? e += t.name : t.type === "Function" ? e += C(t.name) + I + N(t.children) + v : t.type === "Dimension" ? e += t.value + C(t.unit) : t.type === "Value" ? e += D(t) : t.type === B ? e += z(t) : t.type === "Parentheses" ? e += I + N(t.children) + v : t.type === "Url" ? e += "url(" + g + t.value + g + v : e += P(t), t.type !== B && r.next !== null && r.next.data.type !== B && (e += a);
-    }), e;
-  }
-  function z(n) {
-    let e = c, t = n.value.trim(), r = t.charCodeAt(0);
-    return r === 43 || r === 45 ? e += a : r !== 44 && (e += p), e += t, r === 43 || r === 45 ? e += a : e += p, e;
-  }
-  function D(n) {
-    return n.type === "Raw" ? R(n, 0) : N(n.children);
-  }
-  function R(n, e) {
-    return i(e) + P(n).trim();
-  }
-  let L = k.children, _ = c;
-  if (L.first !== null) {
-    let n = m(0, b(L.first));
-    n && (_ += n + u), L.forEach((t, r) => {
-      if (t.type === F ? _ += M(t) : t.type === j ? _ += U(t) : _ += R(t, s), r.next !== null) {
-        _ += u;
-        let l = m(E(t), b(r.next.data));
-        l && (_ += i(s) + l), _ += u;
+      let Z = ((T = h.next_sibling) == null ? void 0 : T.type) !== l.DECLARATION;
+      if (h.type === l.DECLARATION) {
+        let C = F(h), J = Z ? M : b;
+        e.push(o(a) + C + J);
+      } else h.type === l.STYLE_RULE ? (n !== void 0 && e.length !== 0 && e.push(c), e.push(j(h))) : h.type === l.AT_RULE && (n !== void 0 && e.length !== 0 && e.push(c), e.push(o(a) + U(h)));
+      n = h.end;
+    }
+    let u = _(n, t.end);
+    return u && e.push(o(a) + u), a--, e.push(o(a) + g), e.join(E);
+  }
+  function j(t) {
+    var r, s;
+    let e = [];
+    if (((r = t.first_child) == null ? void 0 : r.type) === l.SELECTOR_LIST) {
+      let i = K(t.first_child), n = _(t.first_child.end, (s = t.block) == null ? void 0 : s.start);
+      n && (i += E + o(a) + n), i += p + w, t.block && (t.block.has_children || _(t.block.start, t.block.end)) || (i += g), e.push(i);
+    }
+    return t.block && (t.block.has_children || _(t.block.start, t.block.end)) && e.push(x(t.block)), e.join(E);
+  }
+  function V(t) {
+    return t.replace(/\s*([:,])/g, t.toLowerCase().includes("selector(") ? "$1" : "$1 ").replace(/\)([a-zA-Z])/g, ") $1").replace(/\s*(=>|<=)\s*/g, " $1 ").replace(/([^<>=\s])([<>])([^<>=\s])/g, `$1${p}$2${p}$3`).replace(/\s+/g, p).replace(/calc\(\s*([^()+\-*/]+)\s*([*/+-])\s*([^()+\-*/]+)\s*\)/g, (e, r, s, i) => {
+      let n = s === "+" || s === "-" ? f : p;
+      return `calc(${r.trim()}${n}${s}${n}${i.trim()})`;
+    }).replace(/selector|url|supports|layer\(/gi, (e) => e.toLowerCase());
+  }
+  function U(t) {
+    let e = [], r = ["@", t.name.toLowerCase()];
+    return t.prelude && r.push(f, V(t.prelude.text)), t.block === null ? r.push(b) : (r.push(p, w), !t.block.is_empty || _(t.block.start, t.block.end) || r.push(g)), e.push(r.join(c)), t.block !== null && (!t.block.is_empty || _(t.block.start, t.block.end)) && e.push(x(t.block)), e.join(E);
+  }
+  function q(t) {
+    let e = [], r = t.children;
+    if (r.length === 0)
+      return _(0, t.end, 0);
+    let s = r[0];
+    if (s) {
+      let u = _(0, s.start, 0);
+      u && e.push(u);
+    }
+    let i;
+    for (let u of t) {
+      if (i !== void 0) {
+        let T = _(i, u.start, 0);
+        T && e.push(T);
       }
-    });
-    let e = m(E(
-      /** @type {import('css-tree').CssNode} */
-      L.last
-    ), E(k));
-    e && (_ += u + e);
-  } else
-    _ += m(0, E(k));
-  return _;
+      u.type === l.STYLE_RULE ? e.push(j(u)) : u.type === l.AT_RULE && e.push(U(u)), i = u.end, u.has_next && (u.next_sibling && _(u.end, u.next_sibling.start, 0) || e.push(c));
+    }
+    let n = _(i, t.end, 0);
+    return n && e.push(n), e.join(E);
+  }
+  return q(d).trimEnd();
 }
-function fe(y) {
-  return ne(y, { minify: !0 });
+function _t(R) {
+  return pt(R, { minify: !0 });
 }
 export {
-  ne as format,
-  fe as minify
+  pt as format,
+  _t as minify
 };

package/dist/index.d.ts

@@ -1,29 +1,16 @@
+export type FormatOptions = {
+    /** Whether to minify the CSS or keep it formatted */
+    minify?: boolean;
+    /** Tell the formatter to use N spaces instead of tabs  */
+    tab_size?: number;
+};
 /**
- * @typedef {Object} Options
- * @property {boolean} [minify] Whether to minify the CSS or keep it formatted
- * @property {number} [tab_size] Tell the formatter to use N spaces instead of tabs
- *
  * Format a string of CSS using some simple rules
- * @param {string} css The original CSS
- * @param {Options} [options]
- * @returns {string} The formatted CSS
  */
-export function format(css: string, { minify, tab_size, }?: Options): string;
+export declare function format(css: string, { minify, tab_size }?: FormatOptions): string;
 /**
  * Minify a string of CSS
  * @param {string} css The original CSS
  * @returns {string} The minified CSS
  */
-export function minify(css: string): string;
-export type Options = {
-    /**
-     * Whether to minify the CSS or keep it formatted
-     */
-    minify?: boolean | undefined;
-    /**
-     * Tell the formatter to use N spaces instead of tabs
-     *
-     * Format a string of CSS using some simple rules
-     */
-    tab_size?: number | undefined;
-};
+export declare function minify(css: string): string;

package/package.json

@@ -1,60 +1,65 @@
 {
-  "name": "@projectwallace/format-css",
-  "version": "2.1.1",
-  "description": "Fast, small, zero-config library to format or minify CSS with basic rules.",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/projectwallace/format-css.git"
-  },
-  "homepage": "https://github.com/projectwallace/format-css",
-  "issues": "https://github.com/projectwallace/format-css/issues",
-  "license": "MIT",
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "type": "module",
-  "main": "./dist/format-css.js",
-  "exports": {
-    "types": "./dist/index.d.ts",
-    "default": "./dist/format-css.js"
-  },
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "vite build",
-    "test": "c8 --reporter=lcov uvu",
-    "check": "tsc",
-    "prettier": "prettier --check index.js test/**/*.js"
-  },
-  "devDependencies": {
-    "@codecov/vite-plugin": "^1.9.0",
-    "@types/css-tree": "^2.3.10",
-    "c8": "^10.1.3",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.3",
-    "uvu": "^0.5.6",
-    "vite": "^6.2.6",
-    "vite-plugin-dts": "^4.5.3"
-  },
-  "dependencies": {
-    "css-tree": "^3.0.1"
-  },
-  "files": [
-    "dist"
-  ],
-  "keywords": [
-    "css",
-    "stylesheet",
-    "formatter",
-    "format",
-    "print",
-    "prettifier",
-    "pretty",
-    "prettier"
-  ],
-  "prettier": {
-    "semi": false,
-    "useTabs": true,
-    "printWidth": 140,
-    "singleQuote": true
-  }
-}
+	"name": "@projectwallace/format-css",
+	"version": "2.2.0",
+	"description": "Fast, small, zero-config library to format or minify CSS with basic rules.",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/projectwallace/format-css.git"
+	},
+	"homepage": "https://github.com/projectwallace/format-css",
+	"issues": "https://github.com/projectwallace/format-css/issues",
+	"license": "MIT",
+	"author": "Bart Veneman <bart@projectwallace.com>",
+	"engines": {
+		"node": ">=18.0.0"
+	},
+	"type": "module",
+	"main": "./dist/format-css.js",
+	"exports": {
+		"types": "./dist/index.d.ts",
+		"default": "./dist/format-css.js"
+	},
+	"types": "./dist/index.d.ts",
+	"scripts": {
+		"build": "vite build",
+		"test": "vitest --coverage",
+		"check": "tsc",
+		"prettier": "prettier --check index.ts test/**/*.ts",
+		"lint": "oxlint",
+		"lint-package": "publint"
+	},
+	"devDependencies": {
+		"@codecov/vite-plugin": "^1.9.1",
+		"@vitest/coverage-v8": "^4.0.3",
+		"c8": "^10.1.3",
+		"oxlint": "^1.24.0",
+		"prettier": "^3.6.2",
+		"publint": "^0.3.15",
+		"typescript": "^5.9.3",
+		"vite": "^6.2.6",
+		"vite-plugin-dts": "^4.5.4",
+		"vitest": "^4.0.3"
+	},
+	"files": [
+		"dist"
+	],
+	"keywords": [
+		"css",
+		"stylesheet",
+		"formatter",
+		"format",
+		"print",
+		"prettifier",
+		"pretty",
+		"prettier"
+	],
+	"prettier": {
+		"semi": false,
+		"useTabs": true,
+		"printWidth": 140,
+		"singleQuote": true
+	},
+	"dependencies": {
+		"@projectwallace/css-parser": "^0.12.2"
+	}
+}