as-test 0.2.0 → 0.3.0

package/bin/about.js

@@ -0,0 +1,135 @@
+import chalk from "chalk";
+export function about() {
+  console.log(
+    chalk.bold.blueBright("as-test") +
+      " is a testing framework for AssemblyScript. " +
+      chalk.dim("(v" + version + ")") +
+      "\n",
+  );
+  console.log(
+    chalk.bold("Usage: as-test") +
+      " " +
+      chalk.dim("<command>") +
+      " " +
+      chalk.bold.blueBright("[...flags]") +
+      " " +
+      chalk.bold("[...args]") +
+      " " +
+      chalk.dim("(alias: ast)") +
+      "\n",
+  );
+  console.log(chalk.bold("Commands:"));
+  console.log(
+    "  " +
+      chalk.bold.blueBright("run") +
+      "       " +
+      chalk.dim("<my-test.spec.ts>") +
+      "       " +
+      "Run unit tests with selected runtime",
+  );
+  console.log(
+    "  " +
+      chalk.bold.blueBright("build") +
+      "     " +
+      chalk.dim("<my-test.spec.ts>") +
+      "       " +
+      "Build unit tests and compile",
+  );
+  console.log(
+    "  " +
+      chalk.bold.blueBright("test") +
+      "      " +
+      chalk.dim("<my-test.spec.ts>") +
+      "       " +
+      "Build and run unit tests with selected runtime" +
+      "\n",
+  );
+  console.log(
+    "  " +
+      chalk.bold.magentaBright("init") +
+      "       " +
+      chalk.strikethrough.dim("") +
+      "                       " +
+      "Initialize an empty testing template",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.bold.magentaBright("config") +
+      "     " +
+      chalk.strikethrough.dim("as-test.config.json") +
+      "    " +
+      "Specify the configuration file",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.bold.magentaBright("reporter") +
+      "   " +
+      chalk.strikethrough.dim("<tap>") +
+      "                  " +
+      "Specify the test reporter to use",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.bold.magentaBright("use") +
+      "        " +
+      chalk.strikethrough.dim("wasmtime") +
+      "               " +
+      "Specify the runtime to use" +
+      "\n",
+  );
+  console.log(chalk.bold("Flags:"));
+  console.log(
+    "  " +
+      chalk.strikethrough.dim("run") +
+      "        " +
+      chalk.strikethrough.bold.blue("--coverage") +
+      "             " +
+      "Use code coverage",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.dim("run") +
+      "        " +
+      chalk.strikethrough.bold.blue("--snapshot") +
+      "             " +
+      "Take a snapshot of the tests",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.dim("use") +
+      "        " +
+      chalk.strikethrough.bold.blue("--list") +
+      "                 " +
+      "List supported runtimes",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.dim("reporter") +
+      "   " +
+      chalk.strikethrough.bold.blue("--list") +
+      "                 " +
+      "List supported reporters",
+  );
+  console.log(
+    "  " +
+      chalk.strikethrough.dim("<command>") +
+      "  " +
+      chalk.strikethrough.bold.blue("--help") +
+      "                 " +
+      "Print info about command" +
+      "\n",
+  );
+  console.log(
+    chalk.dim(
+      "If your using this, consider dropping a star, it would help a lot!",
+    ) + "\n",
+  );
+  console.log(
+    "View the repo:                   " +
+      chalk.magenta("https://github.com/JairusSW/as-test"),
+  );
+  console.log(
+    "View the docs:                   " +
+      chalk.strikethrough.blue("https://docs.jairus.dev/as-test"),
+  );
+}

package/bin/build.js

@@ -1,145 +1,86 @@
 import { existsSync, readFileSync } from "fs";
-import { Config } from "./types.js";
 import { glob } from "glob";
 import chalk from "chalk";
-import { exec } from "child_process";
-import { formatTime } from "./util.js";
+import { execSync } from "child_process";
 import * as path from "path";
