ic-mops 0.41.0 → 0.42.0

package/dist/declarations/main/main.did.js

@@ -62,7 +62,8 @@ export const idlFactory = ({ IDL }) => {
     'repo' : IDL.Text,
     'version' : IDL.Text,
   });
-  const PackageConfigV2__1 = IDL.Record({
+  const Requirement = IDL.Record({ 'value' : IDL.Text, 'name' : IDL.Text });
+  const PackageConfigV3 = IDL.Record({
     'dfx' : IDL.Text,
     'moc' : IDL.Text,
     'scripts' : IDL.Vec(Script),
@@ -77,6 +78,7 @@ export const idlFactory = ({ IDL }) => {
     'devDependencies' : IDL.Vec(DependencyV2),
     'repository' : IDL.Text,
     'dependencies' : IDL.Vec(DependencyV2),
+    'requirements' : IDL.Vec(Requirement),
     'license' : IDL.Text,
     'readme' : IDL.Text,
   });
@@ -92,7 +94,7 @@ export const idlFactory = ({ IDL }) => {
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
-    'config' : PackageConfigV2__1,
+    'config' : PackageConfigV3,
     'publication' : PackagePublication,
   });
   const BenchmarkMetric = IDL.Text;
@@ -118,7 +120,7 @@ export const idlFactory = ({ IDL }) => {
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
-    'config' : PackageConfigV2__1,
+    'config' : PackageConfigV3,
     'publication' : PackagePublication,
   });
   const TestStats__1 = IDL.Record({
@@ -158,7 +160,7 @@ export const idlFactory = ({ IDL }) => {
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
-    'config' : PackageConfigV2__1,
+    'config' : PackageConfigV3,
     'changes' : PackageChanges,
     'publication' : PackagePublication,
   });
@@ -177,7 +179,7 @@ export const idlFactory = ({ IDL }) => {
     'dependents' : IDL.Vec(PackageSummary__1),
     'devDeps' : IDL.Vec(PackageSummary__1),
     'downloadsInLast7Days' : IDL.Nat,
-    'config' : PackageConfigV2__1,
+    'config' : PackageConfigV3,
     'changes' : PackageChanges,
     'publication' : PackagePublication,
   });
@@ -189,7 +191,7 @@ export const idlFactory = ({ IDL }) => {
     'downloadsTotal' : IDL.Nat,
     'downloadsInLast30Days' : IDL.Nat,
     'downloadsInLast7Days' : IDL.Nat,
-    'config' : PackageConfigV2__1,
+    'config' : PackageConfigV3,
     'changes' : PackageChanges,
     'publication' : PackagePublication,
   });
