@formatjs/cli 6.11.0 → 6.12.1

package/bin/formatjs

@@ -4171,7 +4171,7 @@ var require_fill_range = __commonJS({
     var util = require("util");
     var toRegexRange = require_to_regex_range();
     var isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
-    var transform2 = (toNumber) => {
+    var transform = (toNumber) => {
       return (value) => toNumber === true ? Number(value) : String(value);
     };
     var isValidValue = (value) => {
@@ -4292,7 +4292,7 @@ var require_fill_range = __commonJS({
       let padded = zeros(startString) || zeros(endString) || zeros(stepString);
       let maxLen = padded ? Math.max(startString.length, endString.length, stepString.length) : 0;
       let toNumber = padded === false && stringify4(start, end, options) === false;
-      let format9 = options.transform || transform2(toNumber);
+      let format9 = options.transform || transform(toNumber);
       if (options.toRegex && step === 1) {
         return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
       }
@@ -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);
@@ -17747,9 +17747,9 @@ var init_printer = __esm({
   }
 });
 
-// node_modules/.aspect_rules_js/typescript@5.8.3/node_modules/typescript/lib/typescript.js
+// node_modules/.aspect_rules_js/typescript@5.8.2/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) {
+  "node_modules/.aspect_rules_js/typescript@5.8.2/node_modules/typescript/lib/typescript.js"(exports, module2) {
     var ts2 = {};
     ((module3) => {
       "use strict";
@@ -19912,7 +19912,7 @@ var require_typescript = __commonJS({
         tracing: () => tracing,
         tracingEnabled: () => tracingEnabled,
         transferSourceFileChildren: () => transferSourceFileChildren,
-        transform: () => transform2,
+        transform: () => transform,
         transformClassFields: () => transformClassFields,
         transformDeclarations: () => transformDeclarations,
         transformECMAScriptModule: () => transformECMAScriptModule,
@@ -20019,7 +20019,7 @@ var require_typescript = __commonJS({
       });
       module3.exports = __toCommonJS(typescript_exports);
       var versionMajorMinor = "5.8";
-      var version = "5.8.3";
+      var version = "5.8.2";
       var Comparison = ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -36210,8 +36210,8 @@ ${lanes.join("\n")}
         return isJSDocImplementsTag(node.parent) || isJSDocAugmentsTag(node.parent) || isHeritageClause(node.parent) && !isExpressionWithTypeArgumentsInClassExtendsClause(node);
       }
       function forEachReturnStatement(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
+        return traverse2(body);
+        function traverse2(node) {
           switch (node.kind) {
             case 253:
               return visitor(node);
@@ -36230,19 +36230,19 @@ ${lanes.join("\n")}
             case 256:
             case 258:
             case 299:
-              return forEachChild(node, traverse);
+              return forEachChild(node, traverse2);
           }
         }
       }
       function forEachYieldExpression(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
+        return traverse2(body);
+        function traverse2(node) {
           switch (node.kind) {
             case 229:
               visitor(node);
               const operand = node.expression;
               if (operand) {
-                traverse(operand);
+                traverse2(operand);
               }
               return;
             case 266:
@@ -36253,11 +36253,11 @@ ${lanes.join("\n")}
             default:
               if (isFunctionLike(node)) {
                 if (node.name && node.name.kind === 167) {
-                  traverse(node.name.expression);
+                  traverse2(node.name.expression);
                   return;
                 }
               } else if (!isPartOfTypeNode(node)) {
-                forEachChild(node, traverse);
+                forEachChild(node, traverse2);
               }
           }
         }
@@ -77036,11 +77036,10 @@ ${lanes.join("\n")}
             serializeExistingTypeNode(context, typeNode, addUndefined) {
               return serializeExistingTypeNode(context, typeNode, !!addUndefined);
             },
-            serializeReturnTypeForSignature(syntacticContext, signatureDeclaration, symbol) {
+            serializeReturnTypeForSignature(syntacticContext, signatureDeclaration) {
               const context = syntacticContext;
               const signature = getSignatureFromDeclaration(signatureDeclaration);
-              symbol ?? (symbol = getSymbolOfDeclaration(signatureDeclaration));
-              const returnType = context.enclosingSymbolTypes.get(getSymbolId(symbol)) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
+              const returnType = context.enclosingSymbolTypes.get(getSymbolId(getSymbolOfDeclaration(signatureDeclaration))) ?? instantiateType(getReturnTypeOfSignature(signature), context.mapper);
               return serializeInferredReturnTypeForSignature(context, signature, returnType);
             },
             serializeTypeOfExpression(syntacticContext, expr) {
@@ -77054,7 +77053,7 @@ ${lanes.join("\n")}
               symbol ?? (symbol = getSymbolOfDeclaration(declaration));
               let type = (_a = context.enclosingSymbolTypes) == null ? void 0 : _a.get(getSymbolId(symbol));
               if (type === void 0) {
-                type = symbol.flags & 98304 && declaration.kind === 178 ? instantiateType(getWriteTypeOfSymbol(symbol), context.mapper) : symbol && !(symbol.flags & (2048 | 131072)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
+                type = symbol && !(symbol.flags & (2048 | 131072)) ? instantiateType(getWidenedLiteralType(getTypeOfSymbol(symbol)), context.mapper) : errorType;
               }
               const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
               if (addUndefinedForParameter) {
@@ -77121,7 +77120,6 @@ ${lanes.join("\n")}
               const context = syntacticContext;
               if (context.bundled || context.enclosingFile !== getSourceFileOfNode(lit)) {
                 let name = lit.text;
-                const originalName = name;
                 const nodeSymbol = getNodeLinks(parent2).resolvedSymbol;
                 const meaning = parent2.isTypeOf ? 111551 : 788968;
                 const parentSymbol = nodeSymbol && isSymbolAccessible(
@@ -77151,9 +77149,7 @@ ${lanes.join("\n")}
                     context.tracker.reportLikelyUnsafeImportRequiredError(name);
                   }
                 }
-                if (name !== originalName) {
-                  return name;
-                }
+                return name;
               }
             },
             canReuseTypeNode(context, typeNode) {
@@ -77862,7 +77858,7 @@ ${lanes.join("\n")}
                 }
               }
             }
-            function visitAndTransformType(type2, transform22) {
+            function visitAndTransformType(type2, transform2) {
               var _a2, _b2, _c;
               const typeId = type2.id;
               const isConstructorObject = getObjectFlags(type2) & 16 && type2.symbol && type2.symbol.flags & 32;
@@ -77905,7 +77901,7 @@ ${lanes.join("\n")}
               const prevTrackedSymbols = context.trackedSymbols;
               context.trackedSymbols = void 0;
               const startLength = context.approximateLength;
-              const result = transform22(type2);
+              const result = transform2(type2);
               const addedLength = context.approximateLength - startLength;
               if (!context.reportedDiagnostic && !context.encounteredError) {
                 (_c = links == null ? void 0 : links.serializedTypes) == null ? void 0 : _c.set(key, {
@@ -78343,7 +78339,6 @@ ${lanes.join("\n")}
             if (propertySymbol.flags & 98304) {
               const writeType = getWriteTypeOfSymbol(propertySymbol);
               if (propertyType !== writeType && !isErrorType(propertyType) && !isErrorType(writeType)) {
-                const symbolMapper = getSymbolLinks(propertySymbol).mapper;
                 const getterDeclaration = getDeclarationOfKind(
                   propertySymbol,
                   177
@@ -78353,7 +78348,7 @@ ${lanes.join("\n")}
                 typeElements.push(
                   setCommentRange2(
                     context,
-                    signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(getterSignature, symbolMapper) : getterSignature, 177, context, { name: propertyName }),
+                    signatureToSignatureDeclarationHelper(getterSignature, 177, context, { name: propertyName }),
                     getterDeclaration
                   )
                 );
@@ -78366,7 +78361,7 @@ ${lanes.join("\n")}
                 typeElements.push(
                   setCommentRange2(
                     context,
-                    signatureToSignatureDeclarationHelper(symbolMapper ? instantiateSignature(setterSignature, symbolMapper) : setterSignature, 178, context, { name: propertyName }),
+                    signatureToSignatureDeclarationHelper(setterSignature, 178, context, { name: propertyName }),
                     setterDeclaration
                   )
                 );
@@ -79641,13 +79636,13 @@ ${lanes.join("\n")}
             const addUndefinedForParameter = declaration && (isParameter(declaration) || isJSDocParameterTag(declaration)) && requiresAddingImplicitUndefined(declaration, context.enclosingDeclaration);
             const decl = declaration ?? symbol.valueDeclaration ?? getDeclarationWithTypeAnnotation(symbol) ?? ((_a = symbol.declarations) == null ? void 0 : _a[0]);
             if (decl) {
-              const restore = addSymbolTypeToContext(context, symbol, type);
               if (isAccessor(decl)) {
                 result = syntacticNodeBuilder.serializeTypeOfAccessor(decl, symbol, context);
               } else if (hasInferredType(decl) && !nodeIsSynthesized(decl) && !(getObjectFlags(type) & 196608)) {
+                const restore = addSymbolTypeToContext(context, symbol, type);
                 result = syntacticNodeBuilder.serializeTypeOfDeclaration(decl, symbol, context);
+                restore();
               }
-              restore();
             }
             if (!result) {
               if (addUndefinedForParameter) {
@@ -79820,7 +79815,10 @@ ${lanes.join("\n")}
                 /*context*/
                 void 0
               );
-              return setTextRange2(context, updated, node2);
+              if (updated !== node2) {
+                setTextRange2(context, updated, node2);
+              }
+              return updated;
             }
           }
           function serializeTypeName(context, node, isTypeOf, typeArguments) {
@@ -86103,11 +86101,11 @@ ${lanes.join("\n")}
             if (links.flags & 512) {
               links.containsArgumentsReference = true;
             } else {
-              links.containsArgumentsReference = traverse(declaration.body);
+              links.containsArgumentsReference = traverse2(declaration.body);
             }
           }
           return links.containsArgumentsReference;
-          function traverse(node) {
+          function traverse2(node) {
             if (!node)
               return false;
             switch (node.kind) {
@@ -86117,14 +86115,14 @@ ${lanes.join("\n")}
               case 174:
               case 177:
               case 178:
-                return node.name.kind === 167 && traverse(node.name);
+                return node.name.kind === 167 && traverse2(node.name);
               case 211:
               case 212:
-                return traverse(node.expression);
+                return traverse2(node.expression);
               case 303:
-                return traverse(node.initializer);
+                return traverse2(node.initializer);
               default:
-                return !nodeStartsNewLexicalEnvironment(node) && !isPartOfTypeNode(node) && !!forEachChild(node, traverse);
+                return !nodeStartsNewLexicalEnvironment(node) && !isPartOfTypeNode(node) && !!forEachChild(node, traverse2);
             }
           }
         }
@@ -105523,11 +105521,6 @@ ${lanes.join("\n")}
             ])) {
               grammarErrorOnNode(node, Diagnostics.This_syntax_is_reserved_in_files_with_the_mts_or_cts_extension_Use_an_as_expression_instead);
             }
-            if (compilerOptions.erasableSyntaxOnly) {
-              const start = skipTrivia(file.text, node.pos);
-              const end = node.expression.pos;
-              diagnostics.add(createFileDiagnostic(file, start, end - start, Diagnostics.This_syntax_is_not_allowed_when_erasableSyntaxOnly_is_enabled));
-            }
           }
           return checkAssertionWorker(node, checkMode);
         }
@@ -146445,8 +146438,8 @@ ${lanes.join("\n")}
         mark("beforeTransform");
         const transformersWithContext = transformers.map((t) => t(context));
         const transformation = (node) => {
-          for (const transform22 of transformersWithContext) {
-            node = transform22(node);
+          for (const transform2 of transformersWithContext) {
+            node = transform2(node);
           }
           return node;
         };
@@ -147059,7 +147052,7 @@ ${lanes.join("\n")}
                 markLinkedReferences(sourceFile);
             }
           );
-          const transform22 = transformNodes(
+          const transform2 = transformNodes(
             resolver,
             host,
             factory,
@@ -147085,13 +147078,13 @@ ${lanes.join("\n")}
             // resolver hooks
             hasGlobalName: resolver.hasGlobalName,
             // transform hooks
-            onEmitNode: transform22.emitNodeWithNotification,
-            isEmitNotificationEnabled: transform22.isEmitNotificationEnabled,
-            substituteNode: transform22.substituteNode
+            onEmitNode: transform2.emitNodeWithNotification,
+            isEmitNotificationEnabled: transform2.isEmitNotificationEnabled,
+            substituteNode: transform2.substituteNode
           });
-          Debug.assert(transform22.transformed.length === 1, "Should only see one output from the transform");
-          printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform22, printer, compilerOptions);
-          transform22.dispose();
+          Debug.assert(transform2.transformed.length === 1, "Should only see one output from the transform");
+          printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform2, printer, compilerOptions);
+          transform2.dispose();
           if (emittedFilesList) {
             emittedFilesList.push(jsFilePath);
             if (sourceMapFilePath) {
@@ -147209,8 +147202,8 @@ ${lanes.join("\n")}
             resolver.markLinkedReferences(n);
           });
         }
-        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform22, printer, mapOptions) {
-          const sourceFileOrBundle = transform22.transformed[0];
+        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform2, printer, mapOptions) {
+          const sourceFileOrBundle = transform2.transformed[0];
           const bundle = sourceFileOrBundle.kind === 308 ? sourceFileOrBundle : void 0;
           const sourceFile = sourceFileOrBundle.kind === 307 ? sourceFileOrBundle : void 0;
           const sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
@@ -147266,7 +147259,7 @@ ${lanes.join("\n")}
             writer.writeLine();
           }
           const text = writer.getText();
-          const data = { sourceMapUrlPos, diagnostics: transform22.diagnostics };
+          const data = { sourceMapUrlPos, diagnostics: transform2.diagnostics };
           writeFile(host, emitterDiagnostics, jsFilePath, text, !!compilerOptions.emitBOM, sourceFiles, data);
           writer.clear();
           return !data.skippedDtsWrite;
@@ -164982,11 +164975,9 @@ ${lanes.join("\n")}
               if (!resolver.canReuseTypeNode(context, node)) {
                 return resolver.serializeExistingTypeNode(context, node);
               }
-              const specifier = rewriteModuleSpecifier2(node, node.argument.literal);
-              const literal = specifier === node.argument.literal ? reuseNode(context, node.argument.literal) : specifier;
               return factory.updateImportTypeNode(
                 node,
-                literal === node.argument.literal ? reuseNode(context, node.argument) : factory.createLiteralTypeNode(literal),
+                factory.updateLiteralTypeNode(node.argument, rewriteModuleSpecifier2(node, node.argument.literal)),
                 visitNode(node.attributes, visitExistingNodeTreeSymbols, isImportAttributes),
                 visitNode(node.qualifier, visitExistingNodeTreeSymbols, isEntityName),
                 visitNodes2(node.typeArguments, visitExistingNodeTreeSymbols, isTypeNode),
@@ -165148,7 +165139,10 @@ ${lanes.join("\n")}
             }
             function rewriteModuleSpecifier2(parent2, lit) {
               const newName = resolver.getModuleSpecifierOverride(context, parent2, lit);
-              return newName ? setOriginalNode(factory.createStringLiteral(newName), lit) : lit;
+              if (newName) {
+                return setOriginalNode(factory.createStringLiteral(newName), lit);
+              }
+              return visitNode(lit, visitExistingNodeTreeSymbols, isStringLiteral);
             }
           }
         }
@@ -165324,7 +165318,12 @@ ${lanes.join("\n")}
             return withNewScope(context, node, () => serializeTypeAnnotationOfDeclaration(accessorType, context, node, symbol) ?? inferTypeOfDeclaration(node, symbol, context));
           }
           if (accessorDeclarations.getAccessor) {
-            return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(accessorDeclarations.getAccessor, symbol, context));
+            return withNewScope(context, accessorDeclarations.getAccessor, () => createReturnFromSignature(
+              accessorDeclarations.getAccessor,
+              /*symbol*/
+              void 0,
+              context
+            ));
           }
           return void 0;
         }
