@lingui/macro 3.12.0 → 3.12.1

package/global.d.ts

@@ -28,9 +28,9 @@ declare module "@lingui/macro" {
    * });
    * ```
    *
-   * @param messageDescriptior The descriptor to translate
+   * @param descriptor The message descriptor to translate
    */
-  export function t(messageDescriptior: MessageDescriptor): string
+  export function t(descriptor: MessageDescriptor): string
 
   /**
    * Translates a template string using the global I18n instance
@@ -47,7 +47,7 @@ declare module "@lingui/macro" {
   ): string
 
   /**
-   * Translates a template string using a given I18n instance
+   * Translates a template string or message descriptor using a given I18n instance
    *
    * @example
    * ```
@@ -59,12 +59,24 @@ declare module "@lingui/macro" {
    * });
    * const message = t(i18n)`Hello ${name}`;
    * ```
+   *
+   * @example
+   * ```
+   * import { t } from "@lingui/macro";
+   * import { I18n } from "@lingui/core";
+   * const i18n = new I18n({
+   *   locale: "nl",
+   *   messages: { "Hello {0}": "Hallo {0}" },
+   * });
+   * const message = t(i18n)({ message: `Hello ${name}` });
+   * ```
    */
   export function t(
-    i18n: I18n,
-    literals: TemplateStringsArray,
-    ...placeholders: any[]
-  ): string
+    i18n: I18n
+  ): {
+    (literals: TemplateStringsArray, ...placeholders: any[]): string
+    (descriptor: MessageDescriptor): string
+  }
 
   export type UnderscoreDigit<T = string> = { [digit: string]: T }
   export type ChoiceOptions<T = string> = {

package/index.d.ts

@@ -34,9 +34,9 @@ export type ChoiceOptions<T = string> = {
  * });
  * ```
  *
- * @param messageDescriptior The descriptor to translate
+ * @param descriptor The message descriptor to translate
  */
-export function t(messageDescriptior: MessageDescriptor): string
+export function t(descriptor: MessageDescriptor): string
 
 /**
  * Translates a template string using the global I18n instance
@@ -53,7 +53,7 @@ export function t(
 ): string
 
 /**
- * Translates a template string using a given I18n instance
+ * Translates a template string or message descriptor using a given I18n instance
  *
  * @example
  * ```
@@ -65,12 +65,24 @@ export function t(
  * });
  * const message = t(i18n)`Hello ${name}`;
  * ```
+ *
+ * @example
+ * ```
+ * import { t } from "@lingui/macro";
+ * import { I18n } from "@lingui/core";
+ * const i18n = new I18n({
+ *   locale: "nl",
+ *   messages: { "Hello {0}": "Hallo {0}" },
+ * });
+ * const message = t(i18n)({ message: `Hello ${name}` });
+ * ```
  */
 export function t(
-  i18n: I18n,
-  literals: TemplateStringsArray,
-  ...placeholders: any[]
-): string
+  i18n: I18n
+): {
+  (literals: TemplateStringsArray, ...placeholders: any[]): string
+  (descriptor: MessageDescriptor): string
+}
 
 /**
  * Pluralize a message

package/macroJs.js

@@ -129,6 +129,15 @@ var MacroJs = /*#__PURE__*/function () {
           comment: _comment
         }, i18nInstance);
 
+        return false;
+      } // t(i18nInstance)(messageDescriptor) -> i18nInstance._(messageDescriptor)
+
+
+      if (_this.types.isCallExpression(path.node) && _this.types.isCallExpression(path.parentPath.node) && _this.types.isIdentifier(path.node.arguments[0]) && _this.isIdentifier(path.node.callee, "t")) {
+        var _i18nInstance = path.node.arguments[0];
+
+        _this.replaceTAsFunction(path.parentPath, _i18nInstance);
+
         return false;
       }
 
@@ -167,10 +176,10 @@ var MacroJs = /*#__PURE__*/function () {
 
       path.replaceWith(descriptor);
     });
-    (0, _defineProperty2.default)(this, "replaceTAsFunction", function (path) {
+    (0, _defineProperty2.default)(this, "replaceTAsFunction", function (path, linguiInstance) {
       var descriptor = _this.processDescriptor(path.node.arguments[0]);
 
-      var newNode = _this.types.callExpression(_this.types.memberExpression(_this.types.identifier(_this.i18nImportName), _this.types.identifier("_")), [descriptor]);
+      var newNode = _this.types.callExpression(_this.types.memberExpression(linguiInstance !== null && linguiInstance !== void 0 ? linguiInstance : _this.types.identifier(_this.i18nImportName), _this.types.identifier("_")), [descriptor]);
 
       path.replaceWith(newNode);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/macro",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "Macro for generating messages in ICU MessageFormat syntax",
   "main": "index.js",
   "author": {
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@lingui/conf": "^3.12.0",
+    "@lingui/conf": "^3.12.1",
     "ramda": "^0.27.1"
   },
   "peerDependencies": {