as-test 0.5.1 → 0.5.3

package/bin/build.js

@@ -3,35 +3,87 @@ import { glob } from "glob";
 import chalk from "chalk";
 import { execSync } from "child_process";
 import * as path from "path";
-import { getPkgRunner, loadConfig } from "./util.js";
+import { applyMode, getPkgRunner, loadConfig } from "./util.js";
 const DEFAULT_CONFIG_PATH = path.join(process.cwd(), "./as-test.config.json");
-export async function build(configPath = DEFAULT_CONFIG_PATH, selectors = []) {
-    const config = loadConfig(configPath, false);
-    ensureDeps(config);
+export async function build(configPath = DEFAULT_CONFIG_PATH, selectors = [], modeName, featureToggles = {}) {
+    const loadedConfig = loadConfig(configPath, false);
+    const mode = applyMode(loadedConfig, modeName);
+    const config = mode.config;
+    if (!hasCustomBuildCommand(config)) {
+        ensureDeps(config);
+    }
     const pkgRunner = getPkgRunner();
     const inputPatterns = resolveInputPatterns(config.input, selectors);
-    const inputFiles = await glob(inputPatterns);
-    const buildArgs = getBuildArgs(config);
+    const inputFiles = (await glob(inputPatterns)).sort((a, b) => a.localeCompare(b));
+    const coverageEnabled = resolveCoverageEnabled(config.coverage, featureToggles.coverage);
+    const buildEnv = {
+        ...mode.env,
+        AS_TEST_COVERAGE_ENABLED: coverageEnabled ? "1" : "0",
+    };
     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;
-        }
+        const outFile = `${config.outDir}/${resolveArtifactFileName(file, config.buildOptions.target, modeName)}`;
+        const cmd = getBuildCommand(config, pkgRunner, file, outFile, modeName, featureToggles);
         try {
-            buildFile(cmd);
+            buildFile(cmd, buildEnv);
         }
         catch (error) {
-            throw new Error(`Failed to build ${path.basename(file)} with ${getBuildStderr(error)}`);
+            const modeLabel = modeName ?? "default";
+            throw new Error(`Failed to build ${path.basename(file)} in mode ${modeLabel} with ${getBuildStderr(error)}\nBuild command: ${cmd}`);
         }
     }
 }
