as-test 0.1.7 → 0.1.8

package/bin/init.js

@@ -4,41 +4,37 @@ import * as path from "path";
 import { createInterface } from "readline";
 import { Config } from "./types.js";
 export function init(args) {
-  console.log(
-    chalk.bold("This command will make sure that the following files exist") +
-      "\n",
-  );
-  console.log(
-    "  " +
-      chalk.bold.blueBright("./as-test.config.json") +
-      chalk.dim(" - The core config file for as-test") +
-      "\n",
-  );
-  console.log(
-    "This command will attempt to update files to match the correct configuration.\n",
-  );
-  console.log("Do you want to proceed? [Y/n] ");
-  createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  }).question("", (answer) => {
-    if (answer.toLowerCase() === "y") {
-      initialize();
-    } else {
-      console.log("Exiting...");
-      process.exit(0);
-    }
-  });
+    console.log(chalk.bold("This command will make sure that the following files exist") +
+        "\n");
+    console.log("  " +
+        chalk.bold.blueBright("./as-test.config.json") +
+        chalk.dim(" - The core config file for as-test") +
+        "\n");
+    console.log("This command will attempt to update files to match the correct configuration.\n");
+    console.log("Do you want to proceed? [Y/n] ");
+    createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    }).question("", (answer) => {
+        if (answer.toLowerCase() === "y") {
+            initialize();
+        }
+        else {
+            console.log("Exiting...");
+            process.exit(0);
+        }
+    });
 }
 function initialize() {
-  const CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
-  if (existsSync(CONFIG_PATH)) {
-    console.log("Found ./as-test.config.json. Updating...");
-    process.exit(0);
-  } else {
-    console.log("Wrote ./as-test.config.json");
-    writeFileSync(CONFIG_PATH, JSON.stringify(new Config(), null, 2));
-    console.log(JSON.stringify(new Config(), null, 2));
-    process.exit(0);
-  }
+    const CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
+    if (existsSync(CONFIG_PATH)) {
+        console.log("Found ./as-test.config.json. Updating...");
+        process.exit(0);
+    }
+    else {
+        console.log("Wrote ./as-test.config.json");
+        writeFileSync(CONFIG_PATH, JSON.stringify(new Config(), null, 2));
+        console.log(JSON.stringify(new Config(), null, 2));
+        process.exit(0);
+    }
 }

package/bin/run.js

