ic-mops 1.11.1 → 2.0.0

package/commands/template.ts

@@ -1,109 +1,152 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import chalk from 'chalk';
-import prompts from 'prompts';
-import {kebabCase, pascalCase} from 'change-case';
-import {getRootDir, readConfig} from '../mops.js';
-import {copyTemplateFileSync} from '../templates.js';
+import fs from "node:fs";
+import path from "node:path";
+import chalk from "chalk";
+import prompts from "prompts";
+import { kebabCase, pascalCase } from "change-case";
+import { getRootDir, readConfig } from "../mops.js";
+import { copyTemplateFileSync } from "../templates.js";
 
-export async function template(templateName ?: string, options : any = {}) {
-	if (!templateName) {
-		let res = await prompts({
-			type: 'select',
-			name: 'value',
-			message: 'Select template:',
-			choices: [
-				{title: 'README.md', value: 'readme'},
-				{title: 'src/lib.mo', value: 'lib.mo'},
-				{title: 'test/lib.test.mo', value: 'lib.test.mo'},
-				{title: 'License MIT', value: 'license:MIT'},
-				{title: 'License Apache-2.0', value: 'license:Apache-2.0'},
-				{title: 'GitHub Workflow to run \'mops test\'', value: 'github-workflow:mops-test'},
-				{title: 'GitHub Workflow to publish a package', value: 'github-workflow:mops-publish'},
-				{title: '× Cancel', value: ''},
-			],
-			initial: 0,
-		});
-		templateName = res.value;
-	}
+export async function template(templateName?: string, options: any = {}) {
+  if (!templateName) {
+    let res = await prompts({
+      type: "select",
+      name: "value",
+      message: "Select template:",
+      choices: [
+        { title: "README.md", value: "readme" },
+        { title: "src/lib.mo", value: "lib.mo" },
+        { title: "test/lib.test.mo", value: "lib.test.mo" },
+        { title: "License MIT", value: "license:MIT" },
+        { title: "License Apache-2.0", value: "license:Apache-2.0" },
+        {
+          title: "GitHub Workflow to run 'mops test'",
+          value: "github-workflow:mops-test",
+        },
+        {
+          title: "GitHub Workflow to publish a package",
+          value: "github-workflow:mops-publish",
+        },
+        { title: "× Cancel", value: "" },
+      ],
+      initial: 0,
+    });
+    templateName = res.value;
+  }
 
-	if (templateName === 'github-workflow:mops-test') {
-		let dest = path.resolve(getRootDir(), '.github/workflows/mops-test.yml');
-		if (fs.existsSync(dest)) {
-			console.log(chalk.yellow('Workflow already exists:'), path.relative(getRootDir(), dest));
-			return;
-		}
-		fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), {recursive: true});
-		copyTemplateFileSync('mops-test.yml', dest);
-		console.log(chalk.green('Created'), path.relative(getRootDir(), dest));
-	}
-	else if (templateName === 'github-workflow:mops-publish') {
-		let dest = path.resolve(getRootDir(), '.github/workflows/mops-publish.yml');
-		if (fs.existsSync(dest)) {
-			console.log(chalk.yellow('Workflow already exists:'), path.relative(getRootDir(), dest));
-			return;
-		}
-		fs.mkdirSync(path.resolve(getRootDir(), '.github/workflows'), {recursive: true});
-		copyTemplateFileSync('mops-publish.yml', dest);
-		console.log(chalk.green('Created'), path.relative(getRootDir(), dest));
-	}
-	else if (templateName?.startsWith('license:')) {
-		let dest = path.resolve(getRootDir(), 'LICENSE');
-		if (fs.existsSync(dest)) {
-			console.log(chalk.yellow('LICENSE already exists'));
-			return;
-		}
+  if (templateName === "github-workflow:mops-test") {
+    let dest = path.resolve(getRootDir(), ".github/workflows/mops-test.yml");
+    if (fs.existsSync(dest)) {
+      console.log(
+        chalk.yellow("Workflow already exists:"),
+        path.relative(getRootDir(), dest),
+      );
+      return;
+    }
+    fs.mkdirSync(path.resolve(getRootDir(), ".github/workflows"), {
+      recursive: true,
+    });
+    copyTemplateFileSync("mops-test.yml", dest);
+    console.log(chalk.green("Created"), path.relative(getRootDir(), dest));
+  } else if (templateName === "github-workflow:mops-publish") {
+    let dest = path.resolve(getRootDir(), ".github/workflows/mops-publish.yml");
+    if (fs.existsSync(dest)) {
+      console.log(
+        chalk.yellow("Workflow already exists:"),
+        path.relative(getRootDir(), dest),
+      );
+      return;
+    }
+    fs.mkdirSync(path.resolve(getRootDir(), ".github/workflows"), {
+      recursive: true,
+    });
+    copyTemplateFileSync("mops-publish.yml", dest);
+    console.log(chalk.green("Created"), path.relative(getRootDir(), dest));
+  } else if (templateName?.startsWith("license:")) {
+    let dest = path.resolve(getRootDir(), "LICENSE");
+    if (fs.existsSync(dest)) {
+      console.log(chalk.yellow("LICENSE already exists"));
+      return;
+    }
 
-		let setYearAndOwner = (file : string) => {
-			let license = fs.readFileSync(file).toString();
-			license = license.replace(/<year>/g, new Date().getFullYear().toString());
-			if (options.copyrightOwner) {
-				license = license.replace(/<copyright-owner>/g, options.copyrightOwner);
-			}
-			fs.writeFileSync(file, license);
-		};
+    let setYearAndOwner = (file: string) => {
+      let license = fs.readFileSync(file).toString();
+      license = license.replace(/<year>/g, new Date().getFullYear().toString());
+      if (options.copyrightOwner) {
+        license = license.replace(/<copyright-owner>/g, options.copyrightOwner);
+      }
+      fs.writeFileSync(file, license);
+    };
 
-		if (templateName === 'license:MIT') {
-			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') {
-			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'));
-		}
-	}
-	else if (templateName === 'lib.mo') {
-		fs.mkdirSync(path.join(getRootDir(), 'src'), {recursive: true});
-		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});
-		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') {
-		let dest = path.resolve(getRootDir(), 'README.md');
-		if (fs.existsSync(dest)) {
-			console.log(chalk.yellow('README.md already exists'));
-			return;
-		}
-		copyTemplateFileSync('README.md', dest);
+    if (templateName === "license:MIT") {
+      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") {
+      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"),
+      );
+    }
+  } else if (templateName === "lib.mo") {
+    fs.mkdirSync(path.join(getRootDir(), "src"), { recursive: true });
+    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 });
+    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") {
+    let dest = path.resolve(getRootDir(), "README.md");
+    if (fs.existsSync(dest)) {
+      console.log(chalk.yellow("README.md already exists"));
+      return;
+    }
+    copyTemplateFileSync("README.md", dest);
 
