@formatjs/cli 6.14.4 → 6.14.5

package/bin/formatjs

@@ -2,7 +2,7 @@
 import { fileURLToPath as _furl } from "node:url";
 import { dirname as _dname } from "node:path";
 _dname(_furl(import.meta.url));
-import { _ as __exportAll, a as warn, c as require_json_stable_stringify, d as isPluralElement, f as isSelectElement, g as __commonJSMin, h as parse, i as getStdinAsString, l as TYPE, m as isTagElement, n as interpolateName, o as writeStderr, p as isStructurallySame, r as debug, s as writeStdout, t as parseScript, u as isLiteralElement, v as __require, y as __toESM } from "./parse_script-BLH7yZ7h.js";
+import { _ as __exportAll, a as warn, c as require_json_stable_stringify, d as isPluralElement, f as isSelectElement, g as __commonJSMin, h as parse, i as getStdinAsString, l as TYPE, m as isTagElement, n as interpolateName, o as writeStderr, p as isStructurallySame, r as debug, s as writeStdout, t as parseScript, u as isLiteralElement, v as __require, y as __toESM } from "./parse_script-Dh6HQV8l.js";
 import { basename, join, resolve } from "path";
 import { readFileSync } from "fs";
 import { readFile } from "fs/promises";
@@ -11444,7 +11444,7 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
 		parseFile(source, fn, opts);
 	} else if (fn.endsWith(".gts") || fn.endsWith(".gjs")) {
 		debug("Processing %s as gts/gjs file", fn);
-		const { parseFile } = await import("./gts_extractor-DbRF6KL4.js");
+		const { parseFile } = await import("./gts_extractor-CEZNDfvc.js");
 		parseFile(source, fn, opts);
 	} else {
 		debug("Processing %s using typescript extractor", fn);

package/bin/{gts_extractor-DbRF6KL4.js → gts_extractor-CEZNDfvc.js}

@@ -1,7 +1,7 @@
 import { fileURLToPath as _furl } from "node:url";
 import { dirname as _dname } from "node:path";
 _dname(_furl(import.meta.url));
-import { t as parseScript } from "./parse_script-BLH7yZ7h.js";
+import { t as parseScript } from "./parse_script-Dh6HQV8l.js";
 import { parseFile as parseFile$1 } from "./hbs_extractor-BBhVhSg0.js";
 import { Preprocessor } from "content-tag";
 //#region packages/cli-lib/gts_extractor.ts
@@ -14,4 +14,4 @@ function parseFile(source, fileName, options) {
 //#endregion
 export { parseFile };
 
-//# sourceMappingURL=gts_extractor-DbRF6KL4.js.map
+//# sourceMappingURL=gts_extractor-CEZNDfvc.js.map

package/bin/{gts_extractor-DbRF6KL4.js.map → gts_extractor-CEZNDfvc.js.map}

@@ -1 +1 @@
-{"version":3,"file":"gts_extractor-DbRF6KL4.js","names":[],"sources":["../gts_extractor.ts"],"sourcesContent":["import {Preprocessor} from 'content-tag'\nimport {parseFile as parseHbsFile} from '#packages/cli-lib/hbs_extractor.js'\nimport {parseScript} from '#packages/cli-lib/parse_script.js'\nlet p = new Preprocessor()\n\nexport function parseFile(\n  source: string,\n  fileName: string,\n  options: any\n): void {\n  const scriptParseFn = parseScript(options, fileName)\n  const transformedSource = p.process(source, {filename: fileName})\n\n  scriptParseFn(transformedSource.code)\n\n  // extract template from transformed source to then run through hbs processor\n  const parseResult = p.parse(source, {filename: fileName})\n\n  for (let parsed of parseResult) {\n    parseHbsFile(parsed.contents, fileName, options)\n  }\n}\n"],"mappings":";;;;;;;AAGA,IAAI,IAAI,IAAI,cAAc;AAE1B,SAAgB,UACd,QACA,UACA,SACM;AACgB,aAAY,SAAS,SAAS,CAC1B,EAAE,QAAQ,QAAQ,EAAC,UAAU,UAAS,CAAC,CAEjC,KAAK;CAGrC,MAAM,cAAc,EAAE,MAAM,QAAQ,EAAC,UAAU,UAAS,CAAC;AAEzD,MAAK,IAAI,UAAU,YACjB,aAAa,OAAO,UAAU,UAAU,QAAQ"}
+{"version":3,"file":"gts_extractor-CEZNDfvc.js","names":[],"sources":["../gts_extractor.ts"],"sourcesContent":["import {Preprocessor} from 'content-tag'\nimport {parseFile as parseHbsFile} from '#packages/cli-lib/hbs_extractor.js'\nimport {parseScript} from '#packages/cli-lib/parse_script.js'\nlet p = new Preprocessor()\n\nexport function parseFile(\n  source: string,\n  fileName: string,\n  options: any\n): void {\n  const scriptParseFn = parseScript(options, fileName)\n  const transformedSource = p.process(source, {filename: fileName})\n\n  scriptParseFn(transformedSource.code)\n\n  // extract template from transformed source to then run through hbs processor\n  const parseResult = p.parse(source, {filename: fileName})\n\n  for (let parsed of parseResult) {\n    parseHbsFile(parsed.contents, fileName, options)\n  }\n}\n"],"mappings":";;;;;;;AAGA,IAAI,IAAI,IAAI,cAAc;AAE1B,SAAgB,UACd,QACA,UACA,SACM;AACgB,aAAY,SAAS,SAAS,CAC1B,EAAE,QAAQ,QAAQ,EAAC,UAAU,UAAS,CAAC,CAEjC,KAAK;CAGrC,MAAM,cAAc,EAAE,MAAM,QAAQ,EAAC,UAAU,UAAS,CAAC;AAEzD,MAAK,IAAI,UAAU,YACjB,aAAa,OAAO,UAAU,UAAU,QAAQ"}

package/bin/{parse_script-BLH7yZ7h.js → parse_script-Dh6HQV8l.js}

@@ -151818,7 +151818,8 @@ function isSingularMessageDecl(ts, node, additionalComponentNames) {
 	return compNames.has(fnName);
 }
 function evaluateStringConcat(ts, node) {
-	const { right, left } = node;
+	const right = unwrapTransparentTypeScriptExpression(ts, node.right);
+	const left = unwrapTransparentTypeScriptExpression(ts, node.left);
 	if (!ts.isStringLiteral(right)) return ["", false];
 	if (ts.isStringLiteral(left)) return [left.text + right.text, true];
 	if (ts.isBinaryExpression(left)) {
@@ -151827,6 +151828,15 @@ function evaluateStringConcat(ts, node) {
 	}
 	return ["", false];
 }
+function unwrapTransparentTypeScriptExpression(ts, node) {
+	let current = node;
+	while (ts.isAsExpression(current) || ts.isSatisfiesExpression(current) || ts.isNonNullExpression(current) || ts.isTypeAssertionExpression(current)) current = current.expression;
+	return current;
+}
+function unwrapObjectLiteralExpression(ts, node) {
+	const expression = unwrapTransparentTypeScriptExpression(ts, node);
+	return ts.isObjectLiteralExpression(expression) ? expression : void 0;
+}
 function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocation, preserveWhitespace, flatten, throws = true, onMsgError }, sf) {
 	let extractionError = null;
 	function handleError(errorMsg, errorNode) {
@@ -151849,31 +151859,32 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 		const { name } = prop;
 		const initializer = ts.isPropertyAssignment(prop) || ts.isJsxAttribute(prop) ? prop.initializer : void 0;
 		if (name && ts.isIdentifier(name) && initializer) {
-			if (ts.isStringLiteral(initializer)) switch (name.text) {
+			const value = ts.isPropertyAssignment(prop) ? unwrapTransparentTypeScriptExpression(ts, prop.initializer) : initializer;
+			if (ts.isStringLiteral(value)) switch (name.text) {
 				case "id":
-					msg.id = initializer.text;
+					msg.id = value.text;
 					break;
 				case "defaultMessage":
-					msg.defaultMessage = initializer.text;
+					msg.defaultMessage = value.text;
 					break;
 				case "description":
-					msg.description = initializer.text;
+					msg.description = value.text;
 					break;
 			}
-			else if (ts.isNoSubstitutionTemplateLiteral(initializer)) switch (name.text) {
+			else if (ts.isNoSubstitutionTemplateLiteral(value)) switch (name.text) {
 				case "id":
-					msg.id = initializer.text;
+					msg.id = value.text;
 					break;
 				case "defaultMessage":
-					msg.defaultMessage = initializer.text;
+					msg.defaultMessage = value.text;
 					break;
 				case "description":
-					msg.description = initializer.text;
+					msg.description = value.text;
 					break;
 			}
-			else if (ts.isTaggedTemplateExpression(initializer)) {
+			else if (ts.isTaggedTemplateExpression(value)) {
 				if (!(name.text === "id" || name.text === "defaultMessage" || name.text === "description")) return;
-				const { template } = initializer;
+				const { template } = value;
 				if (!ts.isNoSubstitutionTemplateLiteral(template)) {
 					handleError("[FormatJS] Tagged template expression must be no substitution", prop);
 					return;
@@ -151889,35 +151900,34 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 						msg.description = template.text;
 						break;
 				}
-			} else if (ts.isJsxExpression(initializer) && initializer.expression) {
-				if (ts.isStringLiteral(initializer.expression)) switch (name.text) {
+			} else if (ts.isJsxExpression(value) && value.expression) {
+				const expression = unwrapTransparentTypeScriptExpression(ts, value.expression);
+				if (ts.isStringLiteral(expression)) switch (name.text) {
 					case "id":
-						msg.id = initializer.expression.text;
+						msg.id = expression.text;
 						break;
 					case "defaultMessage":
-						msg.defaultMessage = initializer.expression.text;
+						msg.defaultMessage = expression.text;
 						break;
 					case "description":
-						msg.description = initializer.expression.text;
+						msg.description = expression.text;
 						break;
 				}
-				else if (ts.isObjectLiteralExpression(initializer.expression) && name.text === "description") msg.description = objectLiteralExpressionToObj(ts, initializer.expression);
-				else if (ts.isNoSubstitutionTemplateLiteral(initializer.expression)) {
-					const { expression } = initializer;
-					switch (name.text) {
-						case "id":
-							msg.id = expression.text;
-							break;
-						case "defaultMessage":
-							msg.defaultMessage = expression.text;
-							break;
-						case "description":
-							msg.description = expression.text;
-							break;
-					}
-				} else if (ts.isTaggedTemplateExpression(initializer.expression)) {
+				else if (ts.isObjectLiteralExpression(expression) && name.text === "description") msg.description = objectLiteralExpressionToObj(ts, expression);
+				else if (ts.isNoSubstitutionTemplateLiteral(expression)) switch (name.text) {
+					case "id":
+						msg.id = expression.text;
+						break;
+					case "defaultMessage":
+						msg.defaultMessage = expression.text;
+						break;
+					case "description":
+						msg.description = expression.text;
+						break;
+				}
+				else if (ts.isTaggedTemplateExpression(expression)) {
 					if (!(name.text === "id" || name.text === "defaultMessage" || name.text === "description")) return;
-					const { expression: { template } } = initializer;
+					const { template } = expression;
 					if (!ts.isNoSubstitutionTemplateLiteral(template)) {
 						handleError("[FormatJS] Tagged template expression must be no substitution", prop);
 						return;
@@ -151933,8 +151943,7 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 							msg.description = template.text;
 							break;
 					}
-				} else if (ts.isBinaryExpression(initializer.expression)) {
-					const { expression } = initializer;
+				} else if (ts.isBinaryExpression(expression)) {
 					const [result, isStatic] = evaluateStringConcat(ts, expression);
 					if (isStatic) switch (name.text) {
 						case "id":
@@ -151955,8 +151964,8 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 					handleError(`[FormatJS] \`${name.text}\` must be a string literal to be extracted.`, prop);
 					return;
 				}
-			} else if (ts.isBinaryExpression(initializer)) {
-				const [result, isStatic] = evaluateStringConcat(ts, initializer);
+			} else if (ts.isBinaryExpression(value)) {
+				const [result, isStatic] = evaluateStringConcat(ts, value);
 				if (isStatic) switch (name.text) {
 					case "id":
 						msg.id = result;
@@ -151972,7 +151981,7 @@ function extractMessageDescriptor(ts, node, { overrideIdFn, extractSourceLocatio
 					handleError(`[FormatJS] \`${name.text}\` must be a string literal or statically evaluable expression to be extracted.`, prop);
 					return;
 				}
-			} else if (ts.isObjectLiteralExpression(initializer) && name.text === "description") msg.description = objectLiteralExpressionToObj(ts, initializer);
+			} else if (ts.isObjectLiteralExpression(value) && name.text === "description") msg.description = objectLiteralExpressionToObj(ts, value);
 			else if (MESSAGE_DESC_KEYS.includes(name.text) && name.text !== "description") {
 				handleError(`[FormatJS] \`${name.text}\` must be a string literal to be extracted.`, prop);
 				return;
@@ -152056,12 +152065,13 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
 	const { onMsgExtracted, additionalFunctionNames } = opts;
 	if (isMultipleMessageDecl(ts, node)) {
 		const [arg, ...restArgs] = node.arguments;
-		let descriptorsObj;
-		if (ts.isObjectLiteralExpression(arg)) descriptorsObj = arg;
-		else if (ts.isAsExpression(arg) && ts.isObjectLiteralExpression(arg.expression)) descriptorsObj = arg.expression;
+		const descriptorsObj = unwrapObjectLiteralExpression(ts, arg);
 		if (descriptorsObj) {
 			const properties = descriptorsObj.properties;
-			const msgs = properties.filter((prop) => ts.isPropertyAssignment(prop)).map((prop) => ts.isObjectLiteralExpression(prop.initializer) && extractMessageDescriptor(ts, prop.initializer, opts, sf)).filter((msg) => !!msg);
+			const msgs = properties.filter((prop) => ts.isPropertyAssignment(prop)).map((prop) => {
+				const descriptor = unwrapObjectLiteralExpression(ts, prop.initializer);
+				return descriptor && extractMessageDescriptor(ts, descriptor, opts, sf);
+			}).filter((msg) => !!msg);
 			if (!msgs.length) return node;
 			debug("Multiple messages extracted from \"%s\": %s", sf.fileName, msgs);
 			if (typeof onMsgExtracted === "function") onMsgExtracted(sf.fileName, msgs);
@@ -152077,12 +152087,13 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
 		}
 	} else if (isSingularMessageDecl(ts, node, opts.additionalComponentNames || []) || isMemberMethodFormatMessageCall(ts, node, additionalFunctionNames || [])) {
 		const [descriptorsObj, ...restArgs] = node.arguments;
-		if (ts.isObjectLiteralExpression(descriptorsObj)) {
-			const msg = extractMessageDescriptor(ts, descriptorsObj, opts, sf);
+		const descriptor = unwrapObjectLiteralExpression(ts, descriptorsObj);
+		if (descriptor) {
+			const msg = extractMessageDescriptor(ts, descriptor, opts, sf);
 			if (!msg) return node;
 			debug("Message extracted from \"%s\": %s", sf.fileName, msg);
 			if (typeof onMsgExtracted === "function") onMsgExtracted(sf.fileName, [msg]);
-			return factory.updateCallExpression(node, node.expression, node.typeArguments, [setAttributesInObject(ts, factory, descriptorsObj, {
+			return factory.updateCallExpression(node, node.expression, node.typeArguments, [setAttributesInObject(ts, factory, descriptor, {
 				defaultMessage: opts.removeDefaultMessage ? void 0 : msg.defaultMessage,
 				id: msg.id
 			}, opts.ast), ...restArgs]);
@@ -152167,4 +152178,4 @@ ${e.message || ""}`;
 //#endregion
 export { __exportAll as _, warn as a, require_json_stable_stringify as c, isPluralElement$2 as d, isSelectElement$2 as f, __commonJSMin as g, parse as h, getStdinAsString as i, TYPE$2 as l, isTagElement$2 as m, interpolateName as n, writeStderr as o, isStructurallySame as p, debug$1 as r, writeStdout as s, parseScript as t, isLiteralElement$1 as u, __require as v, __toESM as y };
 
-//# sourceMappingURL=parse_script-BLH7yZ7h.js.map
+//# sourceMappingURL=parse_script-Dh6HQV8l.js.map