Update types for extractText() in hbs_extractor.ts

package.json

@@ -34,9 +34,9 @@
     "@commitlint/cli": "17",
     "@commitlint/config-angular": "17",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/reference": "^0.89.0",
-    "@glimmer/syntax": "^0.89.0",
-    "@glimmer/validator": "^0.89.0",
+    "@glimmer/reference": "^0.91.1",
+    "@glimmer/syntax": "^0.91.1",
+    "@glimmer/validator": "^0.91.1",
     "@jest/transform": "29",
     "@jest/types": "29",
     "@lerna-lite/cli": "2",

packages/cli-lib/package.json

@@ -35,9 +35,9 @@
     "@formatjs/icu-messageformat-parser": "workspace:*",
     "@formatjs/ts-transformer": "workspace:*",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/reference": "^0.89.0",
-    "@glimmer/syntax": "^0.89.0",
-    "@glimmer/validator": "^0.89.0",
+    "@glimmer/reference": "^0.91.1",
+    "@glimmer/syntax": "^0.91.1",
+    "@glimmer/validator": "^0.91.1",
     "@types/estree": "^1.0.0",
     "@types/fs-extra": "^9.0.1",
     "@types/json-stable-stringify": "^1.0.32",

packages/cli-lib/src/hbs_extractor.ts

@@ -1,31 +1,56 @@
-import {transform} from 'ember-template-recast'
+import { transform } from 'ember-template-recast'
+import type { AST } from '@glimmer/syntax';
+import { Opts } from '@formatjs/ts-transformer'
+
+function extractText(
+  node: AST.MustacheStatement | AST.SubExpression,
+  fileName: string,
+  options: Opts
+) {
+  if (!options.onMsgExtracted) return;
+  if (!options.overrideIdFn) return;
+
+  if (node.path.type !== 'PathExpression') return;
 
-function extractText(node: any, fileName: any, options: any) {
   if (['format-message', 'formatMessage'].includes(node.path.original)) {
-    let message = node.params[0]?.original
-    let desc = node.params[1]?.original?.trim().replace(/\s+/gm, ' ')
+    let [first, second] = node.params
+
+    if (first.type !== 'StringLiteral') return;
+
+    let message = first?.value;
+
+    let desc: string | undefined;
+    if (second?.type === 'StringLiteral') {
+      desc = second.value?.trim().replace(/\s+/gm, ' ')
+    }
+
     let defaultMessage = message?.trim().replace(/\s+/gm, ' ')
 
-    let id = options.overrideIdFn(undefined, defaultMessage, desc, fileName)
-    options.onMsgExtracted(undefined, {
+    let id = typeof options.overrideIdFn === 'string'
+      ? options.overrideIdFn
+      : options.overrideIdFn(undefined, defaultMessage, desc, fileName);
+
+    options.onMsgExtracted(fileName, [{
       id: id,
       defaultMessage: defaultMessage,
       description: desc,
-    })
+    }])
   }
 }
 
 export function parseFile(source: string, fileName: string, options: any) {
-  let visitor = function () {
+  let visitor = function() {
     return {
-      MustacheStatement(node: any) {
+      MustacheStatement(node: AST.MustacheStatement) {
         extractText(node, fileName, options)
       },
-      SubExpression(node: any) {
+      SubExpression(node: AST.SubExpression) {
         extractText(node, fileName, options)
       },
     }
   }
 
-  transform(source, visitor)
+  // SAFETY: ember-template-recast's types are out of date, 
+  // but it does not affect runtime
+  transform(source, visitor as any)
 }