postcss-nested 7.0.1 → 8.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2014 Andrey Sitnik <andrey@sitnik.ru>
+Copyright 2014 Andrey Sitnik <andrey@sitnik.es>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -69,10 +69,11 @@ Alternatives:
 - See also [`postcss-nesting`], which implements [CSSWG draft].
 - [`postcss-nested-props`] for nested properties like `font-size`.
 
-<a href="https://evilmartians.com/?utm_source=postcss-nested">
-  <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg"
-       alt="Sponsored by Evil Martians" width="236" height="54">
-</a>
+---
+
+<img src="https://cdn.evilmartians.com/badges/logo-no-label.svg" alt="" width="22" height="16" />  PostCSS Nested is built by <b><a href="https://evilmartians.com/">Evil Martians</a></b>, an American design and engineering consultancy for <b>developer tools, AI, and cybersecurity startups</b>.
+
+---
 
 [`postcss-current-selector`]: https://github.com/komlev/postcss-current-selector
 [`postcss-nested-ancestors`]: https://github.com/toomuchdesign/postcss-nested-ancestors
@@ -80,6 +81,3 @@ Alternatives:
 [`postcss-nesting`]: https://github.com/csstools/postcss-plugins/tree/main/plugins/postcss-nesting
 [CSSWG draft]: https://drafts.csswg.org/css-nesting-1/
 [PostCSS]: https://github.com/postcss/postcss
