@projectwallace/format-css 2.1.0 → 2.1.2

package/dist/format-css.js

@@ -1,193 +1,188 @@
-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";
+import { parse as te } from "css-tree";
+const o = " ", p = "", $ = ":", x = ";", L = '"', Y = "(", g = ")", re = "[", ne = "]", V = "{", W = "}", le = "{}", Z = ",", j = "Atrule", F = "Rule", G = "Block", Q = "SelectorList", I = "Selector", q = "PseudoElementSelector", w = "Declaration", B = "Operator";
 function C(y) {
   return /[A-Z]/.test(y) ? y.toLowerCase() : y;
 }
-function ne(y, {
-  minify: O = !1,
-  tab_size: T = void 0
-} = /* @__PURE__ */ Object.create(null)) {
-  if (T !== void 0 && Number(T) < 1)
+function fe(y, { minify: T = !1, tab_size: P = void 0 } = /* @__PURE__ */ Object.create(null)) {
+  if (P !== void 0 && Number(P) < 1)
     throw new TypeError("tab_size must be a number greater than 0");
-  let A = [], R = d(y, {
+  let S = [];
+  function J(n, e) {
+    S.push(e.start.offset, e.end.offset);
+  }
+  let N = te(y, {
     positions: !0,
     parseAtrulePrelude: !1,
     parseCustomProperty: !0,
     parseValue: !0,
-    onComment: (n, e) => {
-      A.push(e.start.offset, e.end.offset);
-    }
+    onComment: J
   });
-  const u = O ? c : `
-`, p = O ? c : a, h = O ? c : x;
+  const u = T ? p : `
+`, c = T ? p : o, X = T ? p : x;
   let s = 0;
-  function i(n) {
-    return O ? c : T ? a.repeat(T * n) : "	".repeat(n);
+  function a(n) {
+    return T === !0 ? p : P !== void 0 ? o.repeat(P * n) : "	".repeat(n);
   }
-  function P(n) {
+  function O(n) {
     let e = n.loc;
-    return e ? y.slice(e.start.offset, e.end.offset) : c;
+    return e == null ? p : y.slice(e.start.offset, e.end.offset);
   }
   function b(n) {
-    return /** @type {import('css-tree').CssLocation} */ n.loc.start.offset;
+    var e;
+    return (e = n.loc) == null ? void 0 : e.start.offset;
   }
   function E(n) {
-    return /** @type {import('css-tree').CssLocation} */ n.loc.end.offset;
+    var e;
+    return (e = n.loc) == null ? void 0 : e.end.offset;
   }
   function m(n, e) {
-    if (O || n === void 0 || e === void 0)
-      return c;
-    let t = "";
-    for (let r = 0; r < A.length; r += 2) {
-      let l = A[r];
+    if (T === !0 || n === void 0 || e === void 0)
+      return p;
+    let t = p;
+    for (let r = 0; r < S.length; r += 2) {
+      let l = S[r];
       if (l === void 0 || l < n) continue;
-      let f = A[r + 1];
+      let f = S[r + 1];
       if (f === void 0 || f > e) break;
-      t.length > 0 && (t += u + i(s)), t += y.slice(l, f);
+      t.length > 0 && (t += u + a(s)), t += y.slice(l, f);
     }
     return t;
   }
   function M(n) {
-    let e, t = n.prelude, r = n.block;
-    t.type === Q && (e = q(t));
+    let e = "", t = n.prelude, r = n.block;
+    t.type === Q && (e = z(t));
     let l = m(E(t), b(r));
-    return l && (e += u + i(s) + l), r.type === G && (e += K(r)), e;
+    return l && (e += u + a(s) + l), r.type === G && (e += U(r)), e;
   }
-  function q(n) {
-    let e = c;
+  function z(n) {
+    let e = p;
     return n.children.forEach((t, r) => {
-      t.type === Y && (e += i(s) + S(t)), r.next !== null && (e += Z + u);
+      t.type === I && (e += a(s) + v(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);
+      f && (e += a(s) + f + u);
     }), e;
   }
-  function S(n) {
-    let e = c;
-    return (n.children || []).forEach((r) => {
+  function v(n) {
+    let e = p, t = n.children;
+    return t == null || t.forEach((r) => {
       switch (r.type) {
         case "TypeSelector": {
           e += C(r.name);
           break;
         }
         case "Combinator": {
-          e += a, r.name !== " " && (e += r.name + a);
+          r.name === " " ? e += o : e += c + r.name + c;
           break;
         }
         case "PseudoClassSelector":
-        case "PseudoElementSelector": {
+        case q: {
           e += $;
           let l = C(r.name);
-          (l === "before" || l === "after" || r.type === "PseudoElementSelector") && (e += $), e += l, r.children && (e += I + S(r) + v);
+          (l === "before" || l === "after" || r.type === q) && (e += $), e += l, r.children !== null && (e += Y + v(r) + g);
           break;
         }
         case Q: {
           r.children.forEach((l, f) => {
-            l.type === Y && (e += S(l)), f.next && f.next.data.type === Y && (e += Z + p);
+            l.type === I && (e += v(l)), f.next !== null && f.next.data.type === I && (e += Z + c);
           });
           break;
         }
         case "Nth": {
           let l = r.nth;
-          if (l)
-            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 + S(r.selector));
+          if (l.type === "AnPlusB") {
+            let f = l.a, i = l.b;
+            f !== null && (e += f + "n"), f !== null && i !== null && (e += o), i !== null && (f !== null && !i.startsWith("-") && (e += "+" + o), e += i);
+          } else
+            e += O(l);
+          r.selector !== null && (e += o + "of" + o + v(r.selector));
           break;
         }
         case "AttributeSelector": {
-          e += ee, e += r.name.name, r.matcher && r.value && (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 && (e += a + r.flags), e += te;
+          e += re, e += r.name.name, r.matcher !== null && r.value !== null && (e += r.matcher, e += L, r.value.type === "String" ? e += r.value.value : r.value.type === "Identifier" && (e += r.value.name), e += L), r.flags !== null && (e += o + r.flags), e += ne;
+          break;
+        }
+        case "NestingSelector": {
+          e += "&";
           break;
         }
         default: {
-          e += P(r);
+          e += O(r);
           break;
         }
       }
     }), e;
   }
-  function K(n) {
-    let e = n.children, t = p;
+  function U(n) {
+    let e = n.children, t = c;
     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;
+      return f ? (t += V + u, t += a(s + 1) + f, t += u + a(s) + W, t) : t + le;
     }
     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);
+    let r = m(b(n), b(e.first));
+    r && (t += a(s) + r + u), e.forEach((f, i) => {
+      if (i.prev !== null) {
+        let H = m(E(i.prev.data), b(f));
+        H && (t += a(s) + H + u);
       }
-      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 += N(f, s)), o.next !== null && (t += u, f.type !== w && (t += u));
+      f.type === w ? (t += d(f), i.next === null ? t += X : t += x) : (i.prev !== null && i.prev.data.type === w && (t += u), f.type === F ? t += M(f) : f.type === j ? t += D(f) : t += k(f, s)), i.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;
+    let l = m(E(e.last), E(n));
+    return l && (t += u + a(s) + l), s--, t += u + a(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 D(n) {
+    let e = a(s) + "@", t = n.prelude, r = n.block;
+    return e += C(n.name), t !== null && (e += o + h(t)), r === null ? e += x : r.type === G && (e += U(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 h(n) {
+    let e = O(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${c}$2${c}$3`).replace(/\s+/g, c).replace(/calc\(\s*([^()+\-*/]+)\s*([*/+-])\s*([^()+\-*/]+)\s*\)/g, (t, r, l, f) => {
+      let i = l === "+" || l === "-" ? o : c;
+      return `calc(${r.trim()}${i}${l}${i}${f.trim()})`;
+    }).replace(/selector|url|supports|layer\(/gi, (t) => C(t));
   }
-  function X(n) {
+  function d(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 && (t += a), n.important === !0 ? t += p + "!important" : typeof n.important == "string" && (t += p + "!" + C(n.important)), i(s) + e + $ + p + t;
+    let t = K(n.value);
+    return e === "font" && (t = t.replace(/\s*\/\s*/, "/")), t === p && T === !0 && (t += o), n.important === !0 ? t += c + "!important" : typeof n.important == "string" && (t += c + "!" + C(n.important)), a(s) + e + $ + c + t;
   }
-  function k(n) {
-    let e = c;
+  function R(n) {
+    let e = p;
     return n.forEach((t, r) => {
-      t.type === "Identifier" ? e += t.name : t.type === "Function" ? e += C(t.name) + I + k(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 + k(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);
+      t.type === "Identifier" ? e += t.name : t.type === "Function" ? e += C(t.name) + Y + R(t.children) + g : t.type === "Dimension" ? e += t.value + C(t.unit) : t.type === "Value" ? e += K(t) : t.type === B ? e += ee(t) : t.type === "Parentheses" ? e += Y + R(t.children) + g : t.type === "Url" ? e += "url(" + L + t.value + L + g : e += O(t), t.type !== B && r.next !== null && r.next.data.type !== B && (e += o);
     }), 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 ee(n) {
+    let e = p, t = n.value.trim(), r = t.charCodeAt(0);
+    return r === 43 || r === 45 ? e += o : r !== 44 && (e += c), e += t, r === 43 || r === 45 ? e += o : e += c, e;
   }
-  function D(n) {
-    return n.type === "Raw" ? N(n, 0) : k(n.children);
+  function K(n) {
+    return n.type === "Raw" ? k(n, 0) : R(n.children);
   }
-  function N(n, e) {
-    return i(e) + P(n).trim();
+  function k(n, e) {
+    return a(e) + O(n).trim();
   }
-  let L = R.children, _ = c;
-  if (L.first) {
-    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) : _ += N(t, s), r.next !== null) {
+  let A = N.children, _ = p;
+  if (A.first !== null) {
+    let n = m(0, b(A.first));
+    n && (_ += n + u), A.forEach((t, r) => {
+      if (t.type === F ? _ += M(t) : t.type === j ? _ += D(t) : _ += k(t, s), r.next !== null) {
         _ += u;
         let l = m(E(t), b(r.next.data));
-        l && (_ += i(s) + l), _ += u;
+        l && (_ += a(s) + l), _ += u;
       }
     });
-    let e = m(E(
-      /** @type {import('css-tree').CssNode} */
-      L.last
-    ), E(R));
+    let e = m(E(A.last), E(N));
     e && (_ += u + e);
   } else
-    _ += m(0, E(R));
+    _ += m(0, E(N));
   return _;
 }
-function fe(y) {
-  return ne(y, { minify: !0 });
+function se(y) {
+  return fe(y, { minify: !0 });
 }
 export {
-  ne as format,
-  fe as minify
+  fe as format,
+  se 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,6 +1,6 @@
 {
   "name": "@projectwallace/format-css",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Fast, small, zero-config library to format or minify CSS with basic rules.",
   "repository": {
     "type": "git",
@@ -9,6 +9,7 @@
   "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"
   },
@@ -21,22 +22,27 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "build": "vite build",
-    "test": "c8 --reporter=lcov uvu",
+    "test": "vitest --coverage",
     "check": "tsc",
-    "prettier": "prettier --check index.js test/**/*.js"
+    "prettier": "prettier --check index.ts test/**/*.ts",
+    "lint": "oxlint",
+    "lint-package": "publint"
   },
   "devDependencies": {
-    "@codecov/vite-plugin": "^1.9.0",
-    "@types/css-tree": "^2.3.10",
+    "@codecov/vite-plugin": "^1.9.1",
+    "@types/css-tree": "^2.3.11",
+    "@vitest/coverage-v8": "^4.0.3",
     "c8": "^10.1.3",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.3",
-    "uvu": "^0.5.6",
+    "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.3"
+    "vite-plugin-dts": "^4.5.4",
+    "vitest": "^4.0.3"
   },
   "dependencies": {
-    "css-tree": "^3.0.1"
+    "css-tree": "^3.1.0"
   },
   "files": [
     "dist"
@@ -57,4 +63,4 @@
     "printWidth": 140,
     "singleQuote": true
   }
-}
+}