@@ -245,7 +247,7 @@ export const idlFactory = ({ IDL }) => {
   const PageCount = IDL.Nat;
   const Result_1 = IDL.Variant({ 'ok' : IDL.Null, 'err' : IDL.Text });
   const Result_3 = IDL.Variant({ 'ok' : FileId, 'err' : Err });
-  const PackageConfigV2 = IDL.Record({
+  const PackageConfigV3_Publishing = IDL.Record({
     'dfx' : IDL.Text,
     'moc' : IDL.Text,
     'scripts' : IDL.Vec(Script),
@@ -260,6 +262,7 @@ export const idlFactory = ({ IDL }) => {
     'devDependencies' : IDL.Vec(DependencyV2),
     'repository' : IDL.Text,
     'dependencies' : IDL.Vec(DependencyV2),
+    'requirements' : IDL.Opt(IDL.Vec(Requirement)),
     'license' : IDL.Text,
     'readme' : IDL.Text,
   });
@@ -379,7 +382,7 @@ export const idlFactory = ({ IDL }) => {
         [Result_3],
         [],
       ),
-    'startPublish' : IDL.Func([PackageConfigV2], [Result_2], []),
+    'startPublish' : IDL.Func([PackageConfigV3_Publishing], [Result_2], []),
     'transferOwnership' : IDL.Func(
         [PackageName, IDL.Principal],
         [Result_1],

package/dist/declarations/storage/storage.did.d.ts

@@ -1,5 +1,6 @@
 import type { Principal } from '@dfinity/principal';
 import type { ActorMethod } from '@dfinity/agent';
+import type { IDL } from '@dfinity/candid';
 
 export type Chunk = Array<number>;
 export type Err = string;
@@ -35,3 +36,5 @@ export interface StorageStats {
   'memorySize' : bigint,
 }
 export interface _SERVICE extends Storage {}
+export declare const idlFactory: IDL.InterfaceFactory;
+export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/dist/fix-dist.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/fix-dist.js

@@ -0,0 +1,9 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+// remove scripts
+let text = readFileSync('dist/package.json', 'utf8');
+let json = JSON.parse(text);
+delete json.scripts;
+// dist/bin/cli.js -> bin/cli.js
+json.bin.mops = 'bin/mops.js';
+json.bin['ic-mops'] = 'bin/mops.js';
+writeFileSync('dist/package.json', JSON.stringify(json, null, 2));

package/dist/helpers/get-moc-path.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import { execSync } from 'node:child_process';
 export function getMocPath() {
     let mocPath = process.env.DFX_MOC_PATH;

package/dist/integrity.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { sha256 } from '@noble/hashes/sha256';

package/dist/mops.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import TOML from '@iarna/toml';
@@ -9,8 +10,8 @@ import { decodeFile } from './pem.js';
 import { mainActor, storageActor } from './api/actors.js';
 import { getNetwork } from './api/network.js';
 import { getHighestVersion } from './api/getHighestVersion.js';
-if (!global.fetch) {
-    global.fetch = fetch;
+if (!globalThis.fetch) {
+    globalThis.fetch = fetch;
 }
 // (!) make changes in pair with backend
 export let apiVersion = '1.2';
@@ -179,7 +180,14 @@ export function readConfig(configFile = getClosestConfigFile()) {
     };
     processDeps(toml.dependencies || {});
     processDeps(toml['dev-dependencies'] || {});
-    return toml;
+    let config = { ...toml };
+    Object.entries(config.requirements || {}).forEach(([name, value]) => {
+        if (name === 'moc') {
+            config.requirements = config.requirements || {};
+            config.requirements.moc = value;
+        }
+    });
+    return config;
 }
 export function writeConfig(config, configFile = getClosestConfigFile()) {
     let resConfig = JSON.parse(JSON.stringify(config));

package/dist/notify-installs.d.ts

@@ -1 +1 @@
-export declare function notifyInstalls(names: string[]): Promise<void>;
+export declare function notifyInstalls(installedDeps: Record<string, string>): Promise<void>;

package/dist/notify-installs.js

@@ -1,11 +1,14 @@
 import { getDependencyType } from './mops.js';
 import { mainActor } from './api/actors.js';
-import { resolvePackages } from './resolve-packages.js';
-export async function notifyInstalls(names) {
-    let resolvedPackages = await resolvePackages();
-    let packages = names.map(name => [name, resolvedPackages[name]]);
+export async function notifyInstalls(installedDeps) {
+    let packages = Object.entries(installedDeps).filter(([_, version]) => getDependencyType(version) === 'mops');
     if (packages.length) {
         let actor = await mainActor();
-        await actor.notifyInstalls(packages.filter(([_, version]) => getDependencyType(version) === 'mops'));
+        try {
+            await actor.notifyInstalls(packages);
+        }
+        catch (err) {
+            // verbose && console.error('Failed to notify installs:', err);
+        }
     }
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",
@@ -42,7 +42,7 @@
     "decomp-tarxz": "0.1.1",
     "decompress": "^4.2.1",
     "del": "7.1.0",
-    "dhall-to-json-cli": "^1.7.6",
+    "dhall-to-json-cli": "1.7.6",
     "eslint": "8.57.0",
     "execa": "8.0.1",
     "fs-extra": "11.2.0",
@@ -81,7 +81,7 @@
     "bun": "1.0.35",
     "esbuild": "0.20.1",
     "tsx": "4.7.1",
-    "typescript": "5.3.2"
+    "typescript": "5.4.3"
   },
   "overrides": {
     "@dfinity/agent": "^0.19.3",

package/dist/pem.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
+import { Buffer } from 'node:buffer';
 import { Ed25519KeyIdentity } from '@dfinity/identity';
 import { Secp256k1KeyIdentity } from '@dfinity/identity-secp256k1';
 export declare function decodeFile(file: string, password?: string): Secp256k1KeyIdentity | Ed25519KeyIdentity;

package/dist/pem.js

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
+import { Buffer } from 'node:buffer';
+import crypto from 'node:crypto';
 import { Ed25519KeyIdentity } from '@dfinity/identity';
 import { Secp256k1KeyIdentity } from '@dfinity/identity-secp256k1';
 import pemfile from 'pem-file';
-import crypto from 'crypto';
 export function decodeFile(file, password) {
     let rawKey = fs.readFileSync(file);
     if (password) {

package/dist/resolve-packages.js

@@ -1,7 +1,9 @@
+import process from 'node:process';
 import path from 'node:path';
 import chalk from 'chalk';
-import { checkConfigFile, formatDir, formatGithubDir, getRootDir, parseGithubURL, readConfig } from './mops.js';
+import { checkConfigFile, getRootDir, parseGithubURL, readConfig } from './mops.js';
 import { readVesselConfig } from './vessel.js';
+import { getDepCacheDir, getDepCacheName } from './cache.js';
 export async function resolvePackages({ verbose = false } = {}) {
     if (!checkConfigFile()) {
         return {};
@@ -61,23 +63,23 @@ export async function resolvePackages({ verbose = false } = {}) {
                 }
             }
             let nestedConfig;
-            let nestedDir = '';
+            let localNestedDir = '';
             // read nested config
             if (repo) {
-                nestedDir = formatGithubDir(name, repo);
-                nestedConfig = await readVesselConfig(nestedDir, { silent: true }) || {};
+                let cacheDir = getDepCacheName(name, repo);
+                nestedConfig = await readVesselConfig(getDepCacheDir(cacheDir), { silent: true }) || {};
             }
             else if (pkgDetails.path) {
-                nestedDir = path.resolve(configDir, pkgDetails.path);
-                nestedConfig = readConfig(nestedDir + '/mops.toml');
+                localNestedDir = path.resolve(configDir, pkgDetails.path);
+                nestedConfig = readConfig(localNestedDir + '/mops.toml');
             }
             else if (version) {
-                nestedDir = formatDir(name, version);
-                nestedConfig = readConfig(nestedDir + '/mops.toml');
+                let cacheDir = getDepCacheName(name, version);
+                nestedConfig = readConfig(getDepCacheDir(cacheDir) + '/mops.toml');
             }
             // collect nested deps
             if (nestedConfig) {
-                await collectDeps(nestedConfig, nestedDir);
+                await collectDeps(nestedConfig, localNestedDir);
             }
             if (!versions[name]) {
                 versions[name] = [];

package/dist/types.d.ts

@@ -18,6 +18,7 @@ export type Config = {
     dependencies?: Dependencies;
     'dev-dependencies'?: Dependencies;
     toolchain?: Toolchain;
+    requirements?: Requirements;
 };
 export type Dependencies = Record<string, Dependency>;
 export type Dependency = {
@@ -32,3 +33,6 @@ export type Toolchain = {
     'pocket-ic'?: string;
 };
 export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';
+export type Requirements = {
+    moc?: string;
+};

package/dist/vessel.js

@@ -1,14 +1,15 @@
+import process from 'node:process';
 import { existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
+import { pipeline } from 'node:stream';
 import { deleteSync } from 'del';
 import { execaCommand } from 'execa';
 import chalk from 'chalk';
 import { createLogUpdate } from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
-import { pipeline } from 'stream';
 import { formatGithubDir, parseGithubURL, progressBar } from './mops.js';
-import { addCache, copyCache, isCached } from './cache.js';
+import { getDepCacheDir, getGithubDepCacheName, isDepCached } from './cache.js';
 const dhallFileToJson = async (filePath, silent) => {
     if (existsSync(filePath)) {
         let cwd = new URL(path.dirname(import.meta.url)).pathname;
@@ -116,32 +117,29 @@ export const downloadFromGithub = async (repo, dest, onProgress) => {
     return promise;
 };
 export const installFromGithub = async (name, repo, { verbose = false, dep = false, silent = false } = {}) => {
-    let { branch, commitHash } = parseGithubURL(repo);
     let dir = formatGithubDir(name, repo);
-    let cacheName = `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
+    let cacheName = getGithubDepCacheName(name, repo);
+    let cacheDir = getDepCacheDir(cacheName);
     let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
     if (existsSync(dir)) {
         silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (local cache)`);
     }
-    else if (isCached(cacheName)) {
-        await copyCache(cacheName, dir);
+    else if (isDepCached(cacheName)) {
         silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (global cache)`);
     }
     else {
-        mkdirSync(dir, { recursive: true });
         let progress = (step, total) => {
             silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} ${progressBar(step, total)}`);
         };
-        progress(0, 2 * (1024 ** 2));
+        progress(0, 1024 * 500);
+        mkdirSync(cacheDir, { recursive: true });
         try {
-            await downloadFromGithub(repo, dir, progress);
+            await downloadFromGithub(repo, cacheDir, progress);
         }
         catch (err) {
-            deleteSync([dir]);
+            deleteSync([cacheDir]);
             process.exit(1);
         }
-        // add to cache
-        await addCache(cacheName, dir);
     }
     if (verbose) {
         silent || logUpdate.done();

package/{remove-scripts.ts → fix-dist.ts}

@@ -1,6 +1,12 @@
 import {readFileSync, writeFileSync} from 'node:fs';
 
+// remove scripts
 let text = readFileSync('dist/package.json', 'utf8');
 let json = JSON.parse(text);
 delete json.scripts;
+
+// dist/bin/cli.js -> bin/cli.js
+json.bin.mops = 'bin/mops.js';
+json.bin['ic-mops'] = 'bin/mops.js';
+
 writeFileSync('dist/package.json', JSON.stringify(json, null, 2));

package/helpers/get-moc-path.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import {execSync} from 'node:child_process';
 
 export function getMocPath() : string {

package/integrity.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
 import {sha256} from '@noble/hashes/sha256';

package/mops.ts

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import {Identity} from '@dfinity/agent';
@@ -14,8 +15,8 @@ import {getNetwork} from './api/network.js';
 import {getHighestVersion} from './api/getHighestVersion.js';
 
 
-if (!global.fetch) {
-	global.fetch = fetch as any;
+if (!globalThis.fetch) {
+	globalThis.fetch = fetch as any;
 }
 
 // (!) make changes in pair with backend
@@ -206,7 +207,16 @@ export function readConfig(configFile = getClosestConfigFile()) : Config {
 	processDeps(toml.dependencies || {});
 	processDeps(toml['dev-dependencies'] || {});
 
-	return toml;
+	let config : Config = {...toml};
+
+	Object.entries(config.requirements || {}).forEach(([name, value]) => {
+		if (name === 'moc') {
+			config.requirements = config.requirements || {};
+			config.requirements.moc = value;
+		}
+	});
+
+	return config;
 }
 
 export function writeConfig(config : Config, configFile = getClosestConfigFile()) {

package/notify-installs.ts

@@ -1,12 +1,16 @@
 import {getDependencyType} from './mops.js';
 import {mainActor} from './api/actors.js';
-import {resolvePackages} from './resolve-packages.js';
 
-export async function notifyInstalls(names : string[]) {
-	let resolvedPackages = await resolvePackages();
-	let packages : [string, string][] = names.map(name => [name, resolvedPackages[name] as string]);
+export async function notifyInstalls(installedDeps : Record<string, string>) {
+	let packages = Object.entries(installedDeps).filter(([_, version]) => getDependencyType(version) === 'mops');
 	if (packages.length) {
 		let actor = await mainActor();
-		await actor.notifyInstalls(packages.filter(([_, version]) => getDependencyType(version) === 'mops'));
+
+		try {
+			await actor.notifyInstalls(packages);
+		}
+		catch (err) {
+			// verbose && console.error('Failed to notify installs:', err);
+		}
 	}
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "ic-mops",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "type": "module",
   "bin": {
-    "mops": "bin/mops.js",
-    "ic-mops": "bin/mops.js",
+    "mops": "dist/bin/mops.js",
+    "ic-mops": "dist/bin/mops.js",
     "moc-wrapper": "bin/moc-wrapper.sh"
   },
   "files": [
@@ -31,8 +31,8 @@
     "bundle:package-json": "tsx bundle-package-json.ts",
     "bundle:tar": "tar -czvf bundle/cli.tgz bundle",
     "copy": "cp -r commands/bench dist/commands && cp -r declarations templates package.json bin dist | true",
-    "prepare": "npm run build && npm run copy && npm run remove-scripts",
-    "remove-scripts": "tsx ./remove-scripts.ts",
+    "prepare": "npm run build && npm run copy && npm run fix-dist",
+    "fix-dist": "tsx ./fix-dist.ts",
     "release": "tsx release-cli.ts",
     "check": "tsc --project tsconfig.json --noEmit",
     "tsc": "tsc",
@@ -57,7 +57,7 @@
     "decomp-tarxz": "0.1.1",
     "decompress": "^4.2.1",
     "del": "7.1.0",
-    "dhall-to-json-cli": "^1.7.6",
+    "dhall-to-json-cli": "1.7.6",
     "eslint": "8.57.0",
     "execa": "8.0.1",
     "fs-extra": "11.2.0",
@@ -96,7 +96,7 @@
     "bun": "1.0.35",
     "esbuild": "0.20.1",
     "tsx": "4.7.1",
-    "typescript": "5.3.2"
+    "typescript": "5.4.3"
   },
   "overrides": {
     "@dfinity/agent": "^0.19.3",

package/pem.ts

@@ -1,8 +1,9 @@
 import fs from 'node:fs';
+import {Buffer} from 'node:buffer';
+import crypto from 'node:crypto';
 import {Ed25519KeyIdentity} from '@dfinity/identity';
 import {Secp256k1KeyIdentity} from '@dfinity/identity-secp256k1';
 import pemfile from 'pem-file';
-import crypto from 'crypto';
 
 export function decodeFile(file : string, password ?: string) {
 	let rawKey = fs.readFileSync(file);

package/resolve-packages.ts

@@ -1,8 +1,10 @@
+import process from 'node:process';
 import path from 'node:path';
 import chalk from 'chalk';
-import {checkConfigFile, formatDir, formatGithubDir, getRootDir, parseGithubURL, readConfig} from './mops.js';
+import {checkConfigFile, getRootDir, parseGithubURL, readConfig} from './mops.js';
 import {VesselConfig, readVesselConfig} from './vessel.js';
 import {Config, Dependency} from './types.js';
+import {getDepCacheDir, getDepCacheName} from './cache.js';
 
 export async function resolvePackages({verbose = false} = {}) : Promise<Record<string, string>> {
 	if (!checkConfigFile()) {
@@ -75,25 +77,25 @@ export async function resolvePackages({verbose = false} = {}) : Promise<Record<s
 			}
 
 			let nestedConfig;
-			let nestedDir = '';
+			let localNestedDir = '';
 
 			// read nested config
 			if (repo) {
-				nestedDir = formatGithubDir(name, repo);
-				nestedConfig = await readVesselConfig(nestedDir, {silent: true}) || {};
+				let cacheDir = getDepCacheName(name, repo);
+				nestedConfig = await readVesselConfig(getDepCacheDir(cacheDir), {silent: true}) || {};
 			}
 			else if (pkgDetails.path) {
-				nestedDir = path.resolve(configDir, pkgDetails.path);
-				nestedConfig = readConfig(nestedDir + '/mops.toml');
+				localNestedDir = path.resolve(configDir, pkgDetails.path);
+				nestedConfig = readConfig(localNestedDir + '/mops.toml');
 			}
 			else if (version) {
-				nestedDir = formatDir(name, version);
-				nestedConfig = readConfig(nestedDir + '/mops.toml');
+				let cacheDir = getDepCacheName(name, version);
+				nestedConfig = readConfig(getDepCacheDir(cacheDir) + '/mops.toml');
 			}
 
 			// collect nested deps
 			if (nestedConfig) {
-				await collectDeps(nestedConfig, nestedDir);
+				await collectDeps(nestedConfig, localNestedDir);
 			}
 
 			if (!versions[name]) {

package/tsconfig.json

@@ -13,6 +13,7 @@
 		"noUnusedLocals": false,
 		"noUnusedParameters": false,
 		"noPropertyAccessFromIndexSignature": false,
+		"exactOptionalPropertyTypes": false,
 		"declaration": true
 	}
 }

package/types.ts

@@ -18,6 +18,7 @@ export type Config = {
 	dependencies ?: Dependencies;
 	'dev-dependencies' ?: Dependencies;
 	toolchain ?: Toolchain;
+	requirements ?: Requirements;
 };
 
 export type Dependencies = Record<string, Dependency>;
@@ -27,7 +28,7 @@ export type Dependency = {
 	version ?: string; // mops package
 	repo ?: string; // github package
 	path ?: string; // local package
-}
+};
 
 export type Toolchain = {
 	moc ?: string;
@@ -35,4 +36,8 @@ export type Toolchain = {
 	'pocket-ic' ?: string;
 };
 
-export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';
+export type Tool = 'moc' | 'wasmtime' | 'pocket-ic';
+
+export type Requirements = {
+	moc ?: string;
+};

package/vessel.ts

@@ -1,14 +1,15 @@
+import process from 'node:process';
 import {existsSync, mkdirSync, createWriteStream, readFileSync, writeFileSync} from 'node:fs';
 import path from 'node:path';
+import {pipeline} from 'node:stream';
 import {deleteSync} from 'del';
 import {execaCommand} from 'execa';
 import chalk from 'chalk';
 import {createLogUpdate} from 'log-update';
 import got from 'got';
 import decompress from 'decompress';
-import {pipeline} from 'stream';
 import {formatGithubDir, parseGithubURL, progressBar} from './mops.js';
-import {addCache, copyCache, isCached} from './cache.js';
+import {getDepCacheDir, getGithubDepCacheName, isDepCached} from './cache.js';
 
 const dhallFileToJson = async (filePath : string, silent : boolean) => {
 	if (existsSync(filePath)) {
@@ -149,38 +150,35 @@ export const downloadFromGithub = async (repo : string, dest : string, onProgres
 };
 
 export const installFromGithub = async (name : string, repo : string, {verbose = false, dep = false, silent = false} = {}) => {
-	let {branch, commitHash} = parseGithubURL(repo);
 	let dir = formatGithubDir(name, repo);
-	let cacheName = `_github/${name}#${branch}` + (commitHash ? `@${commitHash}` : '');
+	let cacheName = getGithubDepCacheName(name, repo);
+	let cacheDir = getDepCacheDir(cacheName);
 
 	let logUpdate = createLogUpdate(process.stdout, {showCursor: true});
 
 	if (existsSync(dir)) {
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (local cache)`);
 	}
-	else if (isCached(cacheName)) {
-		await copyCache(cacheName, dir);
+	else if (isDepCached(cacheName)) {
 		silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} (global cache)`);
 	}
 	else {
-		mkdirSync(dir, {recursive: true});
 
 		let progress = (step : number, total : number) => {
 			silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${repo} ${progressBar(step, total)}`);
 		};
 
-		progress(0, 2 * (1024 ** 2));
+		progress(0, 1024 * 500);
+
+		mkdirSync(cacheDir, {recursive: true});
 
 		try {
-			await downloadFromGithub(repo, dir, progress);
+			await downloadFromGithub(repo, cacheDir, progress);
 		}
 		catch (err) {
-			deleteSync([dir]);
+			deleteSync([cacheDir]);
 			process.exit(1);
 		}
-
-		// add to cache
-		await addCache(cacheName, dir);
 	}
 
 	if (verbose) {