@formatjs/cli 6.16.10 → 6.16.12

package/bin/formatjs

@@ -45,7 +45,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
+var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
 //#region node_modules/.aspect_rules_js/commander@14.0.3/node_modules/commander/lib/error.js
 var require_error$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -3516,7 +3516,7 @@ var require_to_regex_range = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		let nines = 1;
 		let zeros = 1;
 		let stop = countNines(min, nines);
-		let stops = new Set([max]);
+		let stops = /* @__PURE__ */ new Set([max]);
 		while (min <= stop && stop <= max) {
 			stops.add(stop);
 			nines += 1;
@@ -12395,10 +12395,10 @@ function extractWithNative(inputFiles, opts = {}) {
 //#endregion
 //#region packages/cli-lib/compile.ts
 const dynamicImport = new Function("specifier", "return import(specifier)");
-const globSync$1 = import_out.sync;
+const globSync$1 = import_out.default.sync;
 const stringify$2 = import_json_stable_stringify.default || import_json_stable_stringify;
 const CUSTOM_FORMATTER_FILE_DEPRECATION_WARNING = "Passing a custom formatter file to --format during compilation is deprecated and will be removed in a future release. Prefer a built-in formatter name or pre-process translation files before running formatjs compile.";
-const BUILTIN_FORMATTERS$1 = new Set([
+const BUILTIN_FORMATTERS$1 = /* @__PURE__ */ new Set([
 	"default",
 	"simple",
 	"transifex",
@@ -15203,10 +15203,25 @@ function findBraceSyntaxEnd(message, index) {
 function printEscapedMessage(message, isInPlural = false) {
 	let result = "";
 	let literalStart = 0;
+	let quotedStart = -1;
+	let quotedEnd = -1;
+	function flushQuotedToken() {
+		if (quotedStart === -1) return;
+		const literal = message.slice(literalStart, quotedStart);
+		result += literal;
+		if (literal.endsWith("'")) result += "'";
+		result += quoteSyntaxToken(message.slice(quotedStart, quotedEnd));
+		literalStart = quotedEnd;
+		quotedStart = -1;
+	}
 	function quoteToken(start, end) {
-		result += message.slice(literalStart, start);
-		result += quoteSyntaxToken(message.slice(start, end));
-		literalStart = end;
+		if (quotedStart !== -1 && start === quotedEnd) {
+			quotedEnd = end;
+			return;
+		}
+		flushQuotedToken();
+		quotedStart = start;
+		quotedEnd = end;
 	}
 	for (let i = 0; i < message.length; i++) {
 		const ch = message[i];
@@ -15221,6 +15236,7 @@ function printEscapedMessage(message, isInPlural = false) {
 			i = end - 1;
 		} else if (isInPlural && ch === "#") quoteToken(i, i + 1);
 	}
+	flushQuotedToken();
 	return result + message.slice(literalStart);
 }
 function printLiteralElement({ value }, isInPlural, isFirstEl, isLastEl) {
@@ -15247,19 +15263,50 @@ function printArgumentStyle(style) {
 function printDateTimeSkeleton(style) {
 	return style.pattern;
 }
+function compareCodePoints(a, b) {
+	const aIter = a[Symbol.iterator]();
+	const bIter = b[Symbol.iterator]();
+	while (true) {
+		const aNext = aIter.next();
+		const bNext = bIter.next();
+		if (aNext.done || bNext.done) return aNext.done === bNext.done ? 0 : aNext.done ? -1 : 1;
+		const diff = aNext.value.codePointAt(0) - bNext.value.codePointAt(0);
+		if (diff !== 0) return diff;
+	}
+}
 function printSelectElement(el) {
+	const keys = Object.keys(el.options).sort(compareCodePoints);
 	return `{${[
 		el.value,
 		"select",
-		Object.keys(el.options).map((id) => `${id}{${doPrintAST(el.options[id].value, false)}}`).join(" ")
+		keys.map((id) => `${id}{${doPrintAST(el.options[id].value, false)}}`).join(" ")
 	].join(",")}}`;
 }
+const PLURAL_RULE_ORDER = {
+	zero: 0,
+	one: 1,
+	two: 2,
+	few: 3,
+	many: 4,
+	other: 5
+};
+function getPluralRuleSortOrder(rule) {
+	const categoryOrder = PLURAL_RULE_ORDER[rule];
+	if (categoryOrder !== void 0) return [categoryOrder, 0];
+	const exactRule = rule.replace(/^=+/, "");
+	return [6, /^[+-]?\d+$/.test(exactRule) ? Number(exactRule) : 0];
+}
 function printPluralElement(el) {
 	const type = el.pluralType === "cardinal" ? "plural" : "selectordinal";
+	const keys = Object.keys(el.options).sort((a, b) => {
+		const [pa, sa] = getPluralRuleSortOrder(a);
+		const [pb, sb] = getPluralRuleSortOrder(b);
+		return pa - pb || sa - sb;
+	});
 	return `{${[
 		el.value,
 		type,
-		[el.offset ? `offset:${el.offset}` : "", ...Object.keys(el.options).map((id) => `${id}{${doPrintAST(el.options[id].value, true)}}`)].filter(Boolean).join(" ")
+		[el.offset ? `offset:${el.offset}` : "", ...keys.map((id) => `${id}{${doPrintAST(el.options[id].value, true)}}`)].filter(Boolean).join(" ")
 	].join(",")}}`;
 }
 /*! *****************************************************************************
@@ -162991,7 +163038,7 @@ function isMultipleMessageDecl(ts, node) {
 	return ts.isIdentifier(node.expression) && node.expression.text === "defineMessages";
 }
 function isSingularMessageDecl(ts, node, additionalComponentNames) {
-	const compNames = new Set([
+	const compNames = /* @__PURE__ */ new Set([
 		"FormattedMessage",
 		"defineMessage",
 		"formatMessage",
@@ -163207,7 +163254,7 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 * @param sf
 */
 function isMemberMethodFormatMessageCall(ts, node, additionalFunctionNames) {
-	const fnNames = new Set([
+	const fnNames = /* @__PURE__ */ new Set([
 		"formatMessage",
 		"$formatMessage",
 		...additionalFunctionNames
@@ -163506,7 +163553,7 @@ ${e.message || ""}`;
 //#endregion
 //#region packages/cli-lib/extract.ts
 const stringify = import_json_stable_stringify.default || import_json_stable_stringify;
-const BUILTIN_FORMATTERS = new Set([
+const BUILTIN_FORMATTERS = /* @__PURE__ */ new Set([
 	"default",
 	"simple",
 	"transifex",
@@ -163514,7 +163561,7 @@ const BUILTIN_FORMATTERS = new Set([
 	"lokalise",
 	"crowdin"
 ]);
-const NATIVE_SUPPORTED_EXTENSIONS = new Set([
+const NATIVE_SUPPORTED_EXTENSIONS = /* @__PURE__ */ new Set([
 	".cjs",
 	".js",
 	".jsx",
@@ -163573,7 +163620,7 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
 		parseFile(source, fn, scriptParseFn);
 	} else if (fn.endsWith(".svelte")) {
 		debug$1("Processing %s using svelte extractor", fn);
-		const { parseFile } = await import("./svelte_extractor-BWjG2pEq.js");
+		const { parseFile } = await import("./svelte_extractor-x3_5PFcw.js");
 		parseFile(source, fn, scriptParseFn);
 	} else if (fn.endsWith(".hbs")) {
 		debug$1("Processing %s using hbs extractor", fn);
@@ -163827,7 +163874,7 @@ async function verify(files, { sourceLocale, missingKeys, extraKeys, structuralE
 }
 //#endregion
 //#region packages/cli-lib/cli.ts
-const globSync = import_out.sync;
+const globSync = import_out.default.sync;
 const KNOWN_COMMANDS = ["extract"];
 async function main(argv) {
 	(0, import_loud_rejection.default)();