motoko 3.2.0 → 3.3.0

package/lib/ast.d.ts

@@ -22,6 +22,7 @@ export interface Node extends Partial<Source> {
     declaration?: Source;
     args?: AST[];
 }
+export declare function asNode(ast: AST | undefined): Node | undefined;
 export declare function simplifyAST(ast: CompilerNode, parent?: Node | undefined): Node;
 export declare function simplifyAST(ast: CompilerAST[], parent?: Node | undefined): AST[];
 export declare function simplifyAST<T extends CompilerAST>(ast: T, parent?: Node | undefined): T;

package/lib/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../src/ast.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW,GAAG,WAAW,EAAE,GAAG,YAAY,GAAG,MAAM,GAAG,IAAI,CAAC;AACvE,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC;AAE3E,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,oBAAY,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACpC,oBAAY,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAE/C,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;CACb;AAED,MAAM,WAAW,IAAK,SAAQ,OAAO,CAAC,MAAM,CAAC;IACzC,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;AAChF,wBAAgB,WAAW,CACvB,GAAG,EAAE,WAAW,EAAE,EAClB,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAC1B,GAAG,EAAE,CAAC;AACT,wBAAgB,WAAW,CAAC,CAAC,SAAS,WAAW,EAC7C,GAAG,EAAE,CAAC,EACN,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAC1B,CAAC,CAAC"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../src/ast.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW,GAAG,WAAW,EAAE,GAAG,YAAY,GAAG,MAAM,GAAG,IAAI,CAAC;AACvE,oBAAY,YAAY,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC;AAE3E,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,oBAAY,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACpC,oBAAY,GAAG,GAAG,GAAG,EAAE,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAE/C,MAAM,WAAW,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,IAAI,CAAC;IACZ,GAAG,EAAE,IAAI,CAAC;CACb;AAED,MAAM,WAAW,IAAK,SAAQ,OAAO,CAAC,MAAM,CAAC;IACzC,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CAChB;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,CAI7D;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;AAChF,wBAAgB,WAAW,CACvB,GAAG,EAAE,WAAW,EAAE,EAClB,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAC1B,GAAG,EAAE,CAAC;AACT,wBAAgB,WAAW,CAAC,CAAC,SAAS,WAAW,EAC7C,GAAG,EAAE,CAAC,EACN,MAAM,CAAC,EAAE,IAAI,GAAG,SAAS,GAC1B,CAAC,CAAC"}

