@formatjs/cli 6.16.7 → 6.16.9

package/bin/formatjs

@@ -12320,18 +12320,34 @@ function getStdinAsString() {
 //#region packages/cli-lib/native.ts
 const require$1 = createRequire$1(import.meta.url);
 const NATIVE_PACKAGES = {
-	"darwin-arm64": "@formatjs/cli-native-darwin-arm64",
-	"linux-arm64": "@formatjs/cli-native-linux-arm64",
-	"linux-x64": "@formatjs/cli-native-linux-x64",
-	"win32-x64": "@formatjs/cli-native-win32-x64"
+	"darwin-arm64": ["@formatjs/cli-native-darwin-arm64"],
+	"linux-arm64": ["@formatjs/cli-native-linux-arm64", "@formatjs/cli-native-linux-arm64-musl"],
+	"linux-x64": ["@formatjs/cli-native-linux-x64", "@formatjs/cli-native-linux-x64-musl"],
+	"win32-x64": ["@formatjs/cli-native-win32-x64"]
 };
 let nativeBinding;
+function getInstalledNativePackageCandidates(candidates, canResolve = (candidate) => {
+	try {
+		require$1.resolve(candidate);
+		return true;
+	} catch {
+		return false;
+	}
+}) {
+	return candidates.filter(canResolve);
+}
+function getNativePackageCandidates(platform = process.platform, arch = process.arch) {
+	return NATIVE_PACKAGES[`${platform}-${arch}`] || [];
+}
 function loadNative() {
 	if (nativeBinding !== void 0) {
 		if (nativeBinding) return nativeBinding;
 		throw new Error("Native @formatjs/cli-lib binding is unavailable");
 	}
-	const candidates = [process.env.FORMATJS_CLI_LIB_NATIVE_PATH, NATIVE_PACKAGES[`${process.platform}-${process.arch}`]].filter(Boolean);
+	const overridePath = process.env.FORMATJS_CLI_LIB_NATIVE_PATH;
+	const packageCandidates = getNativePackageCandidates();
+	const installedPackageCandidates = getInstalledNativePackageCandidates(packageCandidates);
+	const candidates = [overridePath, ...installedPackageCandidates.length ? installedPackageCandidates : packageCandidates].filter(Boolean);
 	const loadErrors = [];
 	for (const candidate of candidates) try {
 		nativeBinding = require$1(candidate);
@@ -162922,6 +162938,11 @@ function interpolateName(loaderContext, name, options) {
 	if (typeof loaderContext.options === "object" && typeof loaderContext.options.customInterpolateName === "function") url = loaderContext.options.customInterpolateName.call(loaderContext, url, name, options);
 	return url;
 }
+const TRIM_UNICODE_WHITE_SPACE_RE = /^\p{White_Space}+|\p{White_Space}+$/gu;
+const UNICODE_WHITE_SPACE_RE = /\p{White_Space}+/gu;
+function normalizeMessageWhitespace(message) {
+	return message.replace(TRIM_UNICODE_WHITE_SPACE_RE, "").replace(UNICODE_WHITE_SPACE_RE, " ");
+}
 const stringify$1 = import_json_stable_stringify.default || import_json_stable_stringify;
 const MESSAGE_DESC_KEYS = [
 	"id",
@@ -163157,7 +163178,7 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 	});
 	if (extractionError) return;
 	if (!msg.defaultMessage && !msg.id) return;
-	if (msg.defaultMessage && !preserveWhitespace) msg.defaultMessage = msg.defaultMessage.trim().replace(/\s+/gm, " ");
+	if (msg.defaultMessage && !preserveWhitespace) msg.defaultMessage = normalizeMessageWhitespace(msg.defaultMessage);
 	if (flatten && msg.defaultMessage) try {
 		msg.defaultMessage = printAST(hoistSelectors(parse(msg.defaultMessage)));
 	} catch (e) {