motoko 3.0.0-beta5 → 3.0.0-beta6

package/contrib/hljs.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const { keywords, typeKeywords } = require('../lib/keywords');
+
+const literalKeywords = ['true', 'false', 'null'];
+
 /// Highlight.js configuration
 exports.configure = (hljs) => {
     var string = {
@@ -25,25 +29,19 @@ exports.configure = (hljs) => {
         ],
         relevance: 0,
     };
-    hljs.registerLanguage('motoko', function (hljs) {
+    hljs.registerLanguage('motoko', (hljs) => {
         return {
             name: 'Motoko',
             aliases: ['mo'],
             keywords: {
                 $pattern: '[a-zA-Z_]\\w*',
-                keyword:
-                    'actor and await break case catch class' +
-                    ' continue debug do else for func if in import' +
-                    ' module not object or label let loop private' +
-                    ' public return shared try throw query switch' +
-                    ' type var while stable flexible system debug_show' +
-                    ' assert ignore from_candid to_candid with',
-                literal: 'true false null',
-                built_in:
-                    'Any None Null Bool Int Int8 Int16 Int32 Int64' +
-                    ' Nat Nat8 Nat16 Nat32 Nat64 Word8 Word16 Word32 Word64' +
-                    ' Float Char Text Blob Error Principal' +
-                    ' async',
+                keyword: keywords
+                    .filter(
+                        (k) => !literalKeywords.includes(k) && k !== 'async',
+                    )
+                    .join(' '),
+                literal: literalKeywords.join(' '),
+                built_in: `async ${typeKeywords.join(' ')}`,
             },
             illegal: '</',
             contains: [
@@ -92,7 +90,7 @@ exports.configure = (hljs) => {
             ],
         };
     });
-    hljs.registerLanguage('candid', function (hljs) {
+    hljs.registerLanguage('candid', (hljs) => {
         return {
             name: 'Candid',
             aliases: ['did'],

package/contrib/monaco.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { keywords, typeKeywords } = require('../lib/keywords');
+
 /// Monaco editor configuration
 exports.configure = (monaco) => {
     monaco.languages.register({ id: 'motoko' });
@@ -25,12 +27,7 @@ exports.configure = (monaco) => {
         defaultToken: '',
         tokenPostfix: '.mo',
         // prettier-ignore
-        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',
-        ],
+        keywords,
         accessmodifiers: [
             'public',
             'private',
@@ -41,10 +38,7 @@ exports.configure = (monaco) => {
             'system',
         ],
         // prettier-ignore
-        typeKeywords: [
-            'Any', 'None', 'Null', 'Bool', 'Int', 'Int8', 'Int16', 'Int32', 'Int64', 'Nat',
-            'Nat8', 'Nat16', 'Nat32', 'Nat64', 'Float', 'Char', 'Text', 'Blob', 'Error', 'Principal',
-        ],
+        typeKeywords,
         // prettier-ignore
         operators: [
             '=', '<', '>', ':', '<:', '?', '+', '-', '*', '/', '%', '**', '+%', '-%', '*%', '**%', '&', '|', '^', '<<', '>>', '<<>', '<>>',

package/lib/keywords.d.ts

@@ -0,0 +1,3 @@
+export declare const keywords: string[];
+export declare const typeKeywords: string[];
+//# sourceMappingURL=keywords.d.ts.map

package/lib/keywords.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keywords.d.ts","sourceRoot":"","sources":["../src/keywords.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,UAgDpB,CAAC;AAEF,eAAO,MAAM,YAAY,UAqBxB,CAAC"}

package/lib/keywords.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.typeKeywords = exports.keywords = void 0;
+exports.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',
+];
+exports.typeKeywords = [
+    'Any',
+    'None',
+    'Null',
+    'Bool',
+    'Int',
+    'Int8',
+    'Int16',
+    'Int32',
+    'Int64',
+    'Nat',
+    'Nat8',
+    'Nat16',
+    'Nat32',
+    'Nat64',
+    'Float',
+    'Char',
+    'Text',
+    'Blob',
+    'Error',
+    'Principal',
+];
+//# sourceMappingURL=keywords.js.map

package/lib/keywords.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keywords.js","sourceRoot":"","sources":["../src/keywords.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAG;IACpB,OAAO;IACP,KAAK;IACL,OAAO;IACP,QAAQ;IACR,OAAO;IACP,OAAO;IACP,MAAM;IACN,OAAO;IACP,OAAO;IACP,UAAU;IACV,OAAO;IACP,YAAY;IACZ,IAAI;IACJ,MAAM;IACN,OAAO;IACP,UAAU;IACV,KAAK;IACL,aAAa;IACb,MAAM;IACN,IAAI;IACJ,QAAQ;IACR,IAAI;IACJ,QAAQ;IACR,OAAO;IACP,KAAK;IACL,MAAM;IACN,QAAQ;IACR,KAAK;IACL,MAAM;IACN,QAAQ;IACR,IAAI;IACJ,SAAS;IACT,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,WAAW;IACX,MAAM;IACN,KAAK;IACL,MAAM;IACN,KAAK;IACL,OAAO;IACP,MAAM;CACT,CAAC;AAEW,QAAA,YAAY,GAAG;IACxB,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,KAAK;IACL,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,WAAW;CACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "motoko",
-    "version": "3.0.0-beta5",
+    "version": "3.0.0-beta6",
     "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/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',
+];