solparse - npm Package Compare versions

Comparing version 1.4.2 to 2.0.0

index.js

@@ -1,47 +0,88 @@
-var PEG = require("pegjs");
-var fs = require("fs");
-var path = require("path");
+"use strict";
 
-var builtParsers = {
-  "solidity": require("./build/parser"),
-  "imports": require("./build/imports_parser")
+const PEG = require("pegjs");
+const fs = require("fs");
+const path = require("path");
+
+const antlr4 = require("antlr4");
+const SolidityLexer = require("./antlr/SolidityLexer").SolidityLexer;
+const SolidityParser = require("./antlr/SolidityParser").SolidityParser;
+
+const builtParsers = {
+    "solidity": require("./build/parser"),
+    "imports": require("./build/imports_parser")
 };
 
+
+function parseComments(code) {
+    const chars = new antlr4.InputStream(code);
+    const lexer = new SolidityLexer(chars);
+    const tokens  = new antlr4.CommonTokenStream(lexer);
+    const parser = new SolidityParser(tokens);
+
+    parser.buildParseTrees = true;
+    parser.sourceUnit();
+
+    let comments = tokens.filterForChannel(0, tokens.tokens.length - 1, 1); // 1 is id of channel "HIDDEN"
+
+    comments = comments.map(c => {
+        const commentTypes = {118: "BlockComment", 119: "LineComment"};
+        const {start, stop, line, column, text} = c;
+
+        return {
+            type: commentTypes[c.type],
+            start,
+            end: stop,
+            line,
+            column,
+            text
+        };
+    });
+
+    return comments;
+}
+
+
 // TODO: Make all this async.
 module.exports = {
-  getParser: function(parser_name, rebuild) {
-    if (rebuild == true) {
-      var parserfile = fs.readFileSync(path.resolve("./" + parser_name + ".pegjs"), {encoding: "utf8"});
-      return PEG.generate(parserfile);
-    } else {
-      return builtParsers[parser_name];
-    }
-  },
-  parse: function(source, parser_name, rebuild) {
-    if (typeof parser_name == "boolean") {
-      rebuild = parser_name;
-      parser_name = null;
-    }
+    getParser: function(parser_name, rebuild) {
+        if (rebuild == true) {
+            let parserfile = fs.readFileSync(path.resolve("./" + parser_name + ".pegjs"), {encoding: "utf8"});
+            return PEG.generate(parserfile);
+        } else {
+            return builtParsers[parser_name];
+        }
+    },
+    parse: function(source, options, parser_name, rebuild) {
+        if (typeof parser_name == "boolean") {
+            rebuild = parser_name;
+            parser_name = null;
+        }
 
-    if (parser_name == null) {
-      parser_name = "solidity";
-    }
+        if (parser_name == null) {
+            parser_name = "solidity";
+        }
 
-    var parser = this.getParser(parser_name, rebuild);
+        let parser = this.getParser(parser_name, rebuild);
+        let result;
 
-    var result;
-    try {
-      result = parser.parse(source);
-    } catch (e) {
-      if (e instanceof parser.SyntaxError) {
-        e.message += " Line: " + e.location.start.line + ", Column: " + e.location.start.column;
-      }
-      throw e;
-    }
+        try {
+            result = parser.parse(source);
+        } catch (e) {
+            if (e instanceof parser.SyntaxError) {
+                e.message += " Line: " + e.location.start.line + ", Column: " + e.location.start.column;
+            }
+            throw e;
+        }
 
-    return result;
-  },
-  parseFile: function(file, parser_name, rebuild) {
-    return this.parse(fs.readFileSync(path.resolve(file), {encoding: "utf8"}), parser_name, rebuild);
-  }
+        if (typeof options === "object" && options.comment === true) {
+            result.comments = parseComments(source);
+        }
+
+        return result;
+    },
+    parseFile: function(file, parser_name, rebuild) {
+        return this.parse(fs.readFileSync(path.resolve(file), {encoding: "utf8"}), parser_name, rebuild);
+    },
+    parseComments
 };

package.json

 {
   "name": "solparse",
-  "version": "1.4.2",
+  "version": "2.0.0",
   "description": "PEG.js Solidity parser for Javascript",
@@ -37,2 +37,3 @@ "main": "index.js",
   "dependencies": {
+    "antlr4": "^4.7.0",
     "mocha": "^4.0.1",
@@ -39,0 +40,0 @@ "pegjs": "^0.10.0",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1696001

increased by145.38%

Number of package files

18

increased by63.64%

Lines of code

34956

increased by90.33%

Worsened metrics

Dependency count

4

increased by33.33%

Dependency changes

• + Addedantlr4@^4.7.0

• + Addedantlr4@4.13.2(transitive)