as-test 0.2.1 → 0.3.1

package/bin/util.js

@@ -1,23 +1,47 @@
+import { existsSync, readFileSync } from "fs";
+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.");
-  }
-  // 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`;
+}
+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()));
+    }
+}
+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;
+        }
+    }
+    return null;
 }

package/cli/build.ts

@@ -2,51 +2,50 @@ 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";
+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);
 
-export async function build(args: string[]) {
-  const CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
-  let config: 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()),
-    ) as Config;
-    console.log(chalk.dim("Loading config from: " + CONFIG_PATH) + "\n");
-  }
   const ASCONFIG_PATH = path.join(process.cwd(), config.config);
-  if (!existsSync(ASCONFIG_PATH)) {
+  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". Continuing with default config.' +
-        "\n",
+      `${chalk.bgMagentaBright(" WARN ")}${chalk.dim(":")} Could not locate asconfig.json file! If you do not want to provide a config, set "config": "none"`,
     );
   }
-  const pkg = JSON.parse(readFileSync("./package.json").toString()) as {
+
+  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);
+  }
+}
+
+function ensureDeps(config: Config): void {
+  const pkg = JSON.parse(readFileSync(PKG_PATH).toString()) as {
     dependencies: string[] | null;
     devDependencies: string[] | null;
     peerDependencies: string[] | null;
   };
-  let buildCommands: string[] = [];
 
-  if (config.buildOptions.wasi) {
+  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!",
+        `${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could not find @assemblyscript/wasi-shim! Add it to your dependencies to run with WASI!`,
       );
       process.exit(1);
     }
@@ -62,95 +61,57 @@ export async function build(args: string[]) {
       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!",
+        `${chalk.bold.bgMagentaBright(" WARN ")}${chalk.dim(":")} @assemblyscript/wasi-shim is not included in project dependencies!"`,
       );
     }
   }
+}
 
-  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;
-    }
-    if (config.buildOptions.wasi) {
-      command +=
-        " --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json";
+function getPkgRunner(): string {
+  switch (process.env.npm_config_user_agent) {
+    case "pnpm": {
+      return "pnpx";
     }
-    const outFile =
-      config.outDir +
-      "/" +
-      file.slice(file.lastIndexOf("/") + 1).replace(".ts", ".wasm");
-    if (config.outDir) {
-      command += " -o " + outFile;
+    case "yarn": {
+      return "yarn";
     }
-    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";
+    case "bun": {
+      return "bunx";
     }
-    if (config.buildOptions.args) {
-      command += " " + config.buildOptions.args.join(" ");
-    }
-    if (
-      ["node", "deno", "bun"].includes(
-        config.runOptions.runtime.run.split(" ")[0],
-      )
-    ) {
-      command += " --exportStart";
-    }
-    buildCommands.push(command);
   }
+  return "npx";
+}
 
-  const build = (command: string) => {
-    return new Promise<void>((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();
-      });
-    });
-  };
+function buildFile(command: string): void {
+  execSync(command, { stdio: "inherit" });
+}
 
-  if (config.buildOptions.parallel) {
-    console.log(chalk.dim("Building sources in parallel..."));
-    const start = performance.now();
-    let builders: Promise<void>[] = [];
-    for (const command of buildCommands) {
-      builders.push(build(command));
-    }
+function getBuildArgs(config: Config): string {
+  let buildArgs = "";
 
-    await Promise.all(builders);
+  buildArgs += " --transform as-test/transform --transform json-as/transform";
+
+  if (config.config && config.config !== "none") {
+    buildArgs += " --config " + config.config;
+  }
+  // Should also strip any bindings-enabling from asconfig
+  if (config.buildOptions.target == "bindings") {
+    buildArgs += " --bindings raw --exportRuntime --exportStart _start";
+  } else if (config.buildOptions.target == "wasi") {
+    buildArgs +=
+      " --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json";
+  } else {
     console.log(
-      chalk.dim("Compiled in " + formatTime(performance.now() - start)) + "\n",
+      `${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could determine target in config! Set target to 'bindings' or 'wasi'`,
     );
+    process.exit(0);
+  }
+
+  if (
+    config.buildOptions.args.length &&
+    config.buildOptions.args.find((v) => v.length > 0)
+  ) {
+    buildArgs += " " + config.buildOptions.args.join(" ");
   }
+  return buildArgs;
 }

package/cli/index.ts

@@ -11,7 +11,7 @@ const args: string[] = [];
 
 const COMMANDS: string[] = ["run", "build", "test", "init"];
 
-const version = "0.2.1";
+const version = "0.3.1";
 
 for (const arg of _args) {
   if (arg.startsWith("-")) flags.push(arg);
@@ -19,172 +19,19 @@ for (const arg of _args) {
 }
 
 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());
+  if (flags.includes("--version") || flags.includes("-v")) {
+    console.log("as-test v" + version.toString());
   } else {
-    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"),
-    );
+    info();
   }
 } else if (COMMANDS.includes(args[0]!)) {
   const command = args.shift();
   if (command === "build") {
-    build(args);
+    build();
   } else if (command === "run") {
     run();
   } else if (command === "test") {
-    build(args).then(() => {
+    build().then(() => {
       run();
     });
   } else if (command === "init") {
@@ -199,3 +46,145 @@ not ok 2 should be strictly equal
       args[0],
   );
 }
+
+function info(): void {
+  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"),
+  );
+}