ic-mops 0.31.0 → 0.31.2

package/dist/commands/test.js

@@ -1,186 +0,0 @@
-import { spawn, execSync } from 'node:child_process';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import chalk from 'chalk';
-import { globSync } from 'glob';
-import chokidar from 'chokidar';
-import debounce from 'debounce';
-import { MMF1 } from './mmf1.js';
-import { sources } from './sources.js';
-import { getRootDir } from '../mops.js';
-import { parallel } from '../parallel.js';
-import { absToRel } from './test/utils.js';
-import { VerboseReporter } from './test/reporter-verbose.js';
-let ignore = [
-    '**/node_modules/**',
-    '**/.mops/**',
-    '**/.vessel/**',
-    '**/.git/**',
-];
-let globConfig = {
-    nocase: true,
-    ignore: ignore,
-};
-export async function test(filter = '', { watch = false } = {}) {
-    let rootDir = getRootDir();
-    if (watch) {
-        // todo: run only changed for *.test.mo?
-        // todo: run all for *.mo?
-        let run = debounce(async () => {
-            console.clear();
-            process.stdout.write('\x1Bc');
-            await runAll(filter);
-            console.log('-'.repeat(50));
-            console.log('Waiting for file changes...');
-            console.log(chalk.gray((`Press ${chalk.gray('Ctrl+C')} to exit.`)));
-        }, 200);
-        let watcher = chokidar.watch([
-            path.join(rootDir, '**/*.mo'),
-            path.join(rootDir, 'mops.toml'),
-        ], {
-            ignored: ignore,
-            ignoreInitial: true,
-        });
-        watcher.on('all', () => {
-            run();
-        });
-        run();
-    }
-    else {
-        let passed = await runAll(filter);
-        if (!passed) {
-            process.exit(1);
-        }
-    }
-}
-let mocPath = process.env.DFX_MOC_PATH;
-export async function runAll(filter = '') {
-    let reporter = new VerboseReporter;
-    let rootDir = getRootDir();
-    let files = [];
-    let libFiles = globSync('**/test?(s)/lib.mo', globConfig);
-    if (libFiles[0]) {
-        files = [libFiles[0]];
-    }
-    else {
-        let globStr = '**/test?(s)/**/*.test.mo';
-        if (filter) {
-            globStr = `**/test?(s)/**/*${filter}*.mo`;
-        }
-        files = globSync(path.join(rootDir, globStr), globConfig);
-    }
-    if (!files.length) {
-        if (filter) {
-            console.log(`No test files found for filter '${filter}'`);
-            return;
-        }
-        console.log('No test files found');
-        console.log('Put your tests in \'test\' directory in *.test.mo files');
-        return;
-    }
-    reporter.addFiles(files);
-    // console.log('Test files:');
-    // for (let file of files) {
-    // 	console.log(chalk.gray(`• ${absToRel(file)}`));
-    // }
-    // console.log('='.repeat(50));
-    // let failed = 0;
-    // let passed = 0;
-    // let skipped = 0;
-    let sourcesArr = await sources();
-    if (!mocPath) {
-        mocPath = execSync('dfx cache show').toString().trim() + '/moc';
-    }
-    let wasmDir = `${getRootDir()}/.mops/.test/`;
-    fs.mkdirSync(wasmDir, { recursive: true });
-    await parallel(os.cpus().length, files, async (file) => {
-        let mmf = new MMF1('store');
-        let wasiMode = fs.readFileSync(file, 'utf8').startsWith('// @testmode wasi');
-        let promise = new Promise((resolve) => {
-            if (!mocPath) {
-                mocPath = 'moc';
-            }
-            let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
-            // build and run wasm
-            if (wasiMode) {
-                let wasmFile = `${path.join(wasmDir, path.parse(file).name)}.wasm`;
-                // build
-                let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
-                pipeMMF(buildProc, mmf).then(async () => {
-                    if (mmf.failed > 0) {
-                        return;
-                    }
-                    // run
-                    let proc = spawn('wasmtime', [wasmFile]);
-                    await pipeMMF(proc, mmf);
-                }).finally(() => {
-                    fs.rmSync(wasmFile, { force: true });
-                }).then(resolve);
-            }
-            // interpret
-            else {
-                let proc = spawn(mocPath, ['-r', '-ref-system-api', ...mocArgs]);
-                pipeMMF(proc, mmf).then(resolve);
-            }
-        });
-        reporter.addRun(file, mmf, promise, wasiMode);
-        await promise;
-    });
-    fs.rmSync(wasmDir, { recursive: true, force: true });
-    return reporter.done();
-}
-function pipeMMF(proc, mmf) {
-    return new Promise((resolve) => {
-        // stdout
-        proc.stdout.on('data', (data) => {
-            for (let line of data.toString().split('\n')) {
-                line = line.trim();
-                if (line) {
-                    mmf.parseLine(line);
-                }
-            }
-        });
-        // stderr
-        proc.stderr.on('data', (data) => {
-            let text = data.toString().trim();
-            let failedLine = '';
-            text = text.replace(/([\w+._/-]+):(\d+).(\d+)(-\d+.\d+)/g, (_m0, m1, m2, m3) => {
-                // change absolute file path to relative
-                // change :line:col-line:col to :line:col to work in vscode
-                let res = `${absToRel(m1)}:${m2}:${m3}`;
-                if (!fs.existsSync(m1)) {
-                    return res;
-                }
-                // show failed line
-                let content = fs.readFileSync(m1);
-                let lines = content.toString().split('\n') || [];
-                failedLine += chalk.dim `\n   ...`;
-                let lineBefore = lines[+m2 - 2];
-                if (lineBefore) {
-                    failedLine += chalk.dim `\n   ${+m2 - 1}\t| ${lineBefore.replaceAll('\t', '  ')}`;
-                }
-                failedLine += `\n${chalk.redBright `->`} ${m2}\t| ${lines[+m2 - 1]?.replaceAll('\t', '  ')}`;
-                if (lines.length > +m2) {
-                    failedLine += chalk.dim `\n   ${+m2 + 1}\t| ${lines[+m2]?.replaceAll('\t', '  ')}`;
-                }
-                failedLine += chalk.dim `\n   ...`;
-                return res;
-            });
-            if (failedLine) {
-                text += failedLine;
-            }
-            mmf.fail(text);
-        });
-        // exit
-        proc.on('close', (code) => {
-            if (code === 0) {
-                mmf.pass();
-            }
-            else if (code !== 1) {
-                mmf.fail(`unknown exit code: ${code}`);
-            }
-            resolve();
-        });
-    });
-}

