ic-mops 1.8.0 → 1.9.0

package/dist/cli.js

@@ -28,6 +28,8 @@ import { watch } from './commands/watch/watch.js';
 import { addOwner, printOwners, removeOwner } from './commands/owner.js';
 import { addMaintainer, printMaintainers, removeMaintainer } from './commands/maintainer.js';
 import { format } from './commands/format.js';
+import { docs } from './commands/docs.js';
+import { docsCoverage } from './commands/docs-coverage.js';
 events.setMaxListeners(20);
 let networkFile = getNetworkFile();
 if (fs.existsSync(networkFile)) {
@@ -426,4 +428,27 @@ program
         process.exit(1);
     }
 });
+// docs
+const docsCommand = new Command('docs').description('Documentation management');
+docsCommand
+    .command('generate')
+    .description('Generate documentation for Motoko code')
+    .addOption(new Option('--source <source>', 'Source directory').default('src'))
+    .addOption(new Option('--output <output>', 'Output directory').default('docs'))
+    .addOption(new Option('--format <format>', 'Output format').default('md').choices(['md', 'adoc', 'html']))
+    .action(async (options) => {
+    checkConfigFile(true);
+    await docs(options);
+});
+docsCommand
+    .command('coverage')
+    .description('Documentation coverage report')
+    .addOption(new Option('-s, --source <source>', 'Source directory (with .mo files)').default('src'))
+    .addOption(new Option('-r, --reporter <reporter>', 'Coverage reporter').choices(['files', 'compact', 'missing', 'verbose']).default('files'))
+    .addOption(new Option('-t, --threshold <threshold>', 'Coverage threshold (0-100). If total coverage is below threshold, exit with error code 1').default(70))
+    .action(async (options) => {
+    checkConfigFile(true);
+    await docsCoverage(options);
+});
+program.addCommand(docsCommand);
 program.parse();

package/dist/commands/bench-replica.js