@@ -165443,7 +165442,7 @@ ${lanes.join("\n")}
             /* AnyKeyword */
           );
         }
-        function inferReturnTypeOfSignatureSignature(node, context, symbol, reportFallback) {
+        function inferReturnTypeOfSignatureSignature(node, context, reportFallback) {
           if (reportFallback) {
             context.tracker.reportInferenceFallback(node);
           }
@@ -165453,7 +165452,7 @@ ${lanes.join("\n")}
               /* AnyKeyword */
             );
           }
-          return resolver.serializeReturnTypeForSignature(context, node, symbol) ?? factory.createKeywordTypeNode(
+          return resolver.serializeReturnTypeForSignature(context, node) ?? factory.createKeywordTypeNode(
             133
             /* AnyKeyword */
           );
@@ -165768,17 +165767,18 @@ ${lanes.join("\n")}
           );
         }
         function reuseTypeParameters(typeParameters, context) {
-          return typeParameters == null ? void 0 : typeParameters.map((tp) => {
-            var _a;
-            const { node: tpName } = resolver.trackExistingEntityName(context, tp.name);
-            return factory.updateTypeParameterDeclaration(
-              tp,
-              (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
-              tpName,
-              serializeExistingTypeNodeWithFallback(tp.constraint, context),
-              serializeExistingTypeNodeWithFallback(tp.default, context)
-            );
-          });
+          return typeParameters == null ? void 0 : typeParameters.map(
+            (tp) => {
+              var _a;
+              return factory.updateTypeParameterDeclaration(
+                tp,
+                (_a = tp.modifiers) == null ? void 0 : _a.map((m) => reuseNode(context, m)),
+                reuseNode(context, tp.name),
+                serializeExistingTypeNodeWithFallback(tp.constraint, context),
+                serializeExistingTypeNodeWithFallback(tp.default, context)
+              );
+            }
+          );
         }
         function typeFromObjectLiteralMethod(method, name, context, isConstContext) {
           const returnType = createReturnFromSignature(
@@ -165933,7 +165933,7 @@ ${lanes.join("\n")}
           } else if (isValueSignatureDeclaration(fn)) {
             returnType = typeFromSingleReturnExpression(fn, context);
           }
-          return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, symbol, reportFallback && returnType.reportFallback && !returnTypeNode);
+          return returnType.type !== void 0 ? returnType.type : inferReturnTypeOfSignatureSignature(fn, context, reportFallback && returnType.reportFallback && !returnTypeNode);
         }
         function typeFromSingleReturnExpression(declaration, context) {
           let candidateExpr;
@@ -182256,7 +182256,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         throw new Error("getDefaultLibFilePath is only supported when consumed as a node module. ");
       }
       setObjectAllocator(getServicesObjectAllocator());
