motoko 2.0.2 → 2.0.5

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -1,4 +1,5 @@
-# Motoko
+
+# MotokoJS · [![npm version](https://img.shields.io/npm/v/motoko.svg?logo=npm)](https://www.npmjs.com/package/motoko) [![GitHub license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/dfinity/motoko/issues)
 
 > ### Compile [Motoko](https://smartcontracts.org/) smart contracts in Node.js and the browser.
 

package/contrib/hljs.js

@@ -35,7 +35,8 @@ exports.configure = (hljs) => {
                     ' 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',
+                    ' 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' +

package/contrib/monaco.js

@@ -1,87 +1,53 @@
 // Monaco editor configuration
 
-const MOTOKO_KEYWORDS = [
-    'actor',
-    'and',
-    'async',
-    'assert',
-    'await',
-    'break',
-    'case',
-    'catch',
-    'class',
-    'continue',
-    'debug',
-    'else',
-    'false',
-    'for',
-    'func',
-    'if',
-    'in',
-    'import',
-    'module',
-    'not',
-    'null',
-    'object',
-    'or',
-    'label',
-    'let',
-    'loop',
-    'private',
-    'public',
-    'return',
-    'shared',
-    'try',
-    'throw',
-    'debug_show',
-    'query',
-    'switch',
-    'true',
-    'type',
-    'var',
-    'while',
-    'stable',
-    'flexible',
-    'system',
-    'ignore',
-];
-
 exports.configure = (monaco) => {
-    monaco.languages.register({ id: 'motoko' });
-    monaco.languages.setLanguageConfiguration('motoko', {
+    monaco.languages.register({ id: "motoko" });
+    monaco.languages.setLanguageConfiguration("motoko", {
         comments: {
-            lineComment: '//',
-            blockComment: ['/*', '*/'],
+            lineComment: "//",
+            blockComment: ["/*", "*/"],
         },
         brackets: [
-            ['{', '}'],
-            ['[', ']'],
-            ['(', ')'],
+            ["{", "}"],
+            ["[", "]"],
+            ["(", ")"],
         ],
         autoClosingPairs: [
-            { open: '{', close: '}' },
-            { open: '[', close: ']' },
-            { open: '(', close: ')' },
+            { open: "{", close: "}" },
+            { open: "[", close: "]" },
+            { open: "(", close: ")" },
             { open: '"', close: '"' },
-            { open: '<', close: '>' },
+            { open: "<", close: ">" },
         ],
     });
-    monaco.languages.setMonarchTokensProvider('motoko', {
-        defaultToken: '',
-        tokenPostfix: '.mo',
+    monaco.languages.setMonarchTokensProvider("motoko", {
+        defaultToken: "",
+        tokenPostfix: ".mo",
         // prettier-ignore
-        keywords: MOTOKO_KEYWORDS,
-        accessmodifiers: ['public', 'private', 'shared'],
+        keywords: [
+            'actor', 'and', 'async', 'assert', 'await', 'break', 'case', 'catch', 'class',
+            'continue', 'debug', 'else', 'false', 'for', 'from_candid', 'func', 'if', 'ignore', 'in', 'import',
+            'module', 'not', 'null', 'object', 'or', 'label', 'let', 'loop', 'private',
+            'public', 'return', 'shared', 'try', 'throw', 'to_candid', 'debug_show', 'query', 'switch',
+            'true', 'type', 'var', 'while', 'with',
+        ],
+        accessmodifiers: [
+            "public",
+            "private",
+            "shared",
+            "stable",
+            "flexible",
+            "system",
+        ],
         // prettier-ignore
         typeKeywords: [
             'Any', 'None', 'Null', 'Bool', 'Int', 'Int8', 'Int16', 'Int32', 'Int64', 'Nat',
-            'Nat8', 'Nat16', 'Nat32', 'Nat64', 'Float',
-            'Char', 'Text', 'Blob', 'Error', 'Principal',
+            'Nat8', 'Nat16', 'Nat32', 'Nat64', 'Float', 'Char', 'Text', 'Blob', 'Error', 'Principal',
         ],
         // prettier-ignore
         operators: [
-            '=', '<', '>', ':', '<:', '?', '+', '-', '*', '/', '%', '**', '&', '|', '^', '<<', '>>',
-            '#', '==', '!=', '>=', '<=', ':=', '+=', '-=', '*=', '/=', '%=', '**=', '&=', '|=',
+            '=', '<', '>', ':', '<:', '?', '+', '-', '*', '/', '%', '**', '+%', '-%', '*%', '**%', '&', '|', '^', '<<', '>>', '<<>', '<>>',
+            '#', '==', '!=', '>=', '<=', ':=', '+=', '-=', '*=', '/=', '%=', '**=', '+%=', '-%=', '*%=', '**%=', '&=', '|=',
             '^=', '<<=', '>>=', '#=', '->',
         ],
         symbols: /[=(){}[\].,:;@#_&\-<>`?!+*\\/]/,
@@ -95,68 +61,55 @@ exports.configure = (monaco) => {
                     /[a-zA-Z_$][\w$]*/,
                     {
                         cases: {
-                            '@typeKeywords': 'keyword.type',
-                            '@keywords': 'keyword',
-                            '@default': 'identifier',
+                            "@typeKeywords": "keyword.type",
+                            "@keywords": "keyword",
+                            "@default": "identifier",
                         },
                     },
                 ],
                 // whitespace
-                { include: '@whitespace' },
+                { include: "@whitespace" },
 
                 // delimiters and operators
-                [/[{}()[\]]/, '@brackets'],
-                [/[<>](?!@symbols)/, '@brackets'],
-                [
-                    /@symbols/,
-                    { cases: { '@operators': 'operator', '@default': '' } },
-                ],
+                [/[{}()[\]]/, "@brackets"],
+                [/[<>](?!@symbols)/, "@brackets"],
+                [/@symbols/, { cases: { "@operators": "operator", "@default": "" } }],
                 // numbers
-                [/\d*\.\d+([eE][-+]?\d+)?/, 'number.float'],
-                [/0[xX][0-9a-fA-F_]+/, 'number.hex'],
-                [/[0-9_]+/, 'number'],
+                [/\d*\.\d+([eE][-+]?\d+)?/, "number.float"],
+                [/0[xX][0-9a-fA-F_]+/, "number.hex"],
+                [/[0-9_]+/, "number"],
 
                 // delimiter: after number because of .\d floats
-                [/[;,.]/, 'delimiter'],
+                [/[;,.]/, "delimiter"],
 
                 // strings
-                [/"([^"\\]|\\.)*$/, 'string.invalid'], // non-teminated string
-                [
-                    /"/,
-                    {
-                        token: 'string.quote',
-                        bracket: '@open',
-                        next: '@string',
-                    },
-                ],
+                [/"([^"\\]|\\.)*$/, "string.invalid"], // non-teminated string
+                [/"/, { token: "string.quote", bracket: "@open", next: "@string" }],
 
                 // characters
-                [/'[^\\']'/, 'string'],
-                [/(')(@escapes)(')/, ['string', 'string.escape', 'string']],
-                [/'/, 'string.invalid'],
+                [/'[^\\']'/, "string"],
+                [/(')(@escapes)(')/, ["string", "string.escape", "string"]],
+                [/'/, "string.invalid"],
             ],
 
             comment: [
-                [/[^/*]+/, 'comment'],
-                [/\/\*/, 'comment', '@push'], // nested comment
-                ['\\*/', 'comment', '@pop'],
-                [/[/*]/, 'comment'],
+                [/[^/*]+/, "comment"],
+                [/\/\*/, "comment", "@push"], // nested comment
+                ["\\*/", "comment", "@pop"],
+                [/[/*]/, "comment"],
             ],
 
             string: [
-                [/[^\\"]+/, 'string'],
-                [/@escapes/, 'string.escape'],
-                [/\\./, 'string.escape.invalid'],
-                [
-                    /"/,
-                    { token: 'string.quote', bracket: '@close', next: '@pop' },
-                ],
+                [/[^\\"]+/, "string"],
+                [/@escapes/, "string.escape"],
+                [/\\./, "string.escape.invalid"],
+                [/"/, { token: "string.quote", bracket: "@close", next: "@pop" }],
             ],
 
             whitespace: [
-                [/[ \t\r\n]+/, 'white'],
-                [/\/\*/, 'comment', '@comment'],
-                [/\/\/.*$/, 'comment'],
+                [/[ \t\r\n]+/, "white"],
+                [/\/\*/, "comment", "@comment"],
+                [/\/\/.*$/, "comment"],
             ],
         },
     });

package/lib/package.js

@@ -62,7 +62,7 @@ async function fetchFromCDN(mo, repo, directory = '') {
                 const stripped =
                     directory +
                     f.name.slice(repo.dir ? repo.dir.length + 1 : 0);
-                mo.addFile(stripped, content);
+                mo.write(stripped, content);
                 files[stripped] = content;
             })();
             promises.push(promise);
@@ -100,7 +100,7 @@ async function fetchFromGithub(mo, repo, directory = '') {
                     directory +
                     (directory ? '/' : '') +
                     f.path.slice(repo.dir ? repo.dir.length + 1 : 0);
-                mo.addFile(stripped, content);
+                mo.write(stripped, content);
                 files[stripped] = content;
             })();
             promises.push(promise);

package/package.json

@@ -1,10 +1,14 @@
 {
     "name": "motoko",
-    "version": "2.0.2",
+    "version": "2.0.5",
     "description": "Compile Motoko smart contracts in Node.js and the browser.",
     "author": "Ryan Vandersmith (https://github.com/rvanasa)",
     "license": "Apache-2.0",
     "main": "./index.js",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/dfinity/node-motoko.git"
+    },
     "scripts": {
         "generate": "node utils/generate",
         "test": "jest"
@@ -21,7 +25,7 @@
     },
     "directories": {
         "lib": "lib",
-        "contrib": "contrib"
+        "example": "examples"
     },
     "files": [
         "index.js",