@formatjs/cli 6.12.0 → 6.12.2

package/bin/formatjs

@@ -5431,7 +5431,7 @@ var require_scan = __commonJS({
       }
       let base = str;
       let prefix = "";
-      let glob = "";
+      let glob2 = "";
       if (start > 0) {
         prefix = str.slice(0, start);
         str = str.slice(start);
@@ -5439,10 +5439,10 @@ var require_scan = __commonJS({
       }
       if (base && isGlob === true && lastIndex > 0) {
         base = str.slice(0, lastIndex);
-        glob = str.slice(lastIndex);
+        glob2 = str.slice(lastIndex);
       } else if (isGlob === true) {
         base = "";
-        glob = str;
+        glob2 = str;
       } else {
         base = str;
       }
@@ -5452,8 +5452,8 @@ var require_scan = __commonJS({
         }
       }
       if (opts.unescape === true) {
-        if (glob)
-          glob = utils.removeBackslashes(glob);
+        if (glob2)
+          glob2 = utils.removeBackslashes(glob2);
         if (base && backslashes === true) {
           base = utils.removeBackslashes(base);
         }
@@ -5463,7 +5463,7 @@ var require_scan = __commonJS({
         input,
         start,
         base,
-        glob,
+        glob: glob2,
         isBrace,
         isBracket,
         isGlob,
@@ -6309,9 +6309,9 @@ var require_picomatch = __commonJS({
     var utils = require_utils2();
     var constants = require_constants2();
     var isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
-    var picomatch = (glob, options, returnState = false) => {
-      if (Array.isArray(glob)) {
-        const fns = glob.map((input) => picomatch(input, options, returnState));
+    var picomatch = (glob2, options, returnState = false) => {
+      if (Array.isArray(glob2)) {
+        const fns = glob2.map((input) => picomatch(input, options, returnState));
         const arrayMatcher = (str) => {
           for (const isMatch of fns) {
             const state2 = isMatch(str);
@@ -6322,13 +6322,13 @@ var require_picomatch = __commonJS({
         };
         return arrayMatcher;
       }
-      const isState = isObject(glob) && glob.tokens && glob.input;
-      if (glob === "" || typeof glob !== "string" && !isState) {
+      const isState = isObject(glob2) && glob2.tokens && glob2.input;
+      if (glob2 === "" || typeof glob2 !== "string" && !isState) {
         throw new TypeError("Expected pattern to be a non-empty string");
       }
       const opts = options || {};
       const posix = utils.isWindows(options);
-      const regex = isState ? picomatch.compileRe(glob, options) : picomatch.makeRe(glob, options, false, true);
+      const regex = isState ? picomatch.compileRe(glob2, options) : picomatch.makeRe(glob2, options, false, true);
       const state = regex.state;
       delete regex.state;
       let isIgnored = () => false;
@@ -6337,8 +6337,8 @@ var require_picomatch = __commonJS({
         isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
       }
       const matcher = (input, returnObject = false) => {
-        const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
-        const result = { glob, state, regex, posix, input, output, match, isMatch };
+        const { isMatch, match, output } = picomatch.test(input, regex, options, { glob: glob2, posix });
+        const result = { glob: glob2, state, regex, posix, input, output, match, isMatch };
         if (typeof opts.onResult === "function") {
           opts.onResult(result);
         }
@@ -6363,7 +6363,7 @@ var require_picomatch = __commonJS({
       }
       return matcher;
     };
-    picomatch.test = (input, regex, options, { glob, posix } = {}) => {
+    picomatch.test = (input, regex, options, { glob: glob2, posix } = {}) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected input to be a string");
       }
@@ -6372,11 +6372,11 @@ var require_picomatch = __commonJS({
       }
       const opts = options || {};
       const format9 = opts.format || (posix ? utils.toPosixSlashes : null);
-      let match = input === glob;
+      let match = input === glob2;
       let output = match && format9 ? format9(input) : input;
       if (match === false) {
         output = format9 ? format9(input) : input;
-        match = output === glob;
+        match = output === glob2;
       }
       if (match === false || opts.capture === true) {
         if (opts.matchBase === true || opts.basename === true) {
@@ -6387,8 +6387,8 @@ var require_picomatch = __commonJS({
       }
       return { isMatch: Boolean(match), match, output };
     };
-    picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
-      const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
+    picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => {
+      const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options);
       return regex.test(path2.basename(input));
     };
     picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
@@ -6581,9 +6581,9 @@ var require_micromatch = __commonJS({
       }
       return [].concat(patterns).every((p2) => picomatch(p2, options)(str));
     };
-    micromatch.capture = (glob, input, options) => {
+    micromatch.capture = (glob2, input, options) => {
       let posix = utils.isWindows(options);
-      let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
+      let regex = picomatch.makeRe(String(glob2), { ...options, capture: true });
       let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
       if (match) {
         return match.slice(1).map((v) => v === void 0 ? "" : v);
@@ -7183,7 +7183,7 @@ var require_out = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.statSync = exports.stat = exports.Settings = void 0;
     var async = require_async();
-    var sync = require_sync();
+    var sync2 = require_sync();
     var settings_1 = require_settings();
     exports.Settings = settings_1.default;
     function stat(path2, optionsOrSettingsOrCallback, callback) {
@@ -7196,7 +7196,7 @@ var require_out = __commonJS({
     exports.stat = stat;
     function statSync(path2, optionsOrSettings) {
       const settings = getSettings(optionsOrSettings);
-      return sync.read(path2, settings);
+      return sync2.read(path2, settings);
     }
     exports.statSync = statSync;
     function getSettings(settingsOrOptions = {}) {
@@ -7574,7 +7574,7 @@ var require_out2 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Settings = exports.scandirSync = exports.scandir = void 0;
     var async = require_async2();
-    var sync = require_sync2();
+    var sync2 = require_sync2();
     var settings_1 = require_settings2();
     exports.Settings = settings_1.default;
     function scandir(path2, optionsOrSettingsOrCallback, callback) {
@@ -7587,7 +7587,7 @@ var require_out2 = __commonJS({
     exports.scandir = scandir;
     function scandirSync(path2, optionsOrSettings) {
       const settings = getSettings(optionsOrSettings);
-      return sync.read(path2, settings);
+      return sync2.read(path2, settings);
     }
     exports.scandirSync = scandirSync;
     function getSettings(settingsOrOptions = {}) {
@@ -9005,15 +9005,15 @@ var require_out4 = __commonJS({
     }
     (function(FastGlob2) {
       FastGlob2.glob = FastGlob2;
-      FastGlob2.globSync = sync;
+      FastGlob2.globSync = sync2;
       FastGlob2.globStream = stream;
       FastGlob2.async = FastGlob2;
-      function sync(source, options) {
+      function sync2(source, options) {
         assertPatternsInput(source);
         const works = getWorks(source, sync_1.default, options);
         return utils.array.flatten(works);
       }
-      FastGlob2.sync = sync;
+      FastGlob2.sync = sync2;
       function stream(source, options) {
         assertPatternsInput(source);
         const works = getWorks(source, stream_1.default, options);
@@ -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;
   }
@@ -229909,7 +229929,7 @@ var {
 } = import_index.default;
 
 // packages/cli-lib/src/cli.ts
-var import_fast_glob = __toESM(require_out4());
+var glob = __toESM(require_out4());
 var import_loud_rejection = __toESM(require_loud_rejection());
 
 // packages/cli-lib/src/compile.ts
@@ -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,18 +230476,36 @@ 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 {
-      rawResults = await Promise.all(
-        files.map(async (fn) => {
-          debug("Extracting file:", fn);
-          const source = await (0, import_promises.readFile)(fn, "utf8");
-          return processFile(source, fn, opts);
-        })
-      );
+      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, optsWithThrows);
+          })
+        );
+        rawResults = settledResults.map((result) => {
+          if (result.status === "fulfilled") {
+            return result.value;
+          } else {
+            warn(String(result.reason));
+            return void 0;
+          }
+        });
+      } else {
+        rawResults = await Promise.all(
+          files.map(async (fn) => {
+            debug("Extracting file:", fn);
+            const source = await (0, import_promises.readFile)(fn, "utf8");
+            return processFile(source, fn, optsWithThrows);
+          })
+        );
+      }
     }
   } catch (e) {
-    if (throws) {
+    if (shouldThrow) {
       throw e;
     } else {
       warn(String(e));
@@ -230689,6 +230733,7 @@ async function verify(files, { sourceLocale, missingKeys, extraKeys, structuralE
 // packages/cli-lib/src/cli.ts
 var import_path4 = require("path");
 var import_fs = require("fs");
+var globSync = glob.sync;
 var KNOWN_COMMANDS = ["extract"];
 async function main(argv) {
   (0, import_loud_rejection.default)();
@@ -230778,7 +230823,7 @@ sentences are not translator-friendly.`
     const files = [];
     if (filePatterns.length) {
       files.push(
-        ...(0, import_fast_glob.sync)(filePatterns, {
+        ...globSync(filePatterns, {
           ignore: cmdObj.ignore
         })
       );
@@ -230839,7 +230884,7 @@ This is especially useful to convert from a TMS-specific format back to react-in
   ).action(async (filePatterns, opts) => {
     debug("File pattern:", filePatterns);
     debug("Options:", opts);
-    const files = (0, import_fast_glob.sync)(filePatterns);
+    const files = globSync(filePatterns);
     if (!files.length) {
       throw new Error(`No input file found with pattern ${filePatterns}`);
     }
@@ -230873,7 +230918,7 @@ This is especially useful to convert from a TMS-specific format back to react-in
   ).action(async (folder, outFolder, opts) => {
     debug("Folder:", folder);
     debug("Options:", opts);
-    const files = (0, import_fast_glob.sync)(`${folder}/*.json`);
+    const files = globSync(`${folder}/*.json`);
     if (!files.length) {
       throw new Error(`No JSON file found in ${folder}`);
     }
@@ -230901,7 +230946,7 @@ This is especially useful to convert from a TMS-specific format back to react-in
   ).action(async (filePatterns, opts) => {
     debug("File pattern:", filePatterns);
     debug("Options:", opts);
-    const files = (0, import_fast_glob.sync)(filePatterns, {
+    const files = globSync(filePatterns, {
       ignore: opts.ignore
     });
     if (!files.length) {

package/package.json

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