ic-mops 0.34.4 → 0.36.0

package/integrity.ts

@@ -12,19 +12,19 @@ type LockFileV1 = {
 	hashes: Record<string, Record<string, string>>;
 };
 
-export async function checkIntegrity(lock?: 'save' | 'check' | 'ignore') {
+export async function checkIntegrity(lock?: 'check' | 'update' | 'ignore') {
 	let force = !!lock;
 
 	if (!lock && !process.env['CI'] && fs.existsSync(path.join(getRootDir(), 'mops.lock'))) {
-		lock = 'save';
+		lock = 'update';
 	}
 
 	if (!lock) {
 		lock = process.env['CI'] ? 'check' : 'ignore';
 	}
 
-	if (lock === 'save') {
-		await saveLockFile();
+	if (lock === 'update') {
+		await updateLockFile();
 		await checkLockFile(force);
 	}
 	else if (lock === 'check') {
@@ -82,7 +82,7 @@ export async function checkRemote() {
 	}
 }
 
-export async function saveLockFile() {
+export async function updateLockFile() {
 	let rootDir = getRootDir();
 	let lockFile = path.join(rootDir, 'mops.lock');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.34.4",
+  "version": "0.36.0",
   "type": "module",
   "bin": {
     "mops": "dist/cli.js"
@@ -19,7 +19,7 @@
   "author": "Zen Voich <zen.voich@gmail.com>",
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "scripts": {
     "build": "tsc",
@@ -37,6 +37,7 @@
     "@dfinity/identity": "^0.18.1",
     "@dfinity/identity-secp256k1": "^0.18.1",
     "@dfinity/principal": "^0.18.1",
+    "@hadronous/pic": "0.2.0",
     "@iarna/toml": "^2.2.5",
     "@noble/hashes": "1.3.2",
     "as-table": "^1.0.55",
@@ -55,7 +56,7 @@
     "glob": "^10.3.3",
     "globby": "^13.2.2",
     "got": "13.0.0",
-    "log-update": "^5.0.1",
+    "log-update": "6.0.0",
     "markdown-table": "3.0.3",
     "mdast-util-from-markdown": "^2.0.0",
     "mdast-util-to-markdown": "^2.1.0",
@@ -65,6 +66,7 @@
     "pem-file": "^1.0.1",
     "prompts": "^2.4.2",
     "stream-to-promise": "^3.0.0",
+    "string-width": "7.0.0",
     "tar": "^6.1.15"
   },
   "devDependencies": {
@@ -78,7 +80,13 @@
     "@types/stream-to-promise": "^2.2.1",
     "@types/tar": "^6.1.5",
     "esbuild": "^0.18.16",
-    "tsx": "^3.12.7",
+    "tsx": "4.6.2",
     "typescript": "^5.1.6"
+  },
+  "overrides": {
+    "@dfinity/agent": "^0.18.1",
+    "@dfinity/identity": "^0.18.1",
+    "@dfinity/principal": "^0.18.1",
+    "@dfinity/candid": "^0.18.1"
   }
 }

package/dist/helpers/download-package-files.d.ts

@@ -1,12 +0,0 @@
-import { Principal } from '@dfinity/principal';
-import { Storage } from '../declarations/storage/storage.did.js';
-export declare function downloadPackageFiles(pkg: string, version?: string, threads?: number, onLoad?: (_fileIds: string[], _fileId: string) => void): Promise<Map<string, string>>;
-export declare function getPackageFilesInfo(pkg: string, version: string): Promise<{
-    storageId: Principal;
-    fileIds: string[];
-}>;
-export declare function getFileIds(pkg: string, version: string): Promise<string[]>;
-export declare function downloadFile(storage: Storage, fileId: string): Promise<{
-    path: string;
-    data: Array<number>;
-}>;

package/dist/helpers/download-package-files.js

@@ -1,62 +0,0 @@
-import { mainActor, storageActor } from '../mops.js';
-import { parallel } from '../parallel.js';
-import { resolveVersion } from './resolve-version.js';
-export async function downloadPackageFiles(pkg, version = '', threads = 8, onLoad = (_fileIds, _fileId) => { }) {
-    version = await resolveVersion(pkg, version);
-    let { storageId, fileIds } = await getPackageFilesInfo(pkg, version);
-    let storage = await storageActor(storageId);
-    let filesData = new Map;
-    await parallel(threads, fileIds, async (fileId) => {
-        let { path, data } = await downloadFile(storage, fileId);
-        filesData.set(path, data);
-        onLoad(fileIds, fileId);
-    });
-    return filesData;
-}
-// get package files meta
-export async function getPackageFilesInfo(pkg, version) {
-    let actor = await mainActor();
-    let [packageDetailsRes, fileIds] = await Promise.all([
-        actor.getPackageDetails(pkg, version),
-        getFileIds(pkg, version),
-    ]);
-    if ('err' in packageDetailsRes) {
-        throw packageDetailsRes.err;
-    }
-    let packageDetails = packageDetailsRes.ok;
-    return {
-        storageId: packageDetails.publication.storage,
-        fileIds,
-    };
-}
-// get package files ids
-export async function getFileIds(pkg, version) {
-    let actor = await mainActor();
-    let fileIdsRes = await actor.getFileIds(pkg, version);
-    if ('err' in fileIdsRes) {
-        throw fileIdsRes.err;
-    }
-    let filesIds = fileIdsRes.ok;
-    return filesIds;
-}
-// download single file
-export async function downloadFile(storage, fileId) {
-    let fileMetaRes = await storage.getFileMeta(fileId);
-    if ('err' in fileMetaRes) {
-        throw fileMetaRes.err;
-    }
-    let fileMeta = fileMetaRes.ok;
-    let data = [];
-    for (let i = 0n; i < fileMeta.chunkCount; i++) {
-        let chunkRes = await storage.downloadChunk(fileId, i);
-        if ('err' in chunkRes) {
-            throw chunkRes.err;
-        }
-        let chunk = chunkRes.ok;
-        data = [...data, ...chunk];
-    }
-    return {
-        path: fileMeta.path,
-        data: data,
-    };
-}

package/dist/helpers/resolve-version.d.ts

@@ -1 +0,0 @@
-export declare function resolveVersion(pkg: string, version?: string): Promise<string>;

package/dist/helpers/resolve-version.js

@@ -1,11 +0,0 @@
-import { getHighestVersion } from '../mops.js';
-export async function resolveVersion(pkg, version = '') {
-    if (!version) {
-        let versionRes = await getHighestVersion(pkg);
-        if ('err' in versionRes) {
-            throw versionRes.err;
-        }
-        version = versionRes.ok;
-    }
-    return version;
-}