-      function transform2(source, transformers, compilerOptions) {
+      function transform(source, transformers, compilerOptions) {
         const diagnostics = [];
         compilerOptions = fixupCompilerOptions(compilerOptions, diagnostics);
         const nodes = isArray(source) ? source : [source];
@@ -215849,7 +215849,7 @@ ${options.prefix}` : "\n" : options.prefix
         tracing: () => tracing,
         tracingEnabled: () => tracingEnabled,
         transferSourceFileChildren: () => transferSourceFileChildren,
-        transform: () => transform2,
+        transform: () => transform,
         transformClassFields: () => transformClassFields,
         transformDeclarations: () => transformDeclarations,
         transformECMAScriptModule: () => transformECMAScriptModule,
@@ -229479,7 +229479,10 @@ function extractMessageDescriptor(ts2, node, { overrideIdFn, extractSourceLocati
   if (flatten2 && msg.defaultMessage) {
     try {
       msg.defaultMessage = printAST(hoistSelectors(parse(msg.defaultMessage)));
-    } catch {
+    } catch (e) {
+      const { line, character } = sf.getLineAndCharacterOfPosition(node.pos);
+      throw new Error(`[formatjs] Cannot flatten message in file "${sf.fileName}" at line ${line + 1}, column ${character + 1}${msg.id ? ` with id "${msg.id}"` : ""}: ${e.message}
+Message: ${msg.defaultMessage}`);
     }
   }
   if (msg.defaultMessage && overrideIdFn) {
@@ -229847,22 +229850,20 @@ function extractText(node, fileName, options) {
   }
 }
 function parseFile2(source, fileName, options) {
-  let visitor = function() {
-    return {
-      MustacheStatement(node) {
-        extractText(node, fileName, options);
-      },
-      SubExpression(node) {
-        extractText(node, fileName, options);
-      }
-    };
-  };
-  (0, import_ember_template_recast.transform)(source, visitor);
+  const ast = (0, import_syntax.preprocess)(source);
+  (0, import_syntax.traverse)(ast, {
+    MustacheStatement(node) {
+      extractText(node, fileName, options);
+    },
+    SubExpression(node) {
+      extractText(node, fileName, options);
+    }
+  });
 }
-var import_ember_template_recast;
+var import_syntax;
 var init_hbs_extractor = __esm({
   "packages/cli-lib/src/hbs_extractor.ts"() {
-    import_ember_template_recast = require("ember-template-recast");
+    import_syntax = require("@glimmer/syntax");
   }
 });
 
@@ -229908,7 +229909,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
@@ -230451,13 +230452,31 @@ 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 (0, import_promises.readFile)(fn, "utf8");
-          return processFile(source, fn, opts);
-        })
-      );
+      if (throws === false) {
+        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);
+          })
+        );
+        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, opts);
+          })
+        );
+      }
     }
   } catch (e) {
     if (throws) {
@@ -230688,6 +230707,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)();
@@ -230777,7 +230797,7 @@ sentences are not translator-friendly.`
     const files = [];
     if (filePatterns.length) {
       files.push(
-        ...(0, import_fast_glob.sync)(filePatterns, {
+        ...globSync(filePatterns, {
           ignore: cmdObj.ignore
         })
       );
@@ -230838,7 +230858,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}`);
     }
@@ -230860,10 +230880,19 @@ This is especially useful to convert from a TMS-specific format back to react-in
   ).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);
-    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}`);
     }
@@ -230891,7 +230920,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,21 +1,20 @@
 {
   "name": "@formatjs/cli",
   "description": "A CLI for formatjs.",
-  "version": "6.11.0",
+  "version": "6.12.1",
   "license": "MIT",
   "author": "Linjie Ding <linjie@airtable.com>",
   "engines": {
     "node": ">= 16"
   },
   "devDependencies": {
-    "@formatjs/cli-lib": "8.2.0"
+    "@formatjs/cli-lib": "8.2.2"
   },
   "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"
   },
   "bin": {
     "formatjs": "bin/formatjs"
@@ -58,9 +57,6 @@
     "@glimmer/validator": {
       "optional": true
     },
-    "ember-template-recast": {
-      "optional": true
-    },
     "content-tag": {
       "optional": true
     }