@formatjs/cli-lib 6.3.6 → 6.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/cli-lib",
-  "version": "6.3.6",
+  "version": "6.3.8",
   "description": "Lib for CLI for formatjs.",
   "keywords": [
     "intl",
@@ -43,12 +43,12 @@
     "loud-rejection": "^2.2.0",
     "tslib": "^2.4.0",
     "typescript": "5",
-    "@formatjs/icu-messageformat-parser": "2.7.6",
-    "@formatjs/ts-transformer": "3.13.12"
+    "@formatjs/ts-transformer": "3.13.12",
+    "@formatjs/icu-messageformat-parser": "2.7.6"
   },
   "peerDependencies": {
-    "@vue/compiler-core": "^3.3.4",
-    "vue": "^3.3.4"
+    "@vue/compiler-core": "^3.4.0",
+    "vue": "^3.4.0"
   },
   "peerDependenciesMeta": {
     "vue": {

package/src/extract.js

@@ -23,13 +23,15 @@ function calculateLineColFromOffset(text, start) {
 async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
     let messages = [];
     let meta;
+    const onMsgExtracted = opts.onMsgExtracted;
+    const onMetaExtracted = opts.onMetaExtracted;
     opts = {
         ...opts,
         additionalComponentNames: [
             '$formatMessage',
             ...(opts.additionalComponentNames || []),
         ],
-        onMsgExtracted(_, msgs) {
+        onMsgExtracted(filePath, msgs) {
             if (opts.extractSourceLocation) {
                 msgs = msgs.map(msg => ({
                     ...msg,
@@ -37,9 +39,15 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
                 }));
             }
             messages = messages.concat(msgs);
+            if (onMsgExtracted) {
+                onMsgExtracted(filePath, msgs);
+            }
         },
-        onMetaExtracted(_, m) {
+        onMetaExtracted(filePath, m) {
             meta = m;
+            if (onMetaExtracted) {
+                onMetaExtracted(filePath, m);
+            }
         },
     };
     if (!opts.overrideIdFn && idInterpolationPattern) {

package/src/vue_extractor.js

@@ -1,31 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseFile = void 0;
+const compiler_core_1 = require("@vue/compiler-core");
 const compiler_sfc_1 = require("vue/compiler-sfc");
-// Duplicate `NodeTypes` here because they are defined as
-// const enum, which does not work with swc transpilation: https://github.com/vuejs/core/issues/1228
-const ELEMENT = 1;
-const SIMPLE_EXPRESSION = 4;
-const INTERPOLATION = 5;
-const DIRECTIVE = 7;
-const COMPOUND_EXPRESSION = 8;
 function walk(node, visitor) {
-    if (typeof node !== 'object') {
+    if (typeof node !== 'object' || node == null) {
         return;
     }
-    if (node.type !== ELEMENT &&
-        node.type !== COMPOUND_EXPRESSION &&
-        node.type !== INTERPOLATION) {
+    if (node.type === compiler_core_1.NodeTypes.ROOT) {
+        node.children.forEach(n => walk(n, visitor));
+        return;
+    }
+    if (node.type !== compiler_core_1.NodeTypes.ELEMENT &&
+        node.type !== compiler_core_1.NodeTypes.COMPOUND_EXPRESSION &&
+        node.type !== compiler_core_1.NodeTypes.INTERPOLATION) {
         return;
     }
     visitor(node);
-    if (node.type === INTERPOLATION) {
+    if (node.type === compiler_core_1.NodeTypes.INTERPOLATION) {
         visitor(node.content);
     }
-    else if (node.type === ELEMENT) {
+    else if (node.type === compiler_core_1.NodeTypes.ELEMENT) {
         node.children.forEach(n => walk(n, visitor));
         node.props
-            .filter((prop) => prop.type === DIRECTIVE)
+            .filter((prop) => prop.type === compiler_core_1.NodeTypes.DIRECTIVE)
             .filter(prop => !!prop.exp)
             .forEach(prop => visitor(prop.exp));
     }
@@ -38,7 +36,7 @@ function templateSimpleExpressionNodeVisitor(parseScriptFn) {
         if (typeof n !== 'object') {
             return;
         }
-        if (n.type !== SIMPLE_EXPRESSION) {
+        if (n.type !== compiler_core_1.NodeTypes.SIMPLE_EXPRESSION) {
             return;
         }
         const { content } = n;