as-test 0.3.0 → 0.3.2

package/bin/run.js

@@ -7,225 +7,256 @@ import { existsSync, mkdirSync, writeFileSync } from "fs";
 import { diff } from "typer-diff";
 const CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
 export async function run() {
-    const reports = [];
-    const config = loadConfig(CONFIG_PATH);
-    const inputFiles = await glob(config.input);
-    console.log(chalk.dim("Running tests using " + config.runOptions.runtime.name + ""));
-    const command = config.runOptions.runtime.run.split(" ")[0];
-    let execPath = getExec(command);
-    if (!execPath) {
-        console.log(`${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could not locate ${command} in PATH variable!`);
-        process.exit(0);
-    }
-    if (inputFiles.length) {
-        console.log(chalk.bold.blueBright(` _____  _____      _____  _____  _____  _____ `));
-        console.log(chalk.bold.blueBright(`|  _  ||   __| ___|_   _||   __||   __||_   _|`));
-        console.log(chalk.bold.blueBright(`|     ||__   ||___| | |  |   __||__   |  | |  `));
-        console.log(chalk.bold.blueBright(`|__|__||_____|      |_|  |_____||_____|  |_|  `));
-        console.log(chalk.dim("\n------------------- v0.3.0 -------------------\n"));
+  const reports = [];
+  const config = loadConfig(CONFIG_PATH);
+  const inputFiles = await glob(config.input);
+  console.log(
+    chalk.dim("Running tests using " + config.runOptions.runtime.name + ""),
+  );
+  const command = config.runOptions.runtime.run.split(" ")[0];
+  let execPath = getExec(command);
+  if (!execPath) {
+    console.log(
+      `${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could not locate ${command} in PATH variable!`,
+    );
+    process.exit(0);
+  }
+  if (inputFiles.length) {
+    console.log(
+      chalk.bold.blueBright(` _____  _____      _____  _____  _____  _____ `),
+    );
+    console.log(
+      chalk.bold.blueBright(`|  _  ||   __| ___|_   _||   __||   __||_   _|`),
+    );
+    console.log(
+      chalk.bold.blueBright(`|     ||__   ||___| | |  |   __||__   |  | |  `),
+    );
+    console.log(
+      chalk.bold.blueBright(`|__|__||_____|      |_|  |_____||_____|  |_|  `),
+    );
+    console.log(
+      chalk.dim("\n------------------- v0.3.2 -------------------\n"),
+    );
+  }
+  for (const plugin of Object.keys(config.plugins)) {
+    if (!config.plugins[plugin]) continue;
+    console.log(
+      chalk.bgBlueBright(" PLUGIN ") +
+        " " +
+        chalk.dim(
+          "Using " + plugin.slice(0, 1).toUpperCase() + plugin.slice(1),
+        ) +
+        "\n",
+    );
+  }
+  for (let i = 0; i < inputFiles.length; i++) {
+    const file = inputFiles[i];
+    const outFile = path.join(
+      config.outDir,
+      file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm"),
+    );
+    let cmd = config.runOptions.runtime.run.replace(command, execPath);
+    if (config.buildOptions.target == "bindings") {
+      cmd = config.runOptions.runtime.run.replace(command, execPath);
+      if (cmd.includes("<name>")) {
+        cmd = cmd.replace(
+          "<name>",
+          file
+            .slice(file.lastIndexOf("/") + 1)
+            .replace(".ts", "")
+            .replace(".spec", ""),
+        );
+      } else {
+        cmd = cmd.replace(
+          "<file>",
+          outFile
+            .replace("build", "tests")
+            .replace(".spec", "")
+            .replace(".wasm", ".run.js"),
+        );
+      }
+    } else {
+      cmd = cmd.replace("<file>", outFile);
     }
-    for (const plugin of Object.keys(config.plugins)) {
-        if (!config.plugins[plugin])
-            continue;
-        console.log(chalk.bgBlueBright(" PLUGIN ") +
-            " " +
-            chalk.dim("Using " + plugin.slice(0, 1).toUpperCase() + plugin.slice(1)) +
-            "\n");
+    const report = JSON.parse(
+      await (() => {
+        return new Promise((res, _) => {
+          let stdout = "";
+          const io = exec(cmd);
+          io.stdout.pipe(process.stdout);
+          io.stderr.pipe(process.stderr);
+          io.stdout.on("data", (data) => {
+            stdout += readData(data);
+          });
+          io.stdout.on("close", () => {
+            res(stdout);
+          });
+        });
+      })(),
+    );
+    reports.push(report);
+  }
+  if (config.logs && config.logs != "none") {
+    if (!existsSync(path.join(process.cwd(), config.logs))) {
+      mkdirSync(path.join(process.cwd(), config.logs));
     }
-    for (let i = 0; i < inputFiles.length; i++) {
-        const file = inputFiles[i];
-        const outFile = path.join(config.outDir, file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm"));
-        let cmd = config.runOptions.runtime.run.replace(command, execPath);
-        if (config.buildOptions.target == "bindings") {
-            cmd = config.runOptions.runtime.run.replace(command, execPath);
-            if (cmd.includes("<name>")) {
-                cmd = cmd.replace("<name>", file
-                    .slice(file.lastIndexOf("/") + 1)
-                    .replace(".ts", "")
-                    .replace(".spec", ""));
+    writeFileSync(
+      path.join(process.cwd(), config.logs, "test.log.json"),
+      JSON.stringify(reports, null, 2),
+    );
+  }
+  const reporter = new Reporter(reports);
+  if (reporter.failed.length) {
+    console.log(chalk.dim("----------------- [FAILED] -------------------\n"));
+    for (const failed of reporter.failed) {
+      console.log(
+        `${chalk.bgRed(" FAIL ")} ${chalk.dim(failed.description)}\n`,
+      );
+      for (const test of failed.tests) {
+        const diffResult = diff(
+          JSON.stringify(test._left),
+          JSON.stringify(test._right),
+        );
+        let expected = chalk.dim(JSON.stringify(test._left));
+        let received = "";
+        for (const res of diffResult.diff) {
+          switch (res.type) {
+            case "correct": {
+              received += chalk.dim(res.value);
+              continue;
             }
-            else {
-                cmd = cmd.replace("<file>", outFile
-                    .replace("build", "tests")
-                    .replace(".spec", "")
-                    .replace(".wasm", ".run.js"));
+            case "extra": {
+              received += chalk.red.strikethrough(res.value);
+              continue;
             }
-        }
-        else {
-            cmd = cmd.replace("<file>", outFile);
-        }
-        const report = JSON.parse(await (() => {
-            return new Promise((res, _) => {
-                let stdout = "";
-                const io = exec(cmd);
-                io.stdout.pipe(process.stdout);
-                io.stderr.pipe(process.stderr);
-                io.stdout.on("data", (data) => {
-                    stdout += readData(data);
-                });
-                io.stdout.on("close", () => {
-                    res(stdout);
-                });
-            });
-        })());
-        reports.push(report);
-    }
-    if (config.logs && config.logs != "none") {
-        if (!existsSync(path.join(process.cwd(), config.logs))) {
-            mkdirSync(path.join(process.cwd(), config.logs));
-        }
-        writeFileSync(path.join(process.cwd(), config.logs, "test.log.json"), JSON.stringify(reports, null, 2));
-    }
-    const reporter = new Reporter(reports);
-    if (reporter.failed.length) {
-        console.log(chalk.dim("----------------- [FAILED] -------------------\n"));
-        for (const failed of reporter.failed) {
-            console.log(`${chalk.bgRed(" FAIL ")} ${chalk.dim(failed.description)}\n`);
-            for (const test of failed.tests) {
-                const diffResult = diff(JSON.stringify(test._left), JSON.stringify(test._right));
-                let expected = chalk.dim(JSON.stringify(test._left));
-                let received = "";
-                for (const res of diffResult.diff) {
-                    switch (res.type) {
-                        case "correct": {
-                            received += chalk.dim(res.value);
-                            continue;
-                        }
-                        case "extra": {
-                            received += chalk.red.strikethrough(res.value);
-                            continue;
-                        }
-                        case "missing": {
-                            received += chalk.bgBlack(res.value);
-                            continue;
-                        }
-                        case "wrong": {
-                            received += chalk.bgRed(res.value);
-                            continue;
-                        }
-                        case "untouched": {
-                            //received += chalk.bgBlackBright(res.value);
-                            continue;
-                        }
-                        case "spacer": {
-                            //received += chalk.bgBlackBright(res.value);
-                            continue;
-                        }
-                    }
-                }
-                if (test.verdict == "fail") {
-                    console.log(`${chalk.dim("(expected) ->")} ${expected}`);
-                    console.log(`${chalk.dim("(received) ->")} ${received}\n`);
-                }
+            case "missing": {
+              received += chalk.bgBlack(res.value);
+              continue;
+            }
+            case "wrong": {
+              received += chalk.bgRed(res.value);
+              continue;
+            }
+            case "untouched": {
+              //received += chalk.bgBlackBright(res.value);
+              continue;
             }
+            case "spacer": {
+              //received += chalk.bgBlackBright(res.value);
+              continue;
+            }
+          }
         }
+        if (test.verdict == "fail") {
+          console.log(`${chalk.dim("(expected) ->")} ${expected}`);
+          console.log(`${chalk.dim("(received) ->")} ${received}\n`);
+        }
+      }
     }
-    console.log(chalk.dim("----------------- [RESULTS] ------------------\n"));
-    process.stdout.write(chalk.bold("Files:  "));
-    if (reporter.failedFiles) {
-        process.stdout.write(chalk.bold.red(reporter.failedFiles + " failed"));
-    }
-    else {
-        process.stdout.write(chalk.bold.greenBright("0 failed"));
-    }
-    process.stdout.write(", " + (reporter.failedFiles + reporter.passedFiles) + " total\n");
-    process.stdout.write(chalk.bold("Suites: "));
-    if (reporter.failedSuites) {
-        process.stdout.write(chalk.bold.red(reporter.failedSuites + " failed"));
-    }
-    else {
-        process.stdout.write(chalk.bold.greenBright("0 failed"));
-    }
-    process.stdout.write(", " + (reporter.failedSuites + reporter.passedSuites) + " total\n");
-    process.stdout.write(chalk.bold("Tests:  "));
-    if (reporter.failedTests) {
-        process.stdout.write(chalk.bold.red(reporter.failedTests + " failed"));
-    }
-    else {
-        process.stdout.write(chalk.bold.greenBright("0 failed"));
-    }
-    process.stdout.write(", " + (reporter.failedTests + reporter.passedTests) + " total\n");
-    process.stdout.write(chalk.bold("Time:   ") + formatTime(reporter.time) + "\n");
-    if (reporter.failedFiles)
-        process.exit(1);
-    process.exit(0);
+  }
+  console.log(chalk.dim("----------------- [RESULTS] ------------------\n"));
+  process.stdout.write(chalk.bold("Files:  "));
+  if (reporter.failedFiles) {
+    process.stdout.write(chalk.bold.red(reporter.failedFiles + " failed"));
+  } else {
+    process.stdout.write(chalk.bold.greenBright("0 failed"));
+  }
+  process.stdout.write(
+    ", " + (reporter.failedFiles + reporter.passedFiles) + " total\n",
+  );
+  process.stdout.write(chalk.bold("Suites: "));
+  if (reporter.failedSuites) {
+    process.stdout.write(chalk.bold.red(reporter.failedSuites + " failed"));
+  } else {
+    process.stdout.write(chalk.bold.greenBright("0 failed"));
+  }
+  process.stdout.write(
+    ", " + (reporter.failedSuites + reporter.passedSuites) + " total\n",
+  );
+  process.stdout.write(chalk.bold("Tests:  "));
+  if (reporter.failedTests) {
+    process.stdout.write(chalk.bold.red(reporter.failedTests + " failed"));
+  } else {
+    process.stdout.write(chalk.bold.greenBright("0 failed"));
+  }
+  process.stdout.write(
+    ", " + (reporter.failedTests + reporter.passedTests) + " total\n",
+  );
+  process.stdout.write(
+    chalk.bold("Time:   ") + formatTime(reporter.time) + "\n",
+  );
+  if (reporter.failedFiles) process.exit(1);
+  process.exit(0);
 }
 class Reporter {
-    constructor(reports) {
-        this.passedFiles = 0;
-        this.failedFiles = 0;
-        this.passedSuites = 0;
-        this.failedSuites = 0;
-        this.passedTests = 0;
-        this.failedTests = 0;
-        this.failed = [];
-        this.time = 0.0;
-        this.readReports(reports);
+  constructor(reports) {
+    this.passedFiles = 0;
+    this.failedFiles = 0;
+    this.passedSuites = 0;
+    this.failedSuites = 0;
+    this.passedTests = 0;
+    this.failedTests = 0;
+    this.failed = [];
+    this.time = 0.0;
+    this.readReports(reports);
+  }
+  readReports(reports) {
+    for (const file of reports) {
+      this.readFile(file);
     }
-    readReports(reports) {
-        for (const file of reports) {
-            this.readFile(file);
-        }
+  }
+  readFile(file) {
+    let failed = false;
+    for (const suite of file) {
+      if (suite.verdict == "fail") {
+        failed = true;
+        this.failedSuites++;
+      } else {
+        this.passedSuites++;
+      }
+      this.time += suite.time.end - suite.time.start;
+      for (const subSuite of suite.suites) {
+        this.readSuite(subSuite);
+      }
+      for (const test of suite.tests) {
+        if (test.verdict == "fail") this.failed.push(suite);
+        this.readTest(test);
+      }
     }
-    readFile(file) {
-        let failed = false;
-        for (const suite of file) {
-            if (suite.verdict == "fail") {
-                failed = true;
-                this.failedSuites++;
-            }
-            else {
-                this.passedSuites++;
-            }
-            this.time += suite.time.end - suite.time.start;
-            for (const subSuite of suite.suites) {
-                this.readSuite(subSuite);
-            }
-            for (const test of suite.tests) {
-                if (test.verdict == "fail")
-                    this.failed.push(suite);
-                this.readTest(test);
-            }
-        }
-        if (failed)
-            this.failedFiles++;
-        else
-            this.passedFiles++;
+    if (failed) this.failedFiles++;
+    else this.passedFiles++;
+  }
+  readSuite(suite) {
+    if (suite.verdict == "fail") {
+      this.failedSuites++;
+    } else {
+      this.passedSuites++;
     }
-    readSuite(suite) {
-        if (suite.verdict == "fail") {
-            this.failedSuites++;
-        }
-        else {
-            this.passedSuites++;
-        }
-        this.time += suite.time.end - suite.time.start;
-        for (const subSuite of suite.suites) {
-            this.readSuite(subSuite);
-        }
-        for (const test of suite.tests) {
-            if (test.verdict == "fail")
-                this.failed.push(suite);
-            this.readTest(test);
-        }
+    this.time += suite.time.end - suite.time.start;
+    for (const subSuite of suite.suites) {
+      this.readSuite(subSuite);
     }
-    readTest(test) {
-        if (test.verdict == "fail") {
-            this.failedTests++;
-        }
-        else {
-            this.passedTests++;
-        }
+    for (const test of suite.tests) {
+      if (test.verdict == "fail") this.failed.push(suite);
+      this.readTest(test);
     }
+  }
+  readTest(test) {
+    if (test.verdict == "fail") {
+      this.failedTests++;
+    } else {
+      this.passedTests++;
+    }
+  }
 }
 function readData(data) {
-    let out = "";
-    const start = data.indexOf("READ_LINE");
-    if (start >= 0) {
-        const slice = data.slice(start + 9);
-        const end = slice.indexOf("END_LINE");
-        out += slice.slice(0, end);
-        out += readData(slice);
-    }
-    return out;
+  let out = "";
+  const start = data.indexOf("READ_LINE");
+  if (start >= 0) {
+    const slice = data.slice(start + 9);
+    const end = slice.indexOf("END_LINE");
+    out += slice.slice(0, end);
+    out += readData(slice);
+  }
+  return out;
 }

package/bin/types.js

@@ -1,35 +1,35 @@
 export class Config {
-    constructor() {
-        this.input = ["./assembly/__tests__/*.spec.ts"];
-        this.outDir = "./build";
-        this.logs = "./logs";
-        this.config = "none";
-        this.plugins = {
-            coverage: true,
-        };
-        this.buildOptions = new BuildOptions();
-        this.runOptions = new RunOptions();
-    }
+  constructor() {
+    this.input = ["./assembly/__tests__/*.spec.ts"];
+    this.outDir = "./build";
+    this.logs = "./logs";
+    this.config = "none";
+    this.plugins = {
+      coverage: true,
+    };
+    this.buildOptions = new BuildOptions();
+    this.runOptions = new RunOptions();
+  }
 }
 export class Suite {
-    constructor() {
-        this.name = "";
-    }
+  constructor() {
+    this.name = "";
+  }
 }
 export class BuildOptions {
-    constructor() {
-        this.args = [];
-        this.target = "wasi";
-    }
+  constructor() {
+    this.args = [];
+    this.target = "wasi";
+  }
 }
 export class RunOptions {
-    constructor() {
-        this.runtime = new Runtime();
-    }
+  constructor() {
+    this.runtime = new Runtime();
+  }
 }
 export class Runtime {
-    constructor() {
-        this.name = "wasmtime";
-        this.run = "wasmtime <file>";
-    }
+  constructor() {
+    this.name = "wasmtime";
+    this.run = "wasmtime <file>";
+  }
 }

package/bin/util.js

@@ -3,45 +3,52 @@ import { Config } from "./types.js";
 import chalk from "chalk";
 import { delimiter, join } from "path";
 export function formatTime(ms) {
-    if (ms < 0) {
-        throw new Error("Time should be a non-negative number.");
+  if (ms < 0) {
+    throw new Error("Time should be a non-negative number.");
+  }
+  // Convert milliseconds to microseconds
+  const us = ms * 1000;
+  const units = [
+    { name: "μs", divisor: 1 },
+    { name: "ms", divisor: 1000 },
+    { name: "s", divisor: 1000 * 1000 },
+    { name: "m", divisor: 60 * 1000 * 1000 },
+    { name: "h", divisor: 60 * 60 * 1000 * 1000 },
+    { name: "d", divisor: 24 * 60 * 60 * 1000 * 1000 },
+  ];
+  for (let i = units.length - 1; i >= 0; i--) {
+    const unit = units[i];
+    if (us >= unit.divisor) {
+      const value = Math.round((us / unit.divisor) * 1000) / 1000;
+      return `${value}${unit.name}`;
     }
-    // Convert milliseconds to microseconds
-    const us = ms * 1000;
-    const units = [
-        { name: "μs", divisor: 1 },
-        { name: "ms", divisor: 1000 },
-        { name: "s", divisor: 1000 * 1000 },
-        { name: "m", divisor: 60 * 1000 * 1000 },
-        { name: "h", divisor: 60 * 60 * 1000 * 1000 },
-        { name: "d", divisor: 24 * 60 * 60 * 1000 * 1000 },
-    ];
-    for (let i = units.length - 1; i >= 0; i--) {
-        const unit = units[i];
-        if (us >= unit.divisor) {
-            const value = Math.round((us / unit.divisor) * 1000) / 1000;
-            return `${value}${unit.name}`;
-        }
-    }
-    return `${us}us`;
+  }
+  return `${us}us`;
 }
 export function loadConfig(CONFIG_PATH, warn = false) {
-    if (!existsSync(CONFIG_PATH)) {
-        if (warn)
-            console.log(`${chalk.bgMagentaBright(" WARN ")}${chalk.dim(":")} Could not locate config file in the current directory! Continuing with default config.`);
-        return new Config();
-    }
-    else {
-        return Object.assign(new Config(), JSON.parse(readFileSync(CONFIG_PATH).toString()));
-    }
+  if (!existsSync(CONFIG_PATH)) {
+    if (warn)
+      console.log(
+        `${chalk.bgMagentaBright(" WARN ")}${chalk.dim(":")} Could not locate config file in the current directory! Continuing with default config.`,
+      );
+    return new Config();
+  } else {
+    return Object.assign(
+      new Config(),
+      JSON.parse(readFileSync(CONFIG_PATH).toString()),
+    );
+  }
 }
 export function getExec(exec) {
-    const PATH = process.env.PATH.split(delimiter);
-    for (const pathDir of PATH) {
-        const fullPath = join(pathDir, exec + (process.platform === "win32" ? ".exe" : ""));
-        if (existsSync(fullPath)) {
-            return fullPath;
-        }
+  const PATH = process.env.PATH.split(delimiter);
+  for (const pathDir of PATH) {
+    const fullPath = join(
+      pathDir,
+      exec + (process.platform === "win32" ? ".exe" : ""),
+    );
+    if (existsSync(fullPath)) {
+      return fullPath;
     }
-    return null;
+  }
+  return null;
 }

package/cli/index.ts

@@ -11,7 +11,7 @@ const args: string[] = [];
 
 const COMMANDS: string[] = ["run", "build", "test", "init"];
 
-const version = "0.3.0";
+const version = "0.3.2";
 
 for (const arg of _args) {
   if (arg.startsWith("-")) flags.push(arg);

package/cli/init.ts

@@ -9,7 +9,7 @@ export async function init(args: string[]) {
     input: process.stdin,
     output: process.stdout,
   });
-  console.log(chalk.bold("as-test init v0.3.0") + "\n");
+  console.log(chalk.bold("as-test init v0.3.2") + "\n");
   console.log(chalk.dim("[1/3]") + " select a target [wasi/bindings]");
   const target = await ask(chalk.dim(" -> "), rl);
   if (!TARGETS.includes(target)) {
@@ -184,7 +184,6 @@ const exports = instantiate(module, {});`,
     existsSync(PKG_PATH) ? readFileSync(PKG_PATH).toString() : "{}",
   );
   if (!pkg["scripts"]) pkg["scripts"] = {};
-  if (pkg.scripts["test"]) process.exit(0);
   if (!pkg.scripts["pretest"]) {
     pkg.scripts["pretest"] = "as-test build";
     pkg.scripts["test"] = "as-test run";
@@ -193,7 +192,7 @@ const exports = instantiate(module, {});`,
   }
   if (!pkg["devDependencies"]) pkg["devDependencies"] = {};
   if (!pkg["devDependencies"]["as-test"])
-    pkg["devDependencies"]["as-test"] = "^0.3.0";
+    pkg["devDependencies"]["as-test"] = "^0.3.2";
   if (target == "bindings") {
     pkg["type"] = "module";
   }

package/cli/run.ts

@@ -42,7 +42,7 @@ export async function run() {
       chalk.bold.blueBright(`|__|__||_____|      |_|  |_____||_____|  |_|  `),
     );
     console.log(
-      chalk.dim("\n------------------- v0.3.0 -------------------\n"),
+      chalk.dim("\n------------------- v0.3.2 -------------------\n"),
     );
   }