emsdk-env 0.6.0 → 0.7.0

package/dist/{build-C7VNCGou.cjs → build-CjKDHGn4.cjs}

@@ -1,11 +1,11 @@
 /*!
  * name: emsdk-env
- * version: 0.6.0
+ * version: 0.7.0
  * description: Emscripten environment builder
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/emsdk-env
- * git.commit.hash: b3d95605029bb48999dacbfe7f264f960144b13d
+ * git.commit.hash: ddec7e7cc6c59a23b5c87cbd7f99f44e4da3e4b7
  */
 
 "use strict";
@@ -540,6 +540,24 @@ const resolveEmarCommand = async (env, emsdkRoot) => {
   }
   return "emar";
 };
+const resolveWasmOptCommand = async (env, emsdkRoot) => {
+  var _a;
+  if (env.WASM_OPT) {
+    return env.WASM_OPT;
+  }
+  const binaryenRoot = (_a = env.BINARYEN_ROOT) != null ? _a : env.BINARYEN;
+  if (binaryenRoot) {
+    const candidate = path.join(binaryenRoot, "bin", "wasm-opt");
+    if (await pathExists(candidate)) {
+      return candidate;
+    }
+  }
+  const fallback = path.join(emsdkRoot, "upstream", "bin", "wasm-opt");
+  if (await pathExists(fallback)) {
+    return fallback;
+  }
+  return "wasm-opt";
+};
 const createConsoleLogger = (prefix) => {
   return {
     debug: (msg) => console.debug(`[${prefix}]: ${msg}`),
@@ -556,6 +574,7 @@ const DEFAULT_IMPORT_INCLUDE_DIR = "include";
 const DEFAULT_IMPORT_LIB_DIR = "lib";
 const DEFAULT_WASM_BUILD_DIR = path.join(os.tmpdir(), "emsdk-env");
 const DEFAULT_EMSDK_TARGET_VERSION = "latest";
+const DEFAULT_WASM_OPT_ARGS = ["-Oz"];
 let buildSequence = 0;
 const padNumber = (value, length = 2) => String(value).padStart(length, "0");
 const formatTimestamp = (date) => {
@@ -586,6 +605,17 @@ const mergeDefines = (common, target) => ({
   ...common != null ? common : {},
   ...target != null ? target : {}
 });
+const resolveWasmOptEnabled = (common, target) => {
+  var _a, _b;
+  return (_b = (_a = target == null ? void 0 : target.enable) != null ? _a : common == null ? void 0 : common.enable) != null ? _b : false;
+};
+const resolveWasmOptArgs = (common, target, env) => {
+  var _a, _b;
+  const commonArgs = (_a = common == null ? void 0 : common.args) != null ? _a : DEFAULT_WASM_OPT_ARGS;
+  const targetArgs = (_b = target == null ? void 0 : target.args) != null ? _b : [];
+  const mergedArgs = [...commonArgs, ...targetArgs];
+  return expandArray(mergedArgs, env, "wasmOpt.args");
+};
 const resolvePath = (rootDir, value) => path.isAbsolute(value) ? value : path.resolve(rootDir, value);
 const expandPlaceholders = (value, env, label) => value.replace(/\{([A-Z0-9_]+)\}/g, (_match, key) => {
   const replacement = env[key];
@@ -887,6 +917,15 @@ const buildWasm = async (options) => {
   if (emarCommand) {
     logger.debug(`Detected emarCommand: '${emarCommand}'`);
   }
+  let wasmOptCommand;
+  const getWasmOptCommand = async () => {
+    if (wasmOptCommand) {
+      return wasmOptCommand;
+    }
+    wasmOptCommand = await resolveWasmOptCommand(envWithDirs, emsdkRoot);
+    logger.debug(`Detected wasmOptCommand: '${wasmOptCommand}'`);
+    return wasmOptCommand;
+  };
   const outFiles = {};
   const buildTargets = async (expectedType) => {
     var _a2;
@@ -906,12 +945,18 @@ const buildWasm = async (options) => {
             `exports is not supported for archive target: ${targetName}`
           );
         }
+        if (target.wasmOpt !== void 0) {
+          throw new Error(
+            `wasmOpt is not supported for archive target: ${targetName}`
+          );
+        }
       }
       const mergedLinkOptions = targetType === "archive" ? [] : [
         ...ensureArray(common.linkOptions),
         ...ensureArray(target.linkOptions)
       ];
       const mergedExports = targetType === "archive" ? [] : [...ensureArray(common.exports), ...ensureArray(target.exports)];
+      const wasmOptEnabled = targetType === "archive" ? false : resolveWasmOptEnabled(common.wasmOpt, target.wasmOpt);
       const baseCompileOptions = [
         ...ensureArray(common.options),
         ...ensureArray(target.options)
@@ -972,6 +1017,7 @@ const buildWasm = async (options) => {
       const resolvedLinkOptions = targetType === "archive" ? [] : expandArray(mergedLinkOptions, targetEnv, "linkOptions");
       const resolvedExports = targetType === "archive" ? [] : expandArray(mergedExports, targetEnv, "exports");
       const exportArgs = buildExportFlags(resolvedExports);
+      const resolvedWasmOptArgs = wasmOptEnabled ? resolveWasmOptArgs(common.wasmOpt, target.wasmOpt, targetEnv) : [];
       const baseCompileArgs = buildCompileArgs(
         baseCompileOptions,
         baseIncludeDirs,
@@ -1105,6 +1151,27 @@ const buildWasm = async (options) => {
           buildEnv,
           emsdkOptions.signal
         );
+        if (wasmOptEnabled) {
+          const tempOutFile = `${resolvedOutFile}.opt`;
+          const wasmOptArgs = [
+            resolvedOutFile,
+            "-o",
+            tempOutFile,
+            ...resolvedWasmOptArgs
+          ];
+          const wasmOptCommand2 = await getWasmOptCommand();
+          logger.info(`Optimizing target: ${targetName}.wasm`);
+          logger.debug(`wasm-opt ${wasmOptArgs.join(" ")}`);
+          await runCommandWithEnv(
+            wasmOptCommand2,
+            wasmOptArgs,
+            rootDir,
+            buildEnv,
+            emsdkOptions.signal
+          );
+          await promises.rm(resolvedOutFile, { force: true });
+          await promises.rename(tempOutFile, resolvedOutFile);
+        }
       }
       outFiles[targetName] = resolvedOutFile;
     }
@@ -1125,4 +1192,4 @@ const buildWasm = async (options) => {
 exports.buildWasm = buildWasm;
 exports.createConsoleLogger = createConsoleLogger;
 exports.prepareEmsdk = prepareEmsdk;
-//# sourceMappingURL=build-C7VNCGou.cjs.map
+//# sourceMappingURL=build-CjKDHGn4.cjs.map