feat(esm): esm library fixes

Author: sambacha

imports.pegjs

@@ -0,0 +1,93 @@
+'use strict';
+
+
+
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+import 'peggy';
+import pkg from 'peggy';
+const { PEG } = pkg;
+
+
+const builtParsers = {
+  solidity: import('./dist/parser.mjs'),
+  imports: import('./dist/imports_parser.mjs'),
+};
+
+function parseComments(sourceCode) {
+  // for Line comment regexp, the "." doesn't cover line termination chars so we're good :)
+  const comments = [],
+    commentParser = /(\/\*(\*(?!\/)|[^*])*\*\/)|(\/\/.*)/g;
+  let nextComment;
+
+  // eslint-disable-next-line no-cond-assign
+  while ((nextComment = commentParser.exec(sourceCode))) {
+    const text = nextComment[0],
+      types = { '//': 'Line', '/*': 'Block' };
+
+    comments.push({
+      text,
+      type: types[text.slice(0, 2)],
+      start: nextComment.index,
+      end: nextComment.index + text.length,
+    });
+  }
+
+  return comments;
+}
+
+// TODO: Make all this async.
+export default {
+  getParser(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(source, options, parser_name, rebuild) {
+    if (typeof parser_name == 'boolean') {
+      rebuild = parser_name;
+      parser_name = null;
+    }
+
+    if (parser_name == null) {
+      parser_name = 'solidity';
+    }
+
+    let parser = this.getParser(parser_name, rebuild);
+    let 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;
+    }
+
+    if (typeof options === 'object' && options.comment === true) {
+      result.comments = parseComments(source);
+    }
+
+    return result;
+  },
+  parseFile(file, parser_name, rebuild) {
+    return this.parse(
+      fs.readFileSync(path.resolve(file), { encoding: 'utf8' }),
+      parser_name,
+      rebuild,
+    );
+  },
+  parseComments,
+};

index.mjs

@@ -559,6 +559,7 @@ WeeksToken          = "weeks"             !IdentifierPart
 WeiToken            = "wei"               !IdentifierPart
 WhileToken          = "while"             !IdentifierPart
 YearsToken          = "years"             !IdentifierPart
+UncheckedToken      = "unchecked"         !IdentifierPart
 
 /* Skipped */
 
@@ -1151,8 +1152,8 @@ Statements
     }
 
 Statement
-  =  
-  Block
+  = Block
+  / UncheckedBlock
   / VariableStatement
   / EmptyStatement
   / ExpressionStatement
@@ -1231,6 +1232,16 @@ Block
       };
     } 
 
+UncheckedBlock
+  = UncheckedToken __ "{" __ body:(StatementList __)? "}" {
+      return {
+        type: "BlockStatement",
+        body: optionalList(extractOptional(body, 0)),
+        start: location().start.offset,
+        end: location().end.offset
+      };
+    }
+
 StatementList
   = head:Statement tail:(__ Statement)* { return buildList(head, tail, 1); }
 
@@ -1717,7 +1728,8 @@ ModifierDeclaration
     }
 
 FunctionDeclaration
-  = FunctionToken __ fnname:FunctionName __ args:ModifierArgumentList? __ returns:ReturnsDeclarations __ body:FunctionBody
+  = FunctionToken __ fnname:FunctionName __ args:ModifierArgumentList? __ 
+  OverrideToken? __ returns:ReturnsDeclarations __ body:FunctionBody
     {
       return {
         type: "FunctionDeclaration",
@@ -1731,7 +1743,7 @@ FunctionDeclaration
         end: location().end.offset
       };
     }
-  / FunctionToken __ fnname:FunctionName __ args:ModifierArgumentList? __ returns:ReturnsDeclarations __ EOS
+  / FunctionToken __ fnname:FunctionName __ args:ModifierArgumentList?__ OverrideToken? __ returns:ReturnsDeclarations __ EOS
     {
       return {
         type: "FunctionDeclaration",
@@ -2130,4 +2142,4 @@ AssemblyFor
       start: location().start.offset,
       end: location().end.offset
     };
-  }
+  };

lib/solidity.pegjs

@@ -1,6 +1,7 @@
 {
   "name": "pegjs-solidity",
   "version": "1.2.0",
+ "type": "module",
   "description": "pegjs grammar for solidity parsing with esm/commonjs and browser umd support",
   "main": "index.js",
   "files": [