ic-mops 0.42.1 → 0.44.0

package/bundle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/cache.ts

@@ -5,6 +5,10 @@ import getFolderSize from 'get-folder-size';
 
 import {getDependencyType, globalCacheDir, parseGithubURL} from './mops.js';
 
+export let show = () => {
+	return globalCacheDir;
+};
+
 export let getDepCacheDir = (cacheName : string) => {
 	return path.join(globalCacheDir, 'packages', cacheName);
 };

package/cli.ts

@@ -13,7 +13,7 @@ import {whoami} from './commands/whoami.js';
 import {installAll} from './commands/install/install-all.js';
 import {search} from './commands/search.js';
 import {add} from './commands/add.js';
-import {cacheSize, cleanCache} from './cache.js';
+import {cacheSize, cleanCache, show} from './cache.js';
 import {test} from './commands/test/test.js';
 import {template} from './commands/template.js';
 import {remove} from './commands/remove.js';
@@ -199,7 +199,7 @@ program
 program
 	.command('cache')
 	.description('Manage cache')
-	.addArgument(new Argument('<sub>').choices(['size', 'clean']))
+	.addArgument(new Argument('<sub>').choices(['size', 'clean', 'show']))
 	.action(async (sub) => {
 		if (sub == 'clean') {
 			await cleanCache();
@@ -209,6 +209,9 @@ program
 			let size = await cacheSize();
 			console.log('Cache size is ' + size);
 		}
+		else if (sub == 'show') {
+			console.log(show());
+		}
 	});
 
 // test

package/commands/install/install-all.ts

@@ -36,7 +36,7 @@ export async function installAll({verbose = false, silent = false, threads, lock
 		logUpdate('Checking integrity...');
 	}
 
-	let installedPackages = await syncLocalCache();
+	let installedPackages = await syncLocalCache({verbose});
 
 	await Promise.all([
 		notifyInstalls(installedPackages),

package/commands/install/sync-local-cache.ts

@@ -28,7 +28,9 @@ export async function syncLocalCache({verbose = false} = {}) : Promise<Record<st
 		}
 
 		return Promise.resolve();
-	}));
+	})).catch((errors) => {
+		throw errors?.[0];
+	});
 
 	return installedDeps;
 }

package/dist/bin/moc-wrapper.sh

@@ -1,3 +1,40 @@
 #!/bin/bash