package/lib/ast.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simplifyAST = void 0;
+exports.simplifyAST = exports.asNode = void 0;
+function asNode(ast) {
+    if (ast && typeof ast === 'object' && !Array.isArray(ast)) {
+        return ast;
+    }
+}
+exports.asNode = asNode;
 function simplifyAST(ast, parent) {
     if (Array.isArray(ast)) {
         return ast.map((a) => simplifyAST(a, parent));
@@ -10,9 +16,11 @@ function simplifyAST(ast, parent) {
     }
     if (ast.name === '@') {
         const [start, end, subAst] = ast.args;
-        const node = Object.assign(Object.assign({}, (typeof subAst === 'string'
-            ? { name: subAst }
-            : simplifyAST(subAst, parent))), { start: [+start.args[1], +start.args[2]], end: [+end.args[1], +end.args[2]] });
+        const node = typeof subAst === 'string'
+            ? { name: subAst, parent }
+            : simplifyAST(subAst, parent);
+        node.start = [+start.args[1], +start.args[2]];
+        node.end = [+end.args[1], +end.args[2]];
         const file = start.args[0];
         if (file) {
             node.file = file;
@@ -21,15 +29,19 @@ function simplifyAST(ast, parent) {
     }
     if (ast.name === ':') {
         const [typeAst, type] = ast.args;
-        return Object.assign(Object.assign({}, (typeof typeAst === 'string'
-            ? { name: typeAst }
-            : simplifyAST(typeAst, parent))), { type });
+        const node = typeof typeAst === 'string'
+            ? { name: typeAst, parent }
+            : simplifyAST(typeAst, parent);
+        node.type = type;
+        return node;
     }
     if (ast.name === '*') {
         const [doc, docAst] = ast.args;
-        return Object.assign(Object.assign({}, (typeof docAst === 'string'
-            ? { name: docAst }
-            : simplifyAST(docAst, parent))), { doc });
+        const node = typeof docAst === 'string'
+            ? { name: docAst, parent }
+            : simplifyAST(docAst, parent);
+        node.doc = doc;
+        return node;
     }
     const node = {
         name: ast.name,

package/lib/ast.js.map

@@ -1 +1 @@
-{"version":3,"file":"ast.js","sourceRoot":"","sources":["../src/ast.ts"],"names":[],"mappings":";;;AAmCA,SAAgB,WAAW,CAAC,GAAgB,EAAE,MAAyB;IACnE,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;KACjD;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QACzB,OAAO,GAAG,CAAC;KACd;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAClB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,IAIhC,CAAC;QACF,MAAM,IAAI,mCACH,CAAC,OAAO,MAAM,KAAK,QAAQ;YAC1B,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;YAClB,CAAC,CAAC,WAAW,CAAC,MAA6B,EAAE,MAAM,CAAC,CAAC,KACzD,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EACvC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GACpC,CAAC;QACF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;SACpB;QACD,OAAO,IAAI,CAAC;KACf;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAClB,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,IAA6B,CAAC;QAC1D,uCACO,CAAC,OAAO,OAAO,KAAK,QAAQ;YAC3B,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;YACnB,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,KACnC,IAAI,IACN;KACL;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAClB,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,IAA6B,CAAC;QACxD,uCACO,CAAC,OAAO,MAAM,KAAK,QAAQ;YAC1B,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;YAClB,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAClC,GAAG,IACL;KACL;IACD,MAAM,IAAI,GAAS;QACf,IAAI,EAAE,GAAG,CAAC,IAAI;KACjB,CAAC;IACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE;QAClC,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC;AAChB,CAAC;AArDD,kCAqDC"}
+{"version":3,"file":"ast.js","sourceRoot":"","sources":["../src/ast.ts"],"names":[],"mappings":";;;AA0BA,SAAgB,MAAM,CAAC,GAAoB;IACvC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACvD,OAAO,GAAG,CAAC;KACd;AACL,CAAC;AAJD,wBAIC;AAWD,SAAgB,WAAW,CAAC,GAAgB,EAAE,MAAyB;IACnE,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACpB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;KACjD;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QACzB,OAAO,GAAG,CAAC;KACd;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAClB,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,IAIhC,CAAC;QACF,MAAM,IAAI,GACN,OAAO,MAAM,KAAK,QAAQ;YACtB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE;YAC1B,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;SACpB;QACD,OAAO,IAAI,CAAC;KACf;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAClB,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,IAA8B,CAAC;QAC3D,MAAM,IAAI,GACN,OAAO,OAAO,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE;YAC3B,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;KACf;IACD,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE;QAClB,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,IAA8B,CAAC;QACzD,MAAM,IAAI,GACN,OAAO,MAAM,KAAK,QAAQ;YACtB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE;YAC1B,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC;KACf;IACD,MAAM,IAAI,GAAS;QACf,IAAI,EAAE,GAAG,CAAC,IAAI;KACjB,CAAC;IACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE;QAClC,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,IAAI,CAAC;AAChB,CAAC;AApDD,kCAoDC"}

package/lib/file.d.ts

@@ -21,6 +21,6 @@ export declare const file: (mo: Motoko, path: string) => {
     parseMotokoTyped(): {
         ast: import("./ast").Node;
         type: import("./ast").Node;
-    }[];
+    };
 };
 //# sourceMappingURL=file.d.ts.map

package/lib/file.js

@@ -65,7 +65,7 @@ const file = (mo, path) => {
             return mo.parseMotoko(result.read());
         },
         parseMotokoTyped() {
-            return mo.parseMotokoTyped([path]);
+            return mo.parseMotokoTyped(path);
         },
     };
     return result;

package/lib/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../src/file.ts"],"names":[],"mappings":";;;AAEA,SAAS,YAAY,CAAC,IAAY;IAC9B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KACjD;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5B;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAIM,MAAM,IAAI,GAAG,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE;IAC7C,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAG;QACX,IAAI,IAAI;YACJ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,OAAO;YACZ,IAAI,GAAG,OAAO,CAAC;QACnB,CAAC;QACD,kBAAkB;QAClB,uCAAuC;QACvC,iDAAiD;QACjD,KAAK;QACL,KAAK;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI;YACA,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,CAAC,OAAe;YACjB,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,CAAC,OAAe;YAClB,IAAI,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACtC,IAAI,GAAG,OAAO,CAAC;YACf,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI;YACA,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,KAAK;YACD,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,GAAG;YACC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,MAAM;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,IAAc;YACf,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,WAAW;YACP,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,WAAW;YACP,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,gBAAgB;YACZ,OAAO,EAAE,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACvC,CAAC;KACJ,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAxDW,QAAA,IAAI,QAwDf"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../src/file.ts"],"names":[],"mappings":";;;AAEA,SAAS,YAAY,CAAC,IAAY;IAC9B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KACjD;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACxB;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5B;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAIM,MAAM,IAAI,GAAG,CAAC,EAAU,EAAE,IAAY,EAAE,EAAE;IAC7C,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAG;QACX,IAAI,IAAI;YACJ,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,OAAO;YACZ,IAAI,GAAG,OAAO,CAAC;QACnB,CAAC;QACD,kBAAkB;QAClB,uCAAuC;QACvC,iDAAiD;QACjD,KAAK;QACL,KAAK;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI;YACA,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,KAAK,CAAC,OAAe;YACjB,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC;QACD,MAAM,CAAC,OAAe;YAClB,IAAI,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACtC,IAAI,GAAG,OAAO,CAAC;YACf,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI;YACA,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,KAAK;YACD,OAAO,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,GAAG;YACC,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,MAAM;YACF,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,IAAc;YACf,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,WAAW;YACP,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,WAAW;YACP,OAAO,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,gBAAgB;YACZ,OAAO,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;KACJ,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAxDW,QAAA,IAAI,QAwDf"}

package/lib/index.d.ts

@@ -47,7 +47,7 @@ export default function wrapMotoko(compiler: Compiler): {
         parseMotokoTyped(): {
             ast: Node;
             type: Node;
-        }[];
+        };
     };
     read(path: string): string;
     write(path: string, content?: string): void;

