motoko 3.0.0-beta5 → 3.0.0-beta7

package/src/ast.ts

@@ -9,12 +9,19 @@ export interface CompilerNode {
 export type Span = [number, number];
 export type AST = AST[] | Node | string | null;
 
-export interface Node {
+export interface Source {
+    file?: string;
+    start?: Span;
+    end?: Span;
+}
+
+export interface Node extends Source {
     name: string;
     file?: string;
     start?: Span;
     end?: Span;
     type?: Node;
+    declaration?: Source;
     args?: AST[];
 }
 
@@ -51,12 +58,12 @@ export function simplifyAST(ast: CompilerAST): AST {
         };
     }
     if (ast.name === ':') {
-        const [type, subAst] = ast.args as [CompilerNode, CompilerAST];
-        // console.log(subAst); ////
+        const [typeAst, type] = ast.args as [CompilerAST, CompilerNode];
+        // console.log(typeAst); ////
         return {
-            ...(typeof subAst === 'string'
-                ? { name: subAst }
-                : simplifyAST(subAst)),
+            ...(typeof typeAst === 'string'
+                ? { name: typeAst }
+                : simplifyAST(typeAst)),
             type: simplifyAST(type),
         };
     }

package/src/keywords.ts

@@ -0,0 +1,72 @@
+export const keywords = [
+    'actor',
+    'and',
+    'async',
+    'assert',
+    'await',
+    'break',
+    'case',
+    'catch',
+    'class',
+    'continue',
+    'debug',
+    'debug_show',
+    'do',
+    'else',
+    'false',
+    'flexible',
+    'for',
+    'from_candid',
+    'func',
+    'if',
+    'ignore',
+    'in',
+    'import',
+    'label',
+    'let',
+    'loop',
+    'module',
+    'not',
+    'null',
+    'object',
+    'or',
+    'private',
+    'public',
+    'query',
+    'return',
+    'shared',
+    'stable',
+    'switch',
+    'system',
+    'throw',
+    'to_candid',
+    'true',
+    'try',
+    'type',
+    'var',
+    'while',
+    'with',
+];
+
+export const typeKeywords = [
+    'Any',
+    'None',
+    'Null',
+    'Bool',
+    'Int',
+    'Int8',
+    'Int16',
+    'Int32',
+    'Int64',
+    'Nat',
+    'Nat8',
+    'Nat16',
+    'Nat32',
+    'Nat64',
+    'Float',
+    'Char',
+    'Text',
+    'Blob',
+    'Error',
+    'Principal',
+];