-export async function build(args) {
-  const CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
-  let config;
-  if (!existsSync(CONFIG_PATH)) {
-    console.log(
-      chalk.bgMagentaBright(" WARN ") +
-        chalk.dim(":") +
-        " Could not locate config file in the current directory! Continuing with default config." +
-        "\n",
-    );
-    config = new Config();
-  } else {
-    config = Object.assign(
-      new Config(),
-      JSON.parse(readFileSync(CONFIG_PATH).toString()),
-    );
-    console.log(chalk.dim("Loading config from: " + CONFIG_PATH) + "\n");
-  }
-  const ASCONFIG_PATH = path.join(process.cwd(), config.config);
-  if (!existsSync(ASCONFIG_PATH)) {
-    console.log(
-      chalk.bgMagentaBright(" WARN ") +
-        chalk.dim(":") +
-        ' Could not locate asconfig.json file! If you do not want to provide a config, set "config": "none". Continuing with default config.' +
-        "\n",
-    );
-  }
-  const pkg = JSON.parse(readFileSync("./package.json").toString());
-  let buildCommands = [];
-  if (config.buildOptions.wasi) {
-    if (!existsSync("./node_modules/@assemblyscript/wasi-shim/asconfig.json")) {
-      console.log(
-        chalk.bgRed(" ERROR ") +
-          chalk.dim(":") +
-          " " +
-          "could not find @assemblyscript/wasi-shim! Add it to your dependencies to run with WASI!",
-      );
-      process.exit(1);
+import { loadConfig } from "./util.js";
+const CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
+const PKG_PATH = path.join(process.cwd(), "./package.json");
+export async function build() {
+    let config = loadConfig(CONFIG_PATH, true);
+    const ASCONFIG_PATH = path.join(process.cwd(), config.config);
+    if (config.config && config.config !== "none" && !existsSync(ASCONFIG_PATH)) {
+        console.log(`${chalk.bgMagentaBright(" WARN ")}${chalk.dim(":")} Could not locate asconfig.json file! If you do not want to provide a config, set "config": "none"`);
     }
-    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",
-      ) &&
-      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!",
-      );
+    ensureDeps(config);
+    let pkgRunner = getPkgRunner();
+    const inputFiles = await glob(config.input);
+    let buildArgs = getBuildArgs(config);
+    for (const file of inputFiles) {
+        let cmd = `${pkgRunner} asc ${file}${buildArgs}`;
+        const outFile = `${config.outDir}/${file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm")}`;
+        if (config.outDir) {
+            cmd += " -o " + outFile;
+        }
+        buildFile(cmd);
     }
-  }
-  let packageManagerCommand = "npx";
-  if (
-    process.env.npm_config_user_agent &&
-    process.env.npm_config_user_agent.includes("pnpm")
-  ) {
-    packageManagerCommand = "pnpx";
-  } else if (
-    process.env.npm_config_user_agent &&
-    process.env.npm_config_user_agent.includes("yarn")
-  ) {
-    packageManagerCommand = "yarn run";
-  } else if (
-    process.env.npm_config_user_agent &&
-    process.env.npm_config_user_agent.includes("bun")
-  ) {
-    packageManagerCommand = "bunx";
-  }
-  console.log("");
-  const inputFiles = await glob(config.input);
-  for (const file of inputFiles) {
-    console.log(chalk.dim("Including " + file));
-    let command = `${packageManagerCommand} asc ${file}${args.length ? " " + args.join(" ") : ""}`;
-    if (config.config !== "none") {
-      command += " --config " + config.config;
+}
+function ensureDeps(config) {
+    const pkg = JSON.parse(readFileSync(PKG_PATH).toString());
+    if (config.buildOptions.target == "wasi") {
+        if (!existsSync("./node_modules/@assemblyscript/wasi-shim/asconfig.json")) {
+            console.log(`${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could not find @assemblyscript/wasi-shim! Add it to your dependencies to run with WASI!`);
+            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") &&
+            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!"`);
+        }
     }
-    if (config.buildOptions.wasi) {
-      command +=
-        " --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json";
+}
+function getPkgRunner() {
+    switch (process.env.npm_config_user_agent) {
+        case "pnpm": {
+            return "pnpx";
+        }
+        case "yarn": {
+            return "yarn";
+        }
+        case "bun": {
+            return "bunx";
+        }
     }
-    const outFile =
-      config.outDir +
-      "/" +
-      file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm");
-    if (config.outDir) {
-      command += " -o " + outFile;
+    return "npx";
+}
+function buildFile(command) {
+    execSync(command, { stdio: "inherit" });
+}
+function getBuildArgs(config) {
+    let buildArgs = "";
+    buildArgs += " --transform as-test/transform --transform json-as/transform";
+    if (config.config && config.config !== "none") {
+        buildArgs += " --config " + config.config;
     }
-    if (config.coverage.enabled) {
-      console.log(chalk.dim("Enabling coverage"));
-      command += " --use COVERAGE_USE=1 --transform as-test/transform";
-      if (config.coverage.show) command += " --use COVERAGE_SHOW=1";
+    // Should also strip any bindings-enabling from asconfig
+    if (config.buildOptions.target == "bindings") {
+        buildArgs += " --bindings raw --exportRuntime --exportStart _start";
     }
-    if (config.buildOptions.args) {
-      command += " " + config.buildOptions.args.join(" ");
+    else if (config.buildOptions.target == "wasi") {
+        buildArgs +=
+            " --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json";
     }
-    if (
-      ["node", "deno", "bun"].includes(
-        config.runOptions.runtime.run.split(" ")[0],
-      )
-    ) {
-      command += " --exportStart";
+    else {
+        console.log(`${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could determine target in config! Set target to 'bindings' or 'wasi'`);
+        process.exit(0);
     }
-    buildCommands.push(command);
-  }
-  const build = (command) => {
-    return new Promise((resolve, _) => {
-      console.log(chalk.dim("Building: " + command));
-      exec(command, (err, stdout, stderr) => {
-        if (config.buildOptions.verbose) {
-          process.stdout.write(stdout);
-        }
-        if (err) {
-          process.stderr.write(stderr + "\n");
-          process.exit(1);
-        }
-        resolve();
-      });
-    });
-  };
-  if (config.buildOptions.parallel) {
-    console.log(chalk.dim("Building sources in parallel..."));
-    const start = performance.now();
-    let builders = [];
-    for (const command of buildCommands) {
-      builders.push(build(command));
+    if (config.buildOptions.args.length &&
+        config.buildOptions.args.find((v) => v.length > 0)) {
+        buildArgs += " " + config.buildOptions.args.join(" ");
     }
-    await Promise.all(builders);
-    console.log(
-      chalk.dim("Compiled in " + formatTime(performance.now() - start)) + "\n",
-    );
-  }
+    return buildArgs;
 }

package/bin/index.js

@@ -7,38 +7,51 @@ const _args = process.argv.slice(2);
 const flags = [];
 const args = [];
 const COMMANDS = ["run", "build", "test", "init"];
-const version = "0.2.0";
+const version = "0.3.0";
 for (const arg of _args) {
-  if (arg.startsWith("-")) flags.push(arg);
-  else args.push(arg);
+    if (arg.startsWith("-"))
+        flags.push(arg);
+    else
+        args.push(arg);
 }
 if (!args.length) {
-  if (flags.includes("--tap")) {
-    console.log(`TAP version 13
-# timing test
-ok 1 should be strictly equal
-not ok 2 should be strictly equal
-  ---
-    operator: equal
-    expected: 100
-    actual:   107
-  ...
-
-1..2
-# tests 2
-# pass  1
-# fail  1`);
-  } else if (flags.includes("--version") || flags.includes("-v")) {
-    console.log("as-test" + " " + version.toString());
-  } else {
-    console.log(
-      chalk.bold.blueBright("as-test") +
+    if (flags.includes("--version") || flags.includes("-v")) {
+        console.log("as-test v" + version.toString());
+    }
+    else {
+        info();
+    }
+}
+else if (COMMANDS.includes(args[0])) {
+    const command = args.shift();
+    if (command === "build") {
+        build();
+    }
+    else if (command === "run") {
+        run();
+    }
+    else if (command === "test") {
+        build().then(() => {
+            run();
+        });
+    }
+    else if (command === "init") {
+        init(args);
+    }
+}
+else {
+    console.log(chalk.bgRed(" ERROR ") +
+        chalk.dim(":") +
+        " " +
+        chalk.bold("Unknown command: ") +
+        args[0]);
+}
+function info() {
+    console.log(chalk.bold.blueBright("as-test") +
         " is a testing framework for AssemblyScript. " +
         chalk.dim("(v" + version + ")") +
-        "\n",
-    );
-    console.log(
-      chalk.bold("Usage: as-test") +
+        "\n");
+    console.log(chalk.bold("Usage: as-test") +
         " " +
         chalk.dim("<command>") +
         " " +
@@ -47,142 +60,87 @@ not ok 2 should be strictly equal
         chalk.bold("[...args]") +
         " " +
         chalk.dim("(alias: ast)") +
-        "\n",
-    );
+        "\n");
     console.log(chalk.bold("Commands:"));
-    console.log(
-      "  " +
+    console.log("  " +
         chalk.bold.blueBright("run") +
         "       " +
         chalk.dim("<my-test.spec.ts>") +
         "       " +
-        "Run unit tests with selected runtime",
-    );
-    console.log(
-      "  " +
+        "Run unit tests with selected runtime");
+    console.log("  " +
         chalk.bold.blueBright("build") +
         "     " +
         chalk.dim("<my-test.spec.ts>") +
         "       " +
-        "Build unit tests and compile",
-    );
-    console.log(
-      "  " +
+        "Build unit tests and compile");
+    console.log("  " +
         chalk.bold.blueBright("test") +
         "      " +
         chalk.dim("<my-test.spec.ts>") +
         "       " +
         "Build and run unit tests with selected runtime" +
-        "\n",
-    );
-    console.log(
-      "  " +
+        "\n");
+    console.log("  " +
         chalk.bold.magentaBright("init") +
         "       " +
         chalk.strikethrough.dim("") +
         "                       " +
-        "Initialize an empty testing template",
-    );
-    console.log(
-      "  " +
+        "Initialize an empty testing template");
+    console.log("  " +
         chalk.strikethrough.bold.magentaBright("config") +
         "     " +
         chalk.strikethrough.dim("as-test.config.json") +
         "    " +
-        "Specify the configuration file",
-    );
-    console.log(
-      "  " +
+        "Specify the configuration file");
+    console.log("  " +
         chalk.strikethrough.bold.magentaBright("reporter") +
         "   " +
         chalk.strikethrough.dim("<tap>") +
         "                  " +
-        "Specify the test reporter to use",
-    );
-    console.log(
-      "  " +
+        "Specify the test reporter to use");
+    console.log("  " +
         chalk.strikethrough.bold.magentaBright("use") +
         "        " +
         chalk.strikethrough.dim("wasmtime") +
         "               " +
         "Specify the runtime to use" +
-        "\n",
-    );
+        "\n");
     console.log(chalk.bold("Flags:"));
-    console.log(
-      "  " +
+    console.log("  " +
         chalk.strikethrough.dim("run") +
         "        " +
         chalk.strikethrough.bold.blue("--coverage") +
         "             " +
-        "Use code coverage",
-    );
-    console.log(
-      "  " +
+        "Use code coverage");
+    console.log("  " +
         chalk.strikethrough.dim("run") +
         "        " +
         chalk.strikethrough.bold.blue("--snapshot") +
         "             " +
-        "Take a snapshot of the tests",
-    );
-    console.log(
-      "  " +
+        "Take a snapshot of the tests");
+    console.log("  " +
         chalk.strikethrough.dim("use") +
         "        " +
         chalk.strikethrough.bold.blue("--list") +
         "                 " +
-        "List supported runtimes",
-    );
-    console.log(
-      "  " +
+        "List supported runtimes");
+    console.log("  " +
         chalk.strikethrough.dim("reporter") +
         "   " +
         chalk.strikethrough.bold.blue("--list") +
         "                 " +
-        "List supported reporters",
-    );
-    console.log(
-      "  " +
+        "List supported reporters");
+    console.log("  " +
         chalk.strikethrough.dim("<command>") +
         "  " +
         chalk.strikethrough.bold.blue("--help") +
         "                 " +
         "Print info about command" +
-        "\n",
-    );
-    console.log(
-      chalk.dim(
-        "If your using this, consider dropping a star, it would help a lot!",
-      ) + "\n",
-    );
-    console.log(
-      "View the repo:                   " +
-        chalk.magenta("https://github.com/JairusSW/as-test"),
-    );
-    console.log(
-      "View the docs:                   " +
-        chalk.strikethrough.blue("https://docs.jairus.dev/as-test"),
-    );
-  }
-} else if (COMMANDS.includes(args[0])) {
-  const command = args.shift();
-  if (command === "build") {
-    build(args);
-  } else if (command === "run") {
-    run();
-  } else if (command === "test") {
-    build(args).then(() => {
-      run();
-    });
-  } else if (command === "init") {
-    init(args);
-  }
-} else {
-  console.log(
-    chalk.bgRed(" ERROR ") +
-      chalk.dim(":") +
-      " " +
-      chalk.bold("Unknown command: ") +
-      args[0],
-  );
+        "\n");
+    console.log(chalk.dim("If your using this, consider dropping a star, it would help a lot!") + "\n");
+    console.log("View the repo:                   " +
+        chalk.magenta("https://github.com/JairusSW/as-test"));
+    console.log("View the docs:                   " +
+        chalk.strikethrough.blue("https://docs.jairus.dev/as-test"));
 }