@formatjs/cli 6.16.3 → 6.16.5

package/bin/formatjs

@@ -5,8 +5,8 @@ const __filename = _furl(import.meta.url);
 const __dirname = _dname(__filename);
 import { createRequire } from "node:module";
 import * as path from "path";
-import { basename, join, resolve } from "path";
-import { readFileSync } from "fs";
+import { basename, extname, join, resolve } from "path";
+import { existsSync, readFileSync } from "fs";
 import { readFile } from "fs/promises";
 import { pathToFileURL } from "url";
 import { clearLine, cursorTo } from "readline";
@@ -6753,7 +6753,7 @@ var require_pattern = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 	exports.hasGlobStar = hasGlobStar;
 	function endsWithSlashGlobStar(pattern) {
-		return pattern.endsWith("/" + GLOBSTAR);
+		return pattern.endsWith("/**");
 	}
 	exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
 	function isAffectDepthOfReadingPattern(pattern) {
@@ -12360,13 +12360,29 @@ function compileMessagesWithNative(messages, opts = {}) {
 		skipErrors: opts.skipErrors
 	});
 }
+function extractWithNative(inputFiles, opts = {}) {
+	return loadNative().extract([...inputFiles], {
+		additionalComponentNames: opts.additionalComponentNames,
+		additionalFunctionNames: opts.additionalFunctionNames,
+		extractSourceLocation: opts.extractSourceLocation,
+		flatten: opts.flatten,
+		followLinks: opts.followLinks,
+		format: opts.format,
+		idInterpolationPattern: opts.idInterpolationPattern,
+		ignore: opts.ignore,
+		inFile: opts.inFile,
+		pragma: opts.pragma,
+		preserveWhitespace: opts.preserveWhitespace,
+		throws: opts.throws
+	});
+}
 //#endregion
 //#region packages/cli-lib/compile.ts
 const dynamicImport = new Function("specifier", "return import(specifier)");
 const globSync$1 = import_out.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 = new Set([
+const BUILTIN_FORMATTERS$1 = new Set([
 	"default",
 	"simple",
 	"transifex",
@@ -12384,7 +12400,7 @@ async function compile$6(inputFiles, opts = {}) {
 	debug$1("Compiling files:", inputFiles);
 	const { ast, format, pseudoLocale, skipErrors, ignoreTag, signal, followLinks } = opts;
 	signal?.throwIfAborted();
-	if (format && !isBuiltinFormatter(format)) return compileWithCustomFormatter(inputFiles, opts);
+	if (format && !isBuiltinFormatter$1(format)) return compileWithCustomFormatter(inputFiles, opts);
 	return compileWithNative(inputFiles, {
 		ast,
 		format: typeof format === "string" ? format : void 0,
@@ -12394,8 +12410,8 @@ async function compile$6(inputFiles, opts = {}) {
 		skipErrors
 	});
 }
-function isBuiltinFormatter(format) {
-	return typeof format === "string" && BUILTIN_FORMATTERS.has(format);
+function isBuiltinFormatter$1(format) {
+	return typeof format === "string" && BUILTIN_FORMATTERS$1.has(format);
 }
 async function compileWithCustomFormatter(inputFiles, opts) {
 	if (typeof opts.format === "string") await warn(CUSTOM_FORMATTER_FILE_DEPRECATION_WARNING);
@@ -14210,6 +14226,37 @@ function matchIdentifierAtIndex(s, index) {
 	IDENTIFIER_PREFIX_RE.lastIndex = index;
 	return IDENTIFIER_PREFIX_RE.exec(s)[1] ?? "";
 }
+function plainTopLevelEndPosition(message) {
+	if (message.length === 0) return null;
+	let line = 1;
+	let column = 1;
+	for (let offset = 0; offset < message.length;) {
+		const code = message.charCodeAt(offset);
+		switch (code) {
+			case 35:
+			case 39:
+			case 60:
+			case 123:
+			case 125: return null;
+		}
+		if (code === 10) {
+			line++;
+			column = 1;
+			offset++;
+		} else {
+			column++;
+			if (code >= 55296 && code <= 56319 && offset + 1 < message.length) {
+				const next = message.charCodeAt(offset + 1);
+				offset += next >= 56320 && next <= 57343 ? 2 : 1;
+			} else offset++;
+		}
+	}
+	return {
+		offset: message.length,
+		line,
+		column
+	};
+}
 var Parser = class {
 	constructor(message, options = {}) {
 		this.message = message;
@@ -14225,6 +14272,24 @@ var Parser = class {
 	}
 	parse() {
 		if (this.offset() !== 0) throw Error("parser can only be used once");
+		if (this.message.length > 0) {
+			const firstCode = this.message.charCodeAt(0);
+			if (firstCode !== 35 && firstCode !== 39 && firstCode !== 60 && firstCode !== 123 && firstCode !== 125) {
+				const plainEndPosition = plainTopLevelEndPosition(this.message);
+				if (plainEndPosition) {
+					const start = this.clonePosition();
+					this.position = plainEndPosition;
+					return {
+						val: [{
+							type: 0,
+							value: this.message,
+							location: createLocation(start, this.clonePosition())
+						}],
+						err: null
+					};
+				}
+			}
+		}
 		return this.parseMessage(0, "", false);
 	}
 	parseMessage(nestingLevel, parentArgType, expectingCloseTag) {
@@ -70200,7 +70265,7 @@ ${lanes.join("\n")}
 						type = getIntendedTypeFromJSDocTypeReference(node);
 						if (!type) {
 							symbol = resolveTypeReferenceName(node, meaning, true);
-							if (symbol === unknownSymbol) symbol = resolveTypeReferenceName(node, meaning | 111551);
+							if (symbol === unknownSymbol) symbol = resolveTypeReferenceName(node, 900095);
 							else resolveTypeReferenceName(node, meaning);
 							type = getTypeReferenceType(node, symbol);
 						}
@@ -144842,7 +144907,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
 				};
 			}
 			return {
-				newText: openComment + closeComment,
+				newText: "/** */",
 				caretOffset: 3
 			};
 		}
@@ -163420,6 +163485,22 @@ ${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([
+	"default",
+	"simple",
+	"transifex",
+	"smartling",
+	"lokalise",
+	"crowdin"
+]);
+const NATIVE_SUPPORTED_EXTENSIONS = new Set([
+	".cjs",
+	".js",
+	".jsx",
+	".mjs",
+	".ts",
+	".tsx"
+]);
 function calculateLineColFromOffset(text, start) {
 	if (!start) return {
 		line: 1,
@@ -163432,6 +163513,12 @@ function calculateLineColFromOffset(text, start) {
 		col: lastLine.length
 	};
 }
+function isBuiltinFormatter(format) {
+	return !format || typeof format === "string" && BUILTIN_FORMATTERS.has(format);
+}
+function canExtractWithNative(files, opts, readFromStdin) {
+	return !readFromStdin && typeof opts.idInterpolationPattern === "string" && !opts.ast && !opts.extractSourceLocation && !opts.onMetaExtracted && !opts.onMsgError && !opts.onMsgExtracted && !opts.overrideIdFn && !opts.pragma && !opts.removeDefaultMessage && isBuiltinFormatter(opts.format) && files.every((file) => existsSync(file) && NATIVE_SUPPORTED_EXTENSIONS.has(extname(file).toLowerCase()));
+}
 async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
 	let messages = [];
 	let meta;
@@ -163461,19 +163548,19 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
 	const scriptParseFn = parseScript(opts, fn);
 	if (fn.endsWith(".vue")) {
 		debug$1("Processing %s using vue extractor", fn);
-		const { parseFile } = await import("./vue_extractor-BFqKdH3o.js");
+		const { parseFile } = await import("./vue_extractor-CGXoDm-M.js");
 		parseFile(source, fn, scriptParseFn);
 	} else if (fn.endsWith(".svelte")) {
 		debug$1("Processing %s using svelte extractor", fn);
-		const { parseFile } = await import("./svelte_extractor-CLhHGLMq.js");
+		const { parseFile } = await import("./svelte_extractor-R4PlmulG.js");
 		parseFile(source, fn, scriptParseFn);
 	} else if (fn.endsWith(".hbs")) {
 		debug$1("Processing %s using hbs extractor", fn);
-		const { parseFile } = await import("./hbs_extractor-BGwD6qGk.js");
+		const { parseFile } = await import("./hbs_extractor-DC74dtk6.js");
 		parseFile(source, fn, opts);
 	} else if (fn.endsWith(".gts") || fn.endsWith(".gjs")) {
 		debug$1("Processing %s as gts/gjs file", fn);
-		const { parseFile } = await import("./gts_extractor-vkhePCTf.js");
+		const { parseFile } = await import("./gts_extractor-Dk_HfFGZ.js");
 		parseFile(source, fn, opts);
 	} else {
 		debug$1("Processing %s using typescript extractor", fn);
@@ -163504,6 +163591,15 @@ async function extract(files, extractOpts) {
 		throws: shouldThrow,
 		onMsgError: !shouldThrow ? (_, e) => warn(e.message) : void 0
 	};
+	if (!signal?.aborted && canExtractWithNative(files, opts, readFromStdin)) return extractWithNative(files, {
+		additionalComponentNames: ["$formatMessage", ...opts.additionalComponentNames || []],
+		additionalFunctionNames: opts.additionalFunctionNames,
+		flatten: opts.flatten,
+		format: typeof opts.format === "string" ? opts.format : void 0,
+		idInterpolationPattern: opts.idInterpolationPattern,
+		preserveWhitespace: opts.preserveWhitespace,
+		throws: shouldThrow
+	});
 	let rawResults = [];
 	try {
 		if (readFromStdin) {