ic-mops 1.12.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (322) hide show
  1. package/.DS_Store +0 -0
  2. package/.eslintrc.json +7 -7
  3. package/CHANGELOG.md +6 -0
  4. package/api/actors.ts +41 -37
  5. package/api/downloadPackageFiles.ts +75 -61
  6. package/api/getHighestVersion.ts +5 -5
  7. package/api/index.ts +4 -4
  8. package/api/network.ts +19 -21
  9. package/api/resolveVersion.ts +14 -11
  10. package/bin/mops.js +1 -1
  11. package/bundle/bench/bench-canister.mo +109 -101
  12. package/bundle/bench/user-bench.mo +6 -6
  13. package/bundle/bin/mops.js +1 -1
  14. package/bundle/cli.js +797 -792
  15. package/bundle/cli.tgz +0 -0
  16. package/bundle/package.json +6 -5
  17. package/bundle/templates/mops-publish.yml +3 -3
  18. package/bundle/templates/mops-test.yml +3 -3
  19. package/bundle/templates/src/lib.mo +13 -13
  20. package/bundle/templates/test/lib.test.mo +2 -2
  21. package/bundle-package-json.ts +8 -8
  22. package/cache.ts +80 -65
  23. package/check-requirements.ts +49 -45
  24. package/cli.ts +577 -376
  25. package/commands/add.ts +142 -129
  26. package/commands/available-updates.ts +55 -41
  27. package/commands/bench/bench-canister.mo +114 -108
  28. package/commands/bench/user-bench.mo +6 -6
  29. package/commands/bench-replica.ts +146 -118
  30. package/commands/bench.ts +563 -497
  31. package/commands/build.ts +177 -0
  32. package/commands/bump.ts +68 -57
  33. package/commands/check-candid.ts +24 -0
  34. package/commands/docs-coverage.ts +124 -102
  35. package/commands/docs.ts +118 -108
  36. package/commands/format.ts +171 -155
  37. package/commands/init.ts +301 -275
  38. package/commands/install/install-all.ts +75 -62
  39. package/commands/install/install-dep.ts +43 -28
  40. package/commands/install/install-deps.ts +23 -15
  41. package/commands/install/install-local-dep.ts +42 -34
  42. package/commands/install/install-mops-dep.ts +154 -123
  43. package/commands/install/sync-local-cache.ts +39 -35
  44. package/commands/maintainer.ts +109 -99
  45. package/commands/outdated.ts +30 -24
  46. package/commands/owner.ts +107 -99
  47. package/commands/publish.ts +534 -443
  48. package/commands/remove.ts +119 -89
  49. package/commands/replica.ts +391 -316
  50. package/commands/search.ts +42 -36
  51. package/commands/self.ts +63 -56
  52. package/commands/sources.ts +66 -49
  53. package/commands/sync.ts +92 -75
  54. package/commands/template.ts +145 -102
  55. package/commands/test/mmf1.ts +146 -119
  56. package/commands/test/reporters/compact-reporter.ts +87 -84
  57. package/commands/test/reporters/files-reporter.ts +56 -51
  58. package/commands/test/reporters/reporter.ts +12 -6
  59. package/commands/test/reporters/silent-reporter.ts +58 -59
  60. package/commands/test/reporters/verbose-reporter.ts +66 -54
  61. package/commands/test/test.ts +498 -401
  62. package/commands/test/utils.ts +72 -67
  63. package/commands/toolchain/index.ts +363 -322
  64. package/commands/toolchain/moc.ts +78 -50
  65. package/commands/toolchain/pocket-ic.ts +41 -34
  66. package/commands/toolchain/toolchain-utils.ts +92 -72
  67. package/commands/toolchain/wasmtime.ts +37 -34
  68. package/commands/update.ts +82 -64
  69. package/commands/user.ts +90 -81
  70. package/commands/watch/deployer.ts +188 -152
  71. package/commands/watch/error-checker.ts +90 -80
  72. package/commands/watch/formatter.ts +72 -60
  73. package/commands/watch/generator.ts +116 -96
  74. package/commands/watch/globMoFiles.ts +13 -13
  75. package/commands/watch/parseDfxJson.ts +63 -57
  76. package/commands/watch/tester.ts +83 -65
  77. package/commands/watch/warning-checker.ts +149 -136
  78. package/commands/watch/watch.ts +123 -95
  79. package/dist/api/actors.d.ts +4 -4
  80. package/dist/api/actors.js +8 -8
  81. package/dist/api/downloadPackageFiles.d.ts +2 -2
  82. package/dist/api/downloadPackageFiles.js +10 -10
  83. package/dist/api/getHighestVersion.js +1 -1
  84. package/dist/api/index.d.ts +4 -4
  85. package/dist/api/index.js +4 -4
  86. package/dist/api/network.js +9 -9
  87. package/dist/api/resolveVersion.js +3 -3
  88. package/dist/bin/mops.js +1 -1
  89. package/dist/bundle-package-json.js +8 -8
  90. package/dist/cache.js +22 -17
  91. package/dist/check-requirements.js +11 -11
  92. package/dist/cli.js +283 -186
  93. package/dist/commands/add.d.ts +1 -1
  94. package/dist/commands/add.js +40 -37
  95. package/dist/commands/available-updates.d.ts +1 -1
  96. package/dist/commands/available-updates.js +18 -12
  97. package/dist/commands/bench/bench-canister.mo +114 -108
  98. package/dist/commands/bench/user-bench.mo +6 -6
  99. package/dist/commands/bench-replica.d.ts +4 -4
  100. package/dist/commands/bench-replica.js +45 -34
  101. package/dist/commands/bench.d.ts +5 -5
  102. package/dist/commands/bench.js +134 -118
  103. package/dist/commands/build.d.ts +7 -0
  104. package/dist/commands/build.js +121 -0
  105. package/dist/commands/bump.js +27 -18
  106. package/dist/commands/check-candid.d.ts +4 -0
  107. package/dist/commands/check-candid.js +15 -0
  108. package/dist/commands/docs-coverage.d.ts +1 -1
  109. package/dist/commands/docs-coverage.js +45 -31
  110. package/dist/commands/docs.d.ts +1 -1
  111. package/dist/commands/docs.js +39 -38
  112. package/dist/commands/format.js +31 -27
  113. package/dist/commands/init.js +102 -92
  114. package/dist/commands/install/install-all.d.ts +2 -2
  115. package/dist/commands/install/install-all.js +23 -21
  116. package/dist/commands/install/install-dep.d.ts +1 -1
  117. package/dist/commands/install/install-dep.js +21 -8
  118. package/dist/commands/install/install-deps.d.ts +1 -1
  119. package/dist/commands/install/install-deps.js +1 -1
  120. package/dist/commands/install/install-local-dep.js +11 -9
  121. package/dist/commands/install/install-mops-dep.d.ts +1 -1
  122. package/dist/commands/install/install-mops-dep.js +32 -27
  123. package/dist/commands/install/sync-local-cache.js +10 -10
  124. package/dist/commands/maintainer.js +21 -21
  125. package/dist/commands/outdated.js +12 -8
  126. package/dist/commands/owner.js +21 -21
  127. package/dist/commands/publish.js +148 -128
  128. package/dist/commands/remove.d.ts +1 -1
  129. package/dist/commands/remove.js +42 -30
  130. package/dist/commands/replica.d.ts +7 -7
  131. package/dist/commands/replica.js +85 -57
  132. package/dist/commands/search.js +15 -13
  133. package/dist/commands/self.js +31 -28
  134. package/dist/commands/sources.d.ts +5 -1
  135. package/dist/commands/sources.js +23 -17
  136. package/dist/commands/sync.d.ts +1 -1
  137. package/dist/commands/sync.js +38 -25
  138. package/dist/commands/template.js +66 -56
  139. package/dist/commands/test/mmf1.d.ts +3 -3
  140. package/dist/commands/test/mmf1.js +33 -31
  141. package/dist/commands/test/reporters/compact-reporter.d.ts +3 -3
  142. package/dist/commands/test/reporters/compact-reporter.js +19 -15
  143. package/dist/commands/test/reporters/files-reporter.d.ts +3 -3
  144. package/dist/commands/test/reporters/files-reporter.js +18 -14
  145. package/dist/commands/test/reporters/reporter.d.ts +2 -2
  146. package/dist/commands/test/reporters/silent-reporter.d.ts +3 -3
  147. package/dist/commands/test/reporters/silent-reporter.js +4 -4
  148. package/dist/commands/test/reporters/verbose-reporter.d.ts +3 -3
  149. package/dist/commands/test/reporters/verbose-reporter.js +17 -13
  150. package/dist/commands/test/test.d.ts +4 -4
  151. package/dist/commands/test/test.js +134 -112
  152. package/dist/commands/test/utils.d.ts +3 -3
  153. package/dist/commands/test/utils.js +17 -17
  154. package/dist/commands/toolchain/index.d.ts +1 -1
  155. package/dist/commands/toolchain/index.js +81 -69
  156. package/dist/commands/toolchain/moc.d.ts +1 -1
  157. package/dist/commands/toolchain/moc.js +48 -24
  158. package/dist/commands/toolchain/pocket-ic.js +12 -12
  159. package/dist/commands/toolchain/toolchain-utils.d.ts +2 -0
  160. package/dist/commands/toolchain/toolchain-utils.js +32 -23
  161. package/dist/commands/toolchain/wasmtime.js +11 -11
  162. package/dist/commands/update.d.ts +1 -1
  163. package/dist/commands/update.js +18 -14
  164. package/dist/commands/user.js +31 -28
  165. package/dist/commands/watch/deployer.d.ts +4 -4
  166. package/dist/commands/watch/deployer.js +45 -36
  167. package/dist/commands/watch/error-checker.d.ts +2 -2
  168. package/dist/commands/watch/error-checker.js +27 -27
  169. package/dist/commands/watch/formatter.d.ts +4 -4
  170. package/dist/commands/watch/formatter.js +17 -17
  171. package/dist/commands/watch/generator.d.ts +3 -3
  172. package/dist/commands/watch/generator.js +28 -23
  173. package/dist/commands/watch/globMoFiles.js +8 -8
  174. package/dist/commands/watch/parseDfxJson.d.ts +2 -2
  175. package/dist/commands/watch/parseDfxJson.js +9 -9
  176. package/dist/commands/watch/tester.d.ts +4 -4
  177. package/dist/commands/watch/tester.js +23 -21
  178. package/dist/commands/watch/warning-checker.d.ts +3 -3
  179. package/dist/commands/watch/warning-checker.js +36 -36
  180. package/dist/commands/watch/watch.js +45 -32
  181. package/dist/environments/nodejs/cli.d.ts +1 -0
  182. package/dist/environments/nodejs/cli.js +4 -0
  183. package/dist/environments/web/cli.d.ts +1 -0
  184. package/dist/environments/web/cli.js +4 -0
  185. package/dist/error.d.ts +1 -0
  186. package/dist/error.js +5 -0
  187. package/dist/fix-dist.js +5 -5
  188. package/dist/helpers/find-changelog-entry.js +8 -5
  189. package/dist/helpers/get-dep-name.js +2 -2
  190. package/dist/helpers/get-dfx-version.js +4 -4
  191. package/dist/helpers/get-moc-path.js +8 -7
  192. package/dist/helpers/get-moc-version.js +10 -7
  193. package/dist/helpers/get-package-id.js +2 -2
  194. package/dist/helpers/is-candid-compatible.d.ts +1 -0
  195. package/dist/helpers/is-candid-compatible.js +20 -0
  196. package/dist/integrity.d.ts +1 -1
  197. package/dist/integrity.js +47 -38
  198. package/dist/jest.config.d.ts +11 -0
  199. package/dist/jest.config.js +14 -0
  200. package/dist/mops.d.ts +6 -6
  201. package/dist/mops.js +87 -80
  202. package/dist/notify-installs.js +4 -4
  203. package/dist/package.json +9 -5
  204. package/dist/pem.d.ts +3 -3
  205. package/dist/pem.js +20 -12
  206. package/dist/release-cli.js +20 -20
  207. package/dist/resolve-packages.d.ts +1 -1
  208. package/dist/resolve-packages.js +52 -36
  209. package/dist/templates/mops-publish.yml +3 -3
  210. package/dist/templates/mops-test.yml +3 -3
  211. package/dist/templates/src/lib.mo +13 -13
  212. package/dist/templates/test/lib.test.mo +2 -2
  213. package/dist/templates.js +1 -1
  214. package/dist/tests/cli.test.d.ts +1 -0
  215. package/dist/tests/cli.test.js +63 -0
  216. package/dist/types.d.ts +14 -4
  217. package/dist/vessel.d.ts +2 -2
  218. package/dist/vessel.js +41 -34
  219. package/dist/wasm/pkg/bundler/package.json +20 -0
  220. package/dist/wasm/pkg/bundler/wasm.d.ts +3 -0
  221. package/dist/wasm/pkg/bundler/wasm.js +5 -0
  222. package/dist/wasm/pkg/bundler/wasm_bg.js +93 -0
  223. package/dist/wasm/pkg/bundler/wasm_bg.wasm +0 -0
  224. package/dist/wasm/pkg/bundler/wasm_bg.wasm.d.ts +8 -0
  225. package/dist/wasm/pkg/nodejs/package.json +14 -0
  226. package/dist/wasm/pkg/nodejs/wasm.d.ts +3 -0
  227. package/dist/wasm/pkg/nodejs/wasm.js +98 -0
  228. package/dist/wasm/pkg/nodejs/wasm_bg.wasm +0 -0
  229. package/dist/wasm/pkg/nodejs/wasm_bg.wasm.d.ts +8 -0
  230. package/dist/wasm/pkg/web/package.json +18 -0
  231. package/dist/wasm/pkg/web/wasm.d.ts +35 -0
  232. package/dist/wasm/pkg/web/wasm.js +191 -0
  233. package/dist/wasm/pkg/web/wasm_bg.wasm +0 -0
  234. package/dist/wasm/pkg/web/wasm_bg.wasm.d.ts +8 -0
  235. package/dist/wasm.d.ts +5 -0
  236. package/dist/wasm.js +10 -0
  237. package/environments/nodejs/cli.ts +6 -0
  238. package/environments/web/cli.ts +6 -0
  239. package/error.ts +6 -0
  240. package/fix-dist.ts +5 -5
  241. package/global.d.ts +3 -3
  242. package/helpers/find-changelog-entry.ts +26 -23
  243. package/helpers/get-dep-name.ts +5 -5
  244. package/helpers/get-dfx-version.ts +8 -9
  245. package/helpers/get-moc-path.ts +25 -26
  246. package/helpers/get-moc-version.ts +21 -19
  247. package/helpers/get-package-id.ts +4 -4
  248. package/helpers/is-candid-compatible.ts +22 -0
  249. package/integrity.ts +270 -236
  250. package/jest.config.js +14 -0
  251. package/mops.ts +238 -215
  252. package/notify-installs.ts +16 -17
  253. package/package.json +19 -10
  254. package/parallel.ts +28 -24
  255. package/pem.ts +55 -47
  256. package/release-cli.ts +73 -39
  257. package/resolve-packages.ts +231 -189
  258. package/templates/mops-publish.yml +3 -3
  259. package/templates/mops-test.yml +3 -3
  260. package/templates/src/lib.mo +13 -13
  261. package/templates/test/lib.test.mo +2 -2
  262. package/templates.ts +4 -4
  263. package/tests/__snapshots__/cli.test.ts.snap +202 -0
  264. package/tests/build/error/candid/bar.did +3 -0
  265. package/tests/build/error/dfx.json +12 -0
  266. package/tests/build/error/mops.toml +9 -0
  267. package/tests/build/error/src/Bar.mo +5 -0
  268. package/tests/build/error/src/Foo.mo +5 -0
  269. package/tests/build/success/.dfx/local/canister_ids.json +17 -0
  270. package/tests/build/success/.dfx/local/canisters/bar/bar.did +3 -0
  271. package/tests/build/success/.dfx/local/canisters/bar/bar.most +4 -0
  272. package/tests/build/success/.dfx/local/canisters/bar/bar.wasm +0 -0
  273. package/tests/build/success/.dfx/local/canisters/bar/constructor.did +3 -0
  274. package/tests/build/success/.dfx/local/canisters/bar/index.js +42 -0
  275. package/tests/build/success/.dfx/local/canisters/bar/init_args.txt +1 -0
  276. package/tests/build/success/.dfx/local/canisters/bar/service.did +3 -0
  277. package/tests/build/success/.dfx/local/canisters/bar/service.did.d.ts +7 -0
  278. package/tests/build/success/.dfx/local/canisters/bar/service.did.js +4 -0
  279. package/tests/build/success/.dfx/local/canisters/foo/constructor.did +3 -0
  280. package/tests/build/success/.dfx/local/canisters/foo/foo.did +3 -0
  281. package/tests/build/success/.dfx/local/canisters/foo/foo.most +4 -0
  282. package/tests/build/success/.dfx/local/canisters/foo/foo.wasm +0 -0
  283. package/tests/build/success/.dfx/local/canisters/foo/index.js +42 -0
  284. package/tests/build/success/.dfx/local/canisters/foo/init_args.txt +1 -0
  285. package/tests/build/success/.dfx/local/canisters/foo/service.did +3 -0
  286. package/tests/build/success/.dfx/local/canisters/foo/service.did.d.ts +7 -0
  287. package/tests/build/success/.dfx/local/canisters/foo/service.did.js +4 -0
  288. package/tests/build/success/.dfx/local/lsp/ucwa4-rx777-77774-qaada-cai.did +3 -0
  289. package/tests/build/success/.dfx/local/lsp/ulvla-h7777-77774-qaacq-cai.did +3 -0
  290. package/tests/build/success/.dfx/local/network-id +4 -0
  291. package/tests/build/success/candid/bar.did +3 -0
  292. package/tests/build/success/dfx.json +12 -0
  293. package/tests/build/success/mops.toml +9 -0
  294. package/tests/build/success/src/Bar.mo +5 -0
  295. package/tests/build/success/src/Foo.mo +5 -0
  296. package/tests/check-candid/a.did +3 -0
  297. package/tests/check-candid/b.did +5 -0
  298. package/tests/check-candid/c.did +3 -0
  299. package/tests/cli.test.ts +82 -0
  300. package/tsconfig.json +26 -19
  301. package/types.ts +41 -31
  302. package/vessel.ts +219 -187
  303. package/wasm/Cargo.lock +1475 -0
  304. package/wasm/Cargo.toml +28 -0
  305. package/wasm/pkg/bundler/package.json +20 -0
  306. package/wasm/pkg/bundler/wasm.d.ts +3 -0
  307. package/wasm/pkg/bundler/wasm.js +5 -0
  308. package/wasm/pkg/bundler/wasm_bg.js +93 -0
  309. package/wasm/pkg/bundler/wasm_bg.wasm +0 -0
  310. package/wasm/pkg/bundler/wasm_bg.wasm.d.ts +8 -0
  311. package/wasm/pkg/nodejs/package.json +14 -0
  312. package/wasm/pkg/nodejs/wasm.d.ts +3 -0
  313. package/wasm/pkg/nodejs/wasm.js +98 -0
  314. package/wasm/pkg/nodejs/wasm_bg.wasm +0 -0
  315. package/wasm/pkg/nodejs/wasm_bg.wasm.d.ts +8 -0
  316. package/wasm/pkg/web/package.json +18 -0
  317. package/wasm/pkg/web/wasm.d.ts +35 -0
  318. package/wasm/pkg/web/wasm.js +191 -0
  319. package/wasm/pkg/web/wasm_bg.wasm +0 -0
  320. package/wasm/pkg/web/wasm_bg.wasm.d.ts +8 -0
  321. package/wasm/src/lib.rs +17 -0
  322. package/wasm.ts +16 -0