package/lib/versions/interpreter.d.ts

@@ -22,7 +22,7 @@ declare const _default: {
         parseMotokoTyped(): {
             ast: import("../ast").Node;
             type: import("../ast").Node;
-        }[];
+        };
     };
     read(path: string): string;
     write(path: string, content?: string): void;

package/lib/versions/moc.d.ts

@@ -22,7 +22,7 @@ declare const _default: {
         parseMotokoTyped(): {
             ast: import("../ast").Node;
             type: import("../ast").Node;
-        }[];
+        };
     };
     read(path: string): string;
     write(path: string, content?: string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "motoko",
-    "version": "3.2.0",
+    "version": "3.3.0",
     "description": "Compile and run Motoko smart contracts in Node.js or the browser.",
     "author": "Ryan Vandersmith (https://github.com/rvanasa)",
     "license": "Apache-2.0",

package/src/ast.ts

@@ -24,6 +24,12 @@ export interface Node extends Partial<Source> {
     args?: AST[];
 }
 
+export function asNode(ast: AST | undefined): Node | undefined {
+    if (ast && typeof ast === 'object' && !Array.isArray(ast)) {
+        return ast;
+    }
+}
+
 export function simplifyAST(ast: CompilerNode, parent?: Node | undefined): Node;
 export function simplifyAST(
     ast: CompilerAST[],
@@ -44,15 +50,14 @@ export function simplifyAST(ast: CompilerAST, parent?: Node | undefined): AST {
         const [start, end, subAst] = ast.args as [
             CompilerSpan,
             CompilerSpan,
-            CompilerAST,
+            CompilerNode,
         ];
-        const node: Node = {
-            ...(typeof subAst === 'string'
-                ? { name: subAst }
-                : simplifyAST(subAst as any as CompilerNode, parent)),
-            start: [+start.args[1], +start.args[2]],
-            end: [+end.args[1], +end.args[2]],
-        };
+        const node =
+            typeof subAst === 'string'
+                ? { name: subAst, parent }
+                : simplifyAST(subAst, parent);
+        node.start = [+start.args[1], +start.args[2]];
+        node.end = [+end.args[1], +end.args[2]];
         const file = start.args[0];
         if (file) {
             node.file = file;
@@ -60,22 +65,22 @@ export function simplifyAST(ast: CompilerAST, parent?: Node | undefined): AST {
         return node;
     }
     if (ast.name === ':') {
-        const [typeAst, type] = ast.args as [CompilerAST, string];
-        return {
-            ...(typeof typeAst === 'string'
-                ? { name: typeAst }
-                : simplifyAST(typeAst, parent)),
-            type,
-        };
+        const [typeAst, type] = ast.args as [CompilerNode, string];
+        const node =
+            typeof typeAst === 'string'
+                ? { name: typeAst, parent }
+                : simplifyAST(typeAst, parent);
+        node.type = type;
+        return node;
     }
     if (ast.name === '*') {
-        const [doc, docAst] = ast.args as [string, CompilerAST];
-        return {
-            ...(typeof docAst === 'string'
-                ? { name: docAst }
-                : simplifyAST(docAst, parent)),
-            doc,
-        };
+        const [doc, docAst] = ast.args as [string, CompilerNode];
+        const node =
+            typeof docAst === 'string'
+                ? { name: docAst, parent }
+                : simplifyAST(docAst, parent);
+        node.doc = doc;
+        return node;
     }
     const node: Node = {
         name: ast.name,

package/src/file.ts

@@ -67,7 +67,7 @@ export const file = (mo: Motoko, path: string) => {
             return mo.parseMotoko(result.read());
         },
         parseMotokoTyped() {
-            return mo.parseMotokoTyped([path]);
+            return mo.parseMotokoTyped(path);
         },
     };
     return result;