@formatjs/unplugin 1.1.4 → 1.1.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/unplugin",
   "description": "Universal build plugin for FormatJS — supports Vite, Webpack, Rollup, esbuild, and Rspack",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "license": "MIT",
   "author": "Long Ho <holevietlong@gmail.com>",
   "type": "module",

package/transform.d.ts

@@ -7,6 +7,7 @@ export interface Options {
 	additionalFunctionNames?: string[];
 	ast?: boolean;
 	preserveWhitespace?: boolean;
+	flatten?: boolean;
 }
 export declare function transform(code: string, id: string, options: Options): {
 	code: string;

package/transform.js

@@ -2,9 +2,11 @@ import { parseSync, Visitor } from "oxc-parser";
 import MagicString from "magic-string";
 import { interpolateName } from "@formatjs/ts-transformer";
 import { parse } from "@formatjs/icu-messageformat-parser";
+import { hoistSelectors } from "@formatjs/icu-messageformat-parser/manipulator.js";
+import { printAST } from "@formatjs/icu-messageformat-parser/printer.js";
 const DEFAULT_ID_INTERPOLATION_PATTERN = "[sha512:contenthash:base64:6]";
 export function transform(code, id, options) {
-	const { overrideIdFn, idInterpolationPattern = DEFAULT_ID_INTERPOLATION_PATTERN, removeDefaultMessage = false, additionalComponentNames = [], additionalFunctionNames = [], ast: preParseAst = false, preserveWhitespace = false } = options;
+	const { overrideIdFn, idInterpolationPattern = DEFAULT_ID_INTERPOLATION_PATTERN, removeDefaultMessage = false, additionalComponentNames = [], additionalFunctionNames = [], ast: preParseAst = false, preserveWhitespace = false, flatten = true } = options;
 	const componentNames = new Set(["FormattedMessage", ...additionalComponentNames]);
 	const functionNames = new Set([
 		"formatMessage",
@@ -122,6 +124,13 @@ export function transform(code, id, options) {
 		if (defaultMessage && !preserveWhitespace) {
 			defaultMessage = defaultMessage.trim().replace(/\s+/gm, " ");
 		}
+		// Apply flatten transformation (hoist selectors + normalize ICU format via printAST)
+		// This must happen before ID generation so the ID matches formatjs extract and babel-plugin-formatjs
+		if (flatten && defaultMessage) {
+			try {
+				defaultMessage = printAST(hoistSelectors(parse(defaultMessage)));
+			} catch (e) {}
+		}
 		// Generate ID
 		let newId = existingId;
 		if (overrideIdFn) {