ic-mops 0.41.0 → 0.42.0

package/dist/commands/install/install-mops-dep.js

@@ -0,0 +1,103 @@
+import process from 'node:process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { Buffer } from 'node:buffer';
+import { createLogUpdate } from 'log-update';
+import chalk from 'chalk';
+import { deleteSync } from 'del';
+import { checkConfigFile, formatDir, progressBar, readConfig } from '../../mops.js';
+import { getHighestVersion } from '../../api/getHighestVersion.js';
+import { storageActor } from '../../api/actors.js';
+import { parallel } from '../../parallel.js';
+import { getDepCacheDir, getMopsDepCacheName, isDepCached } from '../../cache.js';
+import { downloadFile, getPackageFilesInfo } from '../../api/downloadPackageFiles.js';
+import { installDeps } from './install-deps.js';
+export async function installMopsDep(pkg, version = '', { verbose, silent, dep, threads } = {}) {
+    threads = threads || 12;
+    if (!checkConfigFile()) {
+        return false;
+    }
+    let logUpdate = createLogUpdate(process.stdout, { showCursor: true });
+    // progress
+    let total = Infinity;
+    let step = 0;
+    let progress = () => {
+        step++;
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} ${progressBar(step, total)}`);
+    };
+    progress();
+    if (!version) {
+        let versionRes = await getHighestVersion(pkg);
+        if ('err' in versionRes) {
+            console.log(chalk.red('Error: ') + versionRes.err);
+            return false;
+        }
+        version = versionRes.ok;
+    }
+    let dir = formatDir(pkg, version);
+    let cacheName = getMopsDepCacheName(pkg, version);
+    let cacheDir = getDepCacheDir(cacheName);
+    let alreadyInstalled = false;
+    // already installed
+    if (fs.existsSync(dir)) {
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (local cache)`);
+        alreadyInstalled = true;
+    }
+    // copy from cache
+    else if (isDepCached(cacheName)) {
+        silent || logUpdate(`${dep ? 'Dependency' : 'Installing'} ${pkg}@${version} (global cache)`);
+    }
+    // download
+    else {
+        // GitHub Actions fails with "fetch failed" if there are multiple concurrent actions
+        if (process.env.GITHUB_ENV) {
+            threads = 4;
+        }
+        try {
+            let { storageId, fileIds } = await getPackageFilesInfo(pkg, version);
+            total = fileIds.length + 2;
+            let filesData = new Map;
+            let storage = await storageActor(storageId);
+            await parallel(threads, fileIds, async (fileId) => {
+                let { path, data } = await downloadFile(storage, fileId);
+                filesData.set(path, data);
+                progress();
+            });
+            // write files to global cache
+            try {
+                for (let [filePath, data] of filesData.entries()) {
+                    fs.mkdirSync(path.join(cacheDir, path.dirname(filePath)), { recursive: true });
+                    fs.writeFileSync(path.join(cacheDir, filePath), Buffer.from(data));
+                }
+            }
+            catch (err) {
+                console.error(chalk.red('Error: ') + err);
+                deleteSync([cacheDir], { force: true });
+                return false;
+            }
+        }
+        catch (err) {
+            console.error(chalk.red('Error: ') + err);
+            return false;
+        }
+        progress();
+    }
+    if (verbose) {
+        silent || logUpdate.done();
+    }
+    else {
+        logUpdate.clear();
+    }
+    // install dependencies
+    let config = readConfig(path.join(cacheDir, 'mops.toml'));
+    let res = await installDeps(Object.values(config.dependencies || {}), { silent, verbose });
+    if (!res) {
+        return false;
+    }
+    let installedDeps = res;
+    // add self to installed deps
+    if (!alreadyInstalled) {
+        installedDeps = { ...installedDeps, [pkg]: version };
+    }
+    return installedDeps;
+}

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

@@ -0,0 +1,3 @@
+export declare function syncLocalCache({ verbose }?: {
+    verbose?: boolean | undefined;
+}): Promise<Record<string, string>>;

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