@@ -1,26 +1,26 @@
1
- import os from 'node:os';
2
- import { promisify } from 'node:util';
3
- import { execFile } from 'node:child_process';
4
- import chalk from 'chalk';
5
- import { parallel } from '../../parallel.js';
6
- import { getRootDir } from '../../mops.js';
1
+ import os from "node:os";
2
+ import { promisify } from "node:util";
3
+ import { execFile } from "node:child_process";
4
+ import chalk from "chalk";
5
+ import { parallel } from "../../parallel.js";
6
+ import { getRootDir } from "../../mops.js";
7
7
  export class Generator {
8
8
  verbose = false;
9
9
  canisters = {};
10
- status = 'pending';
10
+ status = "pending";
11
11
  errorChecker;
12
12
  success = 0;
13
13
  errors = [];
14
14
  aborted = false;
15
15
  controllers = new Map();
16
16
  currentRun;
17
- constructor({ verbose, canisters, errorChecker }) {
17
+ constructor({ verbose, canisters, errorChecker, }) {
18
18
  this.verbose = verbose;
19
19
  this.canisters = canisters;
20
20
  this.errorChecker = errorChecker;
21
21
  }
22
22
  reset() {
23
- this.status = 'pending';
23
+ this.status = "pending";
24
24
  this.success = 0;
25
25
  this.errors = [];
26
26
  }
@@ -36,21 +36,24 @@ export class Generator {
36
36
  }
37
37
  async run(onProgress) {
38
38
  await this.abortCurrent();
39
- if (this.errorChecker.status === 'error') {
40
- this.status = 'syntax-error';
39
+ if (this.errorChecker.status === "error") {
40
+ this.status = "syntax-error";
41
41
  onProgress();
42
42
  return;
43
43
  }
44
- this.status = 'running';
44
+ this.status = "running";
45
45
  onProgress();
46
46
  let rootDir = getRootDir();
47
47
  this.currentRun = parallel(os.cpus().length, [...Object.keys(this.canisters)], async (canister) => {
48
48
  let controller = new AbortController();
49
49
  let { signal } = controller;
50
50
  this.controllers.set(canister, controller);
51
- await promisify(execFile)('dfx', ['generate', canister], { cwd: rootDir, signal }).catch((error) => {
52
- if (error.code === 'ABORT_ERR') {
53
- return { stderr: '' };
51
+ await promisify(execFile)("dfx", ["generate", canister], {
52
+ cwd: rootDir,
53
+ signal,
54
+ }).catch((error) => {
55
+ if (error.code === "ABORT_ERR") {
56
+ return { stderr: "" };
54
57
  }
55
58
  throw error;
56
59
  });
@@ -60,21 +63,23 @@ export class Generator {
60
63
  });
61
64
  await this.currentRun;
62
65
  if (!this.aborted) {
63
- this.status = 'success';
66
+ this.status = "success";
64
67
  }
65
68
  onProgress();
66
69
  }
67
70
  getOutput() {
68
71
  let get = (v) => v.toString();
69
- let count = (this.status === 'running' ? get : chalk.bold[this.errors.length > 0 ? 'redBright' : 'green'])(this.errors.length || this.success);
70
- if (this.status === 'pending') {
71
- return `Generate: ${chalk.gray('(pending)')}`;
72
+ let count = (this.status === "running"
73
+ ? get
74
+ : chalk.bold[this.errors.length > 0 ? "redBright" : "green"])(this.errors.length || this.success);
75
+ if (this.status === "pending") {
76
+ return `Generate: ${chalk.gray("(pending)")}`;
72
77
  }
73
- if (this.status === 'running') {
74
- return `Generate: ${count}/${Object.keys(this.canisters).length} ${chalk.gray('(running)')}`;
78
+ if (this.status === "running") {
79
+ return `Generate: ${count}/${Object.keys(this.canisters).length} ${chalk.gray("(running)")}`;
75
80
  }
76
- if (this.status === 'syntax-error') {
77
- return `Generate: ${chalk.gray('(errors)')}`;
81
+ if (this.status === "syntax-error") {
82
+ return `Generate: ${chalk.gray("(errors)")}`;
78
83
  }
79
84
  return `Generate: ${count}`;
80
85
  }
@@ -1,15 +1,15 @@
1
- import { globSync } from 'glob';
1
+ import { globSync } from "glob";
2
2
  let globConfig = {
3
3
  nocase: true,
4
4
  ignore: [
5
- '**/node_modules/**',
6
- '**/.mops/**',
7
- '**/.vessel/**',
8
- '**/.git/**',
9
- '**/.dfx/**',
10
- '**/{build,bundle,dist}/**',
5
+ "**/node_modules/**",
6
+ "**/.mops/**",
7
+ "**/.vessel/**",
8
+ "**/.git/**",
9
+ "**/.dfx/**",
10
+ "**/{build,bundle,dist}/**",
11
11
  ],
12
12
  };
13
13
  export function globMoFiles(rootDir) {
14
- return globSync('**/*.mo', { cwd: rootDir, ...globConfig });
14
+ return globSync("**/*.mo", { cwd: rootDir, ...globConfig });
15
15
  }
@@ -1,10 +1,10 @@
1
1
  type DfxConfig = {
2
2
  $schema: string;
3
3
  version: number;
4
- profile: 'Debug' | 'Release';
4
+ profile: "Debug" | "Release";
5
5
  canisters: {
6
6
  [key: string]: {
7
- type: 'motoko' | 'assets';
7
+ type: "motoko" | "assets";
8
8
  main?: string;
9
9
  specified_id?: string;
10
10
  declarations?: {
@@ -1,22 +1,22 @@
1
- import { existsSync, readFileSync } from 'node:fs';
2
- import path from 'node:path';
3
- import { getRootDir } from '../../mops.js';
1
+ import { existsSync, readFileSync } from "node:fs";
2
+ import path from "node:path";
3
+ import { getRootDir } from "../../mops.js";
4
4
  export function readDfxJson() {
5
- let dfxJsonPath = path.resolve(getRootDir(), 'dfx.json');
5
+ let dfxJsonPath = path.resolve(getRootDir(), "dfx.json");
6
6
  if (!existsSync(dfxJsonPath)) {
7
7
  return {};
8
8
  }
9
- return JSON.parse(readFileSync(dfxJsonPath, 'utf8'));
9
+ return JSON.parse(readFileSync(dfxJsonPath, "utf8"));
10
10
  }
11
11
  export function getMotokoCanisters() {
12
12
  let dfxJson = readDfxJson();
13
13
  return Object.fromEntries(Object.entries(dfxJson.canisters || {})
14
- .filter(([_, canister]) => canister.type === 'motoko')
15
- .map(([name, canister]) => [name, canister.main ?? '']));
14
+ .filter(([_, canister]) => canister.type === "motoko")
15
+ .map(([name, canister]) => [name, canister.main ?? ""]));
16
16
  }
17
17
  export function getMotokoCanistersWithDeclarations() {
18
18
  let dfxJson = readDfxJson();
19
19
  return Object.fromEntries(Object.entries(dfxJson.canisters || {})
20
- .filter(([_, canister]) => canister.type === 'motoko' && canister.declarations)
21
- .map(([name, canister]) => [name, canister.main ?? '']));
20
+ .filter(([_, canister]) => canister.type === "motoko" && canister.declarations)
21
+ .map(([name, canister]) => [name, canister.main ?? ""]));
22
22
  }
@@ -1,14 +1,14 @@
1
- import { ErrorChecker } from './error-checker.js';
2
- import { SilentReporter } from '../test/reporters/silent-reporter.js';
1
+ import { ErrorChecker } from "./error-checker.js";
2
+ import { SilentReporter } from "../test/reporters/silent-reporter.js";
3
3
  export declare class Tester {
4
4
  verbose: boolean;
5
- status: 'pending' | 'running' | 'syntax-error' | 'error' | 'success';
5
+ status: "pending" | "running" | "syntax-error" | "error" | "success";
6
6
  errorChecker: ErrorChecker;
7
7
  reporter: SilentReporter;
8
8
  aborted: boolean;
9
9
  controller: AbortController;
10
10
  currentRun: Promise<any> | undefined;
11
- constructor({ verbose, errorChecker }: {
11
+ constructor({ verbose, errorChecker, }: {
12
12
  verbose: boolean;
13
13
  errorChecker: ErrorChecker;
14
14
  });
@@ -1,21 +1,21 @@
1
- import chalk from 'chalk';
2
- import { readConfig } from '../../mops.js';
3
- import { testWithReporter } from '../test/test.js';
4
- import { SilentReporter } from '../test/reporters/silent-reporter.js';
1
+ import chalk from "chalk";
2
+ import { readConfig } from "../../mops.js";
3
+ import { testWithReporter } from "../test/test.js";
4
+ import { SilentReporter } from "../test/reporters/silent-reporter.js";
5
5
  export class Tester {
6
6
  verbose = false;
7
- status = 'pending';
7
+ status = "pending";
8
8
  errorChecker;
9
9
  reporter = new SilentReporter(false);
10
10
  aborted = false;
11
11
  controller = new AbortController();
12
12
  currentRun;
13
- constructor({ verbose, errorChecker }) {
13
+ constructor({ verbose, errorChecker, }) {
14
14
  this.verbose = verbose;
15
15
  this.errorChecker = errorChecker;
16
16
  }
17
17
  reset() {
18
- this.status = 'pending';
18
+ this.status = "pending";
19
19
  }
20
20
  async abortCurrent() {
21
21
  this.aborted = true;
@@ -26,39 +26,41 @@ export class Tester {
26
26
  }
27
27
  async run(onProgress) {
28
28
  await this.abortCurrent();
29
- if (this.errorChecker.status === 'error') {
30
- this.status = 'syntax-error';
29
+ if (this.errorChecker.status === "error") {
30
+ this.status = "syntax-error";
31
31
  onProgress();
32
32
  return;
33
33
  }
34
- this.status = 'running';
34
+ this.status = "running";
35
35
  onProgress();
36
36
  this.reporter = new SilentReporter(false, onProgress);
37
37
  this.controller = new AbortController();
38
38
  let config = readConfig();
39
- this.currentRun = testWithReporter(this.reporter, '', 'interpreter', config.toolchain?.['pocket-ic'] ? 'pocket-ic' : 'dfx', true, this.controller.signal);
39
+ this.currentRun = testWithReporter(this.reporter, "", "interpreter", config.toolchain?.["pocket-ic"] ? "pocket-ic" : "dfx", true, this.controller.signal);
40
40
  await this.currentRun;
41
41
  if (!this.aborted) {
42
- this.status = this.reporter.failed > 0 ? 'error' : 'success';
42
+ this.status = this.reporter.failed > 0 ? "error" : "success";
43
43
  }
44
44
  onProgress();
45
45
  }
46
46
  getOutput() {
47
47
  let get = (v) => v.toString();
48
- let count = (this.status === 'running' ? get : chalk.bold[this.reporter.failed > 0 ? 'redBright' : 'green'])(this.reporter.failedFiles || this.reporter.passedFiles);
49
- if (this.status === 'pending') {
50
- return `Tests: ${chalk.gray('(pending)')}`;
48
+ let count = (this.status === "running"
49
+ ? get
50
+ : chalk.bold[this.reporter.failed > 0 ? "redBright" : "green"])(this.reporter.failedFiles || this.reporter.passedFiles);
51
+ if (this.status === "pending") {
52
+ return `Tests: ${chalk.gray("(pending)")}`;
51
53
  }
52
- if (this.status === 'running') {
53
- return `Tests: ${count}/${this.reporter.total} ${chalk.gray('(running)')}`;
54
+ if (this.status === "running") {
55
+ return `Tests: ${count}/${this.reporter.total} ${chalk.gray("(running)")}`;
54
56
  }
55
- if (this.status === 'syntax-error') {
56
- return `Tests: ${chalk.gray('(errors)')}`;
57
+ if (this.status === "syntax-error") {
58
+ return `Tests: ${chalk.gray("(errors)")}`;
57
59
  }
58
- let output = '';
60
+ let output = "";
59
61
  output += `Tests: ${count}`;
60
62
  if (this.reporter.errorOutput) {
61
- output += '\n' + this.reporter.errorOutput;
63
+ output += "\n" + this.reporter.errorOutput;
62
64
  }
63
65
  return output;
64
66
  }
@@ -1,8 +1,8 @@
1
- import { ErrorChecker } from './error-checker.js';
1
+ import { ErrorChecker } from "./error-checker.js";
2
2
  export declare class WarningChecker {
3
3
  verbose: boolean;
4
4
  canisters: Record<string, string>;
5
- status: 'pending' | 'running' | 'syntax-error' | 'error' | 'success';
5
+ status: "pending" | "running" | "syntax-error" | "error" | "success";
6
6
  warnings: string[];
7
7
  errorChecker: ErrorChecker;
8
8
  aborted: boolean;
@@ -10,7 +10,7 @@ export declare class WarningChecker {
10
10
  currentRun: Promise<any> | undefined;
11
11
  totalFiles: number;
12
12
  processedFiles: number;
13
- constructor({ verbose, canisters, errorChecker }: {
13
+ constructor({ verbose, canisters, errorChecker, }: {
14
14
  verbose: boolean;
15
15
  canisters: Record<string, string>;
16
16
  errorChecker: ErrorChecker;
@@ -1,16 +1,16 @@
1
- import { execFile } from 'node:child_process';
2
- import { promisify } from 'node:util';
3
- import os from 'node:os';
4
- import chalk from 'chalk';
5
- import { getMocPath } from '../../helpers/get-moc-path.js';
6
- import { getRootDir } from '../../mops.js';
7
- import { sources } from '../sources.js';
8
- import { parallel } from '../../parallel.js';
9
- import { globMoFiles } from './globMoFiles.js';
1
+ import { execFile } from "node:child_process";
2
+ import { promisify } from "node:util";
3
+ import os from "node:os";
4
+ import chalk from "chalk";
5
+ import { getMocPath } from "../../helpers/get-moc-path.js";
6
+ import { getRootDir } from "../../mops.js";
7
+ import { sources } from "../sources.js";
8
+ import { parallel } from "../../parallel.js";
9
+ import { globMoFiles } from "./globMoFiles.js";
10
10
  export class WarningChecker {
11
11
  verbose = false;
12
12
  canisters = {};
13
- status = 'pending';
13
+ status = "pending";
14
14
  warnings = [];
15
15
  errorChecker;
16
16
  aborted = false;
@@ -18,13 +18,13 @@ export class WarningChecker {
18
18
  currentRun;
19
19
  totalFiles = 0;
20
20
  processedFiles = 0;
21
- constructor({ verbose, canisters, errorChecker }) {
21
+ constructor({ verbose, canisters, errorChecker, }) {
22
22
  this.verbose = verbose;
23
23
  this.canisters = canisters;
24
24
  this.errorChecker = errorChecker;
25
25
  }
26
26
  reset() {
27
- this.status = 'pending';
27
+ this.status = "pending";
28
28
  this.warnings = [];
29
29
  this.totalFiles = 0;
30
30
  this.processedFiles = 0;
@@ -41,12 +41,12 @@ export class WarningChecker {
41
41
  }
42
42
  async run(onProgress) {
43
43
  await this.abortCurrent();
44
- if (this.errorChecker.status === 'error') {
45
- this.status = 'syntax-error';
44
+ if (this.errorChecker.status === "error") {
45
+ this.status = "syntax-error";
46
46
  onProgress();
47
47
  return;
48
48
  }
49
- this.status = 'running';
49
+ this.status = "running";
50
50
  onProgress();
51
51
  let rootDir = getRootDir();
52
52
  let mocPath = getMocPath();
@@ -58,29 +58,29 @@ export class WarningChecker {
58
58
  let controller = new AbortController();
59
59
  let { signal } = controller;
60
60
  this.controllers.set(file, controller);
61
- let { stderr } = await promisify(execFile)(mocPath, ['--check', ...deps.flatMap(x => x.split(' ')), file], { cwd: rootDir, signal }).catch((error) => {
62
- if (error.code === 'ABORT_ERR') {
63
- return { stderr: '' };
61
+ let { stderr } = await promisify(execFile)(mocPath, ["--check", ...deps.flatMap((x) => x.split(" ")), file], { cwd: rootDir, signal }).catch((error) => {
62
+ if (error.code === "ABORT_ERR") {
63
+ return { stderr: "" };
64
64
  }
65
65
  throw error;
66
66
  });
67
67
  if (stderr) {
68
- stderr.split('\n').forEach((line) => {
68
+ stderr.split("\n").forEach((line) => {
69
69
  // ignore deps warnings
70
- if (line.startsWith('.mops/')) {
70
+ if (line.startsWith(".mops/")) {
71
71
  return;
72
72
  }
73
- else if (line.includes(': warning [')) {
73
+ else if (line.includes(": warning [")) {
74
74
  // better formatting
75
75
  let str = line
76
- .replace(': warning [', `: ${chalk.yellow('warning')} [`)
77
- .replace(/unused field (\w+)/, `unused field ${chalk.bold('$1')}`)
78
- .replace(/unused identifier (\w+)/, `unused identifier ${chalk.bold('$1')}`)
76
+ .replace(": warning [", `: ${chalk.yellow("warning")} [`)
77
+ .replace(/unused field (\w+)/, `unused field ${chalk.bold("$1")}`)
78
+ .replace(/unused identifier (\w+)/, `unused identifier ${chalk.bold("$1")}`)
79
79
  .trim();
80
80
  this.warnings.push(str);
81
81
  }
82
- else if (line.startsWith(' ') && this.warnings.length) {
83
- this.warnings[this.warnings.length - 1] += '\n ' + line;
82
+ else if (line.startsWith(" ") && this.warnings.length) {
83
+ this.warnings[this.warnings.length - 1] += "\n " + line;
84
84
  }
85
85
  else {
86
86
  // console.log('UNKNOWN WARNING', line);
@@ -93,25 +93,25 @@ export class WarningChecker {
93
93
  });
94
94
  await this.currentRun;
95
95
  if (!this.aborted) {
96
- this.status = this.warnings.length ? 'error' : 'success';
96
+ this.status = this.warnings.length ? "error" : "success";
97
97
  }
98
98
  onProgress();
99
99
  }
100
100
  getOutput() {
101
- if (this.status === 'pending') {
102
- return `Warnings: ${chalk.gray('(pending)')}`;
101
+ if (this.status === "pending") {
102
+ return `Warnings: ${chalk.gray("(pending)")}`;
103
103
  }
104
- if (this.status === 'running') {
105
- return `Warnings: ${this.processedFiles}/${this.totalFiles} ${chalk.gray('(running)')}`;
104
+ if (this.status === "running") {
105
+ return `Warnings: ${this.processedFiles}/${this.totalFiles} ${chalk.gray("(running)")}`;
106
106
  }
107
- if (this.status === 'syntax-error') {
108
- return `Warnings: ${chalk.gray('(errors)')}`;
107
+ if (this.status === "syntax-error") {
108
+ return `Warnings: ${chalk.gray("(errors)")}`;
109
109
  }
110
- let output = '';
110
+ let output = "";
111
111
  let uniqueWarnings = [...new Set(this.warnings)];
112
- output += `Warnings: ${chalk.bold[uniqueWarnings.length ? 'yellowBright' : 'green'](uniqueWarnings.length)}`;
112
+ output += `Warnings: ${chalk.bold[uniqueWarnings.length ? "yellowBright" : "green"](uniqueWarnings.length)}`;
113
113
  if (this.verbose && uniqueWarnings.length) {
114
- output += `\n ${uniqueWarnings.join('\n ')}`;
114
+ output += `\n ${uniqueWarnings.join("\n ")}`;
115
115
  }
116
116
  return output;
117
117
  }
@@ -1,20 +1,20 @@
1
- import chokidar from 'chokidar';
2
- import path from 'node:path';
3
- import debounce from 'debounce';
4
- import chalk from 'chalk';
5
- import { ErrorChecker } from './error-checker.js';
6
- import { WarningChecker } from './warning-checker.js';
7
- import { getMotokoCanisters, getMotokoCanistersWithDeclarations } from './parseDfxJson.js';
8
- import { getRootDir } from '../../mops.js';
9
- import { Tester } from './tester.js';
10
- import { Generator } from './generator.js';
11
- import { Deployer } from './deployer.js';
12
- import { Formatter } from './formatter.js';
1
+ import chokidar from "chokidar";
2
+ import path from "node:path";
3
+ import debounce from "debounce";
4
+ import chalk from "chalk";
5
+ import { ErrorChecker } from "./error-checker.js";
6
+ import { WarningChecker } from "./warning-checker.js";
7
+ import { getMotokoCanisters, getMotokoCanistersWithDeclarations, } from "./parseDfxJson.js";
8
+ import { getRootDir } from "../../mops.js";
9
+ import { Tester } from "./tester.js";
10
+ import { Generator } from "./generator.js";
11
+ import { Deployer } from "./deployer.js";
12
+ import { Formatter } from "./formatter.js";
13
13
  let ignore = [
14
- '**/node_modules/**',
15
- '**/.mops/**',
16
- '**/.vessel/**',
17
- '**/.git/**',
14
+ "**/node_modules/**",
15
+ "**/.mops/**",
16
+ "**/.vessel/**",
17
+ "**/.git/**",
18
18
  ];
19
19
  export async function watch(options) {
20
20
  let hasOptions = Object.values(options).includes(true);
@@ -33,15 +33,25 @@ export async function watch(options) {
33
33
  let canisters = getMotokoCanisters();
34
34
  let canistersWithDeclarations = getMotokoCanistersWithDeclarations();
35
35
  let errorChecker = new ErrorChecker({ verbose: true, canisters: canisters });
36
- let warningChecker = new WarningChecker({ errorChecker, verbose: true, canisters: canisters });
36
+ let warningChecker = new WarningChecker({
37
+ errorChecker,
38
+ verbose: true,
39
+ canisters: canisters,
40
+ });
37
41
  let tester = new Tester({ errorChecker, verbose: true });
38
- let generator = new Generator({ errorChecker, verbose: true, canisters: canistersWithDeclarations });
39
- let deployer = new Deployer({ errorChecker, generator, verbose: true, canisters: canisters });
42
+ let generator = new Generator({
43
+ errorChecker,
44
+ verbose: true,
45
+ canisters: canistersWithDeclarations,
46
+ });
47
+ let deployer = new Deployer({
48
+ errorChecker,
49
+ generator,
50
+ verbose: true,
51
+ canisters: canisters,
52
+ });
40
53
  let formatter = new Formatter({ errorChecker, verbose: true });
41
- let watcher = chokidar.watch([
42
- path.join(rootDir, '**/*.mo'),
43
- path.join(rootDir, 'mops.toml'),
44
- ], {
54
+ let watcher = chokidar.watch([path.join(rootDir, "**/*.mo"), path.join(rootDir, "mops.toml")], {
45
55
  ignored: ignore,
46
56
  ignoreInitial: true,
47
57
  });
@@ -59,16 +69,19 @@ export async function watch(options) {
59
69
  if (options.format) {
60
70
  formatting = true;
61
71
  }
62
- options.error && await errorChecker.run(print);
72
+ options.error && (await errorChecker.run(print));
63
73
  options.warning && warningChecker.run(print);
64
- options.format && formatter.run(print).then(() => setTimeout(() => formatting = false, 500));
74
+ options.format &&
75
+ formatter
76
+ .run(print)
77
+ .then(() => setTimeout(() => (formatting = false), 500));
65
78
  options.test && tester.run(print);
66
- options.generate && await generator.run(print);
79
+ options.generate && (await generator.run(print));
67
80
  options.deploy && deployer.run(print);
68
81
  }, 200);
69
82
  let print = () => {
70
83
  console.clear();
71
- process.stdout.write('\x1Bc');
84
+ process.stdout.write("\x1Bc");
72
85
  options.error && console.log(errorChecker.getOutput());
73
86
  options.warning && console.log(warningChecker.getOutput());
74
87
  options.format && console.log(formatter.getOutput());
@@ -82,13 +95,13 @@ export async function watch(options) {
82
95
  options.test && statuses.push(tester.status);
83
96
  options.generate && statuses.push(generator.status);
84
97
  options.deploy && statuses.push(deployer.status);
85
- if (statuses.every(status => status !== 'pending' && status !== 'running')) {
86
- console.log(chalk.dim('-'.repeat(50)));
87
- console.log(chalk.dim('Waiting for file changes...'));
88
- console.log(chalk.dim(`Press ${chalk.bold('Ctrl+C')} to exit.`));
98
+ if (statuses.every((status) => status !== "pending" && status !== "running")) {
99
+ console.log(chalk.dim("-".repeat(50)));
100
+ console.log(chalk.dim("Waiting for file changes..."));
101
+ console.log(chalk.dim(`Press ${chalk.bold("Ctrl+C")} to exit.`));
89
102
  }
90
103
  };
91
- watcher.on('all', () => {
104
+ watcher.on("all", () => {
92
105
  if (!formatting) {
93
106
  run();
94
107
  }
@@ -0,0 +1 @@
1
+ export * from "../../cli.js";
@@ -0,0 +1,4 @@
1
+ import * as wasm from "../../wasm/pkg/nodejs/wasm.js";
2
+ import { setWasmBindings } from "../../wasm.js";
3
+ setWasmBindings(wasm);
4
+ export * from "../../cli.js";
@@ -0,0 +1 @@
1
+ export * from "../../cli.js";
@@ -0,0 +1,4 @@
1
+ import * as wasm from "../../wasm/pkg/web/wasm.js";
2
+ import { setWasmBindings } from "../../wasm.js";
3
+ setWasmBindings(wasm);
4
+ export * from "../../cli.js";
@@ -0,0 +1 @@
1
+ export declare function cliError(...args: unknown[]): void;
package/dist/error.js ADDED
@@ -0,0 +1,5 @@
1
+ import chalk from "chalk";
2
+ export function cliError(...args) {
3
+ console.error(chalk.red(...args));
4
+ process.exit(1);
5
+ }
package/dist/fix-dist.js CHANGED
@@ -1,9 +1,9 @@
1
- import { readFileSync, writeFileSync } from 'node:fs';
1
+ import { readFileSync, writeFileSync } from "node:fs";
2
2
  // remove scripts
3
- let text = readFileSync('dist/package.json', 'utf8');
3
+ let text = readFileSync("dist/package.json", "utf8");
4
4
  let json = JSON.parse(text);
5
5
  delete json.scripts;
6
6
  // dist/bin/cli.js -> bin/cli.js
7
- json.bin.mops = 'bin/mops.js';
8
- json.bin['ic-mops'] = 'bin/mops.js';
9
- writeFileSync('dist/package.json', JSON.stringify(json, null, 2));
7
+ json.bin.mops = "bin/mops.js";
8
+ json.bin["ic-mops"] = "bin/mops.js";
9
+ writeFileSync("dist/package.json", JSON.stringify(json, null, 2));
@@ -1,24 +1,27 @@
1
- import { fromMarkdown } from 'mdast-util-from-markdown';
2
- import { toMarkdown } from 'mdast-util-to-markdown';
1
+ import { fromMarkdown } from "mdast-util-from-markdown";
2
+ import { toMarkdown } from "mdast-util-to-markdown";
3
3
  export function findChangelogEntry(changelog, version) {
4
4
  let tree = fromMarkdown(changelog);
5
5
  let found = false;
6
+ let depth = 0;
6
7
  let nodes = [];
7
8
  for (let node of tree.children) {
8
9
  if (found) {
9
- if (node.type === 'heading') {
10
+ if (node.type === "heading" && node.depth <= depth) {
10
11
  break;
11
12
  }
12
13
  else {
13
14
  nodes.push(node);
14
15
  }
15
16
  }
16
- else if (node.type === 'heading' && toMarkdown(node).match(new RegExp(`\\b${version}\\b`))) {
17
+ else if (node.type === "heading" &&
18
+ toMarkdown(node).match(new RegExp(`\\b${version}\\b`))) {
19
+ depth = node.depth;
17
20
  found = true;
18
21
  }
19
22
  }
20
23
  return toMarkdown({
21
- type: 'root',
24
+ type: "root",
22
25
  children: nodes,
23
26
  });
24
27
  }
@@ -1,6 +1,6 @@
1
1
  export function getDepName(name) {
2
- return name.split('@')[0] || '';
2
+ return name.split("@")[0] || "";
3
3
  }
4
4
  export function getDepPinnedVersion(name) {
5
- return name.split('@')[1] || '';
5
+ return name.split("@")[1] || "";
6
6
  }