using strip-comments

Author: Janther

package-lock.json

@@ -91,6 +91,7 @@
     "@babel/code-frame": "^7.25.7",
     "@types/jest": "^29.5.13",
     "@types/semver": "^7.5.8",
+    "@types/strip-comments": "^2.0.4",
     "@typescript-eslint/eslint-plugin": "^8.10.0",
     "@typescript-eslint/parser": "^8.10.0",
     "c8": "^9.1.0",
@@ -108,6 +109,7 @@
     "prettier": "^3.3.3",
     "proxyquire": "^2.1.3",
     "solc": "^0.8.28",
+    "strip-comments": "^2.0.1",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3",

package.json

@@ -1,6 +1,7 @@
-import { VersionExpressionSets as SlangVersionExpressionSets } from '@nomicfoundation/slang/ast';
+import { VersionExpressionSets } from '@nomicfoundation/slang/ast';
 import { NonterminalKind, Query } from '@nomicfoundation/slang/cst';
 import { Parser } from '@nomicfoundation/slang/parser';
+import strip from 'strip-comments';
 import {
   maxSatisfying,
   minSatisfying,
@@ -9,7 +10,6 @@ import {
   minVersion,
   validRange
 } from 'semver';
-import { VersionExpressionSets } from '../slang-nodes/VersionExpressionSets.js';
 
 const supportedVersions = Parser.supportedVersions();
 
@@ -60,14 +60,12 @@ function tryToCollectPragmas(text: string, version: string): string {
 
   let match;
   while ((match = matches.next())) {
-    const versionRange = new SlangVersionExpressionSets(
-      match.captures.versionRanges[0].node.asNonterminalNode()!
-    );
     ranges.push(
-      // Replace all comments that could be in the expression with whitespace
-      new VersionExpressionSets(versionRange, 0).comments.reduce(
-        (range, comment) => range.replace(comment.value, ' '),
-        versionRange.cst.unparse()
+      strip(
+        new VersionExpressionSets(
+          match.captures.versionRanges[0].node.asNonterminalNode()!
+        ).cst.unparse(),
+        { keepProtected: true }
       )
     );
   }