emsdk-env 0.6.0 → 0.8.0

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

@@ -1,11 +1,11 @@
 /*!
  * name: emsdk-env
- * version: 0.6.0
+ * version: 0.8.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: 8c3f97866a85cc6c99383eff3526c04077032eac
  */
 
 "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) => {
@@ -582,10 +601,101 @@ const normalizePrepareOptions = (options) => {
     ...rest
   };
 };
+const parseKeyValueInput = (values) => {
+  const parsed = {};
+  for (const entry of values) {
+    const index = entry.indexOf("=");
+    if (index === -1) {
+      parsed[entry] = void 0;
+      continue;
+    }
+    const key = entry.slice(0, index);
+    const value = entry.slice(index + 1);
+    parsed[key] = value;
+  }
+  return parsed;
+};
+const isKeyValueMap = (value) => value instanceof Map;
+const normalizeKeyValueInput = (input) => {
+  if (!input) {
+    return {};
+  }
+  if (Array.isArray(input)) {
+    return parseKeyValueInput(input);
+  }
+  if (isKeyValueMap(input)) {
+    return Object.fromEntries(input);
+  }
+  return { ...input };
+};
 const mergeDefines = (common, target) => ({
-  ...common != null ? common : {},
-  ...target != null ? target : {}
+  ...normalizeKeyValueInput(common),
+  ...normalizeKeyValueInput(target)
 });
+const mergeLinkDirectives = (common, target) => mergeDefines(common, 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.options) != null ? _a : DEFAULT_WASM_OPT_ARGS;
+  const targetArgs = (_b = target == null ? void 0 : target.options) != null ? _b : [];
+  const mergedArgs = [...commonArgs, ...targetArgs];
+  return expandArray(mergedArgs, env, "wasmOpt.options");
+};
+const stripOuterQuotes = (value) => {
+  const trimmed = value.trim();
+  if (trimmed.startsWith('"') && trimmed.endsWith('"') || trimmed.startsWith("'") && trimmed.endsWith("'")) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
+};
+const extractWasmBinaryFile = (value) => {
+  if (value.startsWith("WASM_BINARY_FILE=")) {
+    return value.slice("WASM_BINARY_FILE=".length);
+  }
+  const match = value.match(/^(?:-s|--settings)(?:=)?WASM_BINARY_FILE=(.+)$/);
+  if (match) {
+    return match[1];
+  }
+  return void 0;
+};
+const resolveWasmBinaryFileFromLinkOptions = (linkOptions) => {
+  for (let index = 0; index < linkOptions.length; index += 1) {
+    const option = linkOptions[index];
+    if (!option) {
+      continue;
+    }
+    if (option === "-s" || option === "--settings") {
+      const next = linkOptions[index + 1];
+      if (!next) {
+        continue;
+      }
+      const extracted2 = extractWasmBinaryFile(next);
+      if (extracted2) {
+        return stripOuterQuotes(extracted2);
+      }
+    }
+    const extracted = extractWasmBinaryFile(option);
+    if (extracted) {
+      return stripOuterQuotes(extracted);
+    }
+  }
+  return void 0;
+};
+const resolveWasmOptInputFile = (resolvedOutFile, resolvedLinkOptions) => {
+  const wasmBinaryFile = resolveWasmBinaryFileFromLinkOptions(resolvedLinkOptions);
+  if (wasmBinaryFile) {
+    return path.isAbsolute(wasmBinaryFile) ? wasmBinaryFile : path.resolve(path.dirname(resolvedOutFile), wasmBinaryFile);
+  }
+  const parsed = path.parse(resolvedOutFile);
+  if (parsed.ext.toLowerCase() === ".wasm") {
+    return resolvedOutFile;
+  }
+  const baseName = parsed.name.toLowerCase().endsWith(".wasm") ? parsed.name : `${parsed.name}.wasm`;
+  return path.join(parsed.dir, baseName);
+};
 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];
@@ -606,6 +716,17 @@ const resolveDefines = (defines, env) => {
   }
   return resolved;
 };