-
-## Docs
-Read full docs **[here](https://github.com/postcss/postcss-nested#readme)**.

package/index.d.ts

@@ -1,7 +1,7 @@
 // Original definitions (@types/postcss-nested)
 // by Maxim Vorontsov <https://github.com/VorontsovMaxim>
 
-import { PluginCreator } from 'postcss'
+import type { PluginCreator } from 'postcss'
 
 declare namespace nested {
   interface Options {
@@ -36,6 +36,6 @@ declare namespace nested {
   type Nested = PluginCreator<Options>
 }
 
-declare const nested: nested.Nested
+declare let nested: nested.Nested
 
-export = nested
+export default nested

package/index.js

@@ -1,5 +1,5 @@
-const { AtRule, Rule } = require('postcss')
-let parser = require('postcss-selector-parser')
+import { AtRule, Rule } from 'postcss'
+import parser from 'postcss-selector-parser'
 
 /**
  * Run a selector string through postcss-selector-parser
@@ -75,35 +75,24 @@ function mergeSelectors(parent, child) {
 /**
  * Move a child and its preceding comment(s) to after "after"
  */
-function breakOut(child, parent) {
-  let changeParent = true
-  let lastNode = parent
-
-  for (let node of parent.nodes) {
-    if (!node.nodes) continue
-
-    let prevNode = node.prev()
-    if (prevNode?.type !== 'comment') continue
-
-    let parentRule = parent.toString()
+function breakOut(child, currentNode) {
+  if (child.prev()?.type !== 'comment') {
+    currentNode.after(child)
+    return child
+  }
 
-    /* Checking that the comment "describes" the rule following. Like this:
-      /* comment about the rule below /*
-      .rule {}
-    */
-    let regexp = /[*]\/ *\n.*{/
+  let prevNode = child.prev()
 
-    if (parentRule.match(regexp)) {
-      changeParent = false
-      lastNode.after(node).after(prevNode)
+  /* Checking that the comment "describes" the rule following. Like this:
+    /* comment about the rule below *\
+    .rule {}
+  */
+  let regexp = /[*]\/ *\n.*{/
 
-      lastNode = node
-    }
-  }
-
-  // It is necessary if the above child has never been moved
-  if (changeParent) {
-    parent.after(child)
+  if (child.parent.toString().match(regexp)) {
+    currentNode.after(child).after(prevNode)
+  } else {
+    currentNode.after(child)
   }
 
   return child
@@ -120,7 +109,7 @@ function createFnAtruleChilds(bubble) {
       } else if (child.type === 'atrule' && child.nodes) {
         if (bubble[child.name]) {
           atruleChilds(rule, child, mergeSels)
-        } else if (atrule[rootRuleMergeSel] !== false) {
+        } else if (atrule[ROOT_RULE_MERGE_SEL] !== false) {
           children.push(child)
         }
       } else {
@@ -146,15 +135,15 @@ function pickDeclarations(selector, declarations, after) {
   after.after(parent)
   return parent
 }
-function pickAndClearDeclarations(ruleSelector, declarations, after, clear = true) {
+function pickAndClearDeclarations(
+  ruleSelector,
+  declarations,
+  after,
+  clear = true
+) {
   if (!declarations.length) return [after, declarations]
-
   after = pickDeclarations(ruleSelector, declarations, after)
-
-  if (clear) {
-    declarations = []
-  }
-
+  if (clear) declarations = []
   return [after, declarations]
 }
 
@@ -213,7 +202,7 @@ function getAncestorRules(leaf) {
 }
 
 function unwrapRootRule(rule) {
-  let escapes = rule[rootRuleEscapes]
+  let escapes = rule[ROOT_RULE_ESCAPES]
 
   if (!escapes) {
     rule.after(rule.nodes)
@@ -235,7 +224,7 @@ function unwrapRootRule(rule) {
       } else {
         let oldClone = clone
         clone = parent.clone({ nodes: [] })
-        oldClone && clone.append(oldClone)
+        if (oldClone) clone.append(oldClone)
         breakoutLeaf = breakoutLeaf || clone
       }
     })
@@ -255,26 +244,29 @@ function unwrapRootRule(rule) {
       lineage.slice(0, topEscapedIdx + 1).forEach((parent, i, arr) => {
         let oldRoot = restRoot
         restRoot = parent.clone({ nodes: [] })
-        oldRoot && restRoot.append(oldRoot)
+        if (oldRoot) restRoot.append(oldRoot)
 
         let nextSibs = []
-        let _child = arr[i - 1] || rule
-        let next = _child.next()
+        let child = arr[i - 1] || rule
+        let next = child.next()
         while (next) {
           nextSibs.push(next)
           next = next.next()
         }
         restRoot.append(nextSibs)
       })
-      restRoot && (breakoutRoot || nodes[nodes.length - 1]).after(restRoot)
+      if (restRoot) {
+        let insert = breakoutRoot || nodes[nodes.length - 1]
+        insert.after(restRoot)
+      }
     }
   }
 
   rule.remove()
 }
 
-const rootRuleMergeSel = Symbol('rootRuleMergeSel')
-const rootRuleEscapes = Symbol('rootRuleEscapes')
+const ROOT_RULE_MERGE_SEL = Symbol('rootRuleMergeSel')
+const ROOT_RULE_ESCAPES = Symbol('rootRuleEscapes')
 
 function normalizeRootRule(rule) {
   let { params } = rule
@@ -289,13 +281,13 @@ function normalizeRootRule(rule) {
     rule.removeAll()
     rule.append(selectorBlock)
   }
-  rule[rootRuleEscapes] = escapes
-  rule[rootRuleMergeSel] = escapes ? !escapes('all') : type === 'noop'
+  rule[ROOT_RULE_ESCAPES] = escapes
+  rule[ROOT_RULE_MERGE_SEL] = escapes ? !escapes('all') : type === 'noop'
 }
 
-const hasRootRule = Symbol('hasRootRule')
+const HAS_ROOT_RULE = Symbol('hasRootRule')
 
-module.exports = (opts = {}) => {
+let nested = (opts = {}) => {
   let bubble = atruleNames(
     ['media', 'supports', 'layer', 'container', 'starting-style'],
     opts.bubble
@@ -318,17 +310,17 @@ module.exports = (opts = {}) => {
     Once(root) {
       root.walkAtRules(rootRuleName, node => {
         normalizeRootRule(node)
-        root[hasRootRule] = true
+        root[HAS_ROOT_RULE] = true
       })
     },
 
     postcssPlugin: 'postcss-nested',
 
     RootExit(root) {
-      if (!root[hasRootRule]) return
+      if (!root[HAS_ROOT_RULE]) return
 
       root.walkAtRules(rootRuleName, unwrapRootRule)
-      root[hasRootRule] = false
+      root[HAS_ROOT_RULE] = false
     },
 
     Rule(rule) {
@@ -338,44 +330,45 @@ module.exports = (opts = {}) => {
       let declarations = []
 
       rule.each(child => {
-        switch (child.type) {
-          case 'atrule':
-            [after, declarations] = pickAndClearDeclarations(rule.selector, declarations, after)
-
-            if (child.name === rootRuleName) {
-              unwrapped = true
-              atruleChilds(rule, child, true, child[rootRuleMergeSel])
-              after = breakOut(child, after)
-            } else if (bubble[child.name]) {
-              copyDeclarations = true
-              unwrapped = true
-              atruleChilds(rule, child, true)
-              after = breakOut(child, after)
-            } else if (unwrap[child.name]) {
-              copyDeclarations = true
-              unwrapped = true
-              atruleChilds(rule, child, false)
-              after = breakOut(child, after)
-            } else if (copyDeclarations) {
-              declarations.push(child)
-            }
-
-            break
-          case 'decl':
-            if (copyDeclarations) {
-              declarations.push(child)
-            }
-
-            break
-          case 'rule':
-            [after, declarations] = pickAndClearDeclarations(rule.selector, declarations, after)
-
+        if (child.type === 'atrule') {
+          ;[after, declarations] = pickAndClearDeclarations(
+            rule.selector,
+            declarations,
+            after
+          )
+
+          if (child.name === rootRuleName) {
+            unwrapped = true
+            atruleChilds(rule, child, true, child[ROOT_RULE_MERGE_SEL])
+            after = breakOut(child, after)
+          } else if (bubble[child.name]) {
             copyDeclarations = true
             unwrapped = true
-            child.selectors = mergeSelectors(rule, child)
+            atruleChilds(rule, child, true)
             after = breakOut(child, after)
-
-            break
+          } else if (unwrap[child.name]) {
+            copyDeclarations = true
+            unwrapped = true
+            atruleChilds(rule, child, false)
+            after = breakOut(child, after)
+          } else if (copyDeclarations) {
+            declarations.push(child)
+          }
+        } else if (child.type === 'decl') {
+          if (copyDeclarations) {
+            declarations.push(child)
+          }
+        } else if (child.type === 'rule') {
+          ;[after, declarations] = pickAndClearDeclarations(
+            rule.selector,
+            declarations,
+            after
+          )
+
+          copyDeclarations = true
+          unwrapped = true
+          child.selectors = mergeSelectors(rule, child)
+          after = breakOut(child, after)
         }
       })
 
@@ -388,4 +381,6 @@ module.exports = (opts = {}) => {
     }
   }
 }
-module.exports.postcss = true
+nested.postcss = true
+
+export default nested

package/package.json

@@ -1,20 +1,17 @@
 {
   "name": "postcss-nested",
-  "version": "7.0.1",
+  "version": "8.0.0",
   "description": "PostCSS plugin to unwrap nested rules like how Sass does it",
   "keywords": [
-    "postcss",
     "css",
+    "nested",
+    "postcss",
     "postcss-plugin",
-    "sass",
-    "nested"
+    "sass"
   ],
-  "author": "Andrey Sitnik <andrey@sitnik.ru>",
   "license": "MIT",
+  "author": "Andrey Sitnik <andrey@sitnik.es>",
   "repository": "postcss/postcss-nested",
-  "engines": {
-    "node": ">=18.0"
-  },
   "funding": [
     {
       "type": "opencollective",
@@ -25,10 +22,14 @@
       "url": "https://github.com/sponsors/ai"
     }
   ],
+  "type": "module",
+  "dependencies": {
+    "postcss-selector-parser": "^7.1.4"
+  },
   "peerDependencies": {
     "postcss": "^8.2.14"
   },
-  "dependencies": {
-    "postcss-selector-parser": "^7.0.0"
+  "engines": {
+    "node": "^22.0.0 || ^24.0.0 || >= 26.0.0"
   }
 }