motoko 3.0.0-beta4 → 3.0.0-beta6

package/src/index.ts

@@ -28,15 +28,11 @@ export type Diagnostic = {
 
 export type WasmMode = 'ic' | 'wasi';
 
-export default function wrapMotoko(compiler: Compiler, version: string) {
+export default function wrapMotoko(compiler: Compiler) {
+    const version = compiler.version || '(unknown)';
     const debug = require('debug')(`motoko:${version}`);
 
     const invoke = (key: string, unwrap: boolean, args: any[]) => {
-        if (!compiler) {
-            throw new Error(
-                'Please load a Motoko compiler before running this function',
-            );
-        }
         if (typeof compiler[key] !== 'function') {
             throw new Error(`Unknown compiler function: '${key}'`);
         }
@@ -143,8 +139,9 @@ export default function wrapMotoko(compiler: Compiler, version: string) {
         validatePackage(pkg: Package) {
             validatePackage(pkg);
         },
-        setAliases(aliases: Record<string, string>) {
-            debug('aliases', aliases);
+        setAliases(directory: string, aliases: Record<string, string>) {
+            debug('aliases', directory, aliases);
+            invoke('setCandidPath', false, [directory]);
             invoke('setActorAliases', false, [Object.entries(aliases)]);
         },
         setMetadata(values: string) {

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',
+];

package/src/versions/interpreter.ts

@@ -1,4 +1,4 @@
 import wrapMotoko from '..';
 const { Motoko } = require('../../versions/latest/moc_interpreter.min');
 
-export default wrapMotoko(Motoko, 'latest/interpreter');
+export default wrapMotoko(Motoko);

package/src/versions/moc.ts

@@ -1,4 +1,4 @@
 import wrapMotoko from '..';
 const { Motoko } = require('../../versions/latest/moc.min');
 
-export default wrapMotoko(Motoko, 'latest');
+export default wrapMotoko(Motoko);