+const resolveLinkDirectives = (directives, env) => {
+  const resolved = {};
+  for (const [key, value] of Object.entries(directives)) {
+    if (typeof value === "string") {
+      resolved[key] = expandPlaceholders(value, env, `linkDirectives.${key}`);
+    } else {
+      resolved[key] = value;
+    }
+  }
+  return resolved;
+};
 const resolveIncludeDirs = (includeDirs, env, rootDir) => {
   const expanded = expandArray(includeDirs, env, "includeDirs");
   return expanded.map((value) => resolvePath(rootDir, value));
@@ -624,7 +745,17 @@ const resolveSourcesFromPatterns = async (patterns, env, srcDir, label) => {
   sources.sort();
   return sources;
 };
-const buildDefineFlags = (defines) => Object.entries(defines).map(([key, value]) => `-D${key}=${String(value)}`);
+const buildDefineFlags = (defines) => Object.entries(defines).flatMap(
+  ([key, value]) => value === null || value === void 0 ? [`-D${key}`] : [`-D${key}=${String(value)}`]
+);
+const buildLinkDirectiveFlags = (directives) => {
+  if (Object.keys(directives).length === 0) {
+    return [];
+  }
+  return Object.entries(directives).flatMap(
+    ([key, value]) => value === null || value === void 0 ? ["-s", key] : ["-s", `${key}=${String(value)}`]
+  );
+};
 const buildExportFlags = (exports$1) => {
   if (exports$1.length === 0) {
     return [];
@@ -887,6 +1018,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;
@@ -901,17 +1041,29 @@ const buildWasm = async (options) => {
             `linkOptions is not supported for archive target: ${targetName}`
           );
         }
+        if (target.linkDirectives !== void 0) {
+          throw new Error(
+            `linkDirectives is not supported for archive target: ${targetName}`
+          );
+        }
         if (target.exports !== void 0) {
           throw new Error(
             `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 mergedLinkDirectives = targetType === "archive" ? {} : mergeLinkDirectives(common.linkDirectives, target.linkDirectives);
       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)
@@ -969,9 +1121,15 @@ const buildWasm = async (options) => {
       const targetBuildDir = path.resolve(buildRunDir, targetName);
       await promises.rm(targetBuildDir, { recursive: true, force: true });
       await ensureDirectory(targetBuildDir);
-      const resolvedLinkOptions = targetType === "archive" ? [] : expandArray(mergedLinkOptions, targetEnv, "linkOptions");
+      const resolvedLinkDirectives = targetType === "archive" ? {} : resolveLinkDirectives(mergedLinkDirectives, targetEnv);
+      const linkDirectiveArgs = buildLinkDirectiveFlags(resolvedLinkDirectives);
+      const resolvedLinkOptions = targetType === "archive" ? [] : [
+        ...linkDirectiveArgs,
+        ...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,
@@ -980,7 +1138,6 @@ const buildWasm = async (options) => {
         rootDir
       );
       const groupCompileArgs = sourceGroups.map((group) => {
-        var _a3;
         const groupOptions = [
           ...baseCompileOptions,
           ...ensureArray(group == null ? void 0 : group.options)
@@ -989,7 +1146,7 @@ const buildWasm = async (options) => {
           ...baseIncludeDirs,
           ...ensureArray(group == null ? void 0 : group.includeDirs)
         ];
-        const groupDefines = mergeDefines(baseDefines, (_a3 = group == null ? void 0 : group.defines) != null ? _a3 : {});
+        const groupDefines = mergeDefines(baseDefines, group == null ? void 0 : group.defines);
         return buildCompileArgs(
           groupOptions,
           groupIncludeDirs,
@@ -1105,6 +1262,36 @@ const buildWasm = async (options) => {
           buildEnv,
           emsdkOptions.signal
         );
+        if (wasmOptEnabled) {
+          const wasmOptInput = resolveWasmOptInputFile(
+            resolvedOutFile,
+            resolvedLinkOptions
+          );
+          if (!await pathExists(wasmOptInput)) {
+            throw new Error(
+              `wasm-opt enabled but wasm binary not found: ${wasmOptInput}`
+            );
+          }
+          const tempOutFile = `${wasmOptInput}.opt`;
+          const wasmOptArgs = [
+            wasmOptInput,
+            "-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(wasmOptInput, { force: true });
+          await promises.rename(tempOutFile, wasmOptInput);
+        }
       }
       outFiles[targetName] = resolvedOutFile;
     }
@@ -1125,4 +1312,4 @@ const buildWasm = async (options) => {
 exports.buildWasm = buildWasm;
 exports.createConsoleLogger = createConsoleLogger;
 exports.prepareEmsdk = prepareEmsdk;
-//# sourceMappingURL=build-C7VNCGou.cjs.map
+//# sourceMappingURL=build-ya4uDvN7.cjs.map