@@ -4,61 +4,50 @@ import chalk from "chalk";
 import { exec } from "child_process";
 import { glob } from "glob";
 const installScripts = new Map([
-  ["wasmtime", "curl https://wasmtime.dev/install.sh -sSf | bash"],
-  ["wasmer", "curl https://get.wasmer.io -sSfL | sh"],
+    ["wasmtime", "curl https://wasmtime.dev/install.sh -sSf | bash"],
+    ["wasmer", "curl https://get.wasmer.io -sSfL | sh"],
 ]);
 export async function run() {
-  const config = Object.assign(
-    new Config(),
-    JSON.parse(readFileSync("./as-test.config.json").toString()),
-  );
-  const inputFiles = await glob(config.input);
-  console.log(
-    chalk.dim("Running tests using " + config.runOptions.runtime.name + ""),
-  );
-  let execPath = "";
-  const PATH = process.env["PATH"]?.split(":");
-  for (const bin of PATH) {
-    if (bin.startsWith("/mnt/")) continue; // WSL
-    if (!existsSync(bin)) continue;
-    for (const file of readdirSync(bin)) {
-      if (
-        file == config.runOptions.runtime.name ||
-        file == config.runOptions.runtime.name + ".exe"
-      ) {
-        execPath = bin + "/" + file;
-      }
-    }
-  }
-  if (!execPath) {
-    console.log(
-      chalk.bgRed(" ERROR ") +
-        chalk.dim(":") +
-        " could not locate " +
-        config.runOptions.runtime.name +
-        " in your PATH variable. Either set it, or install it" +
-        (config.runOptions.runtime.name
-          ? "using " +
-            chalk.dim(installScripts.get(config.runOptions.runtime.name))
-          : "."),
-    );
-  }
-  for (const file of inputFiles) {
-    const outFile =
-      config.outDir +
-      "/" +
-      file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm");
-    exec(
-      config.runOptions.runtime.run
-        .replace(config.runOptions.runtime.name, execPath)
-        .replace("<file>", outFile),
-      (err, stdout, stderr) => {
-        process.stdout.write(stdout);
-        process.stderr.write(stderr);
-        if (err) {
-          process.exit(err.code);
+    const config = Object.assign(new Config(), JSON.parse(readFileSync("./as-test.config.json").toString()));
+    const inputFiles = await glob(config.input);
+    console.log(chalk.dim("Running tests using " + config.runOptions.runtime.name + ""));
+    let execPath = "";
+    const PATH = process.env["PATH"]?.split(":");
+    for (const bin of PATH) {
+        if (bin.startsWith("/mnt/"))
+            continue; // WSL
+        if (!existsSync(bin))
+            continue;
+        for (const file of readdirSync(bin)) {
+            if (file == config.runOptions.runtime.name ||
+                file == config.runOptions.runtime.name + ".exe") {
+                execPath = bin + "/" + file;
+            }
         }
-      },
-    );
-  }
+    }
+    if (!execPath) {
+        console.log(chalk.bgRed(" ERROR ") +
+            chalk.dim(":") +
+            " could not locate " +
+            config.runOptions.runtime.name +
+            " in your PATH variable. Either set it, or install it" +
+            (config.runOptions.runtime.name
+                ? "using " +
+                    chalk.dim(installScripts.get(config.runOptions.runtime.name))
+                : "."));
+    }
+    for (const file of inputFiles) {
+        const outFile = config.outDir +
+            "/" +
+            file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm");
+        exec(config.runOptions.runtime.run
+            .replace(config.runOptions.runtime.name, execPath)
+            .replace("<file>", outFile), (err, stdout, stderr) => {
+            process.stdout.write(stdout);
+            process.stderr.write(stderr);
+            if (err) {
+                process.exit(err.code);
+            }
+        });
+    }
 }

package/bin/types.js

@@ -1,41 +1,41 @@
 export class Config {
-  constructor() {
-    this.input = ["./assembly/__tests__/*.spec.ts"];
-    this.outDir = "./build";
-    this.config = "./asconfig.json";
-    this.suites = [];
-    this.coverage = new Coverage();
-    this.buildOptions = new BuildOptions();
-    this.runOptions = new RunOptions();
-  }
+    constructor() {
+        this.input = ["./assembly/__tests__/*.spec.ts"];
+        this.outDir = "./build";
+        this.config = "./asconfig.json";
+        this.suites = [];
+        this.coverage = new Coverage();
+        this.buildOptions = new BuildOptions();
+        this.runOptions = new RunOptions();
+    }
 }
 export class Suite {
-  constructor() {
-    this.name = "";
-  }
+    constructor() {
+        this.name = "";
+    }
 }
 export class Coverage {
-  constructor() {
-    this.enabled = false;
-    this.show = false;
-  }
+    constructor() {
+        this.enabled = false;
+        this.show = false;
+    }
 }
 export class BuildOptions {
-  constructor() {
-    this.args = [];
-    this.wasi = true;
-    this.parallel = true;
-    this.verbose = true;
-  }
+    constructor() {
+        this.args = [];
+        this.wasi = true;
+        this.parallel = true;
+        this.verbose = true;
+    }
 }
 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

@@ -1,23 +1,23 @@
 export function formatTime(ms) {
-  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}`;
+    if (ms < 0) {
+        throw new Error("Time should be a non-negative number.");
     }
-  }
-  return `${us}us`;
+    // 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`;
 }

package/cli/build.ts

@@ -51,26 +51,21 @@ export async function build(args: string[]) {
       process.exit(1);
     }
     if (
-      (pkg.dependencies &&
-        !Object.keys(pkg.dependencies).includes("@assemblyscript/wasi-shim")) ||
-      (pkg.devDependencies &&
-        !Object.keys(pkg.devDependencies).includes(
-          "@assemblyscript/wasi-shim",
-        )) ||
-      (pkg.peerDependencies &&
-        !Object.keys(pkg.peerDependencies).includes(
-          "@assemblyscript/wasi-shim",
-        ))
+      pkg.dependencies &&
+      !Object.keys(pkg.dependencies).includes("@assemblyscript/wasi-shim") &&
+      pkg.devDependencies &&
+      !Object.keys(pkg.devDependencies).includes("@assemblyscript/wasi-shim") &&
+      pkg.peerDependencies &&
+      !Object.keys(pkg.peerDependencies).includes(
+        "@assemblyscript/wasi-shim",
+      ) &&
+      existsSync("./node_modules/@assemblyscript/wasi-shim/asconfig.json")
     ) {
-      if (
-        existsSync("./node_modules/@assemblyscript/wasi-shim/asconfig.json")
-      ) {
-        console.log(
-          chalk.bold.bgMagentaBright(" WARN ") +
-            chalk.dim(": @assemblyscript/wasi-shim") +
-            " is not included in project dependencies!",
-        );
-      }
+      console.log(
+        chalk.bold.bgMagentaBright(" WARN ") +
+          chalk.dim(": @assemblyscript/wasi-shim") +
+          " is not included in project dependencies!",
+      );
     }
   }
 

package/cli/index.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "as-test",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Testing framework for AssemblyScript. Compatible with WASI or Bindings ",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -8,7 +8,6 @@
   "license": "MIT",
   "scripts": {
     "test": "node ./bin/index.js run",
-    "test:tap": "node ./bin/index.js --tap",
     "pretest": "node ./bin/index.js build",
     "build:transform": "tsc -p ./transform",
     "build:cli": "tsc -p cli",