ic-mops 0.28.0-pre.1 → 0.28.1

package/commands/add.ts

@@ -90,7 +90,7 @@ export async function add(name: string, {verbose = false, dev = false} = {}) {
 	}
 
 	writeConfig(config);
-	notifyInstalls(Object.keys(installedPackages));
+	await notifyInstalls(Object.keys(installedPackages));
 
 	logUpdate.clear();
 	console.log(chalk.green('Package installed ') + `${pkgDetails.name} = "${pkgDetails.repo || pkgDetails.path || pkgDetails.version}"`);

package/commands/install-all.ts

@@ -29,7 +29,7 @@ export async function installAll({verbose = false, silent = false} = {}) {
 		}
 	}
 
-	notifyInstalls(Object.keys(installedPackages));
+	await notifyInstalls(Object.keys(installedPackages));
 
 	if (!silent) {
 		logUpdate.clear();

package/commands/publish.ts

@@ -233,6 +233,14 @@ export async function publish(options: {docs?: boolean, test?: boolean} = {}) {
 	// parse changelog
 	console.log('Parsing CHANGELOG.md...');
 	let changelog = parseChangelog(config.package.version);
+	if (!changelog && config.package.repository) {
+		console.log('Fetching release notes from GitHub...');
+		changelog = await fetchGitHubReleaseNotes(config.package.repository, config.package.version);
+	}
+	if (changelog) {
+		console.log('Changelog:');
+		console.log(chalk.gray(changelog));
+	}
 
 	// test
 	let reporter = new SilentReporter;
@@ -342,17 +350,31 @@ function parseChangelog(version: string): string {
 	let str = fs.readFileSync(changelogFile, 'utf-8');
 	let changelog = findChangelogEntry(str, version);
 
-	if (changelog) {
-		console.log('Changelog:');
-		console.log(chalk.gray(changelog));
-	}
-	else {
+	if (!changelog) {
 		console.log(chalk.yellow('No changelog entry found'));
 	}
 
 	return changelog || '';
 }
 
+async function fetchGitHubReleaseNotes(repo: string, version: string): Promise<string> {
+	let repoPath = new URL(repo).pathname;
+	let res = await fetch(`https://api.github.com/repos${repoPath}/releases/tags/${version}`);
+	let release = await res.json();
+
+	if (release.message === 'Not Found') {
+		res = await fetch(`https://api.github.com/repos${repoPath}/releases/tags/v${version}`);
+		release = await res.json();
+
+		if (release.message === 'Not Found') {
+			console.log(chalk.yellow(`No GitHub release found with name ${version} or v${version}`));
+			return '';
+		}
+	}
+
+	return release.body;
+}
+
 function findChangelogEntry(changelog: string, version: string): string {
 	let tree = fromMarkdown(changelog);
 	let found = false;

package/dist/commands/add.js

@@ -80,7 +80,7 @@ export async function add(name, { verbose = false, dev = false } = {}) {
         throw Error(`Invalid config file: [${depsProp}] not found`);
     }
     writeConfig(config);
-    notifyInstalls(Object.keys(installedPackages));
+    await notifyInstalls(Object.keys(installedPackages));
     logUpdate.clear();
     console.log(chalk.green('Package installed ') + `${pkgDetails.name} = "${pkgDetails.repo || pkgDetails.path || pkgDetails.version}"`);
 }

package/dist/commands/bench.d.ts

@@ -0,0 +1,3 @@
+type BenchMode = 'replica' | 'wasi';
+export declare function bench(filter?: string, mode?: BenchMode): Promise<boolean>;
+export {};

package/dist/commands/bench.js

@@ -0,0 +1,130 @@
+import { 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 {sources} from './sources.js';
+import { getRootDir } from '../mops.js';
+import { parallel } from '../parallel.js';
+let ignore = [
+    '**/node_modules/**',
+    '**/.mops/**',
+    '**/.vessel/**',
+    '**/.git/**',
+];
+let globConfig = {
+    nocase: true,
+    ignore: ignore,
+};
+let mocPath = process.env.DFX_MOC_PATH;
+export async function bench(filter = '', mode = 'replica') {
+    let rootDir = getRootDir();
+    let globStr = '**/bench?(mark)/**/*.bench.mo';
+    if (filter) {
+        globStr = `**/bench?(mark)/**/*${filter}*.mo`;
+    }
+    let files = globSync(path.join(rootDir, globStr), globConfig);
+    if (!files.length) {
+        if (filter) {
+            console.log(`No benchmark files found for filter '${filter}'`);
+            return false;
+        }
+        console.log('No *.bench.mo files found');
+        console.log('Put your benchmark files in \'bench\' directory in *.bench.mo files');
+        return false;
+    }
+    if (!mocPath) {
+        mocPath = execSync('dfx cache show').toString().trim() + '/moc';
+    }
+    let benchDir = `${getRootDir()}/.mops/.bench/`;
+    fs.mkdirSync(benchDir, { recursive: true });
+    console.log(files);
+    console.log('Running dfx replica...');
+    startDfx();
+    await parallel(os.cpus().length, files, async (file) => {
+        console.log(`Running ${file}...`);
+        await runBenchFile(file, mode);
+    });
+    console.log('Stopping dfx replica...');
+    stopDfx();
+    // fs.rmSync(benchDir, {recursive: true, force: true});
+    return true;
+}
+function dfxJson(canisterName) {
+    return {
+        version: 1,
+        canisters: {
+            [canisterName]: {
+                type: 'motoko',
+                main: 'canister.mo',
+                args: '--force-gc --generational-gc',
+            }
+        },
+        defaults: {
+            build: {
+                packtool: 'mops sources',
+            },
+        },
+        // networks: {
+        // 	local: {
+        // 		type: 'ephemeral',
+        // 		bind: '127.0.0.1:4941',
+        // 	},
+        // },
+    };
+}
+function startDfx() {
+    // stopDfx();
+    // let dir = path.join(getRootDir(), '.mops/.bench');
+    // fs.writeFileSync(path.join(dir, 'dfx.json'), JSON.stringify(dfxJson(''), null, 2));
+    // execSync('dfx start --background', {cwd: dir});
+}
+function stopDfx() {
+    // let dir = path.join(getRootDir(), '.mops/.bench');
+    // execSync('dfx stop', {cwd: dir});
+}
+async function runBenchFile(file, mode = 'replica') {
+    let tempDir = path.join(getRootDir(), '.mops/.bench/', path.parse(file).name);
+    fs.mkdirSync(tempDir, { recursive: true });
+    if (fs.readFileSync(file, 'utf8').startsWith('// @benchmode wasi')) {
+        mode = 'wasi';
+    }
+    if (!mocPath) {
+        mocPath = 'moc';
+    }
+    // replica mode
+    if (mode === 'replica') {
+        let canisterName = Date.now().toString(36);
+        fs.writeFileSync(path.join(tempDir, 'dfx.json'), JSON.stringify(dfxJson(canisterName), null, 2));
+        fs.cpSync(file, path.join(tempDir, 'canister.mo'));
+        execSync(`dfx deploy ${canisterName} --mode reinstall --yes`, { cwd: tempDir });
+        let res = execSync(`dfx canister call ${canisterName} run 1`, { cwd: tempDir });
+        console.log(res.toString());
+    }
+    // wasi mode
+    else if (mode === 'wasi') {
+        // let sourcesArr = await sources();
+        // let mocArgs = ['--hide-warnings', '--error-detail=2', ...sourcesArr.join(' ').split(' '), file].filter(x => x);
+        // let wasmFile = `${path.join(tempDir, path.parse(file).name)}.wasm`;
+        // // build
+        // let buildProc = spawn(mocPath, [`-o=${wasmFile}`, '-wasi-system-api', ...mocArgs]);
+        // buildProc.on('close', (code) => {
+        // 	if (code !== 0) {
+        // 		throw new Error(`unknown exit code: ${code}`);
+        // 	}
+        // 	resolve();
+        // });
+        // // run
+        // let proc = spawn('wasmtime', ['--max-wasm-stack=2000000', wasmFile]);
+        // proc.on('close', (code) => {
+        // 	if (code !== 0) {
+        // 		throw new Error(`unknown exit code: ${code}`);
+        // 	}
+        // 	resolve();
+        // });
+        // fs.rmSync(wasmFile, {force: true});
+    }
+}

package/dist/commands/install-all.js

@@ -25,7 +25,7 @@ export async function installAll({ verbose = false, silent = false } = {}) {
             installedPackages = { ...installedPackages, ...res };
         }
     }
-    notifyInstalls(Object.keys(installedPackages));
+    await notifyInstalls(Object.keys(installedPackages));
     if (!silent) {
         logUpdate.clear();
         console.log(chalk.green('All packages installed'));

package/dist/commands/publish.js

@@ -208,6 +208,14 @@ export async function publish(options = {}) {
     // parse changelog
     console.log('Parsing CHANGELOG.md...');
     let changelog = parseChangelog(config.package.version);
+    if (!changelog && config.package.repository) {
+        console.log('Fetching release notes from GitHub...');
+        changelog = await fetchGitHubReleaseNotes(config.package.repository, config.package.version);
+    }
+    if (changelog) {
+        console.log('Changelog:');
+        console.log(chalk.gray(changelog));
+    }
     // test
     let reporter = new SilentReporter;
     if (options.test) {
@@ -298,15 +306,25 @@ function parseChangelog(version) {
     }
     let str = fs.readFileSync(changelogFile, 'utf-8');
     let changelog = findChangelogEntry(str, version);
-    if (changelog) {
-        console.log('Changelog:');
-        console.log(chalk.gray(changelog));
-    }
-    else {
+    if (!changelog) {
         console.log(chalk.yellow('No changelog entry found'));
     }
     return changelog || '';
 }
+async function fetchGitHubReleaseNotes(repo, version) {
+    let repoPath = new URL(repo).pathname;
+    let res = await fetch(`https://api.github.com/repos${repoPath}/releases/tags/${version}`);
+    let release = await res.json();
+    if (release.message === 'Not Found') {
+        res = await fetch(`https://api.github.com/repos${repoPath}/releases/tags/v${version}`);
+        release = await res.json();
+        if (release.message === 'Not Found') {
+            console.log(chalk.yellow(`No GitHub release found with name ${version} or v${version}`));
+            return '';
+        }
+    }
+    return release.body;
+}
 function findChangelogEntry(changelog, version) {
     let tree = fromMarkdown(changelog);
     let found = false;

package/dist/notify-installs.js

@@ -1,8 +1,10 @@
-import { mainActor } from './mops.js';
+import { getDependencyType, mainActor } from './mops.js';
 import { resolvePackages } from './resolve-packages.js';
 export async function notifyInstalls(names) {
-    let actor = await mainActor();
     let resolvedPackages = await resolvePackages();
     let packages = names.map(name => [name, resolvedPackages[name]]);
-    actor.notifyInstalls(packages);
+    if (packages.length) {
+        let actor = await mainActor();
+        await actor.notifyInstalls(packages.filter(([_, version]) => getDependencyType(version) === 'mops'));
+    }
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.28.0-pre.1",
+	"version": "0.28.1",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"

package/notify-installs.ts

@@ -1,9 +1,11 @@
-import {mainActor} from './mops.js';
+import {getDependencyType, mainActor} from './mops.js';
 import {resolvePackages} from './resolve-packages.js';
 
 export async function notifyInstalls(names: string[]) {
-	let actor = await mainActor();
 	let resolvedPackages = await resolvePackages();
 	let packages: [string, string][] = names.map(name => [name, resolvedPackages[name] as string]);
-	actor.notifyInstalls(packages);
+	if (packages.length) {
+		let actor = await mainActor();
+		await actor.notifyInstalls(packages.filter(([_, version]) => getDependencyType(version) === 'mops'));
+	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ic-mops",
-	"version": "0.28.0-pre.1",
+	"version": "0.28.1",
 	"type": "module",
 	"bin": {
 		"mops": "dist/cli.js"