-		let config = readConfig();
+    let config = readConfig();
 
-		let data = fs.readFileSync(dest).toString();
-		data = data.replace(/<year>/g, new Date().getFullYear().toString());
-		if (config.package?.name) {
-			data = data.replace(/<name>/g, kebabCase(config.package.name));
-			data = data.replace(/<import-name>/g, pascalCase(config.package.name));
-		}
-		fs.writeFileSync(dest, data);
+    let data = fs.readFileSync(dest).toString();
+    data = data.replace(/<year>/g, new Date().getFullYear().toString());
+    if (config.package?.name) {
+      data = data.replace(/<name>/g, kebabCase(config.package.name));
+      data = data.replace(/<import-name>/g, pascalCase(config.package.name));
+    }
+    fs.writeFileSync(dest, data);
 
-		console.log(chalk.green('Created'), path.relative(getRootDir(), 'README.md'));
-	}
-}
+    console.log(
+      chalk.green("Created"),
+      path.relative(getRootDir(), "README.md"),
+    );
+  }
+}

package/commands/test/mmf1.ts

@@ -2,136 +2,163 @@
 // mops:1:start
 // mops:1:end
 // mops:1:skip
-import chalk from 'chalk';
+import chalk from "chalk";
 
-type Strategy = 'store' | 'print';
-type TestStatus = 'pass' | 'fail' | 'skip';
-type MessageType = 'pass' | 'fail' | 'skip' | 'suite' | 'stdout';
+type Strategy = "store" | "print";
+type TestStatus = "pass" | "fail" | "skip";
+type MessageType = "pass" | "fail" | "skip" | "suite" | "stdout";
 
 export class MMF1 {
-	file : string;
-	stack : string[] = [];
-	currSuite : string = '';
-	failed = 0;
-	passed = 0;
-	skipped = 0;
-	strategy : Strategy;
-	output : {
-		type : MessageType;
-		message : string;
-	}[] = [];
-	nestingSymbol = ' › ';
-	// or <file>
-	// or <file> › <test>
-	// or <file> › <suite> › <test>
-	// or <file> › <suite> › <test> › <nested-test>...
-	passedNamesFlat : string[] = [];
+  file: string;
+  stack: string[] = [];
+  currSuite: string = "";
+  failed = 0;
+  passed = 0;
+  skipped = 0;
+  strategy: Strategy;
+  output: {
+    type: MessageType;
+    message: string;
+  }[] = [];
+  nestingSymbol = " › ";
+  // or <file>
+  // or <file> › <test>
+  // or <file> › <suite> › <test>
+  // or <file> › <suite> › <test> › <nested-test>...
+  passedNamesFlat: string[] = [];
 
-	constructor(strategy : Strategy, file : string) {
-		this.strategy = strategy;
-		this.file = file;
-	}
+  constructor(strategy: Strategy, file: string) {
+    this.strategy = strategy;
+    this.file = file;
+  }
 
-	_log(type : MessageType,  ...args : string[]) {
-		if (this.strategy === 'store') {
-			this.output.push({
-				type,
-				message: args.join(' '),
-			});
-		}
-		else if (this.strategy === 'print') {
-			console.log(...args);
-		}
-	}
+  _log(type: MessageType, ...args: string[]) {
+    if (this.strategy === "store") {
+      this.output.push({
+        type,
+        message: args.join(" "),
+      });
+    } else if (this.strategy === "print") {
+      console.log(...args);
+    }
+  }
 
-	flush(messageType ?: MessageType) {
-		for (let out of this.output) {
-			if (!messageType || out.type === messageType) {
-				console.log(out.message);
-			}
-		}
-		this.output = [];
-	}
+  flush(messageType?: MessageType) {
+    for (let out of this.output) {
+      if (!messageType || out.type === messageType) {
+        console.log(out.message);
+      }
+    }
+    this.output = [];
+  }
 
-	getErrorMessages() {
-		return this.output.filter(out => out.type === 'fail').map(out => out.message);
-	}
+  getErrorMessages() {
+    return this.output
+      .filter((out) => out.type === "fail")
+      .map((out) => out.message);
+  }
 
-	parseLine(line : string) {
-		if (line.startsWith('mops:1:start ')) {
-			this._testStart(line.split('mops:1:start ')[1] || '');
-		}
-		else if (line.startsWith('mops:1:end ')) {
-			this._testEnd(line.split('mops:1:end ')[1] || '');
-		}
-		else if (line.startsWith('mops:1:skip ')) {
-			this._testSkip(line.split('mops:1:skip ')[1] || '');
-		}
-		else if (line.startsWith('mops:')) {
-			// ignore unknown mops messages
-		}
-		else {
-			this._log('stdout', ' '.repeat(this.stack.length * 2), chalk.gray('stdout'), line);
-		}
-	}
+  parseLine(line: string) {
+    if (line.startsWith("mops:1:start ")) {
+      this._testStart(line.split("mops:1:start ")[1] || "");
+    } else if (line.startsWith("mops:1:end ")) {
+      this._testEnd(line.split("mops:1:end ")[1] || "");
+    } else if (line.startsWith("mops:1:skip ")) {
+      this._testSkip(line.split("mops:1:skip ")[1] || "");
+    } else if (line.startsWith("mops:")) {
+      // ignore unknown mops messages
+    } else {
+      this._log(
+        "stdout",
+        " ".repeat(this.stack.length * 2),
+        chalk.gray("stdout"),
+        line,
+      );
+    }
+  }
 
-	_testStart(name : string) {
-		let suite = this.stack[this.stack.length - 1];
-		if (suite) {
-			if (this.currSuite !== suite) {
-				this.currSuite = suite;
-				this._log('suite', ' '.repeat((this.stack.length - 1) * 2), (chalk.gray('•')) + '', suite);
-			}
-		}
-		this.stack.push(name);
-	}
+  _testStart(name: string) {
+    let suite = this.stack[this.stack.length - 1];
+    if (suite) {
+      if (this.currSuite !== suite) {
+        this.currSuite = suite;
+        this._log(
+          "suite",
+          " ".repeat((this.stack.length - 1) * 2),
+          chalk.gray("•") + "",
+          suite,
+        );
+      }
+    }
+    this.stack.push(name);
+  }
 
-	_testEnd(name : string) {
-		let last = this.stack.pop();
-		if (name !== last) {
-			console.error(`Expected test name "${last}" but got "${name}"`);
-			console.error(`Stack: ${this.stack.join(' › ')}`);
-			console.error(`File: ${this.file}`);
-			throw 'mmf1._testEnd: start and end test mismatch';
-		}
-		this._status(name, 'pass');
-	}
+  _testEnd(name: string) {
+    let last = this.stack.pop();
+    if (name !== last) {
+      console.error(`Expected test name "${last}" but got "${name}"`);
+      console.error(`Stack: ${this.stack.join(" › ")}`);
+      console.error(`File: ${this.file}`);
+      throw "mmf1._testEnd: start and end test mismatch";
+    }
+    this._status(name, "pass");
+  }
 
-	_testSkip(name : string) {
-		this._status(name, 'skip');
-	}
+  _testSkip(name: string) {
+    this._status(name, "skip");
+  }
 
-	_status(name : string, status : TestStatus) {
-		if (status === 'pass') {
-			// do not print suite at the end
-			if (name === this.currSuite) {
-				return;
-			}
-			this.passed++;
-			this._log(status, ' '.repeat(this.stack.length * 2), chalk.green('✓'), name);
-			this.passedNamesFlat.push([this.file, ...this.stack, name].join(this.nestingSymbol));
-		}
-		else if (status === 'fail') {
-			this.failed++;
-			this._log(status, ' '.repeat(this.stack.length * 2), chalk.red('✖'), name);
-		}
-		else if (status === 'skip') {
-			this.skipped++;
-			this._log(status, ' '.repeat(this.stack.length * 2), chalk.yellow('−'), name);
-		}
-	}
+  _status(name: string, status: TestStatus) {
+    if (status === "pass") {
+      // do not print suite at the end
+      if (name === this.currSuite) {
+        return;
+      }
+      this.passed++;
+      this._log(
+        status,
+        " ".repeat(this.stack.length * 2),
+        chalk.green("✓"),
+        name,
+      );
+      this.passedNamesFlat.push(
+        [this.file, ...this.stack, name].join(this.nestingSymbol),
+      );
+    } else if (status === "fail") {
+      this.failed++;
+      this._log(
+        status,
+        " ".repeat(this.stack.length * 2),
+        chalk.red("✖"),
+        name,
+      );
+    } else if (status === "skip") {
+      this.skipped++;
+      this._log(
+        status,
+        " ".repeat(this.stack.length * 2),
+        chalk.yellow("−"),
+        name,
+      );
+    }
+  }
 
-	fail(stderr : string) {
-		let name = this.stack.pop() || '';
-		this._status(name, 'fail');
-		this._log('fail', ' '.repeat(this.stack.length * 2), chalk.red('FAIL'), stderr);
-	}
+  fail(stderr: string) {
+    let name = this.stack.pop() || "";
+    this._status(name, "fail");
+    this._log(
+      "fail",
+      " ".repeat(this.stack.length * 2),
+      chalk.red("FAIL"),
+      stderr,
+    );
+  }
 
-	pass() {
-		let name = this.stack.pop();
-		if (name) {
-			this._status(name, 'pass');
-		}
-		this._log('pass', ' '.repeat(this.stack.length * 2), chalk.green('PASS'));
-	}
-}
+  pass() {
+    let name = this.stack.pop();
+    if (name) {
+      this._status(name, "pass");
+    }
+    this._log("pass", " ".repeat(this.stack.length * 2), chalk.green("PASS"));
+  }
+}