fix: format should follow locale order (#1619)

Author: vonovak

packages/core/src/formats.test.ts

@@ -3,50 +3,53 @@ import { date, number } from "./formats"
 describe("@lingui/core/formats", () => {
   describe("date", () => {
     it("should support Date as input", () => {
-      expect(date(["en"], new Date(2023, 2, 5))).toMatchInlineSnapshot(
-        `"3/5/2023"`
-      )
+      expect(date(["en"], new Date(2023, 2, 5))).toBe("3/5/2023")
     })
     it("should support iso string as input", () => {
-      expect(
-        date(["en"], new Date(2023, 2, 5).toISOString())
-      ).toMatchInlineSnapshot(`"3/5/2023"`)
+      expect(date(["en"], new Date(2023, 2, 5).toISOString())).toBe("3/5/2023")
     })
 
     it("should pass format options", () => {
       expect(
         date(["en"], new Date(2023, 2, 5).toISOString(), { dateStyle: "full" })
-      ).toMatchInlineSnapshot(`"Sunday, March 5, 2023"`)
+      ).toBe("Sunday, March 5, 2023")
 
       expect(
         date(["en"], new Date(2023, 2, 5).toISOString(), {
           dateStyle: "medium",
         })
-      ).toMatchInlineSnapshot(`"Mar 5, 2023"`)
+      ).toBe("Mar 5, 2023")
     })
 
     it("should respect passed locale", () => {
       expect(
         date(["pl"], new Date(2023, 2, 5).toISOString(), { dateStyle: "full" })
-      ).toMatchInlineSnapshot(`"niedziela, 5 marca 2023"`)
+      ).toBe("niedziela, 5 marca 2023")
     })
   })
 
   describe("number", () => {
     it("should pass format options", () => {
-      expect(
-        number(["en"], 1000, { style: "currency", currency: "EUR" })
-      ).toMatchInlineSnapshot(`"€1,000.00"`)
+      expect(number(["en"], 1000, { style: "currency", currency: "EUR" })).toBe(
+        "€1,000.00"
+      )
 
-      expect(
-        number(["en"], 1000, { maximumSignificantDigits: 3 })
-      ).toMatchInlineSnapshot(`"1,000"`)
+      expect(number(["en"], 1000, { maximumSignificantDigits: 3 })).toBe(
+        "1,000"
+      )
     })
 
-    it("should respect passed locale", () => {
+    it("should respect passed locale(s)", () => {
+      expect(number(["pl"], 1000, { style: "currency", currency: "EUR" })).toBe(
+        "1000,00 €"
+      )
+
+      expect(
+        number(["pl", "en-US"], 1000, { style: "currency", currency: "EUR" })
+      ).toBe("1000,00 €")
       expect(
-        number(["pl"], 1000, { style: "currency", currency: "EUR" })
-      ).toMatchInlineSnapshot(`"1000,00 €"`)
+        number(["en-US", "pl"], 1000, { style: "currency", currency: "EUR" })
+      ).toBe("€1,000.00")
     })
   })
 })

packages/core/src/formats.ts

@@ -12,7 +12,7 @@ function normalizeLocales(locales: Locales): string[] {
 export function date(
   locales: Locales,
   value: string | Date,
-  format: Intl.DateTimeFormatOptions = {}
+  format?: Intl.DateTimeFormatOptions
 ): string {
   const _locales = normalizeLocales(locales)
 
@@ -27,7 +27,7 @@ export function date(
 export function number(
   locales: Locales,
   value: number,
-  format: Intl.NumberFormatOptions = {}
+  format?: Intl.NumberFormatOptions
 ): string {
   const _locales = normalizeLocales(locales)
 
@@ -49,11 +49,11 @@ export function plural(
 
   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" })
       )
 
@@ -75,9 +75,9 @@ function getMemoized<T>(getKey: () => string, construct: () => T) {
 
 function cacheKey(
   type: string,
-  locales?: readonly string[],
-  options: unknown = {}
+  locales: readonly string[],
+  options?: Intl.DateTimeFormatOptions | Intl.NumberFormatOptions
 ) {
-  const localeKey = [...locales].sort().join("-")
+  const localeKey = locales.join("-")
   return `${type}-${localeKey}-${JSON.stringify(options)}`
 }