@formatjs/cli-lib 8.2.0 → 8.2.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formatjs/cli-lib",
   "description": "Lib for CLI for formatjs.",
-  "version": "8.2.0",
+  "version": "8.2.2",
   "license": "MIT",
   "author": "Linjie Ding <linjie@airtable.com>",
   "type": "module",
@@ -20,16 +20,15 @@
     "loud-rejection": "^2",
     "tslib": "^2.8.1",
     "typescript": "^5.6.0",
-    "@formatjs/icu-messageformat-parser": "3.4.0",
-    "@formatjs/icu-skeleton-parser": "2.1.0",
-    "@formatjs/ts-transformer": "4.3.0"
+    "@formatjs/ts-transformer": "4.3.2",
+    "@formatjs/icu-skeleton-parser": "2.1.1",
+    "@formatjs/icu-messageformat-parser": "3.5.1"
   },
   "peerDependencies": {
-    "@glimmer/syntax": "^0.95.0",
-    "@vue/compiler-core": "3.5.26",
+    "@glimmer/syntax": "^0.84.3 || ^0.95.0",
+    "@vue/compiler-core": "3.5.27",
     "content-tag": "^4.1.0",
-    "ember-template-recast": "^6.1.5",
-    "vue": "3.5.26"
+    "vue": "3.5.27"
   },
   "bugs": "https://github.com/formatjs/formatjs/issues",
   "homepage": "https://github.com/formatjs/formatjs",
@@ -70,9 +69,6 @@
     "@glimmer/validator": {
       "optional": true
     },
-    "ember-template-recast": {
-      "optional": true
-    },
     "content-tag": {
       "optional": true
     }

package/src/cli.js

@@ -1,5 +1,6 @@
 import { program } from "commander";
-import { sync as globSync } from "fast-glob";
+import * as glob from "fast-glob";
+const globSync = glob.sync;
 import loudRejection from "loud-rejection";
 import compile from "./compile.js";
 import compileFolder from "./compile_folder.js";
@@ -104,7 +105,7 @@ type CompileFn = <T = Record<string, MessageDescriptor>>(
 ) => Record<string, string>;
 \`\`\`
 This is especially useful to convert from a TMS-specific format back to react-intl format
-`).option("--ast", `Whether to compile to AST. See https://formatjs.github.io/docs/guides/advanced-usage#pre-parsing-messages for more information`).action(async (folder, outFolder, opts) => {
+`).option("--ast", `Whether to compile to AST. See https://formatjs.github.io/docs/guides/advanced-usage#pre-parsing-messages for more information`).option("--skip-errors", `Whether to continue compiling messages after encountering an error. Any keys with errors will not be included in the output file.`).option("--pseudo-locale <pseudoLocale>", `Whether to generate pseudo-locale files. See https://formatjs.github.io/docs/tooling/cli#--pseudo-locale-pseudolocale for possible values. "--ast" is required for this to work.`).option("--ignore-tag", `Whether the parser to treat HTML/XML tags as string literal instead of parsing them as tag token. When this is false we only allow simple tags without any attributes.`).action(async (folder, outFolder, opts) => {
 		debug("Folder:", folder);
 		debug("Options:", opts);
 		// fast-glob expect `/` in Windows as well

package/src/extract.js

@@ -102,11 +102,28 @@ export async function extract(files, extractOpts) {
 			const stdinSource = await getStdinAsString();
 			rawResults = [await processFile(stdinSource, "dummy", opts)];
 		} else {
-			rawResults = await Promise.all(files.map(async (fn) => {
-				debug("Extracting file:", fn);
-				const source = await readFile(fn, "utf8");
-				return processFile(source, fn, opts);
-			}));
+			// Use Promise.allSettled when throws is false to collect partial results
+			if (throws === false) {
+				const settledResults = await Promise.allSettled(files.map(async (fn) => {
+					debug("Extracting file:", fn);
+					const source = await readFile(fn, "utf8");
+					return processFile(source, fn, opts);
+				}));
+				rawResults = settledResults.map((result) => {
+					if (result.status === "fulfilled") {
+						return result.value;
+					} else {
+						warn(String(result.reason));
+						return undefined;
+					}
+				});
+			} else {
+				rawResults = await Promise.all(files.map(async (fn) => {
+					debug("Extracting file:", fn);
+					const source = await readFile(fn, "utf8");
+					return processFile(source, fn, opts);
+				}));
+			}
 		}
 	} catch (e) {
 		if (throws) {

package/src/hbs_extractor.js

@@ -1,5 +1,5 @@
 import "@formatjs/ts-transformer";
-import { transform } from "ember-template-recast";
+import { preprocess, traverse } from "@glimmer/syntax";
 function extractText(node, fileName, options) {
 	if (!options.onMsgExtracted) return;
 	if (!options.overrideIdFn) return;
@@ -22,17 +22,13 @@ function extractText(node, fileName, options) {
 	}
 }
 export function parseFile(source, fileName, options) {
-	let visitor = function() {
-		return {
-			MustacheStatement(node) {
-				extractText(node, fileName, options);
-			},
-			SubExpression(node) {
-				extractText(node, fileName, options);
-			}
-		};
-	};
-	// SAFETY: ember-template-recast's types are out of date,
-	// but it does not affect runtime
-	transform(source, visitor);
+	const ast = preprocess(source);
+	traverse(ast, {
+		MustacheStatement(node) {
+			extractText(node, fileName, options);
+		},
+		SubExpression(node) {
+			extractText(node, fileName, options);
+		}
+	});
 }