@formatjs/cli 6.12.1 → 6.12.2

package/bin/formatjs

@@ -229318,7 +229318,18 @@ function evaluateStringConcat(ts2, node) {
   }
   return ["", false];
 }
-function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocation, preserveWhitespace, flatten: flatten2 }, sf) {
+function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocation, preserveWhitespace, flatten: flatten2, throws = true, onMsgError }, sf) {
+  let extractionError = null;
+  function handleError(errorMsg) {
+    const error2 = new Error(errorMsg);
+    if (throws) {
+      throw error2;
+    }
+    extractionError = error2;
+    if (onMsgError) {
+      onMsgError(sf.fileName, error2);
+    }
+  }
   let properties = void 0;
   if (ts2.isObjectLiteralExpression(node)) {
     properties = node.properties;
@@ -229364,7 +229375,8 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
         }
         const { template } = initializer;
         if (!ts2.isNoSubstitutionTemplateLiteral(template)) {
-          throw new Error("Tagged template expression must be no substitution");
+          handleError("[FormatJS] Tagged template expression must be no substitution");
+          return;
         }
         switch (name.text) {
           case "id":
@@ -229412,7 +229424,8 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
           }
           const { expression: { template } } = initializer;
           if (!ts2.isNoSubstitutionTemplateLiteral(template)) {
-            throw new Error("Tagged template expression must be no substitution");
+            handleError("[FormatJS] Tagged template expression must be no substitution");
+            return;
           }
           switch (name.text) {
             case "id":
@@ -229441,10 +229454,12 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
                 break;
             }
           } else if (MESSAGE_DESC_KEYS.includes(name.text) && name.text !== "description") {
-            throw new Error(`[FormatJS] \`${name.text}\` must be a string literal or statically evaluable expression to be extracted.`);
+            handleError(`[FormatJS] \`${name.text}\` must be a string literal or statically evaluable expression to be extracted.`);
+            return;
           }
         } else if (MESSAGE_DESC_KEYS.includes(name.text) && name.text !== "description") {
-          throw new Error(`[FormatJS] \`${name.text}\` must be a string literal to be extracted.`);
+          handleError(`[FormatJS] \`${name.text}\` must be a string literal to be extracted.`);
+          return;
         }
       } else if (ts2.isBinaryExpression(initializer)) {
         const [result, isStatic] = evaluateStringConcat(ts2, initializer);
@@ -229461,15 +229476,20 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
               break;
           }
         } else if (MESSAGE_DESC_KEYS.includes(name.text) && name.text !== "description") {
-          throw new Error(`[FormatJS] \`${name.text}\` must be a string literal or statically evaluable expression to be extracted.`);
+          handleError(`[FormatJS] \`${name.text}\` must be a string literal or statically evaluable expression to be extracted.`);
+          return;
         }
       } else if (ts2.isObjectLiteralExpression(initializer) && name.text === "description") {
         msg.description = objectLiteralExpressionToObj(ts2, initializer);
       } else if (MESSAGE_DESC_KEYS.includes(name.text) && name.text !== "description") {
-        throw new Error(`[FormatJS] \`${name.text}\` must be a string literal to be extracted.`);
+        handleError(`[FormatJS] \`${name.text}\` must be a string literal to be extracted.`);
+        return;
       }
     }
   });
+  if (extractionError) {
+    return;
+  }
   if (!msg.defaultMessage && !msg.id) {
     return;
   }
@@ -230442,6 +230462,12 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
 }
 async function extract(files, extractOpts) {
   const { throws, readFromStdin, ...opts } = extractOpts;
+  const shouldThrow = throws === true;
+  const optsWithThrows = {
+    ...opts,
+    throws: shouldThrow,
+    onMsgError: !shouldThrow ? (_, e) => warn(e.message) : void 0
+  };
   let rawResults = [];
   try {
     if (readFromStdin) {
@@ -230450,14 +230476,14 @@ async function extract(files, extractOpts) {
         warn("Reading source file from TTY.");
       }
       const stdinSource = await getStdinAsString();
-      rawResults = [await processFile(stdinSource, "dummy", opts)];
+      rawResults = [await processFile(stdinSource, "dummy", optsWithThrows)];
     } else {
-      if (throws === false) {
+      if (!shouldThrow) {
         const settledResults = await Promise.allSettled(
           files.map(async (fn) => {
             debug("Extracting file:", fn);
             const source = await (0, import_promises.readFile)(fn, "utf8");
-            return processFile(source, fn, opts);
+            return processFile(source, fn, optsWithThrows);
           })
         );
         rawResults = settledResults.map((result) => {
@@ -230473,13 +230499,13 @@ async function extract(files, extractOpts) {
           files.map(async (fn) => {
             debug("Extracting file:", fn);
             const source = await (0, import_promises.readFile)(fn, "utf8");
-            return processFile(source, fn, opts);
+            return processFile(source, fn, optsWithThrows);
           })
         );
       }
     }
   } catch (e) {
-    if (throws) {
+    if (shouldThrow) {
       throw e;
     } else {
       warn(String(e));

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@formatjs/cli",
   "description": "A CLI for formatjs.",
-  "version": "6.12.1",
+  "version": "6.12.2",
   "license": "MIT",
   "author": "Linjie Ding <linjie@airtable.com>",
   "engines": {
     "node": ">= 16"
   },
   "devDependencies": {
-    "@formatjs/cli-lib": "8.2.2"
+    "@formatjs/cli-lib": "8.2.3"
   },
   "peerDependencies": {
     "@glimmer/syntax": "^0.84.3 || ^0.95.0",