@formatjs/cli-lib 6.3.7 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/cli-lib",
-  "version": "6.3.7",
+  "version": "6.4.0",
   "description": "Lib for CLI for formatjs.",
   "keywords": [
     "intl",
@@ -43,12 +43,18 @@
     "loud-rejection": "^2.2.0",
     "tslib": "^2.4.0",
     "typescript": "5",
-    "@formatjs/ts-transformer": "3.13.12",
-    "@formatjs/icu-messageformat-parser": "2.7.6"
+    "@formatjs/icu-messageformat-parser": "2.7.6",
+    "@formatjs/ts-transformer": "3.13.12"
   },
   "peerDependencies": {
-    "@vue/compiler-core": "^3.3.4",
-    "vue": "^3.3.4"
+    "@glimmer/env": "^0.1.7",
+    "@glimmer/reference": "^0.91.1",
+    "@glimmer/syntax": "^0.91.1",
+    "@glimmer/validator": "^0.91.1",
+    "@vue/compiler-core": "^3.4.0",
+    "content-tag": "^2.0.1",
+    "ember-template-recast": "^6.1.4",
+    "vue": "^3.4.0"
   },
   "peerDependenciesMeta": {
     "vue": {
@@ -56,6 +62,24 @@
     },
     "@vue/compiler-core": {
       "optional": true
+    },
+    "@glimmer/env": {
+      "optional": true
+    },
+    "@glimmer/reference": {
+      "optional": true
+    },
+    "@glimmer/syntax": {
+      "optional": true
+    },
+    "@glimmer/validator": {
+      "optional": true
+    },
+    "ember-template-recast": {
+      "optional": true
+    },
+    "content-tag": {
+      "optional": true
     }
   },
   "engines": {

package/src/extract.js

@@ -72,6 +72,16 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
         const { parseFile } = await import('./vue_extractor.js');
         parseFile(source, fn, scriptParseFn);
     }
+    else if (fn.endsWith('.hbs')) {
+        (0, console_utils_1.debug)('Processing %s using hbs extractor', fn);
+        const { parseFile } = await import('./hbs_extractor.js');
+        parseFile(source, fn, opts);
+    }
+    else if (fn.endsWith('.gts') || fn.endsWith('.gjs')) {
+        (0, console_utils_1.debug)('Processing %s as gts/gjs file', fn);
+        const { parseFile } = await import('./gts_extractor.js');
+        parseFile(source, fn, opts);
+    }
     else {
         (0, console_utils_1.debug)('Processing %s using typescript extractor', fn);
         scriptParseFn(source);
@@ -92,32 +102,32 @@ async function processFile(source, fn, { idInterpolationPattern, ...opts }) {
  */
 async function extract(files, extractOpts) {
     const { throws, readFromStdin, flatten, ...opts } = extractOpts;
-    let rawResults;
-    if (readFromStdin) {
-        (0, console_utils_1.debug)(`Reading input from stdin`);
-        // Read from stdin
-        if (process.stdin.isTTY) {
-            (0, console_utils_1.warn)('Reading source file from TTY.');
+    let rawResults = [];
+    try {
+        if (readFromStdin) {
+            (0, console_utils_1.debug)(`Reading input from stdin`);
+            // Read from stdin
+            if (process.stdin.isTTY) {
+                (0, console_utils_1.warn)('Reading source file from TTY.');
+            }
+            const stdinSource = await (0, console_utils_1.getStdinAsString)();
+            rawResults = [await processFile(stdinSource, 'dummy', opts)];
         }
-        const stdinSource = await (0, console_utils_1.getStdinAsString)();
-        rawResults = [await processFile(stdinSource, 'dummy', opts)];
-    }
-    else {
-        rawResults = await Promise.all(files.map(async (fn) => {
-            (0, console_utils_1.debug)('Extracting file:', fn);
-            try {
+        else {
+            rawResults = await Promise.all(files.map(async (fn) => {
+                (0, console_utils_1.debug)('Extracting file:', fn);
                 const source = await (0, fs_extra_1.readFile)(fn, 'utf8');
                 return processFile(source, fn, opts);
-            }
-            catch (e) {
-                if (throws) {
-                    throw e;
-                }
-                else {
-                    (0, console_utils_1.warn)(String(e));
-                }
-            }
-        }));
+            }));
+        }
+    }
+    catch (e) {
+        if (throws) {
+            throw e;
+        }
+        else {
+            (0, console_utils_1.warn)(String(e));
+        }
     }
     const formatter = await (0, formatters_1.resolveBuiltinFormatter)(opts.format);
     const extractionResults = rawResults.filter((r) => !!r);
@@ -126,7 +136,7 @@ async function extract(files, extractOpts) {
         for (const message of messages) {
             const { id, description, defaultMessage } = message;
             if (!id) {
-                const error = new Error(`[FormatJS CLI] Missing message id for message: 
+                const error = new Error(`[FormatJS CLI] Missing message id for message:
 ${JSON.stringify(message, undefined, 2)}`);
                 if (throws) {
                     throw error;

package/src/gts_extractor.d.ts

@@ -0,0 +1 @@
+export declare function parseFile(source: string, fileName: string, options: any): void;

package/src/gts_extractor.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFile = void 0;
+const content_tag_1 = require("content-tag");
+const hbs_extractor_1 = require("./hbs_extractor");
+const parse_script_1 = require("./parse_script");
+let p = new content_tag_1.Preprocessor();
+function parseFile(source, fileName, options) {
+    const scriptParseFn = (0, parse_script_1.parseScript)(options, fileName);
+    const transformedSource = p.process(source, { filename: fileName });
+    scriptParseFn(transformedSource);
+    // extract template from transformed source to then run through hbs processor
+    const parseResult = p.parse(source, { filename: fileName });
+    for (let parsed of parseResult) {
+        (0, hbs_extractor_1.parseFile)(parsed.contents, fileName, options);
+    }
+}
+exports.parseFile = parseFile;

package/src/hbs_extractor.d.ts

@@ -0,0 +1 @@
+export declare function parseFile(source: string, fileName: string, options: any): void;

package/src/hbs_extractor.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFile = void 0;
+const ember_template_recast_1 = require("ember-template-recast");
+function extractText(node, fileName, options) {
+    if (!options.onMsgExtracted)
+        return;
+    if (!options.overrideIdFn)
+        return;
+    if (node.path.type !== 'PathExpression')
+        return;
+    if (['format-message', 'formatMessage'].includes(node.path.original)) {
+        let [first, second] = node.params;
+        if (first.type !== 'StringLiteral')
+            return;
+        let message = first?.value;
+        let desc;
+        if (second?.type === 'StringLiteral') {
+            desc = second.value?.trim().replace(/\s+/gm, ' ');
+        }
+        let defaultMessage = message?.trim().replace(/\s+/gm, ' ');
+        let id = typeof options.overrideIdFn === 'string'
+            ? options.overrideIdFn
+            : options.overrideIdFn(undefined, defaultMessage, desc, fileName);
+        options.onMsgExtracted(fileName, [
+            {
+                id: id,
+                defaultMessage: defaultMessage,
+                description: desc,
+            },
+        ]);
+    }
+}
+function parseFile(source, fileName, options) {
+    let visitor = function () {
+        return {
+            MustacheStatement(node) {
+                extractText(node, fileName, options);
+            },
+            SubExpression(node) {
+                extractText(node, fileName, options);
+            },
+        };
+    };
+    // SAFETY: ember-template-recast's types are out of date,
+    // but it does not affect runtime
+    (0, ember_template_recast_1.transform)(source, visitor);
+}
+exports.parseFile = parseFile;

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;