ic-mops 1.12.0 → 2.0.0

package/bundle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",
@@ -15,14 +15,15 @@
     "!build.sh",
     "!DEVELOPMENT.md",
     "!.mops",
-    "/templates"
+    "/templates",
+    "/wasm"
   ],
   "homepage": "https://mops.one",
   "repository": {
     "type": "git",
-    "url": "https://github.com/ZenVoich/mops.git"
+    "url": "https://github.com/dfinity/mops.git"
   },
-  "author": "Zen Voich <zen.voich@gmail.com>",
+  "author": "DFINITY",
   "license": "MIT",
   "engines": {
     "node": ">=18.0.0"
@@ -32,4 +33,4 @@
     "decomp-tarxz": "0.1.1",
     "buffer": "6.0.3"
   }
-}
+}

package/bundle/templates/mops-publish.yml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: ZenVoich/setup-mops@v1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: dfinity/setup-mops@v1
         with:
           # Make sure you set the MOPS_IDENTITY_PEM secret in your repository settings https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions#creating-secrets-for-a-repository
           identity-pem: ${{ secrets.MOPS_IDENTITY_PEM }}
-      - run: mops publish
+      - run: mops publish

package/bundle/templates/mops-test.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: ZenVoich/setup-mops@v1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: dfinity/setup-mops@v1
         with:
           mops-version: 1
 
@@ -21,4 +21,4 @@ jobs:
         run: mops install
 
       - name: run tests
-        run: mops test
+        run: mops test

package/bundle/templates/src/lib.mo

@@ -1,15 +1,15 @@
 module {
-	// This comment will not be included in the documentation
-	// Use triple slash for documentation
+  // This comment will not be included in the documentation
+  // Use triple slash for documentation
 
-	/// Add two natural numbers
-	///
-	/// Example:
-	/// ```motoko
-	/// assert add(1, 2) == 3;
-	/// assert add(7, 3) == 10;
-	/// ```
-	public func add(x : Nat, y : Nat) : Nat {
-		return x + y;
-	};
-};
+  /// Add two natural numbers
+  ///
+  /// Example:
+  /// ```motoko
+  /// assert add(1, 2) == 3;
+  /// assert add(7, 3) == 10;
+  /// ```
+  public func add(x : Nat, y : Nat) : Nat {
+    return x + y;
+  };
+};

package/bundle/templates/test/lib.test.mo

@@ -1,4 +1,4 @@
-import {add} "../src";
+import { add } "../src";
 
 assert add(1, 2) == 3;
-assert add(3, 22) == 25;
+assert add(3, 22) == 25;

package/bundle-package-json.ts

@@ -1,17 +1,17 @@
-import {readFileSync, writeFileSync} from 'node:fs';
+import { readFileSync, writeFileSync } from "node:fs";
 
-let packageJson = JSON.parse(readFileSync('./bundle/package.json', 'utf8'));
+let packageJson = JSON.parse(readFileSync("./bundle/package.json", "utf8"));
 
-packageJson.bin.mops = 'bin/mops.js';
-packageJson.bin['ic-mops'] = 'bin/mops.js';
+packageJson.bin.mops = "bin/mops.js";
+packageJson.bin["ic-mops"] = "bin/mops.js";
 
 delete packageJson.scripts;
 delete packageJson.devDependencies;
 delete packageJson.overrides;
 packageJson.dependencies = {
-	'dhall-to-json-cli': packageJson.dependencies['dhall-to-json-cli'],
-	'decomp-tarxz': packageJson.dependencies['decomp-tarxz'],
-	'buffer': packageJson.dependencies['buffer'],
+  "dhall-to-json-cli": packageJson.dependencies["dhall-to-json-cli"],
+  "decomp-tarxz": packageJson.dependencies["decomp-tarxz"],
+  buffer: packageJson.dependencies["buffer"],
 };
 
-writeFileSync('./bundle/package.json', JSON.stringify(packageJson, null, '  '));
+writeFileSync("./bundle/package.json", JSON.stringify(packageJson, null, "  "));

package/cache.ts

@@ -1,90 +1,105 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import ncp from 'ncp';
-import getFolderSize from 'get-folder-size';
-
-import {getDependencyType, getNetwork, getRootDir, globalCacheDir, parseGithubURL} from './mops.js';
-import {getPackageId} from './helpers/get-package-id.js';
+import fs from "node:fs";
+import path from "node:path";
+import ncp from "ncp";
+import getFolderSize from "get-folder-size";
+
+import {
+  getDependencyType,
+  getNetwork,
+  getRootDir,
+  globalCacheDir,
+  parseGithubURL,
+} from "./mops.js";
+import { getPackageId } from "./helpers/get-package-id.js";
 
 let getGlobalCacheDir = () => {
-	let network = getNetwork();
-	return path.join(globalCacheDir, network === 'ic' ? '' : network);
+  let network = getNetwork();
+  return path.join(globalCacheDir, network === "ic" ? "" : network);
 };
 
 export let show = () => {
-	return getGlobalCacheDir();
+  return getGlobalCacheDir();
 };
 
