@projectwallace/format-css 2.1.0 → 2.1.1

package/dist/format-css.js

@@ -5,28 +5,28 @@ function C(y) {
 }
 function ne(y, {
   minify: O = !1,
-  tab_size: T = void 0
+  tab_size: S = void 0
 } = /* @__PURE__ */ Object.create(null)) {
-  if (T !== void 0 && Number(T) < 1)
+  if (S !== void 0 && Number(S) < 1)
     throw new TypeError("tab_size must be a number greater than 0");
-  let A = [], R = d(y, {
+  let T = [], k = d(y, {
     positions: !0,
     parseAtrulePrelude: !1,
     parseCustomProperty: !0,
     parseValue: !0,
     onComment: (n, e) => {
-      A.push(e.start.offset, e.end.offset);
+      T.push(e.start.offset, e.end.offset);
     }
   });
   const u = O ? c : `
 `, p = O ? c : a, h = O ? c : x;
   let s = 0;
   function i(n) {
-    return O ? c : T ? a.repeat(T * n) : "	".repeat(n);
+    return O === !0 ? c : S !== void 0 ? a.repeat(S * n) : "	".repeat(n);
   }
   function P(n) {
     let e = n.loc;
-    return e ? y.slice(e.start.offset, e.end.offset) : c;
+    return e == null ? c : y.slice(e.start.offset, e.end.offset);
   }
   function b(n) {
     return /** @type {import('css-tree').CssLocation} */ n.loc.start.offset;
@@ -35,13 +35,13 @@ function ne(y, {
     return /** @type {import('css-tree').CssLocation} */ n.loc.end.offset;
   }
   function m(n, e) {
-    if (O || n === void 0 || e === void 0)
+    if (O === !0 || n === void 0 || e === void 0)
       return c;
     let t = "";
-    for (let r = 0; r < A.length; r += 2) {
-      let l = A[r];
+    for (let r = 0; r < T.length; r += 2) {
+      let l = T[r];
       if (l === void 0 || l < n) continue;
-      let f = A[r + 1];
+      let f = T[r + 1];
       if (f === void 0 || f > e) break;
       t.length > 0 && (t += u + i(s)), t += y.slice(l, f);
     }
@@ -56,12 +56,12 @@ function ne(y, {
   function q(n) {
     let e = c;
     return n.children.forEach((t, r) => {
-      t.type === Y && (e += i(s) + S(t)), r.next !== null && (e += Z + u);
+      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 S(n) {
+  function A(n) {
     let e = c;
     return (n.children || []).forEach((r) => {
       switch (r.type) {
@@ -77,28 +77,31 @@ function ne(y, {
         case "PseudoElementSelector": {
           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 === "PseudoElementSelector") && (e += $), e += l, r.children !== null && (e += I + A(r) + v);
           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 === Y && (e += A(l)), f.next !== null && f.next.data.type === Y && (e += Z + p);
           });
           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, 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 && 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 += 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: {
@@ -124,7 +127,7 @@ function ne(y, {
         let H = m(E(o.prev.data), b(f));
         H && (t += i(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 += 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} */
@@ -147,12 +150,12 @@ function ne(y, {
     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;
+    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 k(n) {
+  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 + 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) + 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) {
@@ -160,16 +163,16 @@ function ne(y, {
     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" ? N(n, 0) : k(n.children);
+    return n.type === "Raw" ? R(n, 0) : N(n.children);
   }
-  function N(n, e) {
+  function R(n, e) {
     return i(e) + P(n).trim();
   }
-  let L = R.children, _ = c;
-  if (L.first) {
+  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) : _ += N(t, s), r.next !== null) {
+      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;
@@ -178,10 +181,10 @@ function ne(y, {
     let e = m(E(
       /** @type {import('css-tree').CssNode} */
       L.last
-    ), E(R));
+    ), E(k));
     e && (_ += u + e);
   } else
-    _ += m(0, E(R));
+    _ += m(0, E(k));
   return _;
 }
 function fe(y) {

package/dist/index.d.ts

@@ -5,7 +5,7 @@
  *
  * Format a string of CSS using some simple rules
  * @param {string} css The original CSS
- * @param {Options} options
+ * @param {Options} [options]
  * @returns {string} The formatted CSS
  */
 export function format(css: string, { minify, tab_size, }?: Options): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectwallace/format-css",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Fast, small, zero-config library to format or minify CSS with basic rules.",
   "repository": {
     "type": "git",