@formatjs/ts-transformer 2.12.13 → 2.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formatjs/ts-transformer",
-  "version": "2.12.13",
+  "version": "2.13.0",
   "description": "TS Compiler transformer for formatjs",
   "main": "index.js",
   "types": "index.d.ts",

package/src/transform.d.ts

@@ -35,6 +35,12 @@ export interface Opts {
      * e.g: `['FormattedFooBarMessage']`.
      */
     additionalComponentNames?: string[];
+    /**
+     * Additional function names to extract messages from,
+     * e.g: `['formatMessage', '$t']`
+     * Default to `['formatMessage']`
+     */
+    additionalFunctionNames?: string[];
     /**
      * Opt-in to extract from `intl.formatMessage` call with the same restrictions,
      * e.g: has to be called with object literal such as

package/src/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../packages/ts-transformer/src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAG1C,oBAAY,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;AAC9E,oBAAY,aAAa,GAAG,CAC1B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACzB,IAAI,CAAC;AAEV,oBAAY,iBAAiB,GAAG,CAC9B,EAAE,CAAC,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAC;AAQZ,aAAK,UAAU,GAAG,OAAO,UAAU,CAAC;AA6CpC,MAAM,WAAW,IAAI;IACnB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B;;;OAGG;IACH,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC;IAC1C;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAyfD,wBAAgB,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,wDAwBzD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,wDAEnC"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../../../../packages/ts-transformer/src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAG1C,oBAAY,SAAS,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;AAC9E,oBAAY,aAAa,GAAG,CAC1B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KACzB,IAAI,CAAC;AAEV,oBAAY,iBAAiB,GAAG,CAC9B,EAAE,CAAC,EAAE,MAAM,EACX,cAAc,CAAC,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,KACd,MAAM,CAAC;AAQZ,aAAK,UAAU,GAAG,OAAO,UAAU,CAAC;AA6CpC,MAAM,WAAW,IAAI;IACnB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;OAGG;IACH,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnC;;;;OAIG;IACH,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B;;;OAGG;IACH,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC;IAC1C;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AA4fD,wBAAgB,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,wDAwBzD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,IAAI,wDAEnC"}

package/src/transform.js

@@ -210,7 +210,8 @@ function extractMessageDescriptor(ts, node, _a, sf) {
  * @param node
  * @param sf
  */
-function isIntlFormatMessageCall(ts, node) {
+function isIntlFormatMessageCall(ts, node, additionalFunctionNames) {
+    var fnNames = new Set(tslib_1.__spreadArrays(['formatMessage'], additionalFunctionNames));
     var method = node.expression;
     // Handle intl.formatMessage()
     if (ts.isPropertyAccessExpression(method)) {
@@ -221,7 +222,7 @@ function isIntlFormatMessageCall(ts, node) {
                 method.expression.name.text === 'intl'));
     }
     // Handle formatMessage()
-    return ts.isIdentifier(method) && method.text === 'formatMessage';
+    return ts.isIdentifier(method) && fnNames.has(method.text);
 }
 function extractMessageFromJsxComponent(ts, factory, node, opts, sf) {
     var onMsgExtracted = opts.onMsgExtracted;
@@ -293,7 +294,7 @@ function generateNewProperties(ts, factory, node, msg, ast) {
     return newProps;
 }
 function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
-    var onMsgExtracted = opts.onMsgExtracted;
+    var onMsgExtracted = opts.onMsgExtracted, additionalFunctionNames = opts.additionalFunctionNames;
     if (isMultipleMessageDecl(ts, node)) {
         var _a = node.arguments, arg = _a[0], restArgs = _a.slice(1);
         var descriptorsObj = void 0;
@@ -338,7 +339,8 @@ function extractMessagesFromCallExpression(ts, factory, node, opts, sf) {
         }
     }
     else if (isSingularMessageDecl(ts, node, opts.additionalComponentNames || []) ||
-        (opts.extractFromFormatMessageCall && isIntlFormatMessageCall(ts, node))) {
+        (opts.extractFromFormatMessageCall &&
+            isIntlFormatMessageCall(ts, node, additionalFunctionNames || []))) {
         var _b = node.arguments, descriptorsObj = _b[0], restArgs = _b.slice(1);
         if (ts.isObjectLiteralExpression(descriptorsObj)) {
             var msg = extractMessageDescriptor(ts, descriptorsObj, opts, sf);