motoko 0.1.4 → 0.1.5

package/contrib/hljs.js

@@ -0,0 +1,122 @@
+// Highlight.js configuration
+
+export const configure = (hljs) => {
+    var string = {
+      className: 'string',
+      variants: [
+        {
+          begin: /r(#*)"(.|\n)*?"\1(?!#)/,
+        },
+        {
+          begin: /b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/,
+        },
+      ],
+    };
+    var number = {
+      className: 'number',
+      variants: [
+        {
+          begin: '[+-]?\\b0[xX]([A-Fa-f0-9_]+)',
+        },
+        {
+          begin: '[+-]?\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)',
+        },
+      ],
+      relevance: 0,
+    };
+    hljs.registerLanguage('motoko', function (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',
+          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',
+        },
+        illegal: '</',
+        contains: [
+          hljs.C_LINE_COMMENT_MODE,
+          hljs.COMMENT('/\\*', '\\*/', {
+            contains: ['self'],
+          }),
+          hljs.inherit(hljs.QUOTE_STRING_MODE, {
+            begin: /b?"/,
+            illegal: null,
+          }),
+          string,
+          number,
+          {
+            className: 'symbol',
+            begin: '#' + hljs.UNDERSCORE_IDENT_RE,
+          },
+          {
+            className: 'function',
+            beginKeywords: 'func',
+            end: '(\\(|<|=|{)',
+            excludeEnd: true,
+            contains: [hljs.UNDERSCORE_TITLE_MODE],
+          },
+          {
+            className: 'class',
+            begin: '\\b(actor( class)?|module|object)\\b',
+            keywords: 'actor class module object',
+            end: '(\\(|<|{)',
+            contains: [hljs.UNDERSCORE_TITLE_MODE],
+            illegal: '[\\w\\d]',
+          },
+          {
+            className: 'built_in',
+            beginKeywords: 'import type',
+            end: '(;|$|=)',
+            excludeEnd: true,
+            contains: [
+              hljs.QUOTE_STRING_MODE,
+              hljs.C_LINE_COMMENT_MODE,
+              hljs.COMMENT('/\\*', '\\*/', {
+                contains: ['self'],
+              }),
+            ],
+          },
+        ],
+      };
+    });
+    hljs.registerLanguage('candid', function (hljs) {
+      return {
+        name: 'Candid',
+        aliases: ['did'],
+        keywords: {
+          $pattern: '[a-zA-Z_]\\w*',
+          keyword: 'import service type',
+          built_in:
+            'opt vec record variant func blob principal' +
+            ' nat nat8 nat16 nat32 nat64 int int8 int16 int32 int64' +
+            ' float32 float64 bool text null reserved empty' +
+            ' oneway query',
+        },
+        illegal: '</',
+        contains: [
+          hljs.C_LINE_COMMENT_MODE,
+          hljs.COMMENT('/\\*', '\\*/', {
+            contains: ['self'],
+          }),
+          hljs.inherit(hljs.QUOTE_STRING_MODE, {
+            begin: /b?"/,
+            illegal: null,
+          }),
+          string,
+          number,
+        ],
+      };
+    });
+  }
+  

package/lib/index.js

@@ -3,7 +3,7 @@
 const debug = require('debug')('motoko');
 
 const { Motoko } = require('./generated/moc');
