ic-mops 1.0.1 → 1.1.0

package/integrity.ts

@@ -24,7 +24,14 @@ type LockFileV2 = {
 	hashes : Record<string, Record<string, string>>;
 };
 
-type LockFile = LockFileV1 | LockFileV2;
+type LockFileV3 = {
+	version : 3;
+	mopsTomlDepsHash : string;
+	hashes : Record<string, Record<string, string>>;
+	deps : Record<string, string>;
+};
+
+type LockFile = LockFileV1 | LockFileV2 | LockFileV3;
 
 export async function checkIntegrity(lock ?: 'check' | 'update' | 'ignore') {
 	let force = !!lock;
@@ -109,24 +116,41 @@ export async function checkRemote() {
 	}
 }
 
-export async function updateLockFile() {
+export function readLockFile() : LockFile | null {
 	let rootDir = getRootDir();
 	let lockFile = path.join(rootDir, 'mops.lock');
-
-	// if lock file exists and mops.toml hasn't changed, don't update it
 	if (fs.existsSync(lockFile)) {
-		let lockFileJson : LockFileV2 = JSON.parse(fs.readFileSync(lockFile).toString());
+		return JSON.parse(fs.readFileSync(lockFile).toString()) as LockFile;
+	}
+	return null;
+}
+
+// check if lock file exists and integrity of mopsTomlDepsHash
+export function checkLockFileLight() : boolean {
+	let existingLockFileJson = readLockFile();
+	if (existingLockFileJson) {
 		let mopsTomlDepsHash = getMopsTomlDepsHash();
-		if (mopsTomlDepsHash === lockFileJson.mopsTomlDepsHash) {
-			return;
+		if (existingLockFileJson.version === 3 && mopsTomlDepsHash === existingLockFileJson.mopsTomlDepsHash) {
+			return true;
 		}
 	}
+	return false;
+}
+
+export async function updateLockFile() {
+	// if lock file exists and mops.toml hasn't changed, don't update it
+	if (checkLockFileLight()) {
+		return;
+	}
+
+	let resolvedDeps = await resolvePackages();
 
 	let fileHashes = await getFileHashesFromRegistry();
 
-	let lockFileJson : LockFileV2 = {
-		version: 2,
+	let lockFileJson : LockFileV3 = {
+		version: 3,
 		mopsTomlDepsHash: getMopsTomlDepsHash(),
+		deps: resolvedDeps,
 		hashes: fileHashes.reduce((acc, [packageId, fileHashes]) => {
 			acc[packageId] = fileHashes.reduce((acc, [fileId, hash]) => {
 				acc[fileId] = bytesToHex(new Uint8Array(hash));
@@ -136,11 +160,14 @@ export async function updateLockFile() {
 		}, {} as Record<string, Record<string, string>>),
 	};
 
+	let rootDir = getRootDir();
+	let lockFile = path.join(rootDir, 'mops.lock');
 	fs.writeFileSync(lockFile, JSON.stringify(lockFileJson, null, 2));
 }
 
 // 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');
 
@@ -157,9 +184,9 @@ export async function checkLockFile(force = false) {
 	let packageIds = await getResolvedMopsPackageIds();
 
 	// check lock file version
-	if (lockFileJsonGeneric.version !== 1 && lockFileJsonGeneric.version !== 2) {
+	if (!supportedVersions.includes(lockFileJsonGeneric.version)) {
 		console.error('Integrity check failed');
-		console.error(`Invalid lock file version: ${lockFileJsonGeneric.version}. Supported versions: 1`);
+		console.error(`Invalid lock file version: ${lockFileJsonGeneric.version}. Supported versions: ${supportedVersions.join(', ')}`);
 		process.exit(1);
 	}
 
@@ -176,8 +203,8 @@ export async function checkLockFile(force = false) {
 		}
 	}
 
-	// V2: check mops.toml deps hash
-	if (lockFileJson.version === 2) {
+	// V2, V3: check mops.toml deps hash
+	if (lockFileJson.version === 2 || lockFileJson.version === 3) {
 		if (lockFileJson.mopsTomlDepsHash !== getMopsTomlDepsHash()) {
 			console.error('Integrity check failed');
 			console.error('Mismatched mops.toml dependencies hash');
@@ -187,6 +214,22 @@ export async function checkLockFile(force = false) {
 		}
 	}
 
+	// V3: check locked deps (including GitHub and local packages)
+	if (lockFileJson.version === 3) {
+		let lockedDeps = {...lockFileJson.deps};
+		let resolvedDeps = await resolvePackages();
+
+		for (let name of Object.keys(resolvedDeps)) {
+			if (lockedDeps[name] !== resolvedDeps[name]) {
+				console.error('Integrity check failed');
+				console.error(`Mismatched package ${name}`);
+				console.error(`Locked: ${lockedDeps[name]}`);
+				console.error(`Actual: ${resolvedDeps[name]}`);
+				process.exit(1);
+			}
+		}
+	}
+
 	// check number of packages
 	if (Object.keys(lockFileJson.hashes).length !== packageIds.length) {
 		console.error('Integrity check failed');

package/mops.ts

@@ -8,7 +8,7 @@ import prompts from 'prompts';
 import fetch from 'node-fetch';
 
 import {decodeFile} from './pem.js';
-import {Config} from './types.js';
+import {Config, Dependency} from './types.js';
 import {mainActor, storageActor} from './api/actors.js';
 import {getNetwork} from './api/network.js';
 import {getHighestVersion} from './api/getHighestVersion.js';
@@ -156,6 +156,19 @@ export function getDependencyType(version : string) {
 	}
 }
 
+export function parseDepValue(name : string, value : string) : Dependency {
+	let depType = getDependencyType(value);
+	if (depType === 'github') {
+		return {name, repo: value, version: ''};
+	}
+	else if (depType === 'local') {
+		return {name, repo: '', path: value, version: ''};
+	}
+	else {
+		return {name, repo: '', version: value};
+	}
+}
+
 export function readConfig(configFile = getClosestConfigFile()) : Config {
 	let text = fs.readFileSync(configFile).toString();
 	let toml = TOML.parse(text);
@@ -165,16 +178,7 @@ export function readConfig(configFile = getClosestConfigFile()) : Config {
 			if (!data || typeof data !== 'string') {
 				throw Error(`Invalid dependency value ${name} = "${data}"`);
 			}
-			let depType = getDependencyType(data);
-			if (depType === 'github') {
-				deps[name] = {name, repo: data, version: ''};
-			}
-			else if (depType === 'local') {
-				deps[name] = {name, repo: '', path: data, version: ''};
-			}
-			else {
-				deps[name] = {name, repo: '', version: data};
-			}
+			deps[name] = parseDepValue(name, data);
 		});
 	};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "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/resolve-packages.ts

@@ -6,12 +6,21 @@ import {VesselConfig, readVesselConfig} from './vessel.js';
 import {Config, Dependency} from './types.js';
 import {getDepCacheDir, getDepCacheName} from './cache.js';
 import {getPackageId} from './helpers/get-package-id.js';
+import {checkLockFileLight, readLockFile} from './integrity.js';
 
 export async function resolvePackages({conflicts = 'ignore' as 'warning' | 'error' | 'ignore'} = {}) : Promise<Record<string, string>> {
 	if (!checkConfigFile()) {
 		return {};
 	}
 
+	if (checkLockFileLight()) {
+		let lockFileJson = readLockFile();
+
+		if (lockFileJson && lockFileJson.version === 3) {
+			return lockFileJson.deps;
+		}
+	}
+
 	let rootDir = getRootDir();
 	let packages : Record<string, Dependency & {isRoot : boolean;}> = {};
 	let versions : Record<string, Array<{

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/vessel.ts

@@ -149,7 +149,7 @@ export const downloadFromGithub = async (repo : string, dest : string, onProgres
 	return promise;
 };
 
-export const installFromGithub = async (name : string, repo : string, {verbose = false, dep = false, silent = false} = {}) => {
+export const installFromGithub = async (name : string, repo : string, {verbose = false, dep = false, silent = false, ignoreTransitive = false} = {}) => {
 	let cacheName = getGithubDepCacheName(name, repo);
 	let cacheDir = getDepCacheDir(cacheName);
 
@@ -183,6 +183,10 @@ export const installFromGithub = async (name : string, repo : string, {verbose =
 		logUpdate.clear();
 	}
 
+	if (ignoreTransitive) {
+		return;
+	}
+
 	const config = await readVesselConfig(cacheDir, {silent});
 
 	if (config) {