@@ -0,0 +1,26 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { copyCache, getDepCacheName } from '../../cache.js';
+import { getDependencyType, getRootDir } from '../../mops.js';
+import { resolvePackages } from '../../resolve-packages.js';
+export async function syncLocalCache({ verbose = false } = {}) {
+    let resolvedPackages = await resolvePackages();
+    let rootDir = getRootDir();
+    verbose && console.log('Syncing local cache...');
+    let installedDeps = {};
+    await Promise.all(Object.entries(resolvedPackages).map(([name, value]) => {
+        let depType = getDependencyType(value);
+        if (depType === 'mops' || depType === 'github') {
+            let cacheName = getDepCacheName(name, value);
+            let dest = path.join(rootDir, '.mops', cacheName);
+            if (!fs.existsSync(dest)) {
+                if (depType === 'mops') {
+                    installedDeps[name] = value;
+                }
+                return copyCache(cacheName, path.join(rootDir, '.mops', cacheName));
+            }
+        }
+        return Promise.resolve();
+    }));
+    return installedDeps;
+}

package/dist/commands/install-all.js

@@ -7,6 +7,7 @@ import { installFromGithub } from '../vessel.js';
 import { notifyInstalls } from '../notify-installs.js';
 import { checkIntegrity } from '../integrity.js';
 import { installLocal } from './install-local.js';
+import { checkRequirements } from '../check-requirements.js';
 export async function installAll({ verbose = false, silent = false, lock } = {}) {
     if (!checkConfigFile()) {
         return;
@@ -38,6 +39,7 @@ export async function installAll({ verbose = false, silent = false, lock } = {})
     ]);
     if (!silent) {
         logUpdate.clear();
+        await checkRequirements();
         console.log(chalk.green('Packages installed'));
     }
 }

package/dist/commands/publish.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import fs from 'node:fs';
 import path from 'node:path';
 import chalk from 'chalk';