-const { loadPackages } = require('./package');
+const { /* resolvePackage, */ loadPackages } = require('./package');
 
 const invoke = (key, unwrap, args) => {
     if (typeof Motoko[key] !== 'function') {
@@ -37,8 +37,12 @@ const invoke = (key, unwrap, args) => {
 
 module.exports = {
     Motoko,
+    // resolvePackage,
     loadPackages,
-    addFile(file, content) {
+    addFile(file, content = '') {
+        if (typeof content !== 'string') {
+            throw new Error('Non-string file content');
+        }
         debug('+file', file);
         invoke('saveFile', false, [file, content]);
     },
@@ -58,7 +62,11 @@ module.exports = {
         invoke('clearPackage', false, []);
     },
     check(file) {
-        invoke('check', true, [file]);
+        const result = invoke('check', false, [file]);
+        return result.diagnostics;
+    },
+    run(file, libFiles) {
+        return invoke('run', false, [libFiles || [], file]);
     },
     candid(file) {
         return invoke('candid', true, [file]);

package/lib/index.spec.js

@@ -0,0 +1,31 @@
+'use strict';
+
+const mo = require('.');
+
+const actor = `
+actor Main {
+    public func test() : async Nat {
+        123
+    }
+}
+`;
+
+describe('check', () => {
+    test('works for a basic example', () => {
+        const file = 'test__check__.mo';
+        mo.addFile(file, actor);
+        expect(mo.check(file)).toStrictEqual([]);
+    });
+});
+
+describe('run', () => {
+    test('works for a basic example', () => {
+        const file = 'test__run__.mo';
+        mo.addFile(file, 'let x = 1 + 1; x');
+        expect(mo.run(file)).toStrictEqual({
+            result: 0,
+            stdout: '2 : Nat\n',
+            stderr: '',
+        });
+    });
+});

package/lib/package.js

@@ -1,7 +1,7 @@
 'use strict';
 // Derived from: https://github.com/dfinity/motoko-playground/blob/main/src/workers/file.ts
 
-const parse = require('parse-github-url');
+const parse = require('isomorphic-parse-github-url');
 const fetch = require('cross-fetch');
 
 async function fetchPackage(mo, info) {
@@ -38,12 +38,12 @@ async function fetchGithub(mo, repo, directory = '') {
     return await fetchFromGithub(mo, repo, directory);
 }
 
-function saveWorkplaceToMotoko(mo, files) {
-    for (const [name, code] of Object.entries(files)) {
-        if (!name.endsWith('mo')) continue;
-        mo.addFile(name, code);
-    }
-}
+// function saveWorkplaceToMotoko(mo, files) {
+//     for (const [name, code] of Object.entries(files)) {
+//         if (!name.endsWith('mo')) continue;
+//         mo.addFile(name, code);
+//     }
+// }
 
 async function fetchFromCDN(mo, repo, directory = '') {
     const meta_url = `https://data.jsdelivr.com/v1/package/gh/${repo.repo}@${repo.branch}/flat`;
@@ -114,6 +114,10 @@ async function fetchFromGithub(mo, repo, directory = '') {
     });
 }
 
+// async function resolve(path) {
+
+// }
+
 function parseGithubPackage(path, name) {
     if (!path) {
         return;
@@ -137,7 +141,6 @@ function parseGithubPackage(path, name) {
 
     return {
         name: name || repoName,
-        // repo,
         repo: `https://github.com/${owner}/${repoName}.git`,
         version: branch,
         dir: filepath,
@@ -146,6 +149,12 @@ function parseGithubPackage(path, name) {
 }
 
 module.exports = {
+    // async resolvePackage(package) {
+    //     if (typeof package === 'string') {
+    //         return resolve(package);
+    //     }
+    //     return package;
+    // },
     async loadPackages(packages) {
         for (const [name, path] of Object.entries(packages)) {
             const mo = require('.');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "motoko",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "description": "Compile Motoko smart contracts in Node.js and the browser.",
     "author": "Ryan Vandersmith (https://github.com/rvanasa)",
     "license": "Apache-2.0",
@@ -11,7 +11,7 @@
     },
     "dependencies": {
         "cross-fetch": "3.1.5",
-        "parse-github-url": "1.0.2"
+        "isomorphic-parse-github-url": "1.0.2"
     },
     "devDependencies": {
         "cross-env": "^7.0.3",

package/lib/index.test.js

@@ -1,17 +0,0 @@
-'use strict'
-
-const Motoko = require('.');
-
-const actorMo = `
-actor Main {
-    public func test() : async Nat {
-        123
-    }
-}
-`;
-
-test('placeholder', () => {
-    expect(true).toEqual(true); // placeholder
-
-    console.log(Motoko.parse(actorMo));
-});