ic-mops 1.1.0-pre.0 → 1.1.1

package/dist/templates/mops-test.yml

@@ -14,9 +14,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ZenVoich/setup-mops@v1
+        with:
+          mops-version: 1
 
-      - name: make sure moc is installed
-        run: mops toolchain bin moc || mops toolchain use moc latest
+      - name: install mops packages
+        run: mops install
 
       - name: run tests
         run: mops test

package/helpers/get-moc-path.ts

@@ -1,13 +1,29 @@
 import process from 'node:process';
-import {execSync} from 'node:child_process';
+import {execFileSync} from 'node:child_process';
 
-export function getMocPath() : string {
+export function getMocPath(throwIfNotFound = false) : string {
 	let mocPath = process.env.DFX_MOC_PATH;
 	if (!mocPath) {
-		mocPath = execSync('dfx cache show').toString().trim() + '/moc';
+		try {
+			mocPath = execFileSync('dfx', ['cache', 'show']).toString().trim() + '/moc';
+		}
+		catch (e) {
+			mocPath = '';
+		}
 	}
 	if (!mocPath) {
 		mocPath = 'moc';
 	}
+
+	if (throwIfNotFound) {
+		try {
+			execFileSync(mocPath, ['--version']);
+		}
+		catch (e) {
+			console.error(e);
+			throw new Error('moc not found');
+		}
+	}
+
 	return mocPath;
 }

package/helpers/get-moc-version.ts

@@ -1,8 +1,20 @@
-import {execSync} from 'node:child_process';
+import {execFileSync} from 'node:child_process';
 import {getMocPath} from './get-moc-path.js';
 
-export function getMocVersion() : string {
-	let mocPath = getMocPath();
-	let match = execSync(mocPath).toString().trim().match(/Motoko compiler ([^\s]+) .*/);
-	return match?.[1] || '';
+export function getMocVersion(throwOnError = false) : string {
+	let mocPath = getMocPath(false);
+	if (!mocPath) {
+		return '';
+	}
+	try {
+		let match = execFileSync(mocPath, ['--version']).toString().trim().match(/Motoko compiler ([^\s]+) .*/);
+		return match?.[1] || '';
+	}
+	catch (e) {
+		if (throwOnError) {
+			console.error(e);
+			throw new Error('moc not found');
+		}
+		return '';
+	}
 }

package/integrity.ts

@@ -167,6 +167,7 @@ export async function updateLockFile() {
 
 // compare hashes of local files with hashes from the lock file
 export async function checkLockFile(force = false) {
+	let supportedVersions = [1, 2, 3];
 	let rootDir = getRootDir();
 	let lockFile = path.join(rootDir, 'mops.lock');
 
@@ -183,9 +184,9 @@ export async function checkLockFile(force = false) {
 	let packageIds = await getResolvedMopsPackageIds();
 
 	// check lock file version
-	if (lockFileJsonGeneric.version !== 1 && lockFileJsonGeneric.version !== 2 && lockFileJsonGeneric.version !== 3) {
+	if (!supportedVersions.includes(lockFileJsonGeneric.version)) {
 		console.error('Integrity check failed');
-		console.error(`Invalid lock file version: ${lockFileJsonGeneric.version}. Supported versions: 1, 2, 3`);
+		console.error(`Invalid lock file version: ${lockFileJsonGeneric.version}. Supported versions: ${supportedVersions.join(', ')}`);
 		process.exit(1);
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.1.0-pre.0",
+  "version": "1.1.1",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",
@@ -80,6 +80,7 @@
     "octokit": "3.1.2",
     "pem-file": "1.0.1",
     "pic-ic": "0.5.3",
+    "promisify-child-process": "4.1.2",
     "prompts": "2.4.2",
     "semver": "7.6.3",
     "stream-to-promise": "3.0.0",
@@ -93,7 +94,7 @@
     "@types/fs-extra": "11.0.4",
     "@types/glob": "8.1.0",
     "@types/ncp": "2.0.8",
-    "@types/node": "22.5.4",
+    "@types/node": "22.7.4",
     "@types/prompts": "2.4.9",
     "@types/semver": "7.5.8",
     "@types/stream-to-promise": "2.2.4",

package/parallel.ts

@@ -1,4 +1,4 @@
-export async function parallel(threads : number, items : any[], fn : CallableFunction) {
+export async function parallel<T>(threads : number, items : T[], fn : (item : T) => Promise<void>) {
 	return new Promise<void>((resolve) => {
 		let busyThreads = 0;
 		items = items.slice();
@@ -14,7 +14,7 @@ export async function parallel(threads : number, items : any[], fn : CallableFun
 				return;
 			}
 			busyThreads++;
-			fn(items.shift()).then(() => {
+			fn(items.shift() as T).then(() => {
 				busyThreads--;
 				loop();
 			});

package/templates/mops-test.yml

@@ -14,9 +14,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ZenVoich/setup-mops@v1
+        with:
+          mops-version: 1
 
-      - name: make sure moc is installed
-        run: mops toolchain bin moc || mops toolchain use moc latest
+      - name: install mops packages
+        run: mops install
 
       - name: run tests
         run: mops test

package/test

@@ -1,4 +0,0 @@
-dev, toolchain 89s
-no dev, no toolchain 68s
-lockfile, toolchain 60s
-lockfile, no toolchain 49s