-export let getDepCacheDir = (cacheName : string) => {
-	return path.join(getGlobalCacheDir(), 'packages', cacheName);
+export let getDepCacheDir = (cacheName: string) => {
+  return path.join(getGlobalCacheDir(), "packages", cacheName);
 };
 
-export let isDepCached = (cacheName : string) => {
-	let dir = getDepCacheDir(cacheName);
-	return fs.existsSync(dir);
+export let isDepCached = (cacheName: string) => {
+  let dir = getDepCacheDir(cacheName);
+  return fs.existsSync(dir);
 };
 
-export function getDepCacheName(name : string, version : string) {
-	let depType = getDependencyType(version);
-	return depType === 'mops' ? getMopsDepCacheName(name, version) : getGithubDepCacheName(name, version);
+export function getDepCacheName(name: string, version: string) {
+  let depType = getDependencyType(version);
+  return depType === "mops"
+    ? getMopsDepCacheName(name, version)
+    : getGithubDepCacheName(name, version);
 }
 
-export function getMopsDepCacheName(name : string, version : string) {
-	return getPackageId(name, version);
+export function getMopsDepCacheName(name: string, version: string) {
+  return getPackageId(name, version);
 }
 
-export function getGithubDepCacheName(name : string, repo : string) {
-	const {branch, commitHash} = parseGithubURL(repo);
-	return `_github/${name}#${branch.replaceAll('/', '___')}` + (commitHash ? `@${commitHash}` : '');
+export function getGithubDepCacheName(name: string, repo: string) {
+  const { branch, commitHash } = parseGithubURL(repo);
+  return (
+    `_github/${name}#${branch.replaceAll("/", "___")}` +
+    (commitHash ? `@${commitHash}` : "")
+  );
 }
 
-export let addCache = (cacheName : string, source : string) => {
-	let dest = path.join(getGlobalCacheDir(), 'packages', cacheName);
-	fs.mkdirSync(dest, {recursive: true});
-
-	return new Promise<void>((resolve, reject) => {
-		ncp.ncp(source, dest, {stopOnErr: true}, (err) => {
-			if (err) {
-				reject(err);
-			}
-			resolve();
-		});
-	});
+export let addCache = (cacheName: string, source: string) => {
+  let dest = path.join(getGlobalCacheDir(), "packages", cacheName);
+  fs.mkdirSync(dest, { recursive: true });
+
+  return new Promise<void>((resolve, reject) => {
+    ncp.ncp(source, dest, { stopOnErr: true }, (err) => {
+      if (err) {
+        reject(err);
+      }
+      resolve();
+    });
+  });
 };
 
-export let copyCache = (cacheName : string, dest : string) => {
-	let source = path.join(getGlobalCacheDir(), 'packages', cacheName);
-	fs.mkdirSync(dest, {recursive: true});
-
-	return new Promise<void>((resolve, reject) => {
-		ncp.ncp(source, dest, {stopOnErr: true}, (err) => {
-			if (err) {
-				reject(err);
-			}
-			resolve();
-		});
-	});
+export let copyCache = (cacheName: string, dest: string) => {
+  let source = path.join(getGlobalCacheDir(), "packages", cacheName);
+  fs.mkdirSync(dest, { recursive: true });
+
+  return new Promise<void>((resolve, reject) => {
+    ncp.ncp(source, dest, { stopOnErr: true }, (err) => {
+      if (err) {
+        reject(err);
+      }
+      resolve();
+    });
+  });
 };
 
 export let cacheSize = async () => {
-	let dir = path.join(getGlobalCacheDir());
-	fs.mkdirSync(dir, {recursive: true});
-
-	let size = await getFolderSize.strict(dir);
-	if (size < 1024 * 1024) {
-		return (size / 1024).toFixed(2) + ' KB';
-	}
-	return (size / 1024 / 1024).toFixed(2) + ' MB';
+  let dir = path.join(getGlobalCacheDir());
+  fs.mkdirSync(dir, { recursive: true });
+
+  let size = await getFolderSize.strict(dir);
+  if (size < 1024 * 1024) {
+    return (size / 1024).toFixed(2) + " KB";
+  }
+  return (size / 1024 / 1024).toFixed(2) + " MB";
 };
 
 export let cleanCache = async () => {
-	if (!getGlobalCacheDir().endsWith('mops/cache') && !getGlobalCacheDir().endsWith('/mops') && !getGlobalCacheDir().endsWith('/mops/' + getNetwork())) {
-		throw new Error('Invalid cache directory: ' + getGlobalCacheDir());
-	}
-
-	// local cache
-	fs.rmSync(path.join(getRootDir(), '.mops'), {recursive: true, force: true});
-
-	// global cache
-	fs.rmSync(getGlobalCacheDir(), {recursive: true, force: true});
-};
+  if (
+    !getGlobalCacheDir().endsWith("mops/cache") &&
+    !getGlobalCacheDir().endsWith("/mops") &&
+    !getGlobalCacheDir().endsWith("/mops/" + getNetwork())
+  ) {
+    throw new Error("Invalid cache directory: " + getGlobalCacheDir());
+  }
+
+  // local cache
+  fs.rmSync(path.join(getRootDir(), ".mops"), { recursive: true, force: true });
+
+  // global cache
+  fs.rmSync(getGlobalCacheDir(), { recursive: true, force: true });
+};

package/check-requirements.ts

@@ -1,52 +1,56 @@
-import path from 'node:path';
-import {SemVer} from 'semver';
-import chalk from 'chalk';
+import path from "node:path";
+import { SemVer } from "semver";
+import chalk from "chalk";
 
-import {getDependencyType, getRootDir, readConfig} from './mops.js';
-import {resolvePackages} from './resolve-packages.js';
-import {getMocVersion} from './helpers/get-moc-version.js';
-import {getPackageId} from './helpers/get-package-id.js';
+import { getDependencyType, getRootDir, readConfig } from "./mops.js";
+import { resolvePackages } from "./resolve-packages.js";
+import { getMocVersion } from "./helpers/get-moc-version.js";
+import { getPackageId } from "./helpers/get-package-id.js";
 
-export async function checkRequirements({verbose = false} = {}) {
-	let config = readConfig();
-	let mocVersion = config.toolchain?.moc;
-	if (!mocVersion) {
-		mocVersion = getMocVersion(false);
-	}
-	if (!mocVersion) {
-		return;
-	}
-	let installedMoc = new SemVer(mocVersion);
-	let highestRequiredMoc = new SemVer('0.0.0');
-	let highestRequiredMocPkgId = '';
-	let rootDir = getRootDir();
+export async function checkRequirements({ verbose = false } = {}) {
+  let config = readConfig();
+  let mocVersion = config.toolchain?.moc;
+  if (!mocVersion) {
+    mocVersion = getMocVersion(false);
+  }
+  if (!mocVersion) {
+    return;
+  }
+  let installedMoc = new SemVer(mocVersion);
+  let highestRequiredMoc = new SemVer("0.0.0");
+  let highestRequiredMocPkgId = "";
+  let rootDir = getRootDir();
 
-	let resolvedPackages = await resolvePackages();
-	for (let [name, version] of Object.entries(resolvedPackages)) {
-		if (getDependencyType(version) === 'mops') {
-			let pkgId = getPackageId(name, version);
-			let depConfig = readConfig(path.join(rootDir, '.mops', pkgId, 'mops.toml'));
-			let moc = depConfig.requirements?.moc;
+  let resolvedPackages = await resolvePackages();
+  for (let [name, version] of Object.entries(resolvedPackages)) {
+    if (getDependencyType(version) === "mops") {
+      let pkgId = getPackageId(name, version);
+      let depConfig = readConfig(
+        path.join(rootDir, ".mops", pkgId, "mops.toml"),
+      );
+      let moc = depConfig.requirements?.moc;
 
-			if (moc) {
-				let requiredMoc = new SemVer(moc);
-				if (highestRequiredMoc.compare(requiredMoc) < 0) {
-					highestRequiredMoc = requiredMoc;
-					highestRequiredMocPkgId = pkgId;
-				}
-				verbose && _check(pkgId, installedMoc, requiredMoc);
-			}
-		}
-	}
+      if (moc) {
+        let requiredMoc = new SemVer(moc);
+        if (highestRequiredMoc.compare(requiredMoc) < 0) {
+          highestRequiredMoc = requiredMoc;
+          highestRequiredMocPkgId = pkgId;
+        }
+        verbose && _check(pkgId, installedMoc, requiredMoc);
+      }
+    }
+  }
 
-	verbose || _check(highestRequiredMocPkgId, installedMoc, highestRequiredMoc);
+  verbose || _check(highestRequiredMocPkgId, installedMoc, highestRequiredMoc);
 }
 
-function _check(pkgId : string, installedMoc : SemVer, requiredMoc : SemVer) {
-	let comp = installedMoc.compare(requiredMoc);
-	if (comp < 0) {
-		console.log(chalk.yellow(`moc version does not meet the requirements of ${pkgId}`));
-		console.log(chalk.yellow(`  Required: >= ${requiredMoc.format()}`));
-		console.log(chalk.yellow(`  Installed:   ${installedMoc.format()}`));
-	}
-}
+function _check(pkgId: string, installedMoc: SemVer, requiredMoc: SemVer) {
+  let comp = installedMoc.compare(requiredMoc);
+  if (comp < 0) {
+    console.log(
+      chalk.yellow(`moc version does not meet the requirements of ${pkgId}`),
+    );
+    console.log(chalk.yellow(`  Required: >= ${requiredMoc.format()}`));
+    console.log(chalk.yellow(`  Installed:   ${installedMoc.format()}`));
+  }
+}