Merge pull request #3551 from bluesign/npm-parser

Fix Cadence Parser NPM Package

Author: turbolent

npm-packages/cadence-parser/src/go.js

@@ -190,7 +190,7 @@ class Go {
 
 		const timeOrigin = Date.now() - performance.now();
 		this.importObject = {
-			go: {
+			gojs: {
 				// Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters)
 				// may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported
 				// function. A goroutine can switch to a new stack if the current stack is too small (see morestack function).

npm-packages/cadence-parser/tests/index.test.ts

@@ -4,117 +4,83 @@ import * as fs from "fs"
 test("parse simple", async () => {
   const binary = fs.readFileSync(require.resolve('../dist/cadence-parser.wasm'))
   const parser = await CadenceParser.create(binary)
-  const res = parser.parse("pub fun main() {}")
+  const res = parser.parse("access(all) fun main() {}")
   expect(res).toEqual({
     "program": {
       "Type": "Program",
       "Declarations": [
         {
-          "Access": "AccessPublic",
+          "Access": "AccessAll",
           "DocString": "",
           "EndPos": {
-            "Column": 16,
+            "Column": 24,
             "Line": 1,
-            "Offset": 16,
+            "Offset": 24,
           },
           "FunctionBlock": {
             "Block": {
               "EndPos": {
-                "Column": 16,
+                "Column": 24,
                 "Line": 1,
-                "Offset": 16,
+                "Offset": 24,
               },
               "StartPos": {
-                "Column": 15,
+                "Column": 23,
                 "Line": 1,
-                "Offset": 15,
+                "Offset": 23,
               },
               "Statements": null,
               "Type": "Block",
             },
             "EndPos": {
-              "Column": 16,
+              "Column": 24,
               "Line": 1,
-              "Offset": 16,
+              "Offset": 24,
             },
             "StartPos": {
-              "Column": 15,
+              "Column": 23,
               "Line": 1,
-              "Offset": 15,
+              "Offset": 23,
             },
             "Type": "FunctionBlock",
           },
           "Identifier": {
             "EndPos": {
-              "Column": 11,
+              "Column": 19,
               "Line": 1,
-              "Offset": 11,
+              "Offset": 19,
             },
             "Identifier": "main",
             "StartPos": {
-              "Column": 8,
+              "Column": 16,
               "Line": 1,
-              "Offset": 8,
+              "Offset": 16,
             },
           },
+          "IsNative": false,
+          "IsStatic": false,
           "ParameterList": {
             "EndPos": {
-              "Column": 13,
+              "Column": 21,
               "Line": 1,
-              "Offset": 13,
+              "Offset": 21,
             },
             "Parameters": null,
             "StartPos": {
-              "Column": 12,
-              "Line": 1,
-              "Offset": 12,
-            },
-          },
-          "ReturnTypeAnnotation": {
-            "AnnotatedType": {
-              "EndPos": {
-                "Column": 12,
-                "Line": 1,
-                "Offset": 12,
-              },
-              "Identifier": {
-                "EndPos": {
-                  "Column": 12,
-                  "Line": 1,
-                  "Offset": 12,
-                },
-                "Identifier": "",
-                "StartPos": {
-                  "Column": 13,
-                  "Line": 1,
-                  "Offset": 13,
-                },
-              },
-              "StartPos": {
-                "Column": 13,
-                "Line": 1,
-                "Offset": 13,
-              },
-              "Type": "NominalType",
-            },
-            "EndPos": {
-              "Column": 12,
-              "Line": 1,
-              "Offset": 12,
-            },
-            "IsResource": false,
-            "StartPos": {
-              "Column": 13,
+              "Column": 20,
               "Line": 1,
-              "Offset": 13,
+              "Offset": 20,
             },
           },
+          "Purity": "Unspecified",
+          "ReturnTypeAnnotation": null,
           "StartPos": {
             "Column": 0,
             "Line": 1,
             "Offset": 0,
           },
           "Type": "FunctionDeclaration",
+          "TypeParameterList": null,
         },
       ],
     },