@lingui/core 4.0.0-next.8 → 4.1.0

package/dist/index.cjs

@@ -10,7 +10,7 @@ function normalizeLocales(locales) {
   const out = Array.isArray(locales) ? locales : [locales];
   return [...out, "en"];
 }
-function date(locales, value, format = {}) {
+function date(locales, value, format) {
   const _locales = normalizeLocales(locales);
   const formatter = getMemoized(
     () => cacheKey("date", _locales, format),
@@ -18,7 +18,7 @@ function date(locales, value, format = {}) {
   );
   return formatter.format(isString(value) ? new Date(value) : value);
 }
-function number(locales, value, format = {}) {
+function number(locales, value, format) {
   const _locales = normalizeLocales(locales);
   const formatter = getMemoized(
     () => cacheKey("number", _locales, format),
@@ -29,10 +29,10 @@ function number(locales, value, format = {}) {
 function plural(locales, ordinal, value, { offset = 0, ...rules }) {
   const _locales = normalizeLocales(locales);
   const plurals = ordinal ? getMemoized(
-    () => cacheKey("plural-ordinal", _locales, {}),
+    () => cacheKey("plural-ordinal", _locales),
     () => new Intl.PluralRules(_locales, { type: "ordinal" })
   ) : getMemoized(
-    () => cacheKey("plural-cardinal", _locales, {}),
+    () => cacheKey("plural-cardinal", _locales),
     () => new Intl.PluralRules(_locales, { type: "cardinal" })
   );
   return rules[value] ?? rules[plurals.select(value - offset)] ?? rules.other;
@@ -46,8 +46,8 @@ function getMemoized(getKey, construct) {
   }
   return formatter;
 }
-function cacheKey(type, locales, options = {}) {
-  const localeKey = [...locales].sort().join("-");
+function cacheKey(type, locales, options) {
+  const localeKey = locales.join("-");
   return `${type}-${localeKey}-${JSON.stringify(options)}`;
 }
 
@@ -216,25 +216,13 @@ class I18n extends EventEmitter {
     this.emit("change");
   }
   /**
-   * @param locales one locale or array of locales.
-   *   If array of locales is passed they would be used as fallback
-   *   locales for date and number formatting
-   * @param messages compiled message catalog
-   * @param notify Should emit `change` event for all subscribers.
-   *    This is useful for integration with frameworks as NextJS to avoid race-conditions during initialization.
+   * @param options {@link LoadAndActivateOptions}
    */
-  loadAndActivate(locales, messages, notify = true) {
-    if (Array.isArray(locales)) {
-      this._locale = locales[0];
-      this._locales = locales;
-    } else {
-      this._locale = locales;
-      this._locales = null;
-    }
+  loadAndActivate({ locale, locales, messages }) {
+    this._locale = locale;
+    this._locales = locales || void 0;
     this._messages[this._locale] = messages;
-    if (notify) {
-      this.emit("change");
-    }
+    this.emit("change");
   }
   activate(locale, locales) {
     if (process.env.NODE_ENV !== "production") {

package/dist/index.d.ts

@@ -57,6 +57,14 @@ type Events = {
     change: () => void;
     missing: (event: MissingMessageEvent) => void;
 };
+type LoadAndActivateOptions = {
+    /** initial active locale */
+    locale: Locale;
+    /** list of alternative locales (BCP 47 language tags) which are used for number and date formatting */
+    locales?: Locales;
+    /** compiled message catalog */
+    messages: Messages;
+};
 declare class I18n extends EventEmitter<Events> {
     private _locale;
     private _locales;
@@ -84,14 +92,9 @@ declare class I18n extends EventEmitter<Events> {
     load(allMessages: AllMessages): void;
     load(locale: Locale, messages: Messages): void;
     /**
-     * @param locales one locale or array of locales.
-     *   If array of locales is passed they would be used as fallback
-     *   locales for date and number formatting
-     * @param messages compiled message catalog
-     * @param notify Should emit `change` event for all subscribers.
-     *    This is useful for integration with frameworks as NextJS to avoid race-conditions during initialization.
+     * @param options {@link LoadAndActivateOptions}
      */
-    loadAndActivate(locales: Locale | Locales, messages: Messages, notify?: boolean): void;
+    loadAndActivate({ locale, locales, messages }: LoadAndActivateOptions): void;
     activate(locale: Locale, locales?: Locales): void;
     _(descriptor: MessageDescriptor): string;
     _(id: string, values?: Values, options?: MessageOptions): string;

package/dist/index.mjs

@@ -8,7 +8,7 @@ function normalizeLocales(locales) {
   const out = Array.isArray(locales) ? locales : [locales];
   return [...out, "en"];
 }
-function date(locales, value, format = {}) {
+function date(locales, value, format) {
   const _locales = normalizeLocales(locales);
   const formatter = getMemoized(
     () => cacheKey("date", _locales, format),
@@ -16,7 +16,7 @@ function date(locales, value, format = {}) {
   );
   return formatter.format(isString(value) ? new Date(value) : value);
 }
-function number(locales, value, format = {}) {
+function number(locales, value, format) {
   const _locales = normalizeLocales(locales);
   const formatter = getMemoized(
     () => cacheKey("number", _locales, format),
@@ -27,10 +27,10 @@ function number(locales, value, format = {}) {
 function plural(locales, ordinal, value, { offset = 0, ...rules }) {
   const _locales = normalizeLocales(locales);
   const plurals = ordinal ? getMemoized(
-    () => cacheKey("plural-ordinal", _locales, {}),
+    () => cacheKey("plural-ordinal", _locales),
     () => new Intl.PluralRules(_locales, { type: "ordinal" })
   ) : getMemoized(
-    () => cacheKey("plural-cardinal", _locales, {}),
+    () => cacheKey("plural-cardinal", _locales),
     () => new Intl.PluralRules(_locales, { type: "cardinal" })
   );
   return rules[value] ?? rules[plurals.select(value - offset)] ?? rules.other;
@@ -44,8 +44,8 @@ function getMemoized(getKey, construct) {
   }
   return formatter;
 }
-function cacheKey(type, locales, options = {}) {
-  const localeKey = [...locales].sort().join("-");
+function cacheKey(type, locales, options) {
+  const localeKey = locales.join("-");
   return `${type}-${localeKey}-${JSON.stringify(options)}`;
 }
 
@@ -214,25 +214,13 @@ class I18n extends EventEmitter {
     this.emit("change");
   }
   /**
-   * @param locales one locale or array of locales.
-   *   If array of locales is passed they would be used as fallback
-   *   locales for date and number formatting
-   * @param messages compiled message catalog
-   * @param notify Should emit `change` event for all subscribers.
-   *    This is useful for integration with frameworks as NextJS to avoid race-conditions during initialization.
+   * @param options {@link LoadAndActivateOptions}
    */
-  loadAndActivate(locales, messages, notify = true) {
-    if (Array.isArray(locales)) {
-      this._locale = locales[0];
-      this._locales = locales;
-    } else {
-      this._locale = locales;
-      this._locales = null;
-    }
+  loadAndActivate({ locale, locales, messages }) {
+    this._locale = locale;
+    this._locales = locales || void 0;
     this._messages[this._locale] = messages;
-    if (notify) {
-      this.emit("change");
-    }
+    this.emit("change");
   }
   activate(locale, locales) {
     if (process.env.NODE_ENV !== "production") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/core",
-  "version": "4.0.0-next.8",
+  "version": "4.1.0",
   "sideEffects": false,
   "description": "I18n tools for javascript",
   "main": "./dist/index.cjs",
@@ -53,11 +53,11 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/message-utils": "^4.0.0-next.8"
+    "@lingui/message-utils": "4.1.0"
   },
   "devDependencies": {
-    "@lingui/jest-mocks": "^3.0.3",
+    "@lingui/jest-mocks": "*",
     "unbuild": "^1.1.2"
   },
-  "gitHead": "c9104b3227327030db3f1c684acba65ea2c0d03f"
+  "gitHead": "471813c5de9ade3acccf647e18922b570a804577"
 }