@@ -9,9 +9,12 @@ import { createActor, idlFactory } from '../declarations/bench/index.js';
 import { toolchain } from './toolchain/index.js';
 import { getDfxVersion } from '../helpers/get-dfx-version.js';
 export class BenchReplica {
+    type;
+    verbose = false;
+    canisters = {};
+    pocketIcServer;
+    pocketIc;
     constructor(type, verbose = false) {
-        this.verbose = false;
-        this.canisters = {};
         this.type = type;
         this.verbose = verbose;
     }

package/dist/commands/docs-coverage.d.ts

@@ -0,0 +1,8 @@
+export type DocsCoverageReporter = 'compact' | 'files' | 'missing' | 'verbose' | 'silent';
+type DocsCoverageOptions = {
+    source: string;
+    reporter: DocsCoverageReporter;
+    threshold: number;
+};
+export declare function docsCoverage(options?: Partial<DocsCoverageOptions>): Promise<number>;
+export {};

package/dist/commands/docs-coverage.js

@@ -0,0 +1,86 @@
+import { readFileSync } from 'node:fs';
+import chalk from 'chalk';
+import { globSync } from 'glob';
+import { JSDOM } from 'jsdom';
+import { docs } from './docs.js';
+export async function docsCoverage(options = {}) {
+    let docsDir = '.mops/.docs';
+    let { source, reporter, threshold } = {
+        source: 'src',
+        reporter: 'files',
+        threshold: 0,
+        ...options,
+    };
+    await docs({
+        source,
+        output: docsDir,
+        format: 'html',
+        silent: true,
+    });
+    let files = globSync(`${docsDir}/**/*.html`, { ignore: [`${docsDir}/**/index.html`] });
+    let coverages = [];
+    for (let file of files) {
+        let coverage = docFileCoverage(file);
+        coverages.push(coverage);
+        if (reporter === 'silent') {
+            continue;
+        }
+        if (reporter !== 'compact' && (reporter !== 'missing' || coverage.coverage < 100)) {
+            console.log(`• ${coverage.file} ${colorizeCoverage(coverage.coverage)}`);
+        }
+        if (reporter === 'missing' && coverage.coverage < 100) {
+            for (let item of coverage.items) {
+                if (!item.covered) {
+                    console.log(`  ${item.covered ? chalk.green('✓') : chalk.red('✖')} ${item.id} ${chalk.gray(item.type)}`);
+                }
+            }
+        }
+        else if (reporter === 'verbose') {
+            for (let item of coverage.items) {
+                console.log(`  ${item.covered ? chalk.green('✓') : chalk.red('✖')} ${item.id} ${chalk.gray(item.type)}`);
+            }
+        }
+    }
+    if (reporter !== 'compact' && reporter !== 'silent') {
+        console.log('-'.repeat(50));
+    }
+    let totalCoverage = coverages.reduce((acc, coverage) => acc + coverage.coverage, 0) / (coverages.length || 1);
+    if (reporter !== 'silent') {
+        console.log(`Documentation coverage: ${colorizeCoverage(totalCoverage)}`);
+    }
+    if (threshold > 0 && totalCoverage < threshold) {
+        process.exit(1);
+    }
+    return totalCoverage;
+}
+function docFileCoverage(file) {
+    let dom = new JSDOM(readFileSync(file, 'utf-8'));
+    let module = dom.window.document.querySelector('h1')?.textContent || '';
+    let moduleFile = `${module}.mo`;
+    let items = [...dom.window.document.querySelectorAll('h4')].map(h4 => {
+        let id = h4.getAttribute('id')?.replace('type.', '');
+        let type = h4.className.replace('-declaration', '').replace('function', 'func');
+        let definition = h4.textContent;
+        let comment = h4.parentElement?.querySelector('p + p')?.textContent;
+        return { file: moduleFile, id, type, definition, comment, covered: (comment || '').length >= 5 };
+    });
+    let coverage = 0;
+    if (!items.length) {
+        coverage = 100;
+    }
+    else {
+        coverage = items.filter(item => item.covered).length / items.length * 100;
+    }
+    return { file: moduleFile, coverage, items };
+}
+function colorizeCoverage(coverage) {
+    if (coverage >= 90) {
+        return chalk.green(coverage.toFixed(2) + '%');
+    }
+    else if (coverage >= 50) {
+        return chalk.yellow(coverage.toFixed(2) + '%');
+    }
+    else {
+        return chalk.red(coverage.toFixed(2) + '%');
+    }
+}

package/dist/commands/docs.d.ts

@@ -1,3 +1,9 @@
-export declare function docs({ silent }?: {
-    silent?: boolean | undefined;
-}): Promise<void>;
+type DocsOptions = {
+    source: string;
+    output: string;
+    format: 'md' | 'adoc' | 'html';
+    silent: boolean;
+    archive: boolean;
+};
+export declare function docs(options?: Partial<DocsOptions>): Promise<void>;
+export {};

package/dist/commands/docs.js

@@ -10,9 +10,20 @@ import streamToPromise from 'stream-to-promise';
 import { getRootDir } from '../mops.js';
 import { toolchain } from './toolchain/index.js';
 let moDocPath;
-export async function docs({ silent = false } = {}) {
+export async function docs(options = {}) {
+    let { source, output, format, silent, archive } = {
+        source: 'src',
+        output: '.mops/.docs',
+        format: 'adoc',
+        silent: false,
+        archive: false,
+        ...options,
+    };
+    if (format === 'md') {
+        format = 'plain';
+    }
     let rootDir = getRootDir();
-    let docsDir = path.join(rootDir, '.mops/.docs');
+    let docsDir = path.join(rootDir, output);
     let docsDirRelative = path.relative(process.cwd(), docsDir);
     deleteSync([docsDir], { force: true });
     // detect mocv (legacy)
@@ -26,13 +37,17 @@ export async function docs({ silent = false } = {}) {
     }
     // generate docs
     await new Promise((resolve) => {
-        let proc = spawn(moDocPath, [`--source=${path.join(rootDir, 'src')}`, `--output=${docsDirRelative}`, '--format=adoc']);
+        let proc = spawn(moDocPath, [
+            `--source=${path.join(rootDir, source)}`,
+            `--output=${docsDirRelative}`,
+            `--format=${format}`,
+        ]);
         // stdout
         proc.stdout.on('data', (data) => {
             let text = data.toString().trim();
             let failedText = 'Failed to extract documentation';
             if (text.includes(failedText)) {
-                console.log(text.replaceAll(failedText, chalk.yellow('Warning: ') + failedText));
+                silent || console.log(text.replaceAll(failedText, chalk.yellow('Warning: ') + failedText));
             }
             silent || console.log('stdout', text);
         });
@@ -65,19 +80,21 @@ export async function docs({ silent = false } = {}) {
         });
     });
     // create archive
-    let ignore = [
-        `${docsDir}/**/*.test.adoc`,
-        `${docsDir}/test/**/*`,
-    ];
-    let files = globSync(`${docsDir}/**/*.adoc`, { ignore }).map(f => path.relative(docsDir, f));
-    files.sort();
-    if (files.length) {
-        let stream = createTar({
-            cwd: docsDir,
-            gzip: true,
-            portable: true,
-        }, files).pipe(fs.createWriteStream(path.join(docsDir, 'docs.tgz')));
-        await streamToPromise(stream);
+    if (archive) {
+        let ignore = [
+            `${docsDir}/**/*.test.adoc`,
+            `${docsDir}/test/**/*`,
+        ];
+        let files = globSync(`${docsDir}/**/*.adoc`, { ignore }).map(f => path.relative(docsDir, f));
+        files.sort();
+        if (files.length) {
+            let stream = createTar({
+                cwd: docsDir,
+                gzip: true,
+                portable: true,
+            }, files).pipe(fs.createWriteStream(path.join(docsDir, 'docs.tgz')));
+            await streamToPromise(stream);
+        }
     }
     silent || console.log(`${chalk.green('Documentation generated')} at ${docsDirRelative}`);
 }

package/dist/commands/publish.js

@@ -14,6 +14,7 @@ import { testWithReporter } from './test/test.js';
 import { SilentReporter } from './test/reporters/silent-reporter.js';
 import { findChangelogEntry } from '../helpers/find-changelog-entry.js';
 import { bench } from './bench.js';
+import { docsCoverage } from './docs-coverage.js';
 export async function publish(options = {}) {
     if (!checkConfigFile()) {
         return;
@@ -194,6 +195,7 @@ export async function publish(options = {}) {
         '!benchmark/**',
         '!**/*.bench.mo',
         '!**/*.Bench.mo',
+        '!**/node_modules/**',
     ];
     let files = config.package.files || ['**/*.mo'];
     files = [...files, ...defaultFiles];
@@ -204,9 +206,13 @@ export async function publish(options = {}) {
     }
     // generate docs
     let docsFile = path.join(rootDir, '.mops/.docs/docs.tgz');
+    let docsCov = 0;
     if (options.docs) {
         console.log('Generating documentation...');
-        await docs({ silent: true });
+        docsCov = await docsCoverage({
+            reporter: 'silent',
+        });
+        await docs({ silent: true, archive: true });
         if (fs.existsSync(docsFile)) {
             files.unshift(docsFile);
         }
@@ -298,6 +304,10 @@ export async function publish(options = {}) {
     if (changelog) {
         await actor.uploadNotes(puiblishingId, changelog);
     }
+    // upload docs coverage
+    if (options.docs) {
+        await actor.uploadDocsCoverage(puiblishingId, docsCov);
+    }
     // upload files
     await parallel(8, files, async (file) => {
         progress();

package/dist/commands/replica.js

@@ -11,13 +11,14 @@ import { readConfig } from '../mops.js';
 import { toolchain } from './toolchain/index.js';
 import { getDfxVersion } from '../helpers/get-dfx-version.js';
 export class Replica {
-    constructor() {
-        this.type = 'dfx';
-        this.verbose = false;
-        this.canisters = {};
-        this.dir = ''; // absolute path (/.../.mops/.test/)
-        this.ttl = 60;
-    }
+    type = 'dfx';
+    verbose = false;
+    canisters = {};
+    pocketIcServer;
+    pocketIc;
+    dfxProcess;
+    dir = ''; // absolute path (/.../.mops/.test/)
+    ttl = 60;
     async start({ type, dir, verbose, silent } = {}) {
         this.type = type ?? this.type;
         this.verbose = verbose ?? this.verbose;

package/dist/commands/test/mmf1.js

@@ -4,19 +4,21 @@
 // mops:1:skip
 import chalk from 'chalk';
 export class MMF1 {
+    file;
+    stack = [];
+    currSuite = '';
+    failed = 0;
+    passed = 0;
+    skipped = 0;
+    strategy;
+    output = [];
+    nestingSymbol = ' › ';
+    // or <file>
+    // or <file> › <test>
+    // or <file> › <suite> › <test>
+    // or <file> › <suite> › <test> › <nested-test>...
+    passedNamesFlat = [];
     constructor(strategy, file) {
-        this.stack = [];
-        this.currSuite = '';
-        this.failed = 0;
-        this.passed = 0;
-        this.skipped = 0;
-        this.output = [];
-        this.nestingSymbol = ' › ';
-        // or <file>
-        // or <file> › <test>
-        // or <file> › <suite> › <test>
-        // or <file> › <suite> › <test> › <nested-test>...
-        this.passedNamesFlat = [];
         this.strategy = strategy;
         this.file = file;
     }

package/dist/commands/test/reporters/compact-reporter.js

@@ -1,41 +1,25 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _CompactReporter_instances, _CompactReporter_allFiles, _CompactReporter_runningFiles, _CompactReporter_failedFiles, _CompactReporter_finishedFiles, _CompactReporter_startTime, _CompactReporter_timerId, _CompactReporter_startTimer, _CompactReporter_clearTimer, _CompactReporter_log;
 import chalk from 'chalk';
 import logUpdate from 'log-update';
 import { absToRel } from '../utils.js';
 export class CompactReporter {
-    constructor() {
-        _CompactReporter_instances.add(this);
-        this.passed = 0;
-        this.failed = 0;
-        this.skipped = 0;
-        this.passedFiles = 0;
-        this.failedFiles = 0;
-        _CompactReporter_allFiles.set(this, new Set());
-        _CompactReporter_runningFiles.set(this, new Set());
-        _CompactReporter_failedFiles.set(this, new Set());
-        _CompactReporter_finishedFiles.set(this, new Set());
-        _CompactReporter_startTime.set(this, Date.now());
-        _CompactReporter_timerId.set(this, null);
-    }
+    passed = 0;
+    failed = 0;
+    skipped = 0;
+    passedFiles = 0;
+    failedFiles = 0;
+    #allFiles = new Set();
+    #runningFiles = new Set();
+    #failedFiles = new Set();
+    #finishedFiles = new Set();
+    #startTime = Date.now();
     addFiles(files) {
-        __classPrivateFieldSet(this, _CompactReporter_allFiles, new Set(files), "f");
-        __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_log).call(this);
-        __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_startTimer).call(this);
+        this.#allFiles = new Set(files);
+        this.#log();
+        this.#startTimer();
     }
     addRun(file, mmf, state, _mode) {
-        __classPrivateFieldGet(this, _CompactReporter_runningFiles, "f").add(file);
-        __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_log).call(this);
+        this.#runningFiles.add(file);
+        this.#log();
         state.then(() => {
             this.passed += mmf.passed;
             this.failed += mmf.failed;
@@ -46,50 +30,53 @@ export class CompactReporter {
             this.passedFiles += Number(mmf.failed === 0);
             this.failedFiles += Number(mmf.failed !== 0);
             if (mmf.failed) {
-                __classPrivateFieldGet(this, _CompactReporter_failedFiles, "f").add(file);
+                this.#failedFiles.add(file);
                 logUpdate.clear();
                 console.log(chalk.red('✖'), absToRel(file));
                 mmf.flush('fail');
                 console.log('-'.repeat(50));
             }
-            __classPrivateFieldGet(this, _CompactReporter_runningFiles, "f").delete(file);
-            __classPrivateFieldGet(this, _CompactReporter_finishedFiles, "f").add(file);
-            __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_log).call(this);
+            this.#runningFiles.delete(file);
+            this.#finishedFiles.add(file);
+            this.#log();
         });
     }
     done() {
-        __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_log).call(this);
+        this.#log();
         logUpdate.done();
-        __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_clearTimer).call(this);
+        this.#clearTimer();
         return this.failed === 0;
     }
-}
-_CompactReporter_allFiles = new WeakMap(), _CompactReporter_runningFiles = new WeakMap(), _CompactReporter_failedFiles = new WeakMap(), _CompactReporter_finishedFiles = new WeakMap(), _CompactReporter_startTime = new WeakMap(), _CompactReporter_timerId = new WeakMap(), _CompactReporter_instances = new WeakSet(), _CompactReporter_startTimer = function _CompactReporter_startTimer() {
-    __classPrivateFieldSet(this, _CompactReporter_timerId, setInterval(() => __classPrivateFieldGet(this, _CompactReporter_instances, "m", _CompactReporter_log).call(this), 55), "f");
-}, _CompactReporter_clearTimer = function _CompactReporter_clearTimer() {
-    if (__classPrivateFieldGet(this, _CompactReporter_timerId, "f")) {
-        clearInterval(__classPrivateFieldGet(this, _CompactReporter_timerId, "f"));
+    #timerId = null;
+    #startTimer() {
+        this.#timerId = setInterval(() => this.#log(), 55);
     }
-}, _CompactReporter_log = function _CompactReporter_log() {
-    let res = [];
-    let i = 0;
-    for (let file of __classPrivateFieldGet(this, _CompactReporter_allFiles, "f")) {
-        if (__classPrivateFieldGet(this, _CompactReporter_runningFiles, "f").has(file)) {
-            res[Number(i)] = '.';
+    #clearTimer() {
+        if (this.#timerId) {
+            clearInterval(this.#timerId);
         }
-        else if (__classPrivateFieldGet(this, _CompactReporter_finishedFiles, "f").has(file)) {
-            res[Number(i)] = __classPrivateFieldGet(this, _CompactReporter_failedFiles, "f").has(file) ? chalk.red(':') : ':';
-        }
-        else {
-            res[Number(i)] = ' ';
+    }
+    #log() {
+        let res = [];
+        let i = 0;
+        for (let file of this.#allFiles) {
+            if (this.#runningFiles.has(file)) {
+                res[Number(i)] = '.';
+            }
+            else if (this.#finishedFiles.has(file)) {
+                res[Number(i)] = this.#failedFiles.has(file) ? chalk.red(':') : ':';
+            }
+            else {
+                res[Number(i)] = ' ';
+            }
+            i++;
         }
-        i++;
+        let output = `[${res.join('')}]\n`
+            + `${chalk.gray(((Date.now() - this.#startTime) / 1000).toFixed(2) + 's')}`
+            + `, total ${this.#allFiles.size} files`
+            + `, passed ${chalk.greenBright(this.passedFiles)} files`
+            + (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)} cases` : '')
+            + (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)} cases` : '');
+        logUpdate(output);
     }
-    let output = `[${res.join('')}]\n`
-        + `${chalk.gray(((Date.now() - __classPrivateFieldGet(this, _CompactReporter_startTime, "f")) / 1000).toFixed(2) + 's')}`
-        + `, total ${__classPrivateFieldGet(this, _CompactReporter_allFiles, "f").size} files`
-        + `, passed ${chalk.greenBright(this.passedFiles)} files`
-        + (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)} cases` : '')
-        + (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)} cases` : '');
-    logUpdate(output);
-};
+}

package/dist/commands/test/reporters/files-reporter.js

@@ -1,18 +1,10 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _FilesReporter_startTime;
 import chalk from 'chalk';
 import { absToRel } from '../utils.js';
 export class FilesReporter {
-    constructor() {
-        this.passed = 0;
-        this.failed = 0;
-        this.skipped = 0;
-        _FilesReporter_startTime.set(this, Date.now());
-    }
+    passed = 0;
+    failed = 0;
+    skipped = 0;
+    #startTime = Date.now();
     addFiles(files) {
         console.log(`Test files: ${files.length}`);
         console.log('='.repeat(50));
@@ -40,11 +32,10 @@ export class FilesReporter {
         else {
             console.log(chalk.greenBright('Tests passed'));
         }
-        console.log(`Done in ${chalk.gray(((Date.now() - __classPrivateFieldGet(this, _FilesReporter_startTime, "f")) / 1000).toFixed(2) + 's')}`
+        console.log(`Done in ${chalk.gray(((Date.now() - this.#startTime) / 1000).toFixed(2) + 's')}`
             + `, passed ${chalk.greenBright(this.passed)} files`
             + (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)} cases` : '')
             + (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)} files` : ''));
         return this.failed === 0;
     }
 }
-_FilesReporter_startTime = new WeakMap();

package/dist/commands/test/reporters/silent-reporter.js

@@ -1,17 +1,17 @@
 import chalk from 'chalk';
 import { absToRel } from '../utils.js';
 export class SilentReporter {
+    total = 0;
+    passed = 0;
+    failed = 0;
+    skipped = 0;
+    passedFiles = 0;
+    failedFiles = 0;
+    passedNamesFlat = [];
+    flushOnError = true;
+    errorOutput = '';
+    onProgress = () => { };
     constructor(flushOnError = true, onProgress = () => { }) {
-        this.total = 0;
-        this.passed = 0;
-        this.failed = 0;
-        this.skipped = 0;
-        this.passedFiles = 0;
-        this.failedFiles = 0;
-        this.passedNamesFlat = [];
-        this.flushOnError = true;
-        this.errorOutput = '';
-        this.onProgress = () => { };
         this.flushOnError = flushOnError;
         this.onProgress = onProgress;
     }

package/dist/commands/test/reporters/verbose-reporter.js

@@ -1,25 +1,11 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _VerboseReporter_startTime, _VerboseReporter_curFileIndex;
 import chalk from 'chalk';
 import { absToRel } from '../utils.js';
 export class VerboseReporter {
-    constructor() {
-        this.passed = 0;
-        this.failed = 0;
-        this.skipped = 0;
-        _VerboseReporter_startTime.set(this, Date.now());
-        _VerboseReporter_curFileIndex.set(this, 0);
-    }
+    passed = 0;
+    failed = 0;
+    skipped = 0;
+    #startTime = Date.now();
+    #curFileIndex = 0;
     addFiles(files) {
         console.log('Test files:');
         for (let file of files) {
@@ -52,16 +38,14 @@ export class VerboseReporter {
         else {
             console.log(chalk.greenBright('Tests passed'));
         }
-        console.log(`Done in ${chalk.gray(((Date.now() - __classPrivateFieldGet(this, _VerboseReporter_startTime, "f")) / 1000).toFixed(2) + 's')}`
+        console.log(`Done in ${chalk.gray(((Date.now() - this.#startTime) / 1000).toFixed(2) + 's')}`
             + `, passed ${chalk.greenBright(this.passed)}`
             + (this.skipped ? `, skipped ${chalk[this.skipped ? 'yellowBright' : 'gray'](this.skipped)}` : '')
             + (this.failed ? `, failed ${chalk[this.failed ? 'redBright' : 'gray'](this.failed)}` : ''));
         return this.failed === 0;
     }
     _printStart(file, mode) {
-        var _a, _b;
-        (__classPrivateFieldSet(this, _VerboseReporter_curFileIndex, (_b = __classPrivateFieldGet(this, _VerboseReporter_curFileIndex, "f"), _a = _b++, _b), "f"), _a) && console.log('-'.repeat(50));
+        this.#curFileIndex++ && console.log('-'.repeat(50));
         console.log(`Running ${chalk.gray(absToRel(file))} ${mode === 'interpreter' ? '' : chalk.gray(`(${mode})`)}`);
     }
 }
-_VerboseReporter_startTime = new WeakMap(), _VerboseReporter_curFileIndex = new WeakMap();

package/dist/commands/watch/deployer.js

@@ -5,14 +5,17 @@ import { execFile, execSync } from 'node:child_process';
 import { parallel } from '../../parallel.js';
 import { getRootDir } from '../../mops.js';
 export class Deployer {
+    verbose = false;
+    canisters = {};
+    status = 'pending';
+    errorChecker;
+    generator;
+    success = 0;
+    errors = [];
+    aborted = false;
+    controllers = new Map();
+    currentRun;
     constructor({ verbose, canisters, errorChecker, generator }) {
-        this.verbose = false;
-        this.canisters = {};
-        this.status = 'pending';
-        this.success = 0;
-        this.errors = [];
-        this.aborted = false;
-        this.controllers = new Map();
         this.verbose = verbose;
         this.canisters = canisters;
         this.errorChecker = errorChecker;

package/dist/commands/watch/error-checker.js

@@ -8,11 +8,11 @@ import { sources } from '../sources.js';
 import { parallel } from '../../parallel.js';
 import { globMoFiles } from './globMoFiles.js';
 export class ErrorChecker {
+    verbose = false;
+    canisters = {};
+    status = 'pending';
+    errors = [];
     constructor({ verbose, canisters }) {
-        this.verbose = false;
-        this.canisters = {};
-        this.status = 'pending';
-        this.errors = [];
         this.verbose = verbose;
         this.canisters = canisters;
     }