ic-mops 0.40.0 → 0.41.1

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

@@ -5,14 +5,13 @@ import logUpdate from 'log-update';
 import { globbySync } from 'globby';
 import { minimatch } from 'minimatch';
 import prompts from 'prompts';
-import { fromMarkdown } from 'mdast-util-from-markdown';
-import { toMarkdown } from 'mdast-util-to-markdown';
 import { checkConfigFile, getIdentity, getRootDir, progressBar, readConfig } from '../mops.js';
 import { mainActor } from '../api/actors.js';
 import { parallel } from '../parallel.js';
 import { docs } from './docs.js';
 import { testWithReporter } from './test/test.js';
 import { SilentReporter } from './test/reporters/silent-reporter.js';
+import { findChangelogEntry } from '../helpers/find-changelog-entry.js';
 import { bench } from './bench.js';
 export async function publish(options = {}) {
     if (!checkConfigFile()) {
@@ -23,7 +22,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);
         }
@@ -142,6 +141,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,
@@ -149,6 +156,9 @@ export async function publish(options = {}) {
             repo: dep.repo || '',
         };
     };
+    let toBackendReq = ([name, value]) => {
+        return { name, value };
+    };
     // map fields
     let backendPkgConfig = {
         name: config.package.name,
@@ -167,6 +177,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',
@@ -355,25 +366,3 @@ async function fetchGitHubReleaseNotes(repo, version) {
     }
     return release.body;
 }
-function findChangelogEntry(changelog, version) {
-    let tree = fromMarkdown(changelog);
-    let found = false;
-    let nodes = [];
-    for (let node of tree.children) {
-        if (found) {
-            if (node.type === 'heading') {
-                break;
-            }
-            else {
-                nodes.push(node);
-            }
-        }
-        else if (node.type === 'heading' && toMarkdown(node).match(new RegExp(`\\b${version}\\b`))) {
-            found = true;
-        }
-    }
-    return toMarkdown({
-        type: 'root',
-        children: nodes,
-    });
-}

package/dist/commands/self.js

