postcss-discard-comments 7.0.4 → 7.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-discard-comments",
-  "version": "7.0.4",
+  "version": "7.0.6",
   "description": "Discard comments in your CSS files with PostCSS.",
   "main": "src/index.js",
   "types": "types/index.d.ts",
@@ -24,7 +24,7 @@
   },
   "repository": "cssnano/cssnano",
   "dependencies": {
-    "postcss-selector-parser": "^7.1.0"
+    "postcss-selector-parser": "^7.1.1"
   },
   "bugs": {
     "url": "https://github.com/cssnano/cssnano/issues"
@@ -33,7 +33,7 @@
     "node": "^18.12.0 || ^20.9.0 || >=22.0"
   },
   "devDependencies": {
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.6",
     "postcss-scss": "^4.0.9",
     "postcss-simple-vars": "^7.0.1"
   },

package/src/index.js

@@ -16,8 +16,25 @@ const selectorParser = require('postcss-selector-parser');
 function pluginCreator(opts = {}) {
   const remover = new CommentRemover(opts);
   const matcherCache = new Map();
+  const parserCache = new Map();
   const replacerCache = new Map();
 
+  /**
+   * @param {string} source
+   * @return {[number, number, number][]}
+   */
+  function getTokens(source) {
+    if (parserCache.has(source)) {
+      return parserCache.get(source);
+    }
+
+    const tokens = commentParser(source);
+
+    parserCache.set(source, tokens);
+
+    return tokens;
+  }
+
   /**
    * @param {string} source
    * @return {[number, number, number][]}
@@ -27,7 +44,7 @@ function pluginCreator(opts = {}) {
       return matcherCache.get(source);
     }
 
-    const result = commentParser(source).filter(([type]) => type);
+    const result = getTokens(source).filter(([type]) => type);
 
     matcherCache.set(source, result);
 
@@ -35,29 +52,46 @@ function pluginCreator(opts = {}) {
   }
 
   /**
-   * @param {string} source
+   * @param {string | undefined} rawSource
    * @param {(s: string) => string[]} space
+   * @param {string=} separator
    * @return {string}
    */
-  function replaceComments(source, space, separator = ' ') {
+  function replaceComments(rawSource, space, separator = ' ') {
+    const source = rawSource || '';
     const key = source + '@|@' + separator;
 
     if (replacerCache.has(key)) {
       return replacerCache.get(key);
     }
-    const parsed = commentParser(source).reduce((value, [type, start, end]) => {
-      const contents = source.slice(start, end);
 
+    if (source.indexOf('/*') === -1) {
+      const normalized = space(source).join(' ');
+
+      replacerCache.set(key, normalized);
+
+      return normalized;
+    }
+
+    const parts = [];
+
+    for (const [type, start, end] of getTokens(source)) {
       if (!type) {
-        return value + contents;
+        parts.push(source.slice(start, end));
+        continue;
       }
 
+      const contents = source.slice(start, end);
+
       if (remover.canRemove(contents)) {
-        return value + separator;
+        parts.push(separator);
+        continue;
       }
 
-      return `${value}/*${contents}*/`;
-    }, '');
+      parts.push('/*' + contents + '*/');
+    }
+
+    const parsed = parts.join('');
 
     const result = space(parsed).join(' ');
 
@@ -67,16 +101,24 @@ function pluginCreator(opts = {}) {
   }
 
   /**
-   * @param {string} source
+   * @param {string | undefined} rawSource
    * @param {(s: string) => string[]} space
    * @return {string}
    */
-  function replaceCommentsInSelector(source, space) {
+  function replaceCommentsInSelector(rawSource, space) {
+    const source = rawSource || '';
     const key = source + '@|@';
 
     if (replacerCache.has(key)) {
       return replacerCache.get(key);
     }
+    if (source.indexOf('/*') === -1) {
+      const normalized = space(source).join(' ');
+
+      replacerCache.set(key, normalized);
+
+      return normalized;
+    }
     const processed = selectorParser((ast) => {
       ast.walk((node) => {
         if (node.type === 'comment') {

package/src/lib/commentParser.js

@@ -1,30 +1,94 @@
 'use strict';
 
+// State machine states reused between parses for better perf
+const STATES = {
+  NORMAL: 0,
+  IN_SINGLE_QUOTE: 1,
+  IN_DOUBLE_QUOTE: 2,
+  IN_COMMENT: 3,
+};
+
 /**
+ * CSS Comment Parser with context awareness
+ * Properly handles comments inside strings, URLs, and escaped characters
+ *
  * @param {string} input
  * @return {[number, number, number][]}
  */
 module.exports = function commentParser(input) {
-  /** @type [number, number, number][] */
+  /** @type {[number, number, number][]} */
   const tokens = [];
   const length = input.length;
   let pos = 0;
-  let next;
+
+  let state = STATES.NORMAL;
+  let tokenStart = 0;
+  let commentStart = 0;
 
   while (pos < length) {
-    next = input.indexOf('/*', pos);
-
-    if (~next) {
-      tokens.push([0, pos, next]);
-      pos = next;
-
-      next = input.indexOf('*/', pos + 2);
-      tokens.push([1, pos + 2, next]);
-      pos = next + 2;
-    } else {
-      tokens.push([0, pos, length]);
-      pos = length;
+    const char = input[pos];
+    const nextChar = pos + 1 < length ? input[pos + 1] : '';
+
+    switch (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;
+        }
+        break;
+
+      case STATES.IN_SINGLE_QUOTE:
+        if (char === '\\' && nextChar) {
+          // Skip escaped character
+          pos += 2;
+          continue;
+        } else if (char === "'") {
+          state = STATES.NORMAL;
+        }
+        break;
+
+      case STATES.IN_DOUBLE_QUOTE:
+        if (char === '\\' && nextChar) {
+          // Skip escaped character
+          pos += 2;
+          continue;
+        } else if (char === '"') {
+          state = STATES.NORMAL;
+        }
+        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;
+        }
+        break;
     }
+
+    pos++;
+  }
+
+  // Handle remaining content
+  if (state === STATES.IN_COMMENT) {
+    // Unclosed comment - treat as comment to end
+    tokens.push([1, commentStart + 2, length]);
+  } else if (tokenStart < length) {
+    // Add final non-comment token
+    tokens.push([0, tokenStart, length]);
   }
 
   return tokens;

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";AAKA;;;;GAIG;AACH;;;;GAIG;AACH,sCAHW,OAAO,GACN,OAAO,SAAS,EAAE,MAAM,CAoLnC;;;;;;gBA3Lc,OAAO,YAAC;wBACR,OAAO,YAAC;aACR,CAAA,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,aAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":";AAKA;;;;GAIG;AACH;;;;GAIG;AACH,sCAHW,OAAO,GACN,OAAO,SAAS,EAAE,MAAM,CA8NnC;;;;;;gBArOc,OAAO,YAAC;wBACR,OAAO,YAAC;aACR,CAAA,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,aAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"commentParser.d.ts","sourceRoot":"","sources":["../../src/lib/commentParser.js"],"names":[],"mappings":"AAMiB,iCAHN,MAAM,GACL,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CA0BrC"}
+{"version":3,"file":"commentParser.d.ts","sourceRoot":"","sources":["../../src/lib/commentParser.js"],"names":[],"mappings":"AAiBiB,iCAHN,MAAM,GACL,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CA+ErC"}