@formatjs/cli 6.13.2 → 6.13.4

package/bin/formatjs

@@ -4654,7 +4654,7 @@ var require_parse = __commonJS({
       CHAR_NO_BREAK_SPACE,
       CHAR_ZERO_WIDTH_NOBREAK_SPACE
     } = require_constants();
-    var parse4 = (input, options = {}) => {
+    var parse5 = (input, options = {}) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected a string");
       }
@@ -4858,7 +4858,7 @@ var require_parse = __commonJS({
       push({ type: "eos" });
       return ast;
     };
-    module2.exports = parse4;
+    module2.exports = parse5;
   }
 });
 
@@ -4869,7 +4869,7 @@ var require_braces = __commonJS({
     var stringify4 = require_stringify();
     var compile8 = require_compile();
     var expand = require_expand();
-    var parse4 = require_parse();
+    var parse5 = require_parse();
     var braces = (input, options = {}) => {
       let output = [];
       if (Array.isArray(input)) {
@@ -4889,7 +4889,7 @@ var require_braces = __commonJS({
       }
       return output;
     };
-    braces.parse = (input, options = {}) => parse4(input, options);
+    braces.parse = (input, options = {}) => parse5(input, options);
     braces.stringify = (input, options = {}) => {
       if (typeof input === "string") {
         return stringify4(braces.parse(input, options), options);
@@ -5547,7 +5547,7 @@ var require_parse2 = __commonJS({
     var syntaxError = (type, char) => {
       return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
     };
-    var parse4 = (input, options) => {
+    var parse5 = (input, options) => {
       if (typeof input !== "string") {
         throw new TypeError("Expected a string");
       }
@@ -5697,7 +5697,7 @@ var require_parse2 = __commonJS({
             output = token.close = `)$))${extglobStar}`;
           }
           if (token.inner.includes("*") && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-            const expression = parse4(rest, { ...options, fastpaths: false }).output;
+            const expression = parse5(rest, { ...options, fastpaths: false }).output;
             output = token.close = `)${expression})${extglobStar})`;
           }
           if (token.prev.type === "bos") {
@@ -6226,7 +6226,7 @@ var require_parse2 = __commonJS({
       }
       return state;
     };
-    parse4.fastpaths = (input, options) => {
+    parse5.fastpaths = (input, options) => {
       const opts = { ...options };
       const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
       const len = input.length;
@@ -6295,7 +6295,7 @@ var require_parse2 = __commonJS({
       }
       return source;
     };
-    module2.exports = parse4;
+    module2.exports = parse5;
   }
 });
 
@@ -6305,7 +6305,7 @@ var require_picomatch = __commonJS({
     "use strict";
     var path2 = require("path");
     var scan = require_scan();
-    var parse4 = require_parse2();
+    var parse5 = require_parse2();
     var utils = require_utils2();
     var constants = require_constants2();
     var isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
@@ -6395,7 +6395,7 @@ var require_picomatch = __commonJS({
     picomatch.parse = (pattern, options) => {
       if (Array.isArray(pattern))
         return pattern.map((p2) => picomatch.parse(p2, options));
-      return parse4(pattern, { ...options, fastpaths: false });
+      return parse5(pattern, { ...options, fastpaths: false });
     };
     picomatch.scan = (input, options) => scan(input, options);
     picomatch.compileRe = (state, options, returnOutput = false, returnState = false) => {
@@ -6421,10 +6421,10 @@ var require_picomatch = __commonJS({
       }
       let parsed = { negated: false, fastpaths: true };
       if (options.fastpaths !== false && (input[0] === "." || input[0] === "*")) {
-        parsed.output = parse4.fastpaths(input, options);
+        parsed.output = parse5.fastpaths(input, options);
       }
       if (!parsed.output) {
-        parsed = parse4(input, options);
+        parsed = parse5(input, options);
       }
       return picomatch.compileRe(parsed, options, returnOutput, returnState);
     };
@@ -12719,8 +12719,8 @@ var require_graceful_fs = __commonJS({
       fs2.createReadStream = createReadStream;
       fs2.createWriteStream = createWriteStream;
       var fs$readFile = fs2.readFile;
-      fs2.readFile = readFile2;
-      function readFile2(path2, options, cb) {
+      fs2.readFile = readFile3;
+      function readFile3(path2, options, cb) {
         if (typeof options === "function")
           cb = options, options = null;
         return go$readFile(path2, options, cb);
@@ -14156,7 +14156,7 @@ var require_jsonfile = __commonJS({
       }
       return obj;
     }
-    var readFile2 = universalify.fromPromise(_readFile);
+    var readFile3 = universalify.fromPromise(_readFile);
     function readFileSync2(file, options = {}) {
       if (typeof options === "string") {
         options = { encoding: options };
@@ -14188,7 +14188,7 @@ var require_jsonfile = __commonJS({
       return fs.writeFileSync(file, str, options);
     }
     module2.exports = {
-      readFile: readFile2,
+      readFile: readFile3,
       readFileSync: readFileSync2,
       writeFile,
       writeFileSync
@@ -24931,7 +24931,7 @@ ${lanes.join("\n")}
             writeOutputIsTTY() {
               return process.stdout.isTTY;
             },
-            readFile: readFile2,
+            readFile: readFile3,
             writeFile: writeFile2,
             watchFile: watchFile2,
             watchDirectory,
@@ -25137,7 +25137,7 @@ ${lanes.join("\n")}
               callback
             );
           }
-          function readFile2(fileName, _encoding) {
+          function readFile3(fileName, _encoding) {
             let buffer;
             try {
               buffer = _fs.readFileSync(fileName);
@@ -61783,7 +61783,7 @@ ${lanes.join("\n")}
         const possibleOption = getSpellingSuggestion(unknownOption, diagnostics.optionDeclarations, getOptionName);
         return possibleOption ? createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, node, diagnostics.unknownDidYouMeanDiagnostic, unknownOptionErrorText || unknownOption, possibleOption.name) : createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, node, diagnostics.unknownOptionDiagnostic, unknownOptionErrorText || unknownOption);
       }
-      function parseCommandLineWorker(diagnostics, commandLine, readFile2) {
+      function parseCommandLineWorker(diagnostics, commandLine, readFile3) {
         const options = {};
         let watchOptions;
         const fileNames = [];
@@ -61831,7 +61831,7 @@ ${lanes.join("\n")}
           }
         }
         function parseResponseFile(fileName) {
-          const text = tryReadFile(fileName, readFile2 || ((fileName2) => sys2.readFile(fileName2)));
+          const text = tryReadFile(fileName, readFile3 || ((fileName2) => sys2.readFile(fileName2)));
           if (!isString(text)) {
             errors.push(text);
             return;
@@ -61939,8 +61939,8 @@ ${lanes.join("\n")}
         unknownDidYouMeanDiagnostic: Diagnostics.Unknown_compiler_option_0_Did_you_mean_1,
         optionTypeMismatchDiagnostic: Diagnostics.Compiler_option_0_expects_an_argument
       };
-      function parseCommandLine(commandLine, readFile2) {
-        return parseCommandLineWorker(compilerOptionsDidYouMeanDiagnostics, commandLine, readFile2);
+      function parseCommandLine(commandLine, readFile3) {
+        return parseCommandLineWorker(compilerOptionsDidYouMeanDiagnostics, commandLine, readFile3);
       }
       function getOptionFromName(optionName, allowShort) {
         return getOptionDeclarationFromName(getOptionsNameMap, optionName, allowShort);
@@ -62022,8 +62022,8 @@ ${lanes.join("\n")}
           watchOptionsToExtend
         );
       }
-      function readConfigFile(fileName, readFile2) {
-        const textOrDiagnostic = tryReadFile(fileName, readFile2);
+      function readConfigFile(fileName, readFile3) {
+        const textOrDiagnostic = tryReadFile(fileName, readFile3);
         return isString(textOrDiagnostic) ? parseConfigFileTextToJson(fileName, textOrDiagnostic) : { config: {}, error: textOrDiagnostic };
       }
       function parseConfigFileTextToJson(fileName, jsonText) {
@@ -62038,14 +62038,14 @@ ${lanes.join("\n")}
           error: jsonSourceFile.parseDiagnostics.length ? jsonSourceFile.parseDiagnostics[0] : void 0
         };
       }
-      function readJsonConfigFile(fileName, readFile2) {
-        const textOrDiagnostic = tryReadFile(fileName, readFile2);
+      function readJsonConfigFile(fileName, readFile3) {
+        const textOrDiagnostic = tryReadFile(fileName, readFile3);
         return isString(textOrDiagnostic) ? parseJsonText(fileName, textOrDiagnostic) : { fileName, parseDiagnostics: [textOrDiagnostic] };
       }
-      function tryReadFile(fileName, readFile2) {
+      function tryReadFile(fileName, readFile3) {
         let text;
         try {
-          text = readFile2(fileName);
+          text = readFile3(fileName);
         } catch (e) {
           return createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message);
         }
@@ -152233,12 +152233,12 @@ ${lanes.join("\n")}
       function createCompilerHost(options, setParentNodes) {
         return createCompilerHostWorker(options, setParentNodes);
       }
-      function createGetSourceFile(readFile2, setParentNodes) {
+      function createGetSourceFile(readFile3, setParentNodes) {
         return (fileName, languageVersionOrOptions, onError) => {
           let text;
           try {
             mark("beforeIORead");
-            text = readFile2(fileName);
+            text = readFile3(fileName);
             mark("afterIORead");
             measure("I/O Read", "beforeIORead", "afterIORead");
           } catch (e) {
@@ -153165,7 +153165,7 @@ ${lanes.join("\n")}
           getRedirectFromOutput,
           forEachResolvedProjectReference: forEachResolvedProjectReference2
         });
-        const readFile2 = host.readFile.bind(host);
+        const readFile3 = host.readFile.bind(host);
         (_e = tracing) == null ? void 0 : _e.push(tracing.Phase.Program, "shouldProgramCreateNewSourceFiles", { hasOldProgram: !!oldProgram });
         const shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         (_f = tracing) == null ? void 0 : _f.pop();
@@ -153392,7 +153392,7 @@ ${lanes.join("\n")}
           shouldTransformImportCall,
           emitBuildInfo,
           fileExists,
-          readFile: readFile2,
+          readFile: readFile3,
           directoryExists,
           getSymlinkCache,
           realpath: (_o = host.realpath) == null ? void 0 : _o.bind(host),
@@ -190752,7 +190752,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       var fixId37 = "fixMissingTypeAnnotationOnExports";
       var addAnnotationFix = "add-annotation";
       var addInlineTypeAssertion = "add-type-assertion";
-      var extractExpression = "extract-expression";
+      var extractExpression2 = "extract-expression";
       var errorCodes48 = [
         Diagnostics.Function_must_have_an_explicit_return_type_annotation_with_isolatedDeclarations.code,
         Diagnostics.Method_must_have_an_explicit_return_type_annotation_with_isolatedDeclarations.code,
@@ -190804,7 +190804,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           addCodeAction(addInlineTypeAssertion, fixes, context, 0, (f) => f.addInlineAssertion(context.span));
           addCodeAction(addInlineTypeAssertion, fixes, context, 1, (f) => f.addInlineAssertion(context.span));
           addCodeAction(addInlineTypeAssertion, fixes, context, 2, (f) => f.addInlineAssertion(context.span));
-          addCodeAction(extractExpression, fixes, context, 0, (f) => f.extractAsVariable(context.span));
+          addCodeAction(extractExpression2, fixes, context, 0, (f) => f.extractAsVariable(context.span));
           return fixes;
         },
         getAllCodeActions: (context) => {
@@ -204693,7 +204693,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         return ts_textChanges_exports.ChangeTracker.with(
           { host, formatContext, preferences },
           (changeTracker) => {
-            const parsed = contents.map((c) => parse4(sourceFile, c));
+            const parsed = contents.map((c) => parse5(sourceFile, c));
             const flattenedLocations = focusLocations && flatten2(focusLocations);
             for (const nodes of parsed) {
               placeNodeGroup(
@@ -204706,7 +204706,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           }
         );
       }
-      function parse4(sourceFile, content) {
+      function parse5(sourceFile, content) {
         const nodeKinds = [
           {
             parse: () => createSourceFile(
@@ -229505,10 +229505,137 @@ var init_vue_extractor = __esm({
   }
 });
 
+// packages/cli-lib/src/svelte_extractor.ts
+var svelte_extractor_exports = {};
+__export(svelte_extractor_exports, {
+  parseFile: () => parseFile2
+});
+function walkFragment(fragment, source, parseScriptFn) {
+  if (!fragment || !fragment.nodes) {
+    return;
+  }
+  for (const node of fragment.nodes) {
+    walkNode(node, source, parseScriptFn);
+  }
+}
+function extractExpression(expression, source, parseScriptFn) {
+  if (!expression || expression.start == null || expression.end == null) {
+    return;
+  }
+  const content = source.slice(expression.start, expression.end);
+  try {
+    parseScriptFn(`(${content})`);
+  } catch (e) {
+    console.warn(
+      `Failed to parse "${content}". Ignore this if content has no extractable message`,
+      e
+    );
+  }
+}
+function walkNode(node, source, parseScriptFn) {
+  switch (node.type) {
+    case "ExpressionTag":
+      extractExpression(node.expression, source, parseScriptFn);
+      break;
+    case "ConstTag":
+      if (node.declaration) {
+        const content = source.slice(
+          node.declaration.start,
+          node.declaration.end
+        );
+        try {
+          parseScriptFn(content);
+        } catch (e) {
+          console.warn(
+            `Failed to parse const declaration. Ignore this if content has no extractable message`,
+            e
+          );
+        }
+      }
+      break;
+    case "IfBlock":
+      extractExpression(node.test, source, parseScriptFn);
+      walkFragment(node.consequent, source, parseScriptFn);
+      walkFragment(node.alternate, source, parseScriptFn);
+      break;
+    case "EachBlock":
+      extractExpression(node.expression, source, parseScriptFn);
+      if (node.key) {
+        extractExpression(node.key, source, parseScriptFn);
+      }
+      walkFragment(node.body, source, parseScriptFn);
+      walkFragment(node.fallback, source, parseScriptFn);
+      break;
+    case "AwaitBlock":
+      extractExpression(node.expression, source, parseScriptFn);
+      walkFragment(node.pending, source, parseScriptFn);
+      walkFragment(node.then, source, parseScriptFn);
+      walkFragment(node.catch, source, parseScriptFn);
+      break;
+    case "KeyBlock":
+      extractExpression(node.expression, source, parseScriptFn);
+      walkFragment(node.fragment, source, parseScriptFn);
+      break;
+    case "SnippetBlock":
+      walkFragment(node.body, source, parseScriptFn);
+      break;
+    case "RegularElement":
+    case "Component":
+    case "SvelteComponent":
+    case "SvelteElement":
+    case "SvelteHead":
+    case "SvelteBody":
+    case "SvelteWindow":
+    case "SvelteDocument":
+    case "SlotElement":
+    case "SvelteSelf":
+    case "SvelteFragment":
+      if (node.attributes) {
+        for (const attr of node.attributes) {
+          if (attr.type === "Attribute") {
+            if (Array.isArray(attr.value)) {
+              for (const v of attr.value) {
+                if (v.type === "ExpressionTag") {
+                  extractExpression(v.expression, source, parseScriptFn);
+                }
+              }
+            } else if (typeof attr.value === "object" && attr.value !== null && attr.value.type === "ExpressionTag") {
+              extractExpression(attr.value.expression, source, parseScriptFn);
+            }
+          } else if (attr.type === "SpreadAttribute") {
+            extractExpression(attr.expression, source, parseScriptFn);
+          } else if (attr.expression) {
+            extractExpression(attr.expression, source, parseScriptFn);
+          }
+        }
+      }
+      walkFragment(node.fragment, source, parseScriptFn);
+      break;
+  }
+}
+function parseFile2(source, filename, parseScriptFn) {
+  const ast = (0, import_compiler.parse)(source, { modern: true, filename });
+  walkFragment(ast.fragment, source, parseScriptFn);
+  if (ast.instance) {
+    const program2 = ast.instance.content;
+    parseScriptFn(source.slice(program2.start, program2.end));
+  }
+  if (ast.module) {
+    const program2 = ast.module.content;
+    parseScriptFn(source.slice(program2.start, program2.end));
+  }
+}
+var import_compiler;
+var init_svelte_extractor = __esm({
+  "packages/cli-lib/src/svelte_extractor.ts"() {
+    import_compiler = require("svelte/compiler");
+  }
+});
+
 // packages/cli-lib/src/hbs_extractor.ts
 var hbs_extractor_exports = {};
 __export(hbs_extractor_exports, {
-  parseFile: () => parseFile2
+  parseFile: () => parseFile3
 });
 function extractText(node, fileName, options) {
   var _a;
@@ -229538,7 +229665,7 @@ function extractText(node, fileName, options) {
     ]);
   }
 }
-function parseFile2(source, fileName, options) {
+function parseFile3(source, fileName, options) {
   const ast = (0, import_syntax.preprocess)(source);
   (0, import_syntax.traverse)(ast, {
     MustacheStatement(node) {
@@ -229559,15 +229686,15 @@ var init_hbs_extractor = __esm({
 // packages/cli-lib/src/gts_extractor.ts
 var gts_extractor_exports = {};
 __export(gts_extractor_exports, {
-  parseFile: () => parseFile3
+  parseFile: () => parseFile4
 });
-function parseFile3(source, fileName, options) {
+function parseFile4(source, fileName, options) {
   const scriptParseFn = parseScript(options, fileName);
   const transformedSource = p.process(source, { filename: fileName });
   scriptParseFn(transformedSource.code);
   const parseResult = p.parse(source, { filename: fileName });
   for (let parsed of parseResult) {
-    parseFile2(parsed.contents, fileName, options);
+    parseFile3(parsed.contents, fileName, options);
   }
 }
 var import_content_tag, p;
@@ -229671,6 +229798,7 @@ var esm_default = {
 };
 
 // packages/cli-lib/src/compile.ts
+var import_promises = require("fs/promises");
 var stringifyNs = __toESM(require_json_stable_stringify());
 init_console_utils();
 
@@ -229958,13 +230086,16 @@ function generateENXB(msg) {
 var stringify = stringifyNs.default || stringifyNs;
 async function compile7(inputFiles, opts = {}) {
   debug("Compiling files:", inputFiles);
-  const { ast, format: format9, pseudoLocale, skipErrors, ignoreTag } = opts;
+  const { ast, format: format9, pseudoLocale, skipErrors, ignoreTag, signal } = opts;
+  signal == null ? void 0 : signal.throwIfAborted();
   const formatter = await resolveBuiltinFormatter(format9);
   const messages = {};
   const messageAsts = {};
   const idsWithFileName = {};
   const compiledFiles = await Promise.all(
-    inputFiles.map((f) => readJSON(f).then(formatter.compile))
+    inputFiles.map(
+      (f) => (0, import_promises.readFile)(f, { encoding: "utf8", signal }).then((content) => JSON.parse(content)).then(formatter.compile)
+    )
   );
   debug("Compiled files:", compiledFiles);
   for (let i = 0; i < inputFiles.length; i++) {
@@ -230049,7 +230180,7 @@ init_ts_transformer();
 init_console_utils();
 var stringifyNs3 = __toESM(require_json_stable_stringify());
 init_parse_script();
-var import_promises = require("fs/promises");
+var import_promises2 = require("fs/promises");
 var stringify3 = stringifyNs3.default || stringifyNs3;
 function calculateLineColFromOffset(text, start) {
   if (!start) {
@@ -230108,16 +230239,20 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
   const scriptParseFn = parseScript(opts, fn);
   if (fn.endsWith(".vue")) {
     debug("Processing %s using vue extractor", fn);
-    const { parseFile: parseFile4 } = await Promise.resolve().then(() => (init_vue_extractor(), vue_extractor_exports));
-    parseFile4(source, fn, scriptParseFn);
+    const { parseFile: parseFile5 } = await Promise.resolve().then(() => (init_vue_extractor(), vue_extractor_exports));
+    parseFile5(source, fn, scriptParseFn);
+  } else if (fn.endsWith(".svelte")) {
+    debug("Processing %s using svelte extractor", fn);
+    const { parseFile: parseFile5 } = await Promise.resolve().then(() => (init_svelte_extractor(), svelte_extractor_exports));
+    parseFile5(source, fn, scriptParseFn);
   } else if (fn.endsWith(".hbs")) {
     debug("Processing %s using hbs extractor", fn);
-    const { parseFile: parseFile4 } = await Promise.resolve().then(() => (init_hbs_extractor(), hbs_extractor_exports));
-    parseFile4(source, fn, opts);
+    const { parseFile: parseFile5 } = await Promise.resolve().then(() => (init_hbs_extractor(), hbs_extractor_exports));
+    parseFile5(source, fn, opts);
   } else if (fn.endsWith(".gts") || fn.endsWith(".gjs")) {
     debug("Processing %s as gts/gjs file", fn);
-    const { parseFile: parseFile4 } = await Promise.resolve().then(() => (init_gts_extractor(), gts_extractor_exports));
-    parseFile4(source, fn, opts);
+    const { parseFile: parseFile5 } = await Promise.resolve().then(() => (init_gts_extractor(), gts_extractor_exports));
+    parseFile5(source, fn, opts);
   } else {
     debug("Processing %s using typescript extractor", fn);
     scriptParseFn(source);
@@ -230130,7 +230265,7 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
   return { messages, meta };
 }
 async function extract(files, extractOpts) {
-  const { throws, readFromStdin, ...opts } = extractOpts;
+  const { throws, readFromStdin, signal, ...opts } = extractOpts;
   const shouldThrow = throws === true;
   const optsWithThrows = {
     ...opts,
@@ -230151,7 +230286,7 @@ async function extract(files, extractOpts) {
         const settledResults = await Promise.allSettled(
           files.map(async (fn) => {
             debug("Extracting file:", fn);
-            const source = await (0, import_promises.readFile)(fn, "utf8");
+            const source = await (0, import_promises2.readFile)(fn, { encoding: "utf8", signal });
             return processFile(source, fn, optsWithThrows);
           })
         );
@@ -230167,7 +230302,7 @@ async function extract(files, extractOpts) {
         rawResults = await Promise.all(
           files.map(async (fn) => {
             debug("Extracting file:", fn);
-            const source = await (0, import_promises.readFile)(fn, "utf8");
+            const source = await (0, import_promises2.readFile)(fn, { encoding: "utf8", signal });
             return processFile(source, fn, optsWithThrows);
           })
         );

package/package.json

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