@formatjs/cli 6.8.7 → 6.9.0

package/bin/formatjs

@@ -32,9 +32,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/error.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/error.js
 var require_error = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/error.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/error.js"(exports) {
     var CommanderError2 = class extends Error {
       /**
        * Constructs the CommanderError class
@@ -67,9 +67,9 @@ var require_error = __commonJS({
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/argument.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/argument.js
 var require_argument = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/argument.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/argument.js"(exports) {
     var { InvalidArgumentError: InvalidArgumentError2 } = require_error();
     var Argument2 = class {
       /**
@@ -101,7 +101,7 @@ var require_argument = __commonJS({
             this._name = name;
             break;
         }
-        if (this._name.length > 3 && this._name.slice(-3) === "...") {
+        if (this._name.endsWith("...")) {
           this.variadic = true;
           this._name = this._name.slice(0, -3);
         }
@@ -117,11 +117,12 @@ var require_argument = __commonJS({
       /**
        * @package
        */
-      _concatValue(value, previous) {
+      _collectValue(value, previous) {
         if (previous === this.defaultValue || !Array.isArray(previous)) {
           return [value];
         }
-        return previous.concat(value);
+        previous.push(value);
+        return previous;
       }
       /**
        * Set the default value, and optionally supply the description to be displayed in the help.
@@ -160,7 +161,7 @@ var require_argument = __commonJS({
             );
           }
           if (this.variadic) {
-            return this._concatValue(arg, previous);
+            return this._collectValue(arg, previous);
           }
           return arg;
         };
@@ -194,9 +195,9 @@ var require_argument = __commonJS({
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/help.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/help.js
 var require_help = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/help.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/help.js"(exports) {
     var { humanReadableArgName } = require_argument();
     var Help2 = class {
       constructor() {
@@ -474,7 +475,11 @@ var require_help = __commonJS({
           extraInfo.push(`env: ${option.envVar}`);
         }
         if (extraInfo.length > 0) {
-          return `${option.description} (${extraInfo.join(", ")})`;
+          const extraDescription = `(${extraInfo.join(", ")})`;
+          if (option.description) {
+            return `${option.description} ${extraDescription}`;
+          }
+          return extraDescription;
         }
         return option.description;
       }
@@ -506,6 +511,43 @@ var require_help = __commonJS({
         }
         return argument.description;
       }
+      /**
+       * Format a list of items, given a heading and an array of formatted items.
+       *
+       * @param {string} heading
+       * @param {string[]} items
+       * @param {Help} helper
+       * @returns string[]
+       */
+      formatItemList(heading, items, helper) {
+        if (items.length === 0)
+          return [];
+        return [helper.styleTitle(heading), ...items, ""];
+      }
+      /**
+       * Group items by their help group heading.
+       *
+       * @param {Command[] | Option[]} unsortedItems
+       * @param {Command[] | Option[]} visibleItems
+       * @param {Function} getGroup
+       * @returns {Map<string, Command[] | Option[]>}
+       */
+      groupItems(unsortedItems, visibleItems, getGroup) {
+        const result = /* @__PURE__ */ new Map();
+        unsortedItems.forEach((item) => {
+          const group = getGroup(item);
+          if (!result.has(group))
+            result.set(group, []);
+        });
+        visibleItems.forEach((item) => {
+          const group = getGroup(item);
+          if (!result.has(group)) {
+            result.set(group, []);
+          }
+          result.get(group).push(item);
+        });
+        return result;
+      }
       /**
        * Generate the built-in help text.
        *
@@ -539,26 +581,23 @@ var require_help = __commonJS({
             helper.styleArgumentDescription(helper.argumentDescription(argument))
           );
         });
-        if (argumentList.length > 0) {
-          output = output.concat([
-            helper.styleTitle("Arguments:"),
-            ...argumentList,
-            ""
-          ]);
-        }
-        const optionList = helper.visibleOptions(cmd).map((option) => {
-          return callFormatItem(
-            helper.styleOptionTerm(helper.optionTerm(option)),
-            helper.styleOptionDescription(helper.optionDescription(option))
-          );
+        output = output.concat(
+          this.formatItemList("Arguments:", argumentList, helper)
+        );
+        const optionGroups = this.groupItems(
+          cmd.options,
+          helper.visibleOptions(cmd),
+          (option) => option.helpGroupHeading ?? "Options:"
+        );
+        optionGroups.forEach((options, group) => {
+          const optionList = options.map((option) => {
+            return callFormatItem(
+              helper.styleOptionTerm(helper.optionTerm(option)),
+              helper.styleOptionDescription(helper.optionDescription(option))
+            );
+          });
+          output = output.concat(this.formatItemList(group, optionList, helper));
         });
-        if (optionList.length > 0) {
-          output = output.concat([
-            helper.styleTitle("Options:"),
-            ...optionList,
-            ""
-          ]);
-        }
         if (helper.showGlobalOptions) {
           const globalOptionList = helper.visibleGlobalOptions(cmd).map((option) => {
             return callFormatItem(
@@ -566,27 +605,24 @@ var require_help = __commonJS({
               helper.styleOptionDescription(helper.optionDescription(option))
             );
           });
-          if (globalOptionList.length > 0) {
-            output = output.concat([
-              helper.styleTitle("Global Options:"),
-              ...globalOptionList,
-              ""
-            ]);
-          }
-        }
-        const commandList = helper.visibleCommands(cmd).map((cmd2) => {
-          return callFormatItem(
-            helper.styleSubcommandTerm(helper.subcommandTerm(cmd2)),
-            helper.styleSubcommandDescription(helper.subcommandDescription(cmd2))
+          output = output.concat(
+            this.formatItemList("Global Options:", globalOptionList, helper)
           );
-        });
-        if (commandList.length > 0) {
-          output = output.concat([
-            helper.styleTitle("Commands:"),
-            ...commandList,
-            ""
-          ]);
         }
+        const commandGroups = this.groupItems(
+          cmd.commands,
+          helper.visibleCommands(cmd),
+          (sub) => sub.helpGroup() || "Commands:"
+        );
+        commandGroups.forEach((commands, group) => {
+          const commandList = commands.map((sub) => {
+            return callFormatItem(
+              helper.styleSubcommandTerm(helper.subcommandTerm(sub)),
+              helper.styleSubcommandDescription(helper.subcommandDescription(sub))
+            );
+          });
+          output = output.concat(this.formatItemList(group, commandList, helper));
+        });
         return output.join("\n");
       }
       /**
@@ -769,9 +805,9 @@ ${itemIndentStr}`);
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/option.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/option.js
 var require_option = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/option.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/option.js"(exports) {
     var { InvalidArgumentError: InvalidArgumentError2 } = require_error();
     var Option2 = class {
       /**
@@ -803,6 +839,7 @@ var require_option = __commonJS({
         this.argChoices = void 0;
         this.conflictsWith = [];
         this.implied = void 0;
+        this.helpGroupHeading = void 0;
       }
       /**
        * Set the default value, and optionally supply the description to be displayed in the help.
@@ -913,11 +950,12 @@ var require_option = __commonJS({
       /**
        * @package
        */
-      _concatValue(value, previous) {
+      _collectValue(value, previous) {
         if (previous === this.defaultValue || !Array.isArray(previous)) {
           return [value];
         }
-        return previous.concat(value);
+        previous.push(value);
+        return previous;
       }
       /**
        * Only allow option value to be one of choices.
@@ -934,7 +972,7 @@ var require_option = __commonJS({
             );
           }
           if (this.variadic) {
-            return this._concatValue(arg, previous);
+            return this._collectValue(arg, previous);
           }
           return arg;
         };
@@ -963,6 +1001,16 @@ var require_option = __commonJS({
         }
         return camelcase(this.name());
       }
+      /**
+       * Set the help group heading.
+       *
+       * @param {string} heading
+       * @return {Option}
+       */
+      helpGroup(heading) {
+        this.helpGroupHeading = heading;
+        return this;
+      }
       /**
        * Check if `arg` matches the short or long flag.
        *
@@ -1073,9 +1121,9 @@ var require_option = __commonJS({
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/suggestSimilar.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/suggestSimilar.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/suggestSimilar.js"(exports) {
     var maxDistance = 3;
     function editDistance(a, b) {
       if (Math.abs(a.length - b.length) > maxDistance)
@@ -1155,9 +1203,9 @@ var require_suggestSimilar = __commonJS({
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/command.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/command.js
 var require_command = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/lib/command.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/lib/command.js"(exports) {
     var EventEmitter = require("node:events").EventEmitter;
     var childProcess = require("node:child_process");
     var path2 = require("node:path");
@@ -1229,6 +1277,9 @@ var require_command = __commonJS({
         this._addImplicitHelpCommand = void 0;
         this._helpCommand = void 0;
         this._helpConfiguration = {};
+        this._helpGroupHeading = void 0;
+        this._defaultCommandGroup = void 0;
+        this._defaultOptionGroup = void 0;
       }
       /**
        * Copy settings that are useful to have in common across root command and subcommands.
@@ -1373,7 +1424,10 @@ var require_command = __commonJS({
       configureOutput(configuration) {
         if (configuration === void 0)
           return this._outputConfiguration;
-        Object.assign(this._outputConfiguration, configuration);
+        this._outputConfiguration = {
+          ...this._outputConfiguration,
+          ...configuration
+        };
         return this;
       }
       /**
@@ -1447,16 +1501,16 @@ var require_command = __commonJS({
        *
        * @param {string} name
        * @param {string} [description]
-       * @param {(Function|*)} [fn] - custom argument processing function
+       * @param {(Function|*)} [parseArg] - custom argument processing function or default value
        * @param {*} [defaultValue]
        * @return {Command} `this` command for chaining
        */
-      argument(name, description, fn, defaultValue) {
+      argument(name, description, parseArg, defaultValue) {
         const argument = this.createArgument(name, description);
-        if (typeof fn === "function") {
-          argument.default(defaultValue).argParser(fn);
+        if (typeof parseArg === "function") {
+          argument.default(defaultValue).argParser(parseArg);
         } else {
-          argument.default(fn);
+          argument.default(parseArg);
         }
         this.addArgument(argument);
         return this;
@@ -1486,7 +1540,7 @@ var require_command = __commonJS({
        */
       addArgument(argument) {
         const previousArgument = this.registeredArguments.slice(-1)[0];
-        if (previousArgument && previousArgument.variadic) {
+        if (previousArgument == null ? void 0 : previousArgument.variadic) {
           throw new Error(
             `only the last argument can be variadic '${previousArgument.name()}'`
           );
@@ -1515,10 +1569,13 @@ var require_command = __commonJS({
       helpCommand(enableOrNameAndArgs, description) {
         if (typeof enableOrNameAndArgs === "boolean") {
           this._addImplicitHelpCommand = enableOrNameAndArgs;
+          if (enableOrNameAndArgs && this._defaultCommandGroup) {
+            this._initCommandGroup(this._getHelpCommand());
+          }
           return this;
         }
-        enableOrNameAndArgs = enableOrNameAndArgs ?? "help [command]";
-        const [, helpName, helpArgs] = enableOrNameAndArgs.match(/([^ ]+) *(.*)/);
+        const nameAndArgs = enableOrNameAndArgs ?? "help [command]";
+        const [, helpName, helpArgs] = nameAndArgs.match(/([^ ]+) *(.*)/);
         const helpDescription = description ?? "display help for command";
         const helpCommand = this.createCommand(helpName);
         helpCommand.helpOption(false);
@@ -1528,6 +1585,8 @@ var require_command = __commonJS({
           helpCommand.description(helpDescription);
         this._addImplicitHelpCommand = true;
         this._helpCommand = helpCommand;
+        if (enableOrNameAndArgs || description)
+          this._initCommandGroup(helpCommand);
         return this;
       }
       /**
@@ -1544,6 +1603,7 @@ var require_command = __commonJS({
         }
         this._addImplicitHelpCommand = true;
         this._helpCommand = helpCommand;
+        this._initCommandGroup(helpCommand);
         return this;
       }
       /**
@@ -1692,6 +1752,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           throw new Error(`Cannot add option '${option.flags}'${this._name && ` to command '${this._name}'`} due to conflicting flag '${matchingFlag}'
 -  already used by option '${matchingOption.flags}'`);
         }
+        this._initOptionGroup(option);
         this.options.push(option);
       }
       /**
@@ -1715,6 +1776,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
             `cannot add command '${newCmd}' as already have command '${existingCmd}'`
           );
         }
+        this._initCommandGroup(command);
         this.commands.push(command);
       }
       /**
@@ -1747,7 +1809,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           if (val !== null && option.parseArg) {
             val = this._callParseArg(option, val, oldValue, invalidValueMessage);
           } else if (val !== null && option.variadic) {
-            val = option._concatValue(val, oldValue);
+            val = option._collectValue(val, oldValue);
           }
           if (val == null) {
             if (option.negate) {
@@ -2406,7 +2468,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @private
        */
       _chainOrCall(promise, fn) {
-        if (promise && promise.then && typeof promise.then === "function") {
+        if ((promise == null ? void 0 : promise.then) && typeof promise.then === "function") {
           return promise.then(() => fn());
         }
         return fn();
@@ -2462,6 +2524,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @private
        */
       _parseCommand(operands, unknown) {
+        var _a;
         const parsed = this.parseOptions(unknown);
         this._parseOptionsEnv();
         this._parseOptionsImplied();
@@ -2511,7 +2574,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           promiseChain = this._chainOrCallHooks(promiseChain, "postAction");
           return promiseChain;
         }
-        if (this.parent && this.parent.listenerCount(commandEvent)) {
+        if ((_a = this.parent) == null ? void 0 : _a.listenerCount(commandEvent)) {
           checkForUnknownOptions();
           this._processArguments();
           this.parent.emit(commandEvent, operands, unknown);
@@ -2623,27 +2686,36 @@ Expecting one of '${allowedValues.join("', '")}'`);
        *     sub --unknown uuu op => [sub], [--unknown uuu op]
        *     sub -- --unknown uuu op => [sub --unknown uuu op], []
        *
-       * @param {string[]} argv
+       * @param {string[]} args
        * @return {{operands: string[], unknown: string[]}}
        */
-      parseOptions(argv) {
+      parseOptions(args) {
         const operands = [];
         const unknown = [];
         let dest = operands;
-        const args = argv.slice();
         function maybeOption(arg) {
           return arg.length > 1 && arg[0] === "-";
         }
+        const negativeNumberArg = (arg) => {
+          if (!/^-(\d+|\d*\.\d+)(e[+-]?\d+)?$/.test(arg))
+            return false;
+          return !this._getCommandAndAncestors().some(
+            (cmd) => cmd.options.map((opt) => opt.short).some((short) => /^-\d$/.test(short))
+          );
+        };
         let activeVariadicOption = null;
-        while (args.length) {
-          const arg = args.shift();
+        let activeGroup = null;
+        let i = 0;
+        while (i < args.length || activeGroup) {
+          const arg = activeGroup ?? args[i++];
+          activeGroup = null;
           if (arg === "--") {
             if (dest === unknown)
               dest.push(arg);
-            dest.push(...args);
+            dest.push(...args.slice(i));
             break;
           }
-          if (activeVariadicOption && !maybeOption(arg)) {
+          if (activeVariadicOption && (!maybeOption(arg) || negativeNumberArg(arg))) {
             this.emit(`option:${activeVariadicOption.name()}`, arg);
             continue;
           }
@@ -2652,14 +2724,14 @@ Expecting one of '${allowedValues.join("', '")}'`);
             const option = this._findOption(arg);
             if (option) {
               if (option.required) {
-                const value = args.shift();
+                const value = args[i++];
                 if (value === void 0)
                   this.optionMissingArgument(option);
                 this.emit(`option:${option.name()}`, value);
               } else if (option.optional) {
                 let value = null;
-                if (args.length > 0 && !maybeOption(args[0])) {
-                  value = args.shift();
+                if (i < args.length && (!maybeOption(args[i]) || negativeNumberArg(args[i]))) {
+                  value = args[i++];
                 }
                 this.emit(`option:${option.name()}`, value);
               } else {
@@ -2676,7 +2748,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
                 this.emit(`option:${option.name()}`, arg.slice(2));
               } else {
                 this.emit(`option:${option.name()}`);
-                args.unshift(`-${arg.slice(2)}`);
+                activeGroup = `-${arg.slice(2)}`;
               }
               continue;
             }
@@ -2689,31 +2761,24 @@ Expecting one of '${allowedValues.join("', '")}'`);
               continue;
             }
           }
-          if (maybeOption(arg)) {
+          if (dest === operands && maybeOption(arg) && !(this.commands.length === 0 && negativeNumberArg(arg))) {
             dest = unknown;
           }
           if ((this._enablePositionalOptions || this._passThroughOptions) && operands.length === 0 && unknown.length === 0) {
             if (this._findCommand(arg)) {
               operands.push(arg);
-              if (args.length > 0)
-                unknown.push(...args);
+              unknown.push(...args.slice(i));
               break;
             } else if (this._getHelpCommand() && arg === this._getHelpCommand().name()) {
-              operands.push(arg);
-              if (args.length > 0)
-                operands.push(...args);
+              operands.push(arg, ...args.slice(i));
               break;
             } else if (this._defaultCommandName) {
-              unknown.push(arg);
-              if (args.length > 0)
-                unknown.push(...args);
+              unknown.push(arg, ...args.slice(i));
               break;
             }
           }
           if (this._passThroughOptions) {
-            dest.push(arg);
-            if (args.length > 0)
-              dest.push(...args);
+            dest.push(arg, ...args.slice(i));
             break;
           }
           dest.push(arg);
@@ -3075,6 +3140,72 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._name = str;
         return this;
       }
+      /**
+       * Set/get the help group heading for this subcommand in parent command's help.
+       *
+       * @param {string} [heading]
+       * @return {Command | string}
+       */
+      helpGroup(heading) {
+        if (heading === void 0)
+          return this._helpGroupHeading ?? "";
+        this._helpGroupHeading = heading;
+        return this;
+      }
+      /**
+       * Set/get the default help group heading for subcommands added to this command.
+       * (This does not override a group set directly on the subcommand using .helpGroup().)
+       *
+       * @example
+       * program.commandsGroup('Development Commands:);
+       * program.command('watch')...
+       * program.command('lint')...
+       * ...
+       *
+       * @param {string} [heading]
+       * @returns {Command | string}
+       */
+      commandsGroup(heading) {
+        if (heading === void 0)
+          return this._defaultCommandGroup ?? "";
+        this._defaultCommandGroup = heading;
+        return this;
+      }
+      /**
+       * Set/get the default help group heading for options added to this command.
+       * (This does not override a group set directly on the option using .helpGroup().)
+       *
+       * @example
+       * program
+       *   .optionsGroup('Development Options:')
+       *   .option('-d, --debug', 'output extra debugging')
+       *   .option('-p, --profile', 'output profiling information')
+       *
+       * @param {string} [heading]
+       * @returns {Command | string}
+       */
+      optionsGroup(heading) {
+        if (heading === void 0)
+          return this._defaultOptionGroup ?? "";
+        this._defaultOptionGroup = heading;
+        return this;
+      }
+      /**
+       * @param {Option} option
+       * @private
+       */
+      _initOptionGroup(option) {
+        if (this._defaultOptionGroup && !option.helpGroupHeading)
+          option.helpGroup(this._defaultOptionGroup);
+      }
+      /**
+       * @param {Command} cmd
+       * @private
+       */
+      _initCommandGroup(cmd) {
+        if (this._defaultCommandGroup && !cmd.helpGroup())
+          cmd.helpGroup(this._defaultCommandGroup);
+      }
       /**
        * Set the name of the command from script filename, such as process.argv[1],
        * or require.main.filename, or __filename.
@@ -3213,15 +3344,22 @@ Expecting one of '${allowedValues.join("', '")}'`);
       helpOption(flags, description) {
         if (typeof flags === "boolean") {
           if (flags) {
-            this._helpOption = this._helpOption ?? void 0;
+            if (this._helpOption === null)
+              this._helpOption = void 0;
+            if (this._defaultOptionGroup) {
+              this._initOptionGroup(this._getHelpOption());
+            }
           } else {
             this._helpOption = null;
           }
           return this;
         }
-        flags = flags ?? "-h, --help";
-        description = description ?? "display help for command";
-        this._helpOption = this.createOption(flags, description);
+        this._helpOption = this.createOption(
+          flags ?? "-h, --help",
+          description ?? "display help for command"
+        );
+        if (flags || description)
+          this._initOptionGroup(this._helpOption);
         return this;
       }
       /**
@@ -3246,6 +3384,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        */
       addHelpOption(option) {
         this._helpOption = option;
+        this._initOptionGroup(option);
         return this;
       }
       /**
@@ -3358,9 +3497,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/index.js
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/index.js
 var require_commander = __commonJS({
-  "node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/index.js"(exports) {
+  "node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/index.js"(exports) {
     var { Argument: Argument2 } = require_argument();
     var { Command: Command2 } = require_command();
     var { CommanderError: CommanderError2, InvalidArgumentError: InvalidArgumentError2 } = require_error();
@@ -12010,11 +12149,43 @@ function cloneDeep(obj) {
   }
   return obj;
 }
+function replacePoundWithArgument(ast, variableName) {
+  return ast.map(function(el) {
+    if (isPoundElement(el)) {
+      return {
+        type: TYPE.number,
+        value: variableName,
+        style: null,
+        location: el.location
+      };
+    }
+    if (isPluralElement(el) || isSelectElement(el)) {
+      var newOptions = {};
+      for (var _i = 0, _a = Object.keys(el.options); _i < _a.length; _i++) {
+        var key = _a[_i];
+        newOptions[key] = {
+          value: replacePoundWithArgument(el.options[key].value, variableName)
+        };
+      }
+      return __assign(__assign({}, el), { options: newOptions });
+    }
+    if (isTagElement(el)) {
+      return __assign(__assign({}, el), { children: replacePoundWithArgument(el.children, variableName) });
+    }
+    return el;
+  });
+}
 function hoistPluralOrSelectElement(ast, el, positionToInject) {
   var cloned = cloneDeep(el);
   var options = cloned.options;
+  var afterElements = ast.slice(positionToInject + 1);
+  var hasSubsequentPluralOrSelect = afterElements.some(isPluralOrSelectElement);
   cloned.options = Object.keys(options).reduce(function(all, k) {
-    var newValue = hoistSelectors(__spreadArray(__spreadArray(__spreadArray([], ast.slice(0, positionToInject), true), options[k].value, true), ast.slice(positionToInject + 1), true));
+    var optionValue = options[k].value;
+    if (hasSubsequentPluralOrSelect && isPluralElement(el)) {
+      optionValue = replacePoundWithArgument(optionValue, el.value);
+    }
+    var newValue = hoistSelectors(__spreadArray(__spreadArray(__spreadArray([], ast.slice(0, positionToInject), true), optionValue, true), afterElements, true));
     all[k] = {
       value: newValue
     };
@@ -17644,6 +17815,109 @@ var init_console_utils = __esm({
   }
 });
 
+// node_modules/.aspect_rules_js/@formatjs+icu-messageformat-parser@0.0.0/node_modules/@formatjs/icu-messageformat-parser/printer.js
+function printAST(ast) {
+  return doPrintAST(ast, false);
+}
+function doPrintAST(ast, isInPlural) {
+  var printedNodes = ast.map(function(el, i) {
+    if (isLiteralElement(el)) {
+      return printLiteralElement(el, isInPlural, i === 0, i === ast.length - 1);
+    }
+    if (isArgumentElement(el)) {
+      return printArgumentElement(el);
+    }
+    if (isDateElement(el) || isTimeElement(el) || isNumberElement(el)) {
+      return printSimpleFormatElement(el);
+    }
+    if (isPluralElement(el)) {
+      return printPluralElement(el);
+    }
+    if (isSelectElement(el)) {
+      return printSelectElement(el);
+    }
+    if (isPoundElement(el)) {
+      return "#";
+    }
+    if (isTagElement(el)) {
+      return printTagElement(el);
+    }
+  });
+  return printedNodes.join("");
+}
+function printTagElement(el) {
+  return "<".concat(el.value, ">").concat(printAST(el.children), "</").concat(el.value, ">");
+}
+function printEscapedMessage(message) {
+  return message.replace(/([{}](?:[\s\S]*[{}])?)/, "'$1'");
+}
+function printLiteralElement(_a, isInPlural, isFirstEl, isLastEl) {
+  var value = _a.value;
+  var escaped = value;
+  if (!isFirstEl && escaped[0] === "'") {
+    escaped = "''".concat(escaped.slice(1));
+  }
+  if (!isLastEl && escaped[escaped.length - 1] === "'") {
+    escaped = "".concat(escaped.slice(0, escaped.length - 1), "''");
+  }
+  escaped = printEscapedMessage(escaped);
+  return isInPlural ? escaped.replace("#", "'#'") : escaped;
+}
+function printArgumentElement(_a) {
+  var value = _a.value;
+  return "{".concat(value, "}");
+}
+function printSimpleFormatElement(el) {
+  return "{".concat(el.value, ", ").concat(TYPE[el.type]).concat(el.style ? ", ".concat(printArgumentStyle(el.style)) : "", "}");
+}
+function printNumberSkeletonToken(token) {
+  var stem = token.stem, options = token.options;
+  return options.length === 0 ? stem : "".concat(stem).concat(options.map(function(o) {
+    return "/".concat(o);
+  }).join(""));
+}
+function printArgumentStyle(style) {
+  if (typeof style === "string") {
+    return printEscapedMessage(style);
+  } else if (style.type === SKELETON_TYPE.dateTime) {
+    return "::".concat(printDateTimeSkeleton(style));
+  } else {
+    return "::".concat(style.tokens.map(printNumberSkeletonToken).join(" "));
+  }
+}
+function printDateTimeSkeleton(style) {
+  return style.pattern;
+}
+function printSelectElement(el) {
+  var msg = [
+    el.value,
+    "select",
+    Object.keys(el.options).map(function(id) {
+      return "".concat(id, "{").concat(doPrintAST(el.options[id].value, false), "}");
+    }).join(" ")
+  ].join(",");
+  return "{".concat(msg, "}");
+}
+function printPluralElement(el) {
+  var type = el.pluralType === "cardinal" ? "plural" : "selectordinal";
+  var msg = [
+    el.value,
+    type,
+    __spreadArray([
+      el.offset ? "offset:".concat(el.offset) : ""
+    ], Object.keys(el.options).map(function(id) {
+      return "".concat(id, "{").concat(doPrintAST(el.options[id].value, true), "}");
+    }), true).filter(Boolean).join(" ")
+  ].join(",");
+  return "{".concat(msg, "}");
+}
+var init_printer = __esm({
+  "node_modules/.aspect_rules_js/@formatjs+icu-messageformat-parser@0.0.0/node_modules/@formatjs/icu-messageformat-parser/printer.js"() {
+    init_tslib_es6();
+    init_types();
+  }
+});
+
 // node_modules/.aspect_rules_js/typescript@5.8.3/node_modules/typescript/lib/typescript.js
 var require_typescript = __commonJS({
   "node_modules/.aspect_rules_js/typescript@5.8.3/node_modules/typescript/lib/typescript.js"(exports, module2) {
@@ -229209,7 +229483,7 @@ function evaluateStringConcat(ts2, node) {
   }
   return ["", false];
 }
-function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocation, preserveWhitespace }, sf) {
+function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocation, preserveWhitespace, flatten: flatten2 }, sf) {
   let properties = void 0;
   if (ts2.isObjectLiteralExpression(node)) {
     properties = node.properties;
@@ -229249,6 +229523,10 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
             break;
         }
       } else if (ts2.isTaggedTemplateExpression(initializer)) {
+        const isMessageProp = name.text === "id" || name.text === "defaultMessage" || name.text === "description";
+        if (!isMessageProp) {
+          return;
+        }
         const { template } = initializer;
         if (!ts2.isNoSubstitutionTemplateLiteral(template)) {
           throw new Error("Tagged template expression must be no substitution");
@@ -229293,6 +229571,10 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
               break;
           }
         } else if (ts2.isTaggedTemplateExpression(initializer.expression)) {
+          const isMessageProp = name.text === "id" || name.text === "defaultMessage" || name.text === "description";
+          if (!isMessageProp) {
+            return;
+          }
           const { expression: { template } } = initializer;
           if (!ts2.isNoSubstitutionTemplateLiteral(template)) {
             throw new Error("Tagged template expression must be no substitution");
@@ -229323,7 +229605,11 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
                 msg.description = result;
                 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.`);
           }
+        } 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.`);
         }
       } else if (ts2.isBinaryExpression(initializer)) {
         const [result, isStatic] = evaluateStringConcat(ts2, initializer);
@@ -229339,9 +229625,13 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
               msg.description = result;
               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.`);
         }
       } 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.`);
       }
     }
   });
@@ -229351,6 +229641,12 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
   if (msg.defaultMessage && !preserveWhitespace) {
     msg.defaultMessage = msg.defaultMessage.trim().replace(/\s+/gm, " ");
   }
+  if (flatten2 && msg.defaultMessage) {
+    try {
+      msg.defaultMessage = printAST(hoistSelectors(parse(msg.defaultMessage)));
+    } catch (e) {
+    }
+  }
   if (msg.defaultMessage && overrideIdFn) {
     switch (typeof overrideIdFn) {
       case "string":
@@ -229385,6 +229681,12 @@ function isMemberMethodFormatMessageCall(ts2, node, additionalFunctionNames) {
   if (ts2.isPropertyAccessExpression(method)) {
     return fnNames.has(method.name.text);
   }
+  if (ts2.isExpressionWithTypeArguments && ts2.isExpressionWithTypeArguments(method)) {
+    const expr = method.expression;
+    if (ts2.isPropertyAccessExpression(expr)) {
+      return fnNames.has(expr.name.text);
+    }
+  }
   return ts2.isIdentifier(method) && fnNames.has(method.text);
 }
 function extractMessageFromJsxComponent(ts2, factory, node, opts, sf) {
@@ -229534,6 +229836,8 @@ var stringifyNs2, typescript, stringify2, MESSAGE_DESC_KEYS, DEFAULT_OPTS, PRAGM
 var init_transform = __esm({
   "node_modules/.aspect_rules_js/@formatjs+ts-transformer@0.0.0/node_modules/@formatjs/ts-transformer/src/transform.js"() {
     init_icu_messageformat_parser();
+    init_manipulator();
+    init_printer();
     stringifyNs2 = __toESM(require_json_stable_stringify());
     typescript = __toESM(require_typescript());
     init_console_utils2();
@@ -229768,7 +230072,7 @@ var init_gts_extractor = __esm({
   }
 });
 
-// node_modules/.aspect_rules_js/commander@13.1.0/node_modules/commander/esm.mjs
+// node_modules/.aspect_rules_js/commander@14.0.2/node_modules/commander/esm.mjs
 var import_index = __toESM(require_commander(), 1);
 var {
   program,
@@ -230236,109 +230540,6 @@ init_console_utils();
 init_ts_transformer();
 init_console_utils();
 var stringifyNs3 = __toESM(require_json_stable_stringify());
-init_icu_messageformat_parser();
-init_manipulator();
-
-// node_modules/.aspect_rules_js/@formatjs+icu-messageformat-parser@0.0.0/node_modules/@formatjs/icu-messageformat-parser/printer.js
-init_tslib_es6();
-init_types();
-function printAST(ast) {
-  return doPrintAST(ast, false);
-}
-function doPrintAST(ast, isInPlural) {
-  var printedNodes = ast.map(function(el, i) {
-    if (isLiteralElement(el)) {
-      return printLiteralElement(el, isInPlural, i === 0, i === ast.length - 1);
-    }
-    if (isArgumentElement(el)) {
-      return printArgumentElement(el);
-    }
-    if (isDateElement(el) || isTimeElement(el) || isNumberElement(el)) {
-      return printSimpleFormatElement(el);
-    }
-    if (isPluralElement(el)) {
-      return printPluralElement(el);
-    }
-    if (isSelectElement(el)) {
-      return printSelectElement(el);
-    }
-    if (isPoundElement(el)) {
-      return "#";
-    }
-    if (isTagElement(el)) {
-      return printTagElement(el);
-    }
-  });
-  return printedNodes.join("");
-}
-function printTagElement(el) {
-  return "<".concat(el.value, ">").concat(printAST(el.children), "</").concat(el.value, ">");
-}
-function printEscapedMessage(message) {
-  return message.replace(/([{}](?:[\s\S]*[{}])?)/, "'$1'");
-}
-function printLiteralElement(_a, isInPlural, isFirstEl, isLastEl) {
-  var value = _a.value;
-  var escaped = value;
-  if (!isFirstEl && escaped[0] === "'") {
-    escaped = "''".concat(escaped.slice(1));
-  }
-  if (!isLastEl && escaped[escaped.length - 1] === "'") {
-    escaped = "".concat(escaped.slice(0, escaped.length - 1), "''");
-  }
-  escaped = printEscapedMessage(escaped);
-  return isInPlural ? escaped.replace("#", "'#'") : escaped;
-}
-function printArgumentElement(_a) {
-  var value = _a.value;
-  return "{".concat(value, "}");
-}
-function printSimpleFormatElement(el) {
-  return "{".concat(el.value, ", ").concat(TYPE[el.type]).concat(el.style ? ", ".concat(printArgumentStyle(el.style)) : "", "}");
-}
-function printNumberSkeletonToken(token) {
-  var stem = token.stem, options = token.options;
-  return options.length === 0 ? stem : "".concat(stem).concat(options.map(function(o) {
-    return "/".concat(o);
-  }).join(""));
-}
-function printArgumentStyle(style) {
-  if (typeof style === "string") {
-    return printEscapedMessage(style);
-  } else if (style.type === SKELETON_TYPE.dateTime) {
-    return "::".concat(printDateTimeSkeleton(style));
-  } else {
-    return "::".concat(style.tokens.map(printNumberSkeletonToken).join(" "));
-  }
-}
-function printDateTimeSkeleton(style) {
-  return style.pattern;
-}
-function printSelectElement(el) {
-  var msg = [
-    el.value,
-    "select",
-    Object.keys(el.options).map(function(id) {
-      return "".concat(id, "{").concat(doPrintAST(el.options[id].value, false), "}");
-    }).join(" ")
-  ].join(",");
-  return "{".concat(msg, "}");
-}
-function printPluralElement(el) {
-  var type = el.pluralType === "cardinal" ? "plural" : "selectordinal";
-  var msg = [
-    el.value,
-    type,
-    __spreadArray([
-      el.offset ? "offset:".concat(el.offset) : ""
-    ], Object.keys(el.options).map(function(id) {
-      return "".concat(id, "{").concat(doPrintAST(el.options[id].value, true), "}");
-    }), true).filter(Boolean).join(" ")
-  ].join(",");
-  return "{".concat(msg, "}");
-}
-
-// packages/cli-lib/src/extract.ts
 init_parse_script();
 var import_promises = require("fs/promises");
 var stringify3 = stringifyNs3.default || stringifyNs3;
@@ -230421,7 +230622,7 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
   return { messages, meta };
 }
 async function extract(files, extractOpts) {
-  const { throws, readFromStdin, flatten: flatten2, ...opts } = extractOpts;
+  const { throws, readFromStdin, ...opts } = extractOpts;
   let rawResults = [];
   try {
     if (readFromStdin) {
@@ -230486,9 +230687,6 @@ ${JSON.stringify(message, void 0, 2)}`
   const results = {};
   const messages = Array.from(extractedMessages.values());
   for (const { id, ...msg } of messages) {
-    if (flatten2 && msg.defaultMessage) {
-      msg.defaultMessage = printAST(hoistSelectors(parse(msg.defaultMessage)));
-    }
     results[id] = msg;
   }
   if (typeof formatter.serialize === "function") {

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@formatjs/cli",
   "description": "A CLI for formatjs.",
-  "version": "6.8.7",
+  "version": "6.9.0",
   "license": "MIT",
   "author": "Linjie Ding <linjie@airtable.com>",
   "engines": {
     "node": ">= 16"
   },
   "devDependencies": {
-    "@formatjs/cli-lib": "8.0.7"
+    "@formatjs/cli-lib": "8.1.0"
   },
   "peerDependencies": {
     "@glimmer/syntax": "^0.95.0",
     "@vue/compiler-core": "^3.5.12",
-    "content-tag": "^3.0.0",
+    "content-tag": "4",
     "ember-template-recast": "^6.1.5",
     "vue": "^3.5.12"
   },