@lingui/core 4.5.0 → 4.6.0

package/dist/index.cjs

@@ -11,9 +11,10 @@ const isString = (s) => typeof s === "string";
 const isFunction = (f) => typeof f === "function";
 
 const cache = /* @__PURE__ */ new Map();
+const defaultLocale = "en";
 function normalizeLocales(locales) {
   const out = Array.isArray(locales) ? locales : [locales];
-  return [...out, "en"];
+  return [...out, defaultLocale];
 }
 function date(locales, value, format) {
   const _locales = normalizeLocales(locales);
@@ -59,16 +60,19 @@ function cacheKey(type, locales, options) {
 const formats = {
   __proto__: null,
   date: date,
+  defaultLocale: defaultLocale,
   number: number,
   plural: plural
 };
 
 const UNICODE_REGEX = /\\u[a-fA-F0-9]{4}|\\x[a-fA-F0-9]{2}/g;
-const getDefaultFormats = (locale, locales, formats = {}) => {
-  locales = locales || locale;
-  const style = (format) => isString(format) ? formats[format] || { style: format } : format;
+const getDefaultFormats = (locale, passedLocales, formats = {}) => {
+  const locales = passedLocales || locale;
+  const style = (format) => {
+    return typeof format === "object" ? format : formats[format] || { style: format };
+  };
   const replaceOctothorpe = (value, message) => {
-    const numberFormat = Object.keys(formats).length ? style("number") : {};
+    const numberFormat = Object.keys(formats).length ? style("number") : void 0;
     const valueStr = number(locales, value, numberFormat);
     return message.replace("#", valueStr);
   };
@@ -83,14 +87,16 @@ const getDefaultFormats = (locale, locales, formats = {}) => {
       const message = plural(locales, true, value, cases);
       return replaceOctothorpe(value - offset, message);
     },
-    select: (value, rules) => rules[value] ?? rules.other,
+    select: selectFormatter,
     number: (value, format) => number(locales, value, style(format)),
     date: (value, format) => date(locales, value, style(format)),
-    undefined: (value) => value
+    undefined: undefinedFormatter
   };
 };
+const selectFormatter = (value, rules) => rules[value] ?? rules.other;
+const undefinedFormatter = (value) => value;
 function interpolate(translation, locale, locales) {
-  return (values, formats = {}) => {
+  return (values = {}, formats) => {
     const formatters = getDefaultFormats(locale, locales, formats);
     const formatMessage = (message) => {
       if (!Array.isArray(message))
@@ -100,14 +106,15 @@ function interpolate(translation, locale, locales) {
           return message2 + token;
         const [name, type, format] = token;
         let interpolatedFormat = {};
-        if (format != null && !isString(format)) {
-          Object.keys(format).forEach((key) => {
-            interpolatedFormat[key] = formatMessage(format[key]);
+        if (format != null && typeof format === "object") {
+          Object.entries(format).forEach(([key, value2]) => {
+            interpolatedFormat[key] = formatMessage(value2);
           });
         } else {
           interpolatedFormat = format;
         }
-        const value = formatters[type](values[name], interpolatedFormat);
+        const formatter = formatters[type];
+        const value = formatter(values[name], interpolatedFormat);
         if (value == null)
           return message2;
         return message2 + value;
@@ -119,7 +126,7 @@ function interpolate(translation, locale, locales) {
     }
     if (isString(result))
       return result.trim();
-    return result;
+    return result ? String(result) : "";
   };
 }
 
@@ -134,25 +141,28 @@ class EventEmitter {
     __publicField$1(this, "_events", {});
   }
   on(event, listener) {
-    if (!this._hasEvent(event))
-      this._events[event] = [];
+    var _a;
+    (_a = this._events)[event] ?? (_a[event] = []);
     this._events[event].push(listener);
     return () => this.removeListener(event, listener);
   }
   removeListener(event, listener) {
-    if (!this._hasEvent(event))
+    const maybeListeners = this._getListeners(event);
+    if (!maybeListeners)
       return;
-    const index = this._events[event].indexOf(listener);
+    const index = maybeListeners.indexOf(listener);
     if (~index)
-      this._events[event].splice(index, 1);
+      maybeListeners.splice(index, 1);
   }
   emit(event, ...args) {
-    if (!this._hasEvent(event))
+    const maybeListeners = this._getListeners(event);
+    if (!maybeListeners)
       return;
-    this._events[event].map((listener) => listener.apply(this, args));
+    maybeListeners.map((listener) => listener.apply(this, args));
   }
-  _hasEvent(event) {
-    return Array.isArray(this._events[event]);
+  _getListeners(event) {
+    const maybeListeners = this._events[event];
+    return Array.isArray(maybeListeners) ? maybeListeners : false;
   }
 }
 
@@ -165,25 +175,23 @@ var __publicField = (obj, key, value) => {
 class I18n extends EventEmitter {
   constructor(params) {
     super();
-    __publicField(this, "_locale");
+    __publicField(this, "_locale", "");
     __publicField(this, "_locales");
-    __publicField(this, "_localeData");
-    __publicField(this, "_messages");
+    __publicField(this, "_localeData", {});
+    __publicField(this, "_messages", {});
     __publicField(this, "_missing");
     /**
      * Alias for {@see I18n._}
      */
     __publicField(this, "t", this._.bind(this));
-    this._messages = {};
-    this._localeData = {};
     if (params.missing != null)
       this._missing = params.missing;
     if (params.messages != null)
       this.load(params.messages);
     if (params.localeData != null)
       this.loadLocaleData(params.localeData);
-    if (params.locale != null || params.locales != null) {
-      this.activate(params.locale, params.locales);
+    if (typeof params.locale === "string" || params.locales) {
+      this.activate(params.locale ?? defaultLocale, params.locales);
     }
   }
   get locale() {
@@ -202,15 +210,17 @@ class I18n extends EventEmitter {
     return this._localeData[this._locale] ?? {};
   }
   _loadLocaleData(locale, localeData) {
-    if (this._localeData[locale] == null) {
+    const maybeLocaleData = this._localeData[locale];
+    if (!maybeLocaleData) {
       this._localeData[locale] = localeData;
     } else {
-      Object.assign(this._localeData[locale], localeData);
+      Object.assign(maybeLocaleData, localeData);
     }
   }
   /**
    * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
    */
+  // @ts-ignore deprecated, so ignore the reported error
   loadLocaleData(localeOrAllData, localeData) {
     if (localeData != null) {
       this._loadLocaleData(localeOrAllData, localeData);
@@ -222,18 +232,19 @@ class I18n extends EventEmitter {
     this.emit("change");
   }
   _load(locale, messages) {
-    if (this._messages[locale] == null) {
+    const maybeMessages = this._messages[locale];
+    if (!maybeMessages) {
       this._messages[locale] = messages;
     } else {
-      Object.assign(this._messages[locale], messages);
+      Object.assign(maybeMessages, messages);
     }
   }
   load(localeOrMessages, messages) {
-    if (messages != null) {
+    if (typeof localeOrMessages == "string" && typeof messages === "object") {
       this._load(localeOrMessages, messages);
     } else {
-      Object.keys(localeOrMessages).forEach(
-        (locale) => this._load(locale, localeOrMessages[locale])
+      Object.entries(localeOrMessages).forEach(
+        ([locale, messages2]) => this._load(locale, messages2)
       );
     }
     this.emit("change");
@@ -257,13 +268,15 @@ class I18n extends EventEmitter {
     this._locales = locales;
     this.emit("change");
   }
-  _(id, values = {}, { message, formats } = {}) {
+  _(id, values, options) {
+    let message = options?.message;
     if (!isString(id)) {
       values = id.values || values;
       message = id.message;
       id = id.id;
     }
-    const messageMissing = !this.messages[id];
+    const messageForId = this.messages[id];
+    const messageMissing = messageForId === void 0;
     const missing = this._missing;
     if (missing && messageMissing) {
       return isFunction(missing) ? missing(this._locale, id) : missing;
@@ -271,7 +284,7 @@ class I18n extends EventEmitter {
     if (messageMissing) {
       this.emit("missing", { id, locale: this._locale });
     }
-    let translation = this.messages[id] || message || id;
+    let translation = messageForId || message || id;
     if (process.env.NODE_ENV !== "production") {
       translation = isString(translation) ? compileMessage.compileMessage(translation) : translation;
     }
@@ -283,7 +296,7 @@ class I18n extends EventEmitter {
       translation,
       this._locale,
       this._locales
-    )(values, formats);
+    )(values, options?.formats);
   }
   date(value, format) {
     return date(this._locales || this._locale, value, format);

package/dist/index.d.cts

@@ -7,7 +7,7 @@ declare class EventEmitter<Events extends {
     on(event: keyof Events, listener: Events[typeof event]): () => void;
     removeListener(event: keyof Events, listener: Events[typeof event]): void;
     emit(event: keyof Events, ...args: Parameters<Events[typeof event]>): void;
-    private _hasEvent;
+    private _getListeners;
 }
 
 type MessageOptions = {
@@ -67,13 +67,13 @@ type LoadAndActivateOptions = {
 };
 declare class I18n extends EventEmitter<Events> {
     private _locale;
-    private _locales;
+    private _locales?;
     private _localeData;
     private _messages;
-    private _missing;
+    private _missing?;
     constructor(params: setupI18nProps);
     get locale(): string;
-    get locales(): Locales;
+    get locales(): Locales | undefined;
     get messages(): Messages;
     /**
      * @deprecated this has no effect. Please remove this from the code. Deprecated in v4
@@ -107,18 +107,24 @@ declare class I18n extends EventEmitter<Events> {
 }
 declare function setupI18n(params?: setupI18nProps): I18n;
 
+declare const defaultLocale = "en";
 declare function date(locales: Locales, value: string | Date, format?: Intl.DateTimeFormatOptions): string;
 declare function number(locales: Locales, value: number, format?: Intl.NumberFormatOptions): string;
-declare function plural(locales: Locales, ordinal: boolean, value: number, { offset, ...rules }: {
-    [x: string]: any;
-    offset?: number;
-}): string;
+type PluralOptions = {
+    [key: string]: Intl.LDMLPluralRule;
+} & {
+    offset: number;
+    other: string;
+};
+declare function plural(locales: Locales, ordinal: boolean, value: number, { offset, ...rules }: PluralOptions): string;
 
+type formats_PluralOptions = PluralOptions;
 declare const formats_date: typeof date;
+declare const formats_defaultLocale: typeof defaultLocale;
 declare const formats_number: typeof number;
 declare const formats_plural: typeof plural;
 declare namespace formats {
-  export { formats_date as date, formats_number as number, formats_plural as plural };
+  export { type formats_PluralOptions as PluralOptions, formats_date as date, formats_defaultLocale as defaultLocale, formats_number as number, formats_plural as plural };
 }
 
 declare const i18n: I18n;

package/dist/index.d.mts

@@ -7,7 +7,7 @@ declare class EventEmitter<Events extends {
     on(event: keyof Events, listener: Events[typeof event]): () => void;
     removeListener(event: keyof Events, listener: Events[typeof event]): void;
     emit(event: keyof Events, ...args: Parameters<Events[typeof event]>): void;
-    private _hasEvent;
+    private _getListeners;
 }
 
 type MessageOptions = {
@@ -67,13 +67,13 @@ type LoadAndActivateOptions = {
 };
 declare class I18n extends EventEmitter<Events> {
     private _locale;
-    private _locales;
+    private _locales?;
     private _localeData;
     private _messages;
-    private _missing;
+    private _missing?;
     constructor(params: setupI18nProps);
     get locale(): string;
-    get locales(): Locales;
+    get locales(): Locales | undefined;
     get messages(): Messages;
     /**
      * @deprecated this has no effect. Please remove this from the code. Deprecated in v4
@@ -107,18 +107,24 @@ declare class I18n extends EventEmitter<Events> {
 }
 declare function setupI18n(params?: setupI18nProps): I18n;
 
+declare const defaultLocale = "en";
 declare function date(locales: Locales, value: string | Date, format?: Intl.DateTimeFormatOptions): string;
 declare function number(locales: Locales, value: number, format?: Intl.NumberFormatOptions): string;
-declare function plural(locales: Locales, ordinal: boolean, value: number, { offset, ...rules }: {
-    [x: string]: any;
-    offset?: number;
-}): string;
+type PluralOptions = {
+    [key: string]: Intl.LDMLPluralRule;
+} & {
+    offset: number;
+    other: string;
+};
+declare function plural(locales: Locales, ordinal: boolean, value: number, { offset, ...rules }: PluralOptions): string;
 
+type formats_PluralOptions = PluralOptions;
 declare const formats_date: typeof date;
+declare const formats_defaultLocale: typeof defaultLocale;
 declare const formats_number: typeof number;
 declare const formats_plural: typeof plural;
 declare namespace formats {
-  export { formats_date as date, formats_number as number, formats_plural as plural };
+  export { type formats_PluralOptions as PluralOptions, formats_date as date, formats_defaultLocale as defaultLocale, formats_number as number, formats_plural as plural };
 }
 
 declare const i18n: I18n;

package/dist/index.d.ts

@@ -7,7 +7,7 @@ declare class EventEmitter<Events extends {
     on(event: keyof Events, listener: Events[typeof event]): () => void;
     removeListener(event: keyof Events, listener: Events[typeof event]): void;
     emit(event: keyof Events, ...args: Parameters<Events[typeof event]>): void;
-    private _hasEvent;
+    private _getListeners;
 }
 
 type MessageOptions = {
@@ -67,13 +67,13 @@ type LoadAndActivateOptions = {
 };
 declare class I18n extends EventEmitter<Events> {
     private _locale;
-    private _locales;
+    private _locales?;
     private _localeData;
     private _messages;
-    private _missing;
+    private _missing?;
     constructor(params: setupI18nProps);
     get locale(): string;
-    get locales(): Locales;
+    get locales(): Locales | undefined;
     get messages(): Messages;
     /**
      * @deprecated this has no effect. Please remove this from the code. Deprecated in v4
@@ -107,18 +107,24 @@ declare class I18n extends EventEmitter<Events> {
 }
 declare function setupI18n(params?: setupI18nProps): I18n;
 
+declare const defaultLocale = "en";
 declare function date(locales: Locales, value: string | Date, format?: Intl.DateTimeFormatOptions): string;
 declare function number(locales: Locales, value: number, format?: Intl.NumberFormatOptions): string;
-declare function plural(locales: Locales, ordinal: boolean, value: number, { offset, ...rules }: {
-    [x: string]: any;
-    offset?: number;
-}): string;
+type PluralOptions = {
+    [key: string]: Intl.LDMLPluralRule;
+} & {
+    offset: number;
+    other: string;
+};
+declare function plural(locales: Locales, ordinal: boolean, value: number, { offset, ...rules }: PluralOptions): string;
 
+type formats_PluralOptions = PluralOptions;
 declare const formats_date: typeof date;
+declare const formats_defaultLocale: typeof defaultLocale;
 declare const formats_number: typeof number;
 declare const formats_plural: typeof plural;
 declare namespace formats {
-  export { formats_date as date, formats_number as number, formats_plural as plural };
+  export { type formats_PluralOptions as PluralOptions, formats_date as date, formats_defaultLocale as defaultLocale, formats_number as number, formats_plural as plural };
 }
 
 declare const i18n: I18n;

package/dist/index.mjs

@@ -5,9 +5,10 @@ const isString = (s) => typeof s === "string";
 const isFunction = (f) => typeof f === "function";
 
 const cache = /* @__PURE__ */ new Map();
+const defaultLocale = "en";
 function normalizeLocales(locales) {
   const out = Array.isArray(locales) ? locales : [locales];
-  return [...out, "en"];
+  return [...out, defaultLocale];
 }
 function date(locales, value, format) {
   const _locales = normalizeLocales(locales);
@@ -53,16 +54,19 @@ function cacheKey(type, locales, options) {
 const formats = {
   __proto__: null,
   date: date,
+  defaultLocale: defaultLocale,
   number: number,
   plural: plural
 };
 
 const UNICODE_REGEX = /\\u[a-fA-F0-9]{4}|\\x[a-fA-F0-9]{2}/g;
-const getDefaultFormats = (locale, locales, formats = {}) => {
-  locales = locales || locale;
-  const style = (format) => isString(format) ? formats[format] || { style: format } : format;
+const getDefaultFormats = (locale, passedLocales, formats = {}) => {
+  const locales = passedLocales || locale;
+  const style = (format) => {
+    return typeof format === "object" ? format : formats[format] || { style: format };
+  };
   const replaceOctothorpe = (value, message) => {
-    const numberFormat = Object.keys(formats).length ? style("number") : {};
+    const numberFormat = Object.keys(formats).length ? style("number") : void 0;
     const valueStr = number(locales, value, numberFormat);
     return message.replace("#", valueStr);
   };
@@ -77,14 +81,16 @@ const getDefaultFormats = (locale, locales, formats = {}) => {
       const message = plural(locales, true, value, cases);
       return replaceOctothorpe(value - offset, message);
     },
-    select: (value, rules) => rules[value] ?? rules.other,
+    select: selectFormatter,
     number: (value, format) => number(locales, value, style(format)),
     date: (value, format) => date(locales, value, style(format)),
-    undefined: (value) => value
+    undefined: undefinedFormatter
   };
 };
+const selectFormatter = (value, rules) => rules[value] ?? rules.other;
+const undefinedFormatter = (value) => value;
 function interpolate(translation, locale, locales) {
-  return (values, formats = {}) => {
+  return (values = {}, formats) => {
     const formatters = getDefaultFormats(locale, locales, formats);
     const formatMessage = (message) => {
       if (!Array.isArray(message))
@@ -94,14 +100,15 @@ function interpolate(translation, locale, locales) {
           return message2 + token;
         const [name, type, format] = token;
         let interpolatedFormat = {};
-        if (format != null && !isString(format)) {
-          Object.keys(format).forEach((key) => {
-            interpolatedFormat[key] = formatMessage(format[key]);
+        if (format != null && typeof format === "object") {
+          Object.entries(format).forEach(([key, value2]) => {
+            interpolatedFormat[key] = formatMessage(value2);
           });
         } else {
           interpolatedFormat = format;
         }
-        const value = formatters[type](values[name], interpolatedFormat);
+        const formatter = formatters[type];
+        const value = formatter(values[name], interpolatedFormat);
         if (value == null)
           return message2;
         return message2 + value;
@@ -113,7 +120,7 @@ function interpolate(translation, locale, locales) {
     }
     if (isString(result))
       return result.trim();
-    return result;
+    return result ? String(result) : "";
   };
 }
 
@@ -128,25 +135,28 @@ class EventEmitter {
     __publicField$1(this, "_events", {});
   }
   on(event, listener) {
-    if (!this._hasEvent(event))
-      this._events[event] = [];
+    var _a;
+    (_a = this._events)[event] ?? (_a[event] = []);
     this._events[event].push(listener);
     return () => this.removeListener(event, listener);
   }
   removeListener(event, listener) {
-    if (!this._hasEvent(event))
+    const maybeListeners = this._getListeners(event);
+    if (!maybeListeners)
       return;
-    const index = this._events[event].indexOf(listener);
+    const index = maybeListeners.indexOf(listener);
     if (~index)
-      this._events[event].splice(index, 1);
+      maybeListeners.splice(index, 1);
   }
   emit(event, ...args) {
-    if (!this._hasEvent(event))
+    const maybeListeners = this._getListeners(event);
+    if (!maybeListeners)
       return;
-    this._events[event].map((listener) => listener.apply(this, args));
+    maybeListeners.map((listener) => listener.apply(this, args));
   }
-  _hasEvent(event) {
-    return Array.isArray(this._events[event]);
+  _getListeners(event) {
+    const maybeListeners = this._events[event];
+    return Array.isArray(maybeListeners) ? maybeListeners : false;
   }
 }
 
@@ -159,25 +169,23 @@ var __publicField = (obj, key, value) => {
 class I18n extends EventEmitter {
   constructor(params) {
     super();
-    __publicField(this, "_locale");
+    __publicField(this, "_locale", "");
     __publicField(this, "_locales");
-    __publicField(this, "_localeData");
-    __publicField(this, "_messages");
+    __publicField(this, "_localeData", {});
+    __publicField(this, "_messages", {});
     __publicField(this, "_missing");
     /**
      * Alias for {@see I18n._}
      */
     __publicField(this, "t", this._.bind(this));
-    this._messages = {};
-    this._localeData = {};
     if (params.missing != null)
       this._missing = params.missing;
     if (params.messages != null)
       this.load(params.messages);
     if (params.localeData != null)
       this.loadLocaleData(params.localeData);
-    if (params.locale != null || params.locales != null) {
-      this.activate(params.locale, params.locales);
+    if (typeof params.locale === "string" || params.locales) {
+      this.activate(params.locale ?? defaultLocale, params.locales);
     }
   }
   get locale() {
@@ -196,15 +204,17 @@ class I18n extends EventEmitter {
     return this._localeData[this._locale] ?? {};
   }
   _loadLocaleData(locale, localeData) {
-    if (this._localeData[locale] == null) {
+    const maybeLocaleData = this._localeData[locale];
+    if (!maybeLocaleData) {
       this._localeData[locale] = localeData;
     } else {
-      Object.assign(this._localeData[locale], localeData);
+      Object.assign(maybeLocaleData, localeData);
     }
   }
   /**
    * @deprecated Plurals automatically used from Intl.PluralRules you can safely remove this call. Deprecated in v4
    */
+  // @ts-ignore deprecated, so ignore the reported error
   loadLocaleData(localeOrAllData, localeData) {
     if (localeData != null) {
       this._loadLocaleData(localeOrAllData, localeData);
@@ -216,18 +226,19 @@ class I18n extends EventEmitter {
     this.emit("change");
   }
   _load(locale, messages) {
-    if (this._messages[locale] == null) {
+    const maybeMessages = this._messages[locale];
+    if (!maybeMessages) {
       this._messages[locale] = messages;
     } else {
-      Object.assign(this._messages[locale], messages);
+      Object.assign(maybeMessages, messages);
     }
   }
   load(localeOrMessages, messages) {
-    if (messages != null) {
+    if (typeof localeOrMessages == "string" && typeof messages === "object") {
       this._load(localeOrMessages, messages);
     } else {
-      Object.keys(localeOrMessages).forEach(
-        (locale) => this._load(locale, localeOrMessages[locale])
+      Object.entries(localeOrMessages).forEach(
+        ([locale, messages2]) => this._load(locale, messages2)
       );
     }
     this.emit("change");
@@ -251,13 +262,15 @@ class I18n extends EventEmitter {
     this._locales = locales;
     this.emit("change");
   }
-  _(id, values = {}, { message, formats } = {}) {
+  _(id, values, options) {
+    let message = options?.message;
     if (!isString(id)) {
       values = id.values || values;
       message = id.message;
       id = id.id;
     }
-    const messageMissing = !this.messages[id];
+    const messageForId = this.messages[id];
+    const messageMissing = messageForId === void 0;
     const missing = this._missing;
     if (missing && messageMissing) {
       return isFunction(missing) ? missing(this._locale, id) : missing;
@@ -265,7 +278,7 @@ class I18n extends EventEmitter {
     if (messageMissing) {
       this.emit("missing", { id, locale: this._locale });
     }
-    let translation = this.messages[id] || message || id;
+    let translation = messageForId || message || id;
     if (process.env.NODE_ENV !== "production") {
       translation = isString(translation) ? compileMessage(translation) : translation;
     }
@@ -277,7 +290,7 @@ class I18n extends EventEmitter {
       translation,
       this._locale,
       this._locales
-    )(values, formats);
+    )(values, options?.formats);
   }
   date(value, format) {
     return date(this._locales || this._locale, value, format);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/core",
-  "version": "4.5.0",
+  "version": "4.6.0",
   "sideEffects": false,
   "description": "I18n tools for javascript",
   "main": "./dist/index.cjs",
@@ -54,12 +54,12 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.20.13",
-    "@lingui/message-utils": "4.5.0",
+    "@lingui/message-utils": "4.6.0",
     "unraw": "^3.0.0"
   },
   "devDependencies": {
     "@lingui/jest-mocks": "*",
     "unbuild": "2.0.0"
   },
-  "gitHead": "62c92d1f8c60b3890bdda870f307fa780d423080"
+  "gitHead": "2afa0efb2d0cd1d47adc76e1eec9f5e57e34ae18"
 }