+function hasCustomBuildCommand(config) {
+    return !!config.buildOptions.cmd.trim().length;
+}
+function getBuildCommand(config, pkgRunner, file, outFile, modeName, featureToggles = {}) {
+    const userArgs = getUserBuildArgs(config);
+    if (hasCustomBuildCommand(config)) {
+        return `${expandBuildCommand(config.buildOptions.cmd, file, outFile, config.buildOptions.target, modeName)}${userArgs}`;
+    }
+    const defaultArgs = getDefaultBuildArgs(config, featureToggles);
+    let cmd = `${pkgRunner} asc ${file}${userArgs}${defaultArgs}`;
+    if (config.outDir) {
+        cmd += " -o " + outFile;
+    }
+    return cmd;
+}
+function getUserBuildArgs(config) {
+    const args = config.buildOptions.args.filter((value) => value.length > 0);
+    if (args.length) {
+        return " " + args.join(" ");
+    }
+    return "";
+}
+function expandBuildCommand(template, file, outFile, target, modeName) {
+    const name = path
+        .basename(file)
+        .replace(/\.spec\.ts$/, "")
+        .replace(/\.ts$/, "");
+    return template
+        .replace(/<file>/g, file)
+        .replace(/<name>/g, name)
+        .replace(/<outFile>/g, outFile)
+        .replace(/<target>/g, target)
+        .replace(/<mode>/g, modeName ?? "");
+}
+function resolveArtifactFileName(file, target, modeName) {
+    const base = path
+        .basename(file)
+        .replace(/\.spec\.ts$/, "")
+        .replace(/\.ts$/, "");
+    if (!modeName) {
+        return `${path.basename(file).replace(".ts", ".wasm")}`;
+    }
+    return `${base}.${modeName}.${target}.wasm`;
+}
 function resolveInputPatterns(configured, selectors) {
-    const configuredInputs = Array.isArray(configured) ? configured : [configured];
+    const configuredInputs = Array.isArray(configured)
+        ? configured
+        : [configured];
     if (!selectors.length)
         return configuredInputs;
     const patterns = new Set();
-    for (const selector of selectors) {
+    for (const selector of expandSelectors(selectors)) {
         if (!selector)
             continue;
         if (isBareSuiteSelector(selector)) {
@@ -45,6 +97,30 @@ function resolveInputPatterns(configured, selectors) {
     }
     return [...patterns];
 }
+function expandSelectors(selectors) {
+    const expanded = [];
+    for (const selector of selectors) {
+        if (!selector)
+            continue;
+        if (!shouldSplitSelector(selector)) {
+            expanded.push(selector);
+            continue;
+        }
+        for (const token of selector.split(",")) {
+            const trimmed = token.trim();
+            if (!trimmed.length)
+                continue;
+            expanded.push(trimmed);
+        }
+    }
+    return expanded;
+}
+function shouldSplitSelector(selector) {
+    return (selector.includes(",") &&
+        !selector.includes("/") &&
+        !selector.includes("\\") &&
+        !/[*?[\]{}]/.test(selector));
+}
 function isBareSuiteSelector(selector) {
     return (!selector.includes("/") &&
         !selector.includes("\\") &&
@@ -60,15 +136,12 @@ function ensureDeps(config) {
             process.exit(1);
         }
     }
-    if (!hasJsonAsTransform()) {
-        console.log(`${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could not find json-as. Install it to compile as-test suites.`);
-        process.exit(1);
-    }
 }
-function buildFile(command) {
+function buildFile(command, env) {
     execSync(command, {
         stdio: ["ignore", "pipe", "pipe"],
         encoding: "utf8",
+        env,
     });
 }
 function getBuildStderr(error) {
@@ -87,17 +160,17 @@ function getBuildStderr(error) {
     const message = typeof err?.message == "string" ? err.message.trim() : "";
     return message || "unknown error";
 }
-function getBuildArgs(config) {
+function getDefaultBuildArgs(config, featureToggles) {
     let buildArgs = "";
+    const tryAsEnabled = resolveTryAsEnabled(featureToggles.tryAs);
     buildArgs += " --transform as-test/transform";
-    buildArgs += " --transform json-as/transform";
-    if (hasTryAsRuntime()) {
+    if (tryAsEnabled) {
         buildArgs += " --transform try-as/transform";
     }
     if (config.config && config.config !== "none") {
         buildArgs += " --config " + config.config;
     }
-    if (hasTryAsRuntime()) {
+    if (tryAsEnabled) {
         buildArgs += " --use AS_TEST_TRY_AS=1";
     }
     // Should also strip any bindings-enabling from asconfig
@@ -114,18 +187,30 @@ function getBuildArgs(config) {
         console.log(`${chalk.bgRed(" ERROR ")}${chalk.dim(":")} could not determine target in config! Set target to 'bindings' or 'wasi'`);
         process.exit(1);
     }
-    if (config.buildOptions.args.length &&
-        config.buildOptions.args.find((v) => v.length > 0)) {
-        buildArgs += " " + config.buildOptions.args.join(" ");
-    }
     return buildArgs;
 }
+function resolveTryAsEnabled(override) {
+    const installed = hasTryAsRuntime();
+    if (override === false)
+        return false;
+    if (override === true && !installed) {
+        throw new Error('try-as feature was enabled, but package "try-as" is not installed');
+    }
+    return installed;
+}
+function resolveCoverageEnabled(rawCoverage, override) {
+    if (override != undefined)
+        return override;
+    if (typeof rawCoverage == "boolean")
+        return rawCoverage;
+    if (rawCoverage && typeof rawCoverage == "object") {
+        const enabled = rawCoverage.enabled;
+        if (typeof enabled == "boolean")
+            return enabled;
+    }
+    return true;
+}
 function hasTryAsRuntime() {
     return (existsSync(path.join(process.cwd(), "node_modules/try-as")) ||
         existsSync(path.join(process.cwd(), "node_modules/try-as/package.json")));
 }
-function hasJsonAsTransform() {
-    return (existsSync(path.join(process.cwd(), "node_modules/json-as/transform.js")) ||
-        existsSync(path.join(process.cwd(), "node_modules/json-as/transform.ts")) ||
-        existsSync(path.join(process.cwd(), "node_modules/json-as/transform")));
-}