-mocPath="$(mops toolchain bin moc --fallback)"
-$mocPath "$@"
+
+# set -e
+
+findRootDir() {
+  dir="$(pwd)"
+  while [[ "$dir" != "" && ! -e "$dir/mops.toml" ]]; do
+    dir=${dir%/*}
+  done
+  echo "$dir"
+}
+
+rootDir=$(findRootDir)
+mopsToml="$rootDir/mops.toml"
+
+if [[ $rootDir == "" ]] || [[ ! -f $mopsToml ]]; then
+  echo "mops.toml not found in $rootDir or its parent directories"
+  exit 1;
+fi;
+
+if command -v openssl &> /dev/null; then
+  mopsTomlHash=$(openssl sha256 $mopsToml | awk -F'= ' '{print $2}')
+else
+  mopsTomlHash=$(shasum $mopsToml -a 256 | awk -F' ' '{print $1}')
+fi;
+
+cached="$rootDir/.mops/moc-$mopsTomlHash"
+
+if [ -f $cached ]; then
+  mocPath=$(cat $cached)
+  if [[ "$mocPath" != *"/moc" ]] ; then
+    mocPath="$(mops toolchain bin moc --fallback)"
+    echo -n $mocPath > "$cached"
+  fi;
+else
+  mocPath="$(mops toolchain bin moc --fallback)"
+  echo -n $mocPath > "$cached"
+fi;
+
+$mocPath "$@"

package/dist/cache.d.ts

@@ -1,3 +1,4 @@
+export declare let show: () => string;
 export declare let getDepCacheDir: (cacheName: string) => string;
 export declare let isDepCached: (cacheName: string) => boolean;
 export declare function getDepCacheName(name: string, version: string): string;

package/dist/cache.js

@@ -3,6 +3,9 @@ import path from 'node:path';
 import ncp from 'ncp';
 import getFolderSize from 'get-folder-size';
 import { getDependencyType, globalCacheDir, parseGithubURL } from './mops.js';
+export let show = () => {
+    return globalCacheDir;
+};
 export let getDepCacheDir = (cacheName) => {
     return path.join(globalCacheDir, 'packages', cacheName);
 };

package/dist/cli.js

@@ -12,7 +12,7 @@ import { whoami } from './commands/whoami.js';
 import { installAll } from './commands/install/install-all.js';
 import { search } from './commands/search.js';
 import { add } from './commands/add.js';
-import { cacheSize, cleanCache } from './cache.js';
+import { cacheSize, cleanCache, show } from './cache.js';
 import { test } from './commands/test/test.js';
 import { template } from './commands/template.js';
 import { remove } from './commands/remove.js';
@@ -172,7 +172,7 @@ program
 program
     .command('cache')
     .description('Manage cache')
-    .addArgument(new Argument('<sub>').choices(['size', 'clean']))
+    .addArgument(new Argument('<sub>').choices(['size', 'clean', 'show']))
     .action(async (sub) => {
     if (sub == 'clean') {
         await cleanCache();
@@ -182,6 +182,9 @@ program
         let size = await cacheSize();
         console.log('Cache size is ' + size);
     }
+    else if (sub == 'show') {
+        console.log(show());
+    }
 });
 // test
 program

package/dist/commands/install/install-all.js

@@ -23,7 +23,7 @@ export async function installAll({ verbose = false, silent = false, threads, loc
     if (!silent && lock !== 'ignore') {
         logUpdate('Checking integrity...');
     }
-    let installedPackages = await syncLocalCache();
+    let installedPackages = await syncLocalCache({ verbose });
     await Promise.all([
         notifyInstalls(installedPackages),
         checkIntegrity(lock),

package/dist/commands/install/sync-local-cache.js

@@ -21,6 +21,8 @@ export async function syncLocalCache({ verbose = false } = {}) {
             }
         }
         return Promise.resolve();
-    }));
+    })).catch((errors) => {
+        throw errors?.[0];
+    });
     return installedDeps;
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.42.1",
+  "version": "0.44.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/dist/vessel.js

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import { createLogUpdate } from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
-import { formatGithubDir, parseGithubURL, progressBar } from './mops.js';
+import { parseGithubURL, progressBar } from './mops.js';
 import { getDepCacheDir, getGithubDepCacheName, isDepCached } from './cache.js';
 const dhallFileToJson = async (filePath, silent) => {
     if (existsSync(filePath)) {
@@ -117,7 +117,6 @@ export const downloadFromGithub = async (repo, dest, onProgress) => {
     return promise;
 };
 export const installFromGithub = async (name, repo, { verbose = false, dep = false, silent = false } = {}) => {
-    let dir = formatGithubDir(name, repo);
     let cacheName = getGithubDepCacheName(name, repo);
     let cacheDir = getDepCacheDir(cacheName);
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
@@ -144,7 +143,7 @@ export const installFromGithub = async (name, repo, { verbose = false, dep = fal
     else {
         logUpdate.clear();
     }
-    const config = await readVesselConfig(dir, { silent });
+    const config = await readVesselConfig(cacheDir, { silent });
     if (config) {
         for (const { name, repo } of config.dependencies) {
             if (repo) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.42.1",
+  "version": "0.44.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",

package/vessel.ts

@@ -8,7 +8,7 @@ import chalk from 'chalk';
 import {createLogUpdate} from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
-import {formatGithubDir, parseGithubURL, progressBar} from './mops.js';
+import {parseGithubURL, progressBar} from './mops.js';
 import {getDepCacheDir, getGithubDepCacheName, isDepCached} from './cache.js';
 
 const dhallFileToJson = async (filePath : string, silent : boolean) => {
@@ -150,7 +150,6 @@ export const downloadFromGithub = async (repo : string, dest : string, onProgres
 };
 
 export const installFromGithub = async (name : string, repo : string, {verbose = false, dep = false, silent = false} = {}) => {
-	let dir = formatGithubDir(name, repo);
 	let cacheName = getGithubDepCacheName(name, repo);
 	let cacheDir = getDepCacheDir(cacheName);
 
@@ -184,7 +183,7 @@ export const installFromGithub = async (name : string, repo : string, {verbose =
 		logUpdate.clear();
 	}
 
-	const config = await readVesselConfig(dir, {silent});
+	const config = await readVesselConfig(cacheDir, {silent});
 
 	if (config) {
 		for (const {name, repo} of config.dependencies) {