@@ -39,7 +39,7 @@ export async function update() {
         console.log('Updating to version: ' + chalk.green(latest));
         let pm = detectPackageManager();
         let npmArgs = pm === 'npm' ? ['--no-fund', '--silent'] : [];
-        let proc = child_process.spawn(pm, ['add', '-g', ...npmArgs, `${url}/versions/${latest}/cli.tgz`], { stdio: 'inherit', detached: false });
+        let proc = child_process.spawn(pm, ['add', '-g', ...npmArgs, `${url}/versions/${latest}.tgz`], { stdio: 'inherit', detached: false });
         proc.on('exit', (res) => {
             if (res !== 0) {
                 console.log(chalk.red('Failed to update.'));

package/dist/commands/template.js

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import prompts from 'prompts';
 import camelCase from 'camelcase';
 import { getRootDir, readConfig } from '../mops.js';
+import { copyTemplateFileSync } from '../templates.js';
 export async function template(templateName, options = {}) {
     if (!templateName) {
         let res = await prompts({
@@ -30,9 +31,8 @@ export async function template(templateName, options = {}) {
             console.log(chalk.yellow('Workflow already exists:'), path.relative(getRootDir(), dest));
             return;
         }
-        let mopsTestYml = new URL('../templates/mops-test.yml', import.meta.url);
         fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), { recursive: true });
-        fs.copyFileSync(mopsTestYml, dest);
+        copyTemplateFileSync('mops-test.yml', dest);
         console.log(chalk.green('Created'), path.relative(getRootDir(), dest));
     }
     else if (templateName === 'github-workflow:mops-publish') {
@@ -41,9 +41,8 @@ export async function template(templateName, options = {}) {
             console.log(chalk.yellow('Workflow already exists:'), path.relative(getRootDir(), dest));
             return;
         }
-        let mopsPublishYml = new URL('../templates/mops-publish.yml', import.meta.url);
         fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), { recursive: true });
-        fs.copyFileSync(mopsPublishYml, dest);
+        copyTemplateFileSync('mops-publish.yml', dest);
         console.log(chalk.green('Created'), path.relative(getRootDir(), dest));
     }
     else if (templateName?.startsWith('license:')) {
@@ -61,13 +60,13 @@ export async function template(templateName, options = {}) {
             fs.writeFileSync(file, license);
         };
         if (templateName === 'license:MIT') {
-            fs.copyFileSync(new URL('../templates/licenses/MIT', import.meta.url), path.resolve(getRootDir(), 'LICENSE'));
+            copyTemplateFileSync('licenses/MIT', path.resolve(getRootDir(), 'LICENSE'));
             setYearAndOwner(path.resolve(getRootDir(), 'LICENSE'));
             console.log(chalk.green('Created'), path.relative(getRootDir(), 'LICENSE'));
         }
         else if (templateName === 'license:Apache-2.0') {
-            fs.copyFileSync(new URL('../templates/licenses/Apache-2.0', import.meta.url), path.resolve(getRootDir(), 'LICENSE'));
-            fs.copyFileSync(new URL('../templates/licenses/Apache-2.0-NOTICE', import.meta.url), path.resolve(getRootDir(), 'NOTICE'));
+            copyTemplateFileSync('licenses/Apache-2.0', path.resolve(getRootDir(), 'LICENSE'));
+            copyTemplateFileSync('licenses/Apache-2.0-NOTICE', path.resolve(getRootDir(), 'NOTICE'));
             setYearAndOwner(path.resolve(getRootDir(), 'NOTICE'));
             console.log(chalk.green('Created'), path.relative(getRootDir(), 'LICENSE'));
             console.log(chalk.green('Created'), path.relative(getRootDir(), 'NOTICE'));
@@ -75,12 +74,12 @@ export async function template(templateName, options = {}) {
     }
     else if (templateName === 'lib.mo') {
         fs.mkdirSync(path.join(getRootDir(), 'src'), { recursive: true });
-        fs.copyFileSync(new URL('../templates/src/lib.mo', import.meta.url), path.resolve(getRootDir(), 'src/lib.mo'));
+        copyTemplateFileSync('src/lib.mo', path.resolve(getRootDir(), 'src/lib.mo'));
         console.log(chalk.green('Created'), path.relative(getRootDir(), 'src/lib.mo'));
     }
     else if (templateName === 'lib.test.mo') {
         fs.mkdirSync(path.join(getRootDir(), 'test'), { recursive: true });
-        fs.copyFileSync(new URL('../templates/test/lib.test.mo', import.meta.url), path.resolve(getRootDir(), 'test/lib.test.mo'));
+        copyTemplateFileSync('test/lib.test.mo', path.resolve(getRootDir(), 'test/lib.test.mo'));
         console.log(chalk.green('Created'), path.relative(getRootDir(), 'test/lib.test.mo'));
     }
     else if (templateName === 'readme') {
@@ -89,7 +88,7 @@ export async function template(templateName, options = {}) {
             console.log(chalk.yellow('README.md already exists'));
             return;
         }
-        fs.copyFileSync(new URL('../templates/README.md', import.meta.url), dest);
+        copyTemplateFileSync('README.md', dest);
         let config = readConfig();
         let data = fs.readFileSync(dest).toString();
         data = data.replace(/<year>/g, new Date().getFullYear().toString());

package/dist/commands/toolchain/index.js

@@ -6,6 +6,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 +205,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 +232,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/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

@@ -10,8 +10,7 @@ export { idlFactory } from "./bench.did.js";
  * beginning in dfx 0.15.0
  */
 export const canisterId =
-  process.env.CANISTER_ID_BENCH ||
-  process.env.BENCH_CANISTER_ID;
+  process.env.CANISTER_ID_BENCH;
 
 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[];

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],