package/dist/integrity.d.ts

@@ -1,4 +0,0 @@
-export declare function getFileHashesFromRegistry(packageIds: string[]): Promise<[string, [string, Uint8Array | number[]][]][]>;
-export declare function checkIntegrity(): Promise<void>;
-export declare function saveLockFile(): Promise<void>;
-export declare function checkLockFile(): Promise<void>;

package/dist/integrity.js

@@ -1,92 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { sha256 } from '@noble/hashes/sha256';
-import { bytesToHex } from '@noble/hashes/utils';
-import { getDependencyType, getRootDir, mainActor } from './mops.js';
-import { resolvePackages } from './resolve-packages.js';
-export async function getFileHashesFromRegistry(packageIds) {
-    let actor = await mainActor();
-    let fileHashesByPackageIds = await actor.getFileHashesByPackageIds(packageIds);
-    return fileHashesByPackageIds;
-}
-export async function checkIntegrity() {
-    let rootDir = getRootDir();
-    let resolvedPackages = await resolvePackages();
-    let packageIds = Object.entries(resolvedPackages)
-        .filter(([_, version]) => getDependencyType(version) === 'mops')
-        .map(([name, version]) => `${name}@${version}`);
-    let fileHashesFromRegistry = await getFileHashesFromRegistry(packageIds);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    for (let [_packageId, fileHashes] of fileHashesFromRegistry) {
-        for (let [fileId, hash] of fileHashes) {
-            let remoteHash = new Uint8Array(hash);
-            let localData = fs.readFileSync(path.join(rootDir, '.mops', fileId));
-            let localHash = await sha256(localData);
-            if (bytesToHex(localHash) !== bytesToHex(remoteHash)) {
-                console.error('Integrity check failed.');
-                console.error(`Mismatched hash for ${fileId}: ${bytesToHex(localHash)} vs ${bytesToHex(remoteHash)}`);
-                process.exit(1);
-            }
-        }
-    }
-}
-export async function saveLockFile() {
-    let rootDir = getRootDir();
-    let resolvedPackages = await resolvePackages();
-    let packageIds = Object.entries(resolvedPackages)
-        .filter(([_, version]) => getDependencyType(version) === 'mops')
-        .map(([name, version]) => `${name}@${version}`);
-    let fileHashes = await getFileHashesFromRegistry(packageIds);
-    let lockFileJson = {
-        version: 1,
-        hashes: fileHashes.reduce((acc, [packageId, fileHashes]) => {
-            acc[packageId] = fileHashes.reduce((acc, [fileId, hash]) => {
-                acc[fileId] = bytesToHex(new Uint8Array(hash));
-                return acc;
-            }, {});
-            return acc;
-        }, {}),
-    };
-    fs.writeFileSync(rootDir + '/mops-lock.json', JSON.stringify(lockFileJson, null, 2));
-}
-export async function checkLockFile() {
-    let rootDir = getRootDir();
-    let resolvedPackages = await resolvePackages();
-    let packageIds = Object.entries(resolvedPackages)
-        .filter(([_name, version]) => getDependencyType(version) === 'mops')
-        .map(([name, version]) => `${name}@${version}`);
-    let fileHashesFromRegistry = await getFileHashesFromRegistry(packageIds);
-    let lockFileJson = JSON.parse(fs.readFileSync(rootDir + '/mops-lock.json').toString());
-    if (lockFileJson.version !== 1) {
-        console.error(`Invalid lock file version: ${lockFileJson.version}`);
-        process.exit(1);
-    }
-    // if (lockFileJson.packageIds.length !== packageIds.length) {
-    // 	console.error(`Mismatched packageIds: ${JSON.stringify(lockFileJson.packageIds)} vs ${JSON.stringify(packageIds)}`);
-    // 	process.exit(1);
-    // }
-    // for (let i = 0; i < packageIds.length; i++) {
-    // 	if (lockFileJson.packageIds[i] !== packageIds[i]) {
-    // 		console.error(`Mismatched packageIds: ${JSON.stringify(lockFileJson.packageIds)} vs ${JSON.stringify(packageIds)}`);
-    // 		process.exit(1);
-    // 	}
-    // }
-    for (let [packageId, fileHashes] of fileHashesFromRegistry) {
-        let hashes = lockFileJson.hashes[packageId];
-        if (!hashes) {
-            console.error(`Missing packageId ${packageId} in lock file`);
-            process.exit(1);
-        }
-        for (let [fileId, hash] of fileHashes) {
-            let lockFileHash = hashes[fileId];
-            if (!lockFileHash) {
-                console.error(`Missing fileId ${fileId} in lock file`);
-                process.exit(1);
-            }
-            if (lockFileHash !== bytesToHex(new Uint8Array(hash))) {
-                console.error(`Mismatched hash for ${fileId}: ${lockFileHash} vs ${bytesToHex(new Uint8Array(hash))}`);
-                process.exit(1);
-            }
-        }
-    }
-}

package/dist/out/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};