motoko 3.0.0-beta4 → 3.0.0-beta6

Sign up to get free protection for your applications and to get access to all the features.
package/README.md CHANGED
@@ -122,7 +122,8 @@ mo.clearPackages()
122
122
  mo.validatePackage(package)
123
123
 
124
124
  // Configure the compiler to resolve `import "canister:{alias}";` -> `import "canister:{id}";`
125
- mo.setAliases({ alias: id, ... })
125
+ // `directory` should contain `*.did` files for canister dependencies
126
+ mo.setAliases(directory, { alias: id, ... })
126
127
 
127
128
  // Set the public metadata (an array of strings) used by the compiler
128
129
  mo.setMetadata(strings)
package/contrib/hljs.js CHANGED
@@ -1,5 +1,9 @@
1
1
  'use strict';
2
2
 
3
+ const { keywords, typeKeywords } = require('../lib/keywords');
4
+
5
+ const literalKeywords = ['true', 'false', 'null'];
6
+
3
7
  /// Highlight.js configuration
4
8
  exports.configure = (hljs) => {
5
9
  var string = {
@@ -25,25 +29,19 @@ exports.configure = (hljs) => {
25
29
  ],
26
30
  relevance: 0,
27
31
  };
28
- hljs.registerLanguage('motoko', function (hljs) {
32
+ hljs.registerLanguage('motoko', (hljs) => {
29
33
  return {
30
34
  name: 'Motoko',
31
35
  aliases: ['mo'],
32
36
  keywords: {
33
37
  $pattern: '[a-zA-Z_]\\w*',
34
- keyword:
35
- 'actor and await break case catch class' +
36
- ' continue debug do else for func if in import' +
37
- ' module not object or label let loop private' +
38
- ' public return shared try throw query switch' +
39
- ' type var while stable flexible system debug_show' +
40
- ' assert ignore from_candid to_candid with',
41
- literal: 'true false null',
42
- built_in:
43
- 'Any None Null Bool Int Int8 Int16 Int32 Int64' +
44
- ' Nat Nat8 Nat16 Nat32 Nat64 Word8 Word16 Word32 Word64' +
45
- ' Float Char Text Blob Error Principal' +
46
- ' async',
38
+ keyword: keywords
39
+ .filter(
40
+ (k) => !literalKeywords.includes(k) && k !== 'async',
41
+ )
42
+ .join(' '),
43
+ literal: literalKeywords.join(' '),
44
+ built_in: `async ${typeKeywords.join(' ')}`,
47
45
  },
48
46
  illegal: '</',
49
47
  contains: [
@@ -92,7 +90,7 @@ exports.configure = (hljs) => {
92
90
  ],
93
91
  };
94
92
  });
95
- hljs.registerLanguage('candid', function (hljs) {
93
+ hljs.registerLanguage('candid', (hljs) => {
96
94
  return {
97
95
  name: 'Candid',
98
96
  aliases: ['did'],
package/contrib/monaco.js CHANGED
@@ -1,5 +1,7 @@
1
1
  'use strict';
2
2
 
3
+ const { keywords, typeKeywords } = require('../lib/keywords');
4
+
3
5
  /// Monaco editor configuration
4
6
  exports.configure = (monaco) => {
5
7
  monaco.languages.register({ id: 'motoko' });
@@ -25,12 +27,7 @@ exports.configure = (monaco) => {
25
27
  defaultToken: '',
26
28
  tokenPostfix: '.mo',
27
29
  // prettier-ignore
28
- keywords: [
29
- 'actor', 'and', 'async', 'assert', 'await', 'break', 'case', 'catch', 'class',
30
- 'continue', 'debug', 'debug_show', 'do', 'else', 'false', 'flexible', 'for', 'from_candid', 'func', 'if', 'ignore', 'in',
31
- 'import', 'label', 'let', 'loop', 'module', 'not', 'null', 'object', 'or', 'private', 'public', 'query', 'return', 'shared',
32
- 'stable', 'switch', 'system', 'throw', 'to_candid', 'true', 'try', 'type', 'var', 'while', 'with',
33
- ],
30
+ keywords,
34
31
  accessmodifiers: [
35
32
  'public',
36
33
  'private',
@@ -41,10 +38,7 @@ exports.configure = (monaco) => {
41
38
  'system',
42
39
  ],
43
40
  // prettier-ignore
44
- typeKeywords: [
45
- 'Any', 'None', 'Null', 'Bool', 'Int', 'Int8', 'Int16', 'Int32', 'Int64', 'Nat',
46
- 'Nat8', 'Nat16', 'Nat32', 'Nat64', 'Float', 'Char', 'Text', 'Blob', 'Error', 'Principal',
47
- ],
41
+ typeKeywords,
48
42
  // prettier-ignore
49
43
  operators: [
50
44
  '=', '<', '>', ':', '<:', '?', '+', '-', '*', '/', '%', '**', '+%', '-%', '*%', '**%', '&', '|', '^', '<<', '>>', '<<>', '<>>',
package/lib/index.d.ts CHANGED
@@ -23,8 +23,8 @@ export declare type Diagnostic = {
23
23
  tags?: string[];
24
24
  };
25
25
  export declare type WasmMode = 'ic' | 'wasi';
26
- export default function wrapMotoko(compiler: Compiler, version: string): {
27
- version: string;
26
+ export default function wrapMotoko(compiler: Compiler): {
27
+ version: any;
28
28
  compiler: any;
29
29
  file(path: string): {
30
30
  path: string;
@@ -60,7 +60,7 @@ export default function wrapMotoko(compiler: Compiler, version: string): {
60
60
  usePackage(name: string, directory: string): void;
61
61
  clearPackages(): void;
62
62
  validatePackage(pkg: Package): void;
63
- setAliases(aliases: Record<string, string>): void;
63
+ setAliases(directory: string, aliases: Record<string, string>): void;
64
64
  setMetadata(values: string): void;
65
65
  check(path: string): Diagnostic[];
66
66
  run(path: string, libPaths?: string[] | undefined): {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0C,MAAM,OAAO,CAAC;AAErE,OAAO,EAGH,OAAO,EACP,WAAW,EAEd,MAAM,WAAW,CAAC;AAGnB,oBAAY,MAAM,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD,aAAK,QAAQ,GAAG,GAAG,CAAC;AAGpB,oBAAY,UAAU,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QACH,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;QAC3C,GAAG,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;KAC5C,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,oBAAY,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;AAErC,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;;;eA+DnD,MAAM;;;;;;;;;;oBAkEJ,MAAM;oBAAU,MAAM;oBAAU,MAAM,GAAG,MAAM;;;;;;;iBAxF3B,IAAI;kBAAQ,IAAI;;;eAyBtC,MAAM,GAAG,MAAM;gBAGd,MAAM,YAAW,MAAM;iBAOtB,MAAM,WAAW,MAAM;iBAGvB,MAAM;oBAIH,MAAM,GAAG,MAAM,EAAE;uBAGR,MAAM,QAAQ,MAAM,GAAG,WAAW;8BAM3B,OAAO,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;qBAGnD,OAAO;qBASP,MAAM,aAAa,MAAM;;yBAQrB,OAAO;wBAGR,OAAO,MAAM,EAAE,MAAM,CAAC;wBAItB,MAAM;gBAGd,MAAM,GAAG,UAAU,EAAE;cAKvB,MAAM,aACD,MAAM,EAAE,GAAG,SAAS,GAChC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;iBAGjD,MAAM,GAAG,MAAM;eAGjB,MAAM,QAAQ,QAAQ;yBAQZ,MAAM,GAAG,MAAM;yBAGf,MAAM,GAAG,IAAI;;gBAxGL,MAAM;iBADF,IAAI;kBAAQ,IAAI;;gBAEpB,MAAM,EAAE;iBAFJ,IAAI;kBAAQ,IAAI;;;4BA8G1B,MAAM,GAAQ,MAAM,GAAG,SAAS;2BAGjC,MAAM,GAAQ,MAAM,GAAG,SAAS;EAO7D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0C,MAAM,OAAO,CAAC;AAErE,OAAO,EAGH,OAAO,EACP,WAAW,EAEd,MAAM,WAAW,CAAC;AAGnB,oBAAY,MAAM,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAEnD,aAAK,QAAQ,GAAG,GAAG,CAAC;AAGpB,oBAAY,UAAU,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,MAAM,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACjE,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE;QACH,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;QAC3C,GAAG,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC;KAC5C,CAAC;IACF,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,oBAAY,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;AAErC,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,QAAQ,EAAE,QAAQ;;;eA2DlC,MAAM;;;;;;;;;;oBAmEJ,MAAM;oBAAU,MAAM;oBAAU,MAAM,GAAG,MAAM;;;;;;;iBAzF3B,IAAI;kBAAQ,IAAI;;;eAyBtC,MAAM,GAAG,MAAM;gBAGd,MAAM,YAAW,MAAM;iBAOtB,MAAM,WAAW,MAAM;iBAGvB,MAAM;oBAIH,MAAM,GAAG,MAAM,EAAE;uBAGR,MAAM,QAAQ,MAAM,GAAG,WAAW;8BAM3B,OAAO,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;qBAGnD,OAAO;qBASP,MAAM,aAAa,MAAM;;yBAQrB,OAAO;0BAGN,MAAM,WAAW,OAAO,MAAM,EAAE,MAAM,CAAC;wBAKzC,MAAM;gBAGd,MAAM,GAAG,UAAU,EAAE;cAKvB,MAAM,aACD,MAAM,EAAE,GAAG,SAAS,GAChC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;iBAGjD,MAAM,GAAG,MAAM;eAGjB,MAAM,QAAQ,QAAQ;yBAQZ,MAAM,GAAG,MAAM;yBAGf,MAAM,GAAG,IAAI;;gBAzGL,MAAM;iBADF,IAAI;kBAAQ,IAAI;;gBAEpB,MAAM,EAAE;iBAFJ,IAAI;kBAAQ,IAAI;;;4BA+G1B,MAAM,GAAQ,MAAM,GAAG,SAAS;2BAGjC,MAAM,GAAQ,MAAM,GAAG,SAAS;EAO7D"}
package/lib/index.js CHANGED
@@ -13,12 +13,10 @@ const ast_1 = require("./ast");
13
13
  const file_1 = require("./file");
14
14
  const package_1 = require("./package");
15
15
  const resolveEntryPoint_1 = require("./utils/resolveEntryPoint");
16
- function wrapMotoko(compiler, version) {
16
+ function wrapMotoko(compiler) {
17
+ const version = compiler.version || '(unknown)';
17
18
  const debug = require('debug')(`motoko:${version}`);
18
19
  const invoke = (key, unwrap, args) => {
19
- if (!compiler) {
20
- throw new Error('Please load a Motoko compiler before running this function');
21
- }
22
20
  if (typeof compiler[key] !== 'function') {
23
21
  throw new Error(`Unknown compiler function: '${key}'`);
24
22
  }
@@ -116,8 +114,9 @@ function wrapMotoko(compiler, version) {
116
114
  validatePackage(pkg) {
117
115
  (0, package_1.validatePackage)(pkg);
118
116
  },
119
- setAliases(aliases) {
120
- debug('aliases', aliases);
117
+ setAliases(directory, aliases) {
118
+ debug('aliases', directory, aliases);
119
+ invoke('setCandidPath', false, [directory]);
121
120
  invoke('setActorAliases', false, [Object.entries(aliases)]);
122
121
  },
123
122
  setMetadata(values) {
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+BAAqE;AACrE,iCAA8B;AAC9B,uCAMmB;AACnB,iEAAoE;AAqBpE,SAAwB,UAAU,CAAC,QAAkB,EAAE,OAAe;IAClE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,MAAe,EAAE,IAAW,EAAE,EAAE;QACzD,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,KAAK,CACX,4DAA4D,CAC/D,CAAC;SACL;QACD,IAAI,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,GAAG,CAAC,CAAC;SAC1D;QACD,IAAI,MAAM,CAAC;QACX,IAAI;YACA,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;SACnC;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,GAAG,YAAY,KAAK,EAAE;gBACtB,MAAM,GAAG,CAAC;aACb;YACD,MAAM,IAAI,KAAK,CACX,qBAAqB,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;iBAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC9C,CAAC;SACL;QACD,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YACd,MAAM,IAAI,KAAK,CACX,MAAM,CAAC,WAAW;gBACd,CAAC,CAAC,MAAM,CAAC,WAAW;qBACb,GAAG,CAAC,CAAC,EAAE,OAAO,EAAc,EAAE,EAAE,CAAC,OAAO,CAAC;qBACzC,IAAI,CAAC,IAAI,CAAC;gBACjB,CAAC,CAAC,kBAAkB,CAC3B,CAAC;SACL;QACD,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC,CAAC;IAMF,SAAS,gBAAgB,CACrB,KAAwB;QAExB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC3B,OAAO,EAAE,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1C;QACD,OAAO,MAAM,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAChD,CAAC,EAAE,GAAG,EAAE,GAAG,EAA4C,EAAE,EAAE;YACvD,OAAO;gBACH,GAAG,EAAE,IAAA,iBAAW,EAAC,GAAG,CAAC;gBACrB,IAAI,EAAE,IAAA,iBAAW,EAAC,GAAG,CAAC;aACzB,CAAC;QACN,CAAC,CACJ,CAAC;IACN,CAAC;IAED,MAAM,EAAE,GAAG;QACP,OAAO;QACP,QAAQ;QACR,IAAI,CAAC,IAAY;YACb,OAAO,IAAA,WAAI,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,IAAY;YACb,OAAO,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,KAAK,CAAC,IAAY,EAAE,UAAkB,EAAE;YACpC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;gBAC7B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;aAC9C;YACD,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACrB,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,CAAC,IAAY,EAAE,OAAe;YAChC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,CAAC,IAAY;YACf,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACrB,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,SAAiB;YAClB,OAAO,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QACjD,CAAC;QACK,YAAY,CAAC,IAAY,EAAE,IAA0B;;gBACvD,IAAI,CAAC,IAAI,EAAE;oBACP,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;iBAC5D;gBACD,OAAO,IAAA,sBAAY,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;SAAA;QACK,eAAe,CAAC,QAA8C;;gBAChE,OAAO,IAAA,yBAAe,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACzC,CAAC;SAAA;QACD,WAAW,CAAC,GAAY;YACpB,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5B,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YACxB,MAAM,SAAS,GAAG,gBAAgB,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC5D,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC/C,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YACH,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,UAAU,CAAC,IAAY,EAAE,SAAiB;YACtC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACnC,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,aAAa;YACT,KAAK,CAAC,WAAW,CAAC,CAAC;YACnB,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,eAAe,CAAC,GAAY;YACxB,IAAA,yBAAe,EAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,UAAU,CAAC,OAA+B;YACtC,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC1B,MAAM,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,WAAW,CAAC,MAAc;YACtB,MAAM,CAAC,mBAAmB,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,KAAK,CAAC,IAAY;YACd,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9C,OAAO,MAAM,CAAC,WAAW,CAAC;QAC9B,CAAC;QACD,GAAG,CACC,IAAY,EACZ,QAA+B;YAE/B,OAAO,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,QAAQ,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,CAAC,IAAY;YACf,OAAO,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,IAAY,EAAE,IAAc;YAC7B,IAAI,CAAC,IAAI,EAAE;gBACP,IAAI,GAAG,IAAI,CAAC;aACf;iBAAM,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,MAAM,EAAE;gBACzC,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;aACnD;YACD,OAAO,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,WAAW,CAAC,OAAe;YACvB,OAAO,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,WAAW,CAAC,OAAe;YACvB,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YACnD,OAAO,IAAA,iBAAW,EAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;QACD,gBAAgB;QAChB,WAAW,CAAC,YAAoB,EAAE;YAC9B,OAAO,IAAA,+BAAW,EAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACtC,CAAC;QACD,UAAU,CAAC,YAAoB,EAAE;YAC7B,OAAO,IAAA,8BAAU,EAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACrC,CAAC;KACJ,CAAC;IACF,aAAa;IACb,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC;IAChB,OAAO,EAAE,CAAC;AACd,CAAC;AAjKD,6BAiKC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ export declare const keywords: string[];
2
+ export declare const typeKeywords: string[];
3
+ //# sourceMappingURL=keywords.d.ts.map
@@ -0,0 +1 @@
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"}
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.typeKeywords = exports.keywords = void 0;
4
+ exports.keywords = [
5
+ 'actor',
6
+ 'and',
7
+ 'async',
8
+ 'assert',
9
+ 'await',
10
+ 'break',
11
+ 'case',
12
+ 'catch',
13
+ 'class',
14
+ 'continue',
15
+ 'debug',
16
+ 'debug_show',
17
+ 'do',
18
+ 'else',
19
+ 'false',
20
+ 'flexible',
21
+ 'for',
22
+ 'from_candid',
23
+ 'func',
24
+ 'if',
25
+ 'ignore',
26
+ 'in',
27
+ 'import',
28
+ 'label',
29
+ 'let',
30
+ 'loop',
31
+ 'module',
32
+ 'not',
33
+ 'null',
34
+ 'object',
35
+ 'or',
36
+ 'private',
37
+ 'public',
38
+ 'query',
39
+ 'return',
40
+ 'shared',
41
+ 'stable',
42
+ 'switch',
43
+ 'system',
44
+ 'throw',
45
+ 'to_candid',
46
+ 'true',
47
+ 'try',
48
+ 'type',
49
+ 'var',
50
+ 'while',
51
+ 'with',
52
+ ];
53
+ exports.typeKeywords = [
54
+ 'Any',
55
+ 'None',
56
+ 'Null',
57
+ 'Bool',
58
+ 'Int',
59
+ 'Int8',
60
+ 'Int16',
61
+ 'Int32',
62
+ 'Int64',
63
+ 'Nat',
64
+ 'Nat8',
65
+ 'Nat16',
66
+ 'Nat32',
67
+ 'Nat64',
68
+ 'Float',
69
+ 'Char',
70
+ 'Text',
71
+ 'Blob',
72
+ 'Error',
73
+ 'Principal',
74
+ ];
75
+ //# sourceMappingURL=keywords.js.map
@@ -0,0 +1 @@
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"}
@@ -1,5 +1,5 @@
1
1
  declare const _default: {
2
- version: string;
2
+ version: any;
3
3
  compiler: any;
4
4
  file(path: string): {
5
5
  path: string;
@@ -35,7 +35,7 @@ declare const _default: {
35
35
  usePackage(name: string, directory: string): void;
36
36
  clearPackages(): void;
37
37
  validatePackage(pkg: import("../package").Package): void;
38
- setAliases(aliases: Record<string, string>): void;
38
+ setAliases(directory: string, aliases: Record<string, string>): void;
39
39
  setMetadata(values: string): void;
40
40
  check(path: string): import("..").Diagnostic[];
41
41
  run(path: string, libPaths?: string[]): {
@@ -1 +1 @@
1
- {"version":3,"file":"interpreter.d.ts","sourceRoot":"","sources":["../../src/versions/interpreter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBAAwD"}
1
+ {"version":3,"file":"interpreter.d.ts","sourceRoot":"","sources":["../../src/versions/interpreter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBAAkC"}
@@ -5,5 +5,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const __1 = __importDefault(require(".."));
7
7
  const { Motoko } = require('../../versions/latest/moc_interpreter.min');
8
- exports.default = (0, __1.default)(Motoko, 'latest/interpreter');
8
+ exports.default = (0, __1.default)(Motoko);
9
9
  //# sourceMappingURL=interpreter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"interpreter.js","sourceRoot":"","sources":["../../src/versions/interpreter.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4B;AAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,2CAA2C,CAAC,CAAC;AAExE,kBAAe,IAAA,WAAU,EAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC"}
1
+ {"version":3,"file":"interpreter.js","sourceRoot":"","sources":["../../src/versions/interpreter.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4B;AAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,2CAA2C,CAAC,CAAC;AAExE,kBAAe,IAAA,WAAU,EAAC,MAAM,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  declare const _default: {
2
- version: string;
2
+ version: any;
3
3
  compiler: any;
4
4
  file(path: string): {
5
5
  path: string;
@@ -35,7 +35,7 @@ declare const _default: {
35
35
  usePackage(name: string, directory: string): void;
36
36
  clearPackages(): void;
37
37
  validatePackage(pkg: import("../package").Package): void;
38
- setAliases(aliases: Record<string, string>): void;
38
+ setAliases(directory: string, aliases: Record<string, string>): void;
39
39
  setMetadata(values: string): void;
40
40
  check(path: string): import("..").Diagnostic[];
41
41
  run(path: string, libPaths?: string[]): {
@@ -1 +1 @@
1
- {"version":3,"file":"moc.d.ts","sourceRoot":"","sources":["../../src/versions/moc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBAA4C"}
1
+ {"version":3,"file":"moc.d.ts","sourceRoot":"","sources":["../../src/versions/moc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,wBAAkC"}
@@ -5,5 +5,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const __1 = __importDefault(require(".."));
7
7
  const { Motoko } = require('../../versions/latest/moc.min');
8
- exports.default = (0, __1.default)(Motoko, 'latest');
8
+ exports.default = (0, __1.default)(Motoko);
9
9
  //# sourceMappingURL=moc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"moc.js","sourceRoot":"","sources":["../../src/versions/moc.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4B;AAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAE5D,kBAAe,IAAA,WAAU,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC"}
1
+ {"version":3,"file":"moc.js","sourceRoot":"","sources":["../../src/versions/moc.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4B;AAC5B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAE5D,kBAAe,IAAA,WAAU,EAAC,MAAM,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "motoko",
3
- "version": "3.0.0-beta4",
3
+ "version": "3.0.0-beta6",
4
4
  "description": "Compile and run Motoko smart contracts in Node.js or the browser.",
5
5
  "author": "Ryan Vandersmith (https://github.com/rvanasa)",
6
6
  "license": "Apache-2.0",