@@ -22,7 +23,7 @@ export async function publish(options = {}) {
     console.log(`Publishing ${config.package?.name}@${config.package?.version}`);
     // validate
     for (let key of Object.keys(config)) {
-        if (!['package', 'dependencies', 'dev-dependencies', 'toolchain'].includes(key)) {
+        if (!['package', 'dependencies', 'dev-dependencies', 'toolchain', 'requirements'].includes(key)) {
             console.log(chalk.red('Error: ') + `Unknown config section [${key}]`);
             process.exit(1);
         }
@@ -141,6 +142,14 @@ export async function publish(options = {}) {
             }
         }
     }
+    if (config.requirements) {
+        Object.keys(config.requirements).forEach((name) => {
+            if (name !== 'moc') {
+                console.log(chalk.red('Error: ') + `Unknown requirement "${name}"`);
+                return;
+            }
+        });
+    }
     let toBackendDep = (dep) => {
         return {
             ...dep,
@@ -148,6 +157,9 @@ export async function publish(options = {}) {
             repo: dep.repo || '',
         };
     };
+    let toBackendReq = ([name, value]) => {
+        return { name, value };
+    };
     // map fields
     let backendPkgConfig = {
         name: config.package.name,
@@ -166,6 +178,7 @@ export async function publish(options = {}) {
         dependencies: Object.values(config.dependencies || {}).map(toBackendDep),
         devDependencies: Object.values(config['dev-dependencies'] || {}).map(toBackendDep),
         scripts: [],
+        requirements: [Object.entries(config.requirements || {}).map((req) => toBackendReq(req))],
     };
     let defaultFiles = [
         'mops.toml',

package/dist/commands/remove.js

@@ -1,9 +1,11 @@
 import fs from 'node:fs';
 import { deleteSync } from 'del';
 import chalk from 'chalk';
-import { formatDir, formatGithubDir, checkConfigFile, readConfig, writeConfig } from '../mops.js';
+import { checkConfigFile, getRootDir, readConfig, writeConfig } from '../mops.js';
 import { checkIntegrity } from '../integrity.js';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { getDepCacheDir, getDepCacheName } from '../cache.js';
+import path from 'node:path';
+import { syncLocalCache } from './install/sync-local-cache.js';
 export async function remove(name, { dev = false, verbose = false, dryRun = false, lock } = {}) {
     if (!checkConfigFile()) {
         return;
@@ -20,13 +22,12 @@ export async function remove(name, { dev = false, verbose = false, dryRun = fals
         }).flat();
     }
     function getTransitiveDependenciesOf(name, version, repo) {
-        let pkgDir = '';
-        if (repo) {
-            pkgDir = formatGithubDir(name, repo);
-        }
-        else if (version) {
-            pkgDir = formatDir(name, version);
+        let value = version || repo;
+        if (!value) {
+            return [];
         }
+        let cacheName = getDepCacheName(name, value);
+        let pkgDir = getDepCacheDir(cacheName);
         let configFile = pkgDir + '/mops.toml';
         if (!fs.existsSync(configFile)) {
             verbose && console.log('no config', configFile);
@@ -61,16 +62,11 @@ export async function remove(name, { dev = false, verbose = false, dryRun = fals
             verbose && console.log(`Ignored transitive dependency ${depId} (other deps depend on it)`);
             continue;
         }
-        let pkgDir;
-        if (dep.repo) {
-            pkgDir = formatGithubDir(dep.name, dep.repo);
-        }
-        else if (dep.version) {
-            pkgDir = formatDir(dep.name, dep.version);
-        }
-        if (pkgDir && fs.existsSync(pkgDir)) {
-            dryRun || deleteSync([`${pkgDir}`], { force: true });
-            verbose && console.log(`Removed local cache ${pkgDir}`);
+        let cacheName = getDepCacheName(dep.name, dep.version || dep.repo || '');
+        let localCacheDir = path.join(getRootDir(), '.mops', cacheName);
+        if (localCacheDir && fs.existsSync(localCacheDir)) {
+            dryRun || deleteSync([localCacheDir], { force: true });
+            verbose && console.log(`Removed local cache ${localCacheDir}`);
         }
     }
     // remove from config
@@ -81,6 +77,7 @@ export async function remove(name, { dev = false, verbose = false, dryRun = fals
         delete config['dev-dependencies'][name];
     }
     dryRun || writeConfig(config);
+    await syncLocalCache();
     await checkIntegrity(lock);
     console.log(chalk.green('Package removed ') + `${name} = "${version}"`);
 }

package/dist/commands/search.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import asTable from 'as-table';
 import chalk from 'chalk';
 import { mainActor } from '../api/actors.js';

package/dist/commands/self.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import child_process, { execSync } from 'node:child_process';
 import chalk from 'chalk';
 import { version, globalConfigDir } from '../mops.js';

package/dist/commands/sources.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import { checkConfigFile, formatDir, formatGithubDir, getDependencyType, readConfig } from '../mops.js';

package/dist/commands/sync.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import { execSync } from 'node:child_process';
 import { globSync } from 'glob';

package/dist/commands/test/test.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 import fs from 'node:fs';

package/dist/commands/toolchain/index.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -6,6 +7,7 @@ import chalk from 'chalk';
 import prompts from 'prompts';
 import { createLogUpdate } from 'log-update';
 import { checkConfigFile, getClosestConfigFile, getRootDir, globalCacheDir, readConfig, writeConfig } from '../../mops.js';
+import { checkRequirements } from '../../check-requirements.js';
 import * as moc from './moc.js';
 import * as pocketIc from './pocket-ic.js';
 import * as wasmtime from './wasmtime.js';
@@ -204,6 +206,7 @@ async function use(tool, version) {
     let oldVersion = config.toolchain[tool];
     config.toolchain[tool] = version;
     writeConfig(config);
+    await checkRequirements();
     if (oldVersion === version) {
         console.log((`${tool} ${version} is already installed`));
     }
@@ -230,6 +233,9 @@ async function update(tool) {
         let oldVersion = config.toolchain[tool];
         config.toolchain[tool] = version;
         writeConfig(config);
+        if (tool === 'moc') {
+            await checkRequirements();
+        }
         if (oldVersion === version) {
             console.log((`Latest ${tool} ${version} is already installed`));
         }

package/dist/commands/toolchain/moc.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'fs-extra';
 import { globalCacheDir } from '../../mops.js';

package/dist/commands/toolchain/pocket-ic.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'node:fs';
 import { globalCacheDir } from '../../mops.js';

package/dist/commands/toolchain/toolchain-utils.js

@@ -1,4 +1,6 @@
+import process from 'node:process';
 import path from 'node:path';
+import { Buffer } from 'node:buffer';
 import { unzipSync } from 'node:zlib';
 import { chmodSync } from 'node:fs';
 import fs from 'fs-extra';

package/dist/commands/toolchain/wasmtime.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import path from 'node:path';
 import fs from 'fs-extra';
 import { globalCacheDir } from '../../mops.js';

package/dist/commands/transfer-ownership.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import chalk from 'chalk';
 import { checkConfigFile, getIdentity, readConfig } from '../mops.js';
 import { mainActor } from '../api/actors.js';

package/dist/commands/user.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import chalk from 'chalk';
 import { getIdentity } from '../mops.js';
 import { mainActor } from '../api/actors.js';

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

@@ -26,4 +26,4 @@ export interface anon_class_10_1 {
 }
 export interface _SERVICE extends anon_class_10_1 {}
 export declare const idlFactory: IDL.InterfaceFactory;
-export declare const init: ({ IDL }: { IDL: IDL }) => IDL.Type[];
+export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];

package/dist/declarations/bench/index.js

@@ -4,15 +4,6 @@ import { Actor, HttpAgent } from "@dfinity/agent";
 import { idlFactory } from "./bench.did.js";
 export { idlFactory } from "./bench.did.js";
 
-/* CANISTER_ID is replaced by webpack based on node environment
- * Note: canister environment variable will be standardized as
- * process.env.CANISTER_ID_<CANISTER_NAME_UPPERCASE>
- * beginning in dfx 0.15.0
- */
-export const canisterId =
-  process.env.CANISTER_ID_BENCH ||
-  process.env.BENCH_CANISTER_ID;
-
 export const createActor = (canisterId, options = {}) => {
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });
 

package/dist/declarations/main/index.js

@@ -10,8 +10,7 @@ export { idlFactory } from "./main.did.js";
  * beginning in dfx 0.15.0
  */
 export const canisterId =
-  process.env.CANISTER_ID_MAIN ||
-  process.env.MAIN_CANISTER_ID;
+  process.env.CANISTER_ID_MAIN;
 
 export const createActor = (canisterId, options = {}) => {
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });

package/dist/declarations/main/main.did

@@ -132,6 +132,11 @@ type Response =
    streaming_strategy: opt StreamingStrategy;
    upgrade: opt bool;
  };
+type Requirement = 
+ record {
+   name: text;
+   value: text;
+ };
 type Request = 
  record {
    body: blob;
@@ -145,7 +150,7 @@ type PageCount = nat;
 type PackageVersion = text;
 type PackageSummary__1 = 
  record {
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -157,7 +162,7 @@ type PackageSummary__1 =
 type PackageSummaryWithChanges__1 = 
  record {
    changes: PackageChanges;
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -169,7 +174,7 @@ type PackageSummaryWithChanges__1 =
 type PackageSummaryWithChanges = 
  record {
    changes: PackageChanges;
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -180,7 +185,7 @@ type PackageSummaryWithChanges =
  };
 type PackageSummary = 
  record {
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    downloadsInLast30Days: nat;
    downloadsInLast7Days: nat;
    downloadsTotal: nat;
@@ -218,7 +223,7 @@ type PackageDetails =
  record {
    benchmarks: Benchmarks__1;
    changes: PackageChanges;
-   config: PackageConfigV2__1;
+   config: PackageConfigV3;
    dependents: vec PackageSummary__1;
    deps: vec PackageSummary__1;
    devDeps: vec PackageSummary__1;
@@ -234,7 +239,7 @@ type PackageDetails =
    testStats: TestStats__1;
    versionHistory: vec PackageSummaryWithChanges__1;
  };
-type PackageConfigV2__1 = 
+type PackageConfigV3_Publishing = 
  record {
    baseDir: text;
    dependencies: vec DependencyV2;
@@ -250,10 +255,11 @@ type PackageConfigV2__1 =
    name: PackageName__1;
    readme: text;
    repository: text;
+   requirements: opt vec Requirement;
    scripts: vec Script;
    version: text;
  };
-type PackageConfigV2 = 
+type PackageConfigV3 = 
  record {
    baseDir: text;
    dependencies: vec DependencyV2;
@@ -269,6 +275,7 @@ type PackageConfigV2 =
    name: PackageName__1;
    readme: text;
    repository: text;
+   requirements: vec Requirement;
    scripts: vec Script;
    version: text;
  };
@@ -341,7 +348,7 @@ type Main =
    search: (Text, opt nat, opt nat) -> (vec PackageSummary, PageCount) query;
    setUserProp: (text, text) -> (Result_1);
    startFileUpload: (PublishingId, Text, nat, blob) -> (Result_3);
-   startPublish: (PackageConfigV2) -> (Result_2);
+   startPublish: (PackageConfigV3_Publishing) -> (Result_2);
    transferOwnership: (PackageName, principal) -> (Result_1);
    transformRequest: (HttpTransformArg) -> (HttpResponse) query;
    uploadBenchmarks: (PublishingId, Benchmarks) -> (Result);

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

@@ -117,7 +117,7 @@ export interface Main {
     [PublishingId, Text, bigint, Uint8Array | number[]],
     Result_3
   >,
-  'startPublish' : ActorMethod<[PackageConfigV2], Result_2>,
+  'startPublish' : ActorMethod<[PackageConfigV3_Publishing], Result_2>,
   'transferOwnership' : ActorMethod<[PackageName, Principal], Result_1>,
   'transformRequest' : ActorMethod<[HttpTransformArg], HttpResponse>,
   'uploadBenchmarks' : ActorMethod<[PublishingId, Benchmarks], Result>,
@@ -136,7 +136,7 @@ export interface PackageChanges {
   'notes' : string,
   'devDeps' : Array<DepChange>,
 }
-export interface PackageConfigV2 {
+export interface PackageConfigV3 {
   'dfx' : string,
   'moc' : string,
   'scripts' : Array<Script>,
@@ -151,10 +151,11 @@ export interface PackageConfigV2 {
   'devDependencies' : Array<DependencyV2>,
   'repository' : string,
   'dependencies' : Array<DependencyV2>,
+  'requirements' : Array<Requirement>,
   'license' : string,
   'readme' : string,
 }
-export interface PackageConfigV2__1 {
+export interface PackageConfigV3_Publishing {
   'dfx' : string,
   'moc' : string,
   'scripts' : Array<Script>,
@@ -169,6 +170,7 @@ export interface PackageConfigV2__1 {
   'devDependencies' : Array<DependencyV2>,
   'repository' : string,
   'dependencies' : Array<DependencyV2>,
+  'requirements' : [] | [Array<Requirement>],
   'license' : string,
   'readme' : string,
 }
@@ -187,7 +189,7 @@ export interface PackageDetails {
   'dependents' : Array<PackageSummary__1>,
   'devDeps' : Array<PackageSummary__1>,
   'downloadsInLast7Days' : bigint,
-  'config' : PackageConfigV2__1,
+  'config' : PackageConfigV3,
   'changes' : PackageChanges,
   'publication' : PackagePublication,
 }
@@ -220,7 +222,7 @@ export interface PackageSummary {
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
-  'config' : PackageConfigV2__1,
+  'config' : PackageConfigV3,
   'publication' : PackagePublication,
 }
 export interface PackageSummaryWithChanges {
@@ -230,7 +232,7 @@ export interface PackageSummaryWithChanges {
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
-  'config' : PackageConfigV2__1,
+  'config' : PackageConfigV3,
   'changes' : PackageChanges,
   'publication' : PackagePublication,
 }
@@ -241,7 +243,7 @@ export interface PackageSummaryWithChanges__1 {
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
-  'config' : PackageConfigV2__1,
+  'config' : PackageConfigV3,
   'changes' : PackageChanges,
   'publication' : PackagePublication,
 }
@@ -252,7 +254,7 @@ export interface PackageSummary__1 {
   'downloadsTotal' : bigint,
   'downloadsInLast30Days' : bigint,
   'downloadsInLast7Days' : bigint,
-  'config' : PackageConfigV2__1,
+  'config' : PackageConfigV3,
   'publication' : PackagePublication,
 }
 export type PackageVersion = string;
@@ -265,6 +267,7 @@ export interface Request {
   'headers' : Array<Header>,
   'certificate_version' : [] | [number],
 }
+export interface Requirement { 'value' : string, 'name' : string }
 export interface Response {
   'body' : Uint8Array | number[],
   'headers' : Array<Header>,
@@ -349,4 +352,4 @@ export interface User__1 {
 }
 export interface _SERVICE extends Main {}
 export declare const idlFactory: IDL.InterfaceFactory;
-export declare const init: ({ IDL }: { IDL: IDL }) => IDL.Type[];
+export declare const init: (args: { IDL: typeof IDL }) => IDL.Type[];