@lingui/core 4.0.0-next.4 → 4.0.0-next.6

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const compile = require('@lingui/core/compile');
+const compileMessage = require('@lingui/message-utils/compileMessage');
 
 const isString = (s) => typeof s === "string";
 const isFunction = (f) => typeof f === "function";
@@ -147,6 +147,10 @@ class EventEmitter {
 class I18n extends EventEmitter {
   constructor(params) {
     super();
+    /**
+     * Alias for {@see I18n._}
+     */
+    this.t = this._.bind(this);
     this._messages = {};
     this._localeData = {};
     if (params.missing != null)
@@ -169,7 +173,7 @@ class I18n extends EventEmitter {
     return this._messages[this._locale] ?? {};
   }
   /**
-   * @deprecated this has no effect. Please remove this from the code. Introduced in v4
+   * @deprecated this has no effect. Please remove this from the code. Deprecated in v4
    */
   get localeData() {
     return this._localeData[this._locale] ?? {};
@@ -182,7 +186,7 @@ class I18n extends EventEmitter {
     }
   }
   /**
-   * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+   * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
    */
   loadLocaleData(localeOrAllData, localeData) {
     if (localeData != null) {
@@ -242,7 +246,6 @@ class I18n extends EventEmitter {
     this._locales = locales;
     this.emit("change");
   }
-  // method for translation and formatting
   _(id, values = {}, { message, formats } = {}) {
     if (!isString(id)) {
       values = id.values || values;
@@ -259,7 +262,7 @@ class I18n extends EventEmitter {
     }
     let translation = this.messages[id] || message || id;
     if (process.env.NODE_ENV !== "production") {
-      translation = isString(translation) ? compile.compileMessage(translation) : translation;
+      translation = isString(translation) ? compileMessage.compileMessage(translation) : translation;
     }
     if (isString(translation) && UNICODE_REGEX.test(translation))
       return JSON.parse(`"${translation}"`);

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { CompiledMessage } from '@lingui/message-utils/compileMessage';
+
 declare class EventEmitter<Events extends {
     [name: string]: (...args: any[]) => any;
 }> {
@@ -11,30 +13,27 @@ declare class EventEmitter<Events extends {
 type MessageOptions = {
     message?: string;
     formats?: Formats;
+    comment?: string;
 };
+
 type Locale = string;
 type Locales = Locale | Locale[];
 type Formats = Record<string, Intl.DateTimeFormatOptions | Intl.NumberFormatOptions>;
 type Values = Record<string, unknown>;
 /**
- * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+ * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
  */
 type LocaleData = {
     plurals?: (n: number, ordinal?: boolean) => ReturnType<Intl.PluralRules["select"]>;
 };
 /**
- * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+ * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
  */
 type AllLocaleData = Record<Locale, LocaleData>;
-type CompiledIcuChoices = Record<string, CompiledMessage> & {
-    offset: number;
-};
-type CompiledMessageToken = string | [name: string, type?: string, format?: null | string | CompiledIcuChoices];
-type CompiledMessage = string | CompiledMessageToken[];
 type Messages = Record<string, CompiledMessage>;
 type AllMessages = Record<Locale, Messages>;
 type MessageDescriptor = {
-    id?: string;
+    id: string;
     comment?: string;
     message?: string;
     values?: Record<string, unknown>;
@@ -49,7 +48,7 @@ type setupI18nProps = {
     locales?: Locales;
     messages?: AllMessages;
     /**
-     * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+     * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
      */
     localeData?: AllLocaleData;
     missing?: MissingHandler;
@@ -69,16 +68,16 @@ declare class I18n extends EventEmitter<Events> {
     get locales(): Locales;
     get messages(): Messages;
     /**
-     * @deprecated this has no effect. Please remove this from the code. Introduced in v4
+     * @deprecated this has no effect. Please remove this from the code. Deprecated in v4
      */
     get localeData(): LocaleData;
     private _loadLocaleData;
     /**
-     * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+     * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
      */
     loadLocaleData(allLocaleData: AllLocaleData): void;
     /**
-     * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+     * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
      */
     loadLocaleData(locale: Locale, localeData: LocaleData): void;
     private _load;
@@ -94,7 +93,12 @@ declare class I18n extends EventEmitter<Events> {
      */
     loadAndActivate(locales: Locale | Locales, messages: Messages, notify?: boolean): void;
     activate(locale: Locale, locales?: Locales): void;
-    _(id: MessageDescriptor | string, values?: Values | undefined, { message, formats }?: MessageOptions | undefined): string;
+    _(descriptor: MessageDescriptor): string;
+    _(id: string, values?: Values, options?: MessageOptions): string;
+    /**
+     * Alias for {@see I18n._}
+     */
+    t: I18n["_"];
     date(value: string | Date, format?: Intl.DateTimeFormatOptions): string;
     number(value: number, format?: Intl.NumberFormatOptions): string;
 }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { compileMessage } from '@lingui/core/compile';
+import { compileMessage } from '@lingui/message-utils/compileMessage';
 
 const isString = (s) => typeof s === "string";
 const isFunction = (f) => typeof f === "function";
@@ -145,6 +145,10 @@ class EventEmitter {
 class I18n extends EventEmitter {
   constructor(params) {
     super();
+    /**
+     * Alias for {@see I18n._}
+     */
+    this.t = this._.bind(this);
     this._messages = {};
     this._localeData = {};
     if (params.missing != null)
@@ -167,7 +171,7 @@ class I18n extends EventEmitter {
     return this._messages[this._locale] ?? {};
   }
   /**
-   * @deprecated this has no effect. Please remove this from the code. Introduced in v4
+   * @deprecated this has no effect. Please remove this from the code. Deprecated in v4
    */
   get localeData() {
     return this._localeData[this._locale] ?? {};
@@ -180,7 +184,7 @@ class I18n extends EventEmitter {
     }
   }
   /**
-   * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Introduced in v4
+   * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
    */
   loadLocaleData(localeOrAllData, localeData) {
     if (localeData != null) {
@@ -240,7 +244,6 @@ class I18n extends EventEmitter {
     this._locales = locales;
     this.emit("change");
   }
-  // method for translation and formatting
   _(id, values = {}, { message, formats } = {}) {
     if (!isString(id)) {
       values = id.values || values;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/core",
-  "version": "4.0.0-next.4",
+  "version": "4.0.0-next.6",
   "sideEffects": false,
   "description": "I18n tools for javascript",
   "main": "./dist/index.cjs",
@@ -44,31 +44,20 @@
         "default": "./dist/index.mjs"
       }
     },
-    "./compile": {
-      "require": {
-        "types": "./dist/compile.d.ts",
-        "default": "./dist/compile.cjs"
-      },
-      "import": {
-        "types": "./dist/compile.d.ts",
-        "default": "./dist/compile.mjs"
-      }
-    },
     "./package.json": "./package.json"
   },
   "files": [
     "LICENSE",
     "README.md",
-    "dist/",
-    "compile.js"
+    "dist/"
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@messageformat/parser": "^5.0.0"
+    "@lingui/message-utils": "^4.0.0-next.6"
   },
   "devDependencies": {
     "@lingui/jest-mocks": "^3.0.3",
     "unbuild": "^1.1.2"
   },
-  "gitHead": "3b999e35d26e67dec7cf0591f794be782e11022c"
+  "gitHead": "d4d9e149b2419d1796e14176d53703a7cff4b82c"
 }

package/compile.js

@@ -1,5 +0,0 @@
-/**
- * This entry is for old runtimes which do not support `exports` field in package.json
- * https://github.com/facebook/metro/issues/670
- */
-module.exports = require("./dist/compile.cjs")

package/dist/compile.cjs

@@ -1,53 +0,0 @@
-'use strict';
-
-const parser = require('@messageformat/parser');
-
-function processTokens(tokens, mapText) {
-  if (!tokens.filter((token) => token.type !== "content").length) {
-    return tokens.map((token) => mapText(token.value)).join("");
-  }
-  return tokens.map((token) => {
-    if (token.type === "content") {
-      return mapText(token.value);
-    } else if (token.type === "octothorpe") {
-      return "#";
-    } else if (token.type === "argument") {
-      return [token.arg];
-    } else if (token.type === "function") {
-      const _param = token?.param?.[0];
-      if (_param) {
-        return [token.arg, token.key, _param.value.trim()];
-      } else {
-        return [token.arg, token.key];
-      }
-    }
-    const offset = token.pluralOffset;
-    const formatProps = {};
-    token.cases.forEach((item) => {
-      formatProps[item.key.replace(/^=(.)+/, "$1")] = processTokens(
-        item.tokens,
-        mapText
-      );
-    });
-    return [
-      token.arg,
-      token.type,
-      {
-        offset,
-        ...formatProps
-      }
-    ];
-  });
-}
-function compileMessage(message, mapText = (v) => v) {
-  try {
-    return processTokens(parser.parse(message), mapText);
-  } catch (e) {
-    console.error(`${e.message} 
-
-Message: ${message}`);
-    return message;
-  }
-}
-
-exports.compileMessage = compileMessage;

package/dist/compile.d.ts

@@ -1,2 +0,0 @@
-
-export { }

package/dist/compile.mjs

@@ -1,51 +0,0 @@
-import { parse } from '@messageformat/parser';
-
-function processTokens(tokens, mapText) {
-  if (!tokens.filter((token) => token.type !== "content").length) {
-    return tokens.map((token) => mapText(token.value)).join("");
-  }
-  return tokens.map((token) => {
-    if (token.type === "content") {
-      return mapText(token.value);
-    } else if (token.type === "octothorpe") {
-      return "#";
-    } else if (token.type === "argument") {
-      return [token.arg];
-    } else if (token.type === "function") {
-      const _param = token?.param?.[0];
-      if (_param) {
-        return [token.arg, token.key, _param.value.trim()];
-      } else {
-        return [token.arg, token.key];
-      }
-    }
-    const offset = token.pluralOffset;
-    const formatProps = {};
-    token.cases.forEach((item) => {
-      formatProps[item.key.replace(/^=(.)+/, "$1")] = processTokens(
-        item.tokens,
-        mapText
-      );
-    });
-    return [
-      token.arg,
-      token.type,
-      {
-        offset,
-        ...formatProps
-      }
-    ];
-  });
-}
-function compileMessage(message, mapText = (v) => v) {
-  try {
-    return processTokens(parse(message), mapText);
-  } catch (e) {
-    console.error(`${e.message} 
-
-Message: ${message}`);
-    return message;
-  }
-}
-
-export { compileMessage };