postcss-discard-comments 8.0.2 → 8.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-discard-comments",
-  "version": "8.0.2",
+  "version": "8.0.3",
   "description": "Discard comments in your CSS files with PostCSS.",
   "exports": {
     ".": {
@@ -37,7 +37,7 @@
     "url": "cssnano/cssnano"
   },
   "dependencies": {
-    "postcss-selector-parser": "^7.1.4"
+    "postcss-selector-parser": "^7.1.5"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -46,11 +46,14 @@
     "node": "^22.11.0 || ^24.11.0 || >=26.0"
   },
   "devDependencies": {
-    "postcss": "^8.5.25",
+    "postcss": "^8.5.26",
     "postcss-scss": "^4.0.9",
     "postcss-simple-vars": "^7.0.1"
   },
   "peerDependencies": {
-    "postcss": "^8.5.25"
+    "postcss": "^8.5.26"
+  },
+  "scripts": {
+    "test": "node --test"
   }
 }

package/src/index.js

@@ -146,93 +146,102 @@ function pluginCreator(opts = {}) {
     return result;
   }
 
-  return {
-    postcssPlugin: 'postcss-discard-comments',
-    /**
-     * @param {import('postcss').Root} css
-     * @param {import('postcss').Helpers} helpers
-     */
-    OnceExit(css, { list }) {
-      css.walk((node) => {
-        if (node.type === 'comment' && remover.canRemove(node.text)) {
-          node.remove();
+  /**
+   * @param {import('postcss').Declaration} node
+   * @param {(s: string) => string[]} space
+   */
+  function processDeclaration(node, space) {
+    if (node.raws.value && node.raws.value.raw) {
+      if (node.raws.value.value === node.value) {
+        node.value = replaceComments(node.raws.value.raw, space);
+      } else {
+        node.value = replaceComments(node.value, space);
+      }
 
-          return;
-        }
+      /** @type {null | {value: string, raw: string}} */ (node.raws.value) =
+        null;
+    }
 
-        if (typeof node.raws.between === 'string') {
-          node.raws.between = replaceComments(node.raws.between, list.space);
-        }
+    if (node.raws.important) {
+      node.raws.important = replaceComments(node.raws.important, space);
 
-        if (node.type === 'decl') {
-          if (node.raws.value && node.raws.value.raw) {
-            if (node.raws.value.value === node.value) {
-              node.value = replaceComments(node.raws.value.raw, list.space);
-            } else {
-              node.value = replaceComments(node.value, list.space);
-            }
-
-            /** @type {null | {value: string, raw: string}} */ (
-              node.raws.value
-            ) = null;
-          }
+      const b = matchesComments(node.raws.important);
 
-          if (node.raws.important) {
-            node.raws.important = replaceComments(
-              node.raws.important,
-              list.space
-            );
+      node.raws.important = b.length ? node.raws.important : '!important';
+    } else {
+      node.value = replaceComments(node.value, space);
+    }
+  }
 
-            const b = matchesComments(node.raws.important);
+  /**
+   * @param {import('postcss').Rule} node
+   * @param {(s: string) => string[]} space
+   */
+  function processRule(node, space) {
+    if (node.raws.selector && node.raws.selector.raw) {
+      node.raws.selector.raw = replaceCommentsInSelector(
+        node.raws.selector.raw,
+        space
+      );
+    } else if (node.selector && node.selector.includes('/*')) {
+      node.selector = replaceCommentsInSelector(node.selector, space);
+    }
+  }
 
-            node.raws.important = b.length ? node.raws.important : '!important';
-          } else {
-            node.value = replaceComments(node.value, list.space);
-          }
+  /**
+   * @param {import('postcss').AtRule} node
+   * @param {(s: string) => string[]} space
+   */
+  function processAtRule(node, space) {
+    if (node.raws.afterName) {
+      const commentsReplaced = replaceComments(node.raws.afterName, space);
+
+      if (!commentsReplaced.length) {
+        node.raws.afterName = commentsReplaced + ' ';
+      } else {
+        node.raws.afterName = ' ' + commentsReplaced + ' ';
+      }
+    }
 
-          return;
-        }
+    if (node.raws.params && node.raws.params.raw) {
+      node.raws.params.raw = replaceComments(node.raws.params.raw, space);
+    } else if (node.params && node.params.includes('/*')) {
+      node.params = replaceComments(node.params, space);
+    }
+  }
 
-        if (node.type === 'rule') {
-          if (node.raws.selector && node.raws.selector.raw) {
-            node.raws.selector.raw = replaceCommentsInSelector(
-              node.raws.selector.raw,
-              list.space
-            );
-          } else if (node.selector && node.selector.includes('/*')) {
-            node.selector = replaceCommentsInSelector(
-              node.selector,
-              list.space
-            );
-          }
+  /**
+   * @param {import('postcss').ChildNode} node
+   * @param {(s: string) => string[]} space
+   */
+  function processNode(node, space) {
+    if (node.type === 'comment' && remover.canRemove(node.text)) {
+      node.remove();
 
-          return;
-        }
+      return;
+    }
 
-        if (node.type === 'atrule') {
-          if (node.raws.afterName) {
-            const commentsReplaced = replaceComments(
-              node.raws.afterName,
-              list.space
-            );
-
-            if (!commentsReplaced.length) {
-              node.raws.afterName = commentsReplaced + ' ';
-            } else {
-              node.raws.afterName = ' ' + commentsReplaced + ' ';
-            }
-          }
+    if (typeof node.raws.between === 'string') {
+      node.raws.between = replaceComments(node.raws.between, space);
+    }
 
-          if (node.raws.params && node.raws.params.raw) {
-            node.raws.params.raw = replaceComments(
-              node.raws.params.raw,
-              list.space
-            );
-          } else if (node.params && node.params.includes('/*')) {
-            node.params = replaceComments(node.params, list.space);
-          }
-        }
-      });
+    if (node.type === 'decl') {
+      processDeclaration(node, space);
+    } else if (node.type === 'rule') {
+      processRule(node, space);
+    } else if (node.type === 'atrule') {
+      processAtRule(node, space);
+    }
+  }
+
+  return {
+    postcssPlugin: 'postcss-discard-comments',
+    /**
+     * @param {import('postcss').Root} css
+     * @param {import('postcss').Helpers} helpers
+     */
+    OnceExit(css, { list }) {
+      css.walk((node) => processNode(node, list.space));
     },
   };
 }

package/src/lib/commentParser.js

@@ -8,6 +8,85 @@ const STATES = {
   IN_COMMENT: 3,
 };
 
+/**
+ * @typedef {object} ParserContext
+ * @property {string} input
+ * @property {[number, number, number][]} tokens
+ * @property {number} length
+ * @property {number} pos
+ * @property {number} state
+ * @property {number} tokenStart
+ * @property {number} commentStart
+ */
+
+/**
+ * @param {ParserContext} context
+ * @param {string} nextChar
+ * @return {boolean}
+ */
+function handleNormalState(context, nextChar) {
+  const { input, pos } = context;
+  const char = input[pos];
+
+  if (char === '/' && nextChar === '*') {
+    if (pos > context.tokenStart) {
+      context.tokens.push([0, context.tokenStart, pos]);
+    }
+    context.commentStart = pos;
+    context.state = STATES.IN_COMMENT;
+    context.pos += 2;
+    return true;
+  }
+
+  if (char === '"') {
+    context.state = STATES.IN_DOUBLE_QUOTE;
+  } else if (char === "'") {
+    context.state = STATES.IN_SINGLE_QUOTE;
+  }
+
+  return false;
+}
+
+/**
+ * @param {ParserContext} context
+ * @param {string} nextChar
+ * @param {string} quote
+ * @return {boolean}
+ */
+function handleQuoteState(context, nextChar, quote) {
+  const char = context.input[context.pos];
+
+  if (char === '\\' && nextChar) {
+    context.pos += 2;
+    return true;
+  }
+
+  if (char === quote) {
+    context.state = STATES.NORMAL;
+  }
+
+  return false;
+}
+
+/**
+ * @param {ParserContext} context
+ * @param {string} nextChar
+ * @return {boolean}
+ */
+function handleCommentState(context, nextChar) {
+  const { input, pos } = context;
+
+  if (input[pos] === '*' && nextChar === '/') {
+    context.tokens.push([1, context.commentStart + 2, pos]);
+    context.tokenStart = pos + 2;
+    context.state = STATES.NORMAL;
+    context.pos += 2;
+    return true;
+  }
+
+  return false;
+}
+
 /**
  * CSS Comment Parser with context awareness
  * Properly handles comments inside strings, URLs, and escaped characters
@@ -16,80 +95,55 @@ const STATES = {
  * @return {[number, number, number][]}
  */
 module.exports = function commentParser(input) {
-  /** @type {[number, number, number][]} */
-  const tokens = [];
-  const length = input.length;
-  let pos = 0;
+  /** @type {ParserContext} */
+  const context = {
+    input,
+    tokens: [],
+    length: input.length,
+    pos: 0,
+    state: STATES.NORMAL,
+    tokenStart: 0,
+    commentStart: 0,
+  };
 
-  let state = STATES.NORMAL;
-  let tokenStart = 0;
-  let commentStart = 0;
+  while (context.pos < context.length) {
+    const nextChar =
+      context.pos + 1 < context.length ? context.input[context.pos + 1] : '';
+    let handled;
 
-  while (pos < length) {
-    const char = input[pos];
-    const nextChar = pos + 1 < length ? input[pos + 1] : '';
-
-    switch (state) {
+    switch (context.state) {
       case STATES.NORMAL:
-        if (char === '/' && nextChar === '*') {
-          // Found comment start - add non-comment token if needed
-          if (pos > tokenStart) {
-            tokens.push([0, tokenStart, pos]);
-          }
-          commentStart = pos;
-          state = STATES.IN_COMMENT;
-          pos += 2; // Skip /*
-          continue;
-        } else if (char === '"') {
-          state = STATES.IN_DOUBLE_QUOTE;
-        } else if (char === "'") {
-          state = STATES.IN_SINGLE_QUOTE;
-        }
+        handled = handleNormalState(context, nextChar);
         break;
 
       case STATES.IN_SINGLE_QUOTE:
-        if (char === '\\' && nextChar) {
-          // Skip escaped character
-          pos += 2;
-          continue;
-        } else if (char === "'") {
-          state = STATES.NORMAL;
-        }
+        handled = handleQuoteState(context, nextChar, "'");
         break;
 
       case STATES.IN_DOUBLE_QUOTE:
-        if (char === '\\' && nextChar) {
-          // Skip escaped character
-          pos += 2;
-          continue;
-        } else if (char === '"') {
-          state = STATES.NORMAL;
-        }
+        handled = handleQuoteState(context, nextChar, '"');
         break;
 
       case STATES.IN_COMMENT:
-        if (char === '*' && nextChar === '/') {
-          // Found comment end
-          tokens.push([1, commentStart + 2, pos]);
-          tokenStart = pos + 2;
-          state = STATES.NORMAL;
-          pos += 2; // Skip */
-          continue;
-        }
+        handled = handleCommentState(context, nextChar);
         break;
     }
 
-    pos++;
+    if (handled) {
+      continue;
+    }
+
+    context.pos++;
   }
 
   // Handle remaining content
-  if (state === STATES.IN_COMMENT) {
+  if (context.state === STATES.IN_COMMENT) {
     // Unclosed comment - treat as comment to end
-    tokens.push([1, commentStart + 2, length]);
-  } else if (tokenStart < length) {
+    context.tokens.push([1, context.commentStart + 2, context.length]);
+  } else if (context.tokenStart < context.length) {
     // Add final non-comment token
-    tokens.push([0, tokenStart, length]);
+    context.tokens.push([0, context.tokenStart, context.length]);
   }
 
-  return tokens;
+  return context.tokens;
 };

package/src/lib/commentRemover.js

@@ -28,6 +28,7 @@ class CommentRemover {
         return false;
       }
     }
+    return false;
   }
 }
 

package/types/lib/commentParser.d.ts

@@ -7,4 +7,13 @@ export = commentParser;
  * @return {[number, number, number][]}
  */
 declare function commentParser(input: string): [number, number, number][];
+export type ParserContext = {
+    input: string;
+    tokens: [number, number, number][];
+    length: number;
+    pos: number;
+    state: number;
+    tokenStart: number;
+    commentStart: number;
+};
 //# sourceMappingURL=commentParser.d.ts.map

package/types/lib/commentParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commentParser.d.ts","sourceRoot":"","sources":["../../src/lib/commentParser.js"],"names":[],"mappings":";AAUA;;;;;;GAMG;+BACqC,KAAK,EAHlC,MAGkC,GAFjC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE"}
+{"version":3,"file":"commentParser.d.ts","sourceRoot":"","sources":["../../src/lib/commentParser.js"],"names":[],"mappings":";AAyFA;;;;;;GAMG;+BACqC,KAAK,EAHlC,MAGkC,GAFjC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;AAnFnC,YAAkB,aAAa,GAC/B;IAAmB,KAAK,EAAb,MAAM,CACjB;IAAuC,MAAM,EAAlC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CACrC;IAAmB,MAAM,EAAd,MAAM,CACjB;IAAmB,GAAG,EAAX,MAAM,CACjB;IAAmB,KAAK,EAAb,MAAM,CACjB;IAAmB,UAAU,EAAlB,MAAM,CACjB;IAAmB,YAAY,EAApB,MAAM,CACnB;CAAA,CAAA"}

package/types/lib/commentRemover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commentRemover.d.ts","sourceRoot":"","sources":["../../src/lib/commentRemover.js"],"names":[],"mappings":"SAiCiB,cAAc;AA/B/B,cAAM,cAAc;IAGX,OAAO;IAqBH,SAAS;IAvBpB,qDAAqD;IACrD,YAAY,OAAO,EADP,OAAO,aAAa,EAAE,OACf,EAElB;IACD;;;OAGG;IACH,SAAS,CAAC,OAAO,EAHN,MAGM,GAFL,OAAO,GAAG,SAAS,CAqB9B;CACF"}
+{"version":3,"file":"commentRemover.d.ts","sourceRoot":"","sources":["../../src/lib/commentRemover.js"],"names":[],"mappings":"SAkCiB,cAAc;AAhC/B,cAAM,cAAc;IAGX,OAAO;IAqBH,SAAS;IAvBpB,qDAAqD;IACrD,YAAY,OAAO,EADP,OAAO,aAAa,EAAE,OACf,EAElB;IACD;;;OAGG;IACH,SAAS,CAAC,OAAO,EAHN,MAGM,GAFL,OAAO,GAAG,SAAS,CAsB9B;CACF"}