@discord/intl 0.10.0-rc.1 → 0.10.0-rc.3

package/dist/format.d.ts

@@ -28,4 +28,4 @@ export declare abstract class FormatBuilder<Result> {
 }
 export type FormatBuilderConstructor<Result> = new () => FormatBuilder<Result>;
 export declare function bindFormatValuesWithBuilder<T, Builder extends FormatBuilder<T>>(builder: Builder, nodes: AstNode[], locales: string | string[], formatters: Formatters, formatConfig: FormatConfig, values?: Record<string, string | object>, currentPluralValue?: number, originalMessage?: string): void;
-export declare function bindFormatValues<Result>(Builder: FormatBuilderConstructor<Result>, nodes: AstNode[], locales: string | string[], formatters: Formatters, formatConfig: FormatConfig, values?: Record<string, string | object>, currentPluralValue?: number): Result[];
+export declare function bindFormatValues<Result>(Builder: FormatBuilderConstructor<Result>, nodes: string | AstNode[], locales: string | string[], formatters: Formatters, formatConfig: FormatConfig, values?: Record<string, string | object>, currentPluralValue?: number): Result[];

package/dist/format.js

@@ -184,6 +184,12 @@ function bindFormatValuesWithBuilder(builder, nodes, locales, formatters, format
 }
 function bindFormatValues(Builder, nodes, locales, formatters, formatConfig, values = {}, currentPluralValue) {
     const builder = new Builder();
-    bindFormatValuesWithBuilder(builder, nodes, locales, formatters, formatConfig, values, currentPluralValue);
-    return builder.finish();
+    if (typeof nodes === 'string') {
+        builder.pushLiteralText(nodes);
+        return builder.finish();
+    }
+    else {
+        bindFormatValuesWithBuilder(builder, nodes, locales, formatters, formatConfig, values, currentPluralValue);
+        return builder.finish();
+    }
 }

package/dist/intl-manager.js

@@ -68,18 +68,7 @@ class IntlManager {
      * immediately return the plain string value of the message in the current locale.
      */
     string(message) {
-        const resolved = message(this.currentLocale);
-        if (resolved == null || resolved.ast.length === 0)
-            return '';
-        let result = '';
-        for (const element of resolved.ast) {
-            if (typeof element !== 'string') {
-                throw new Error('Attempted to call `string` formatting on a non-literal message: ' +
-                    JSON.stringify(resolved));
-            }
-            result += element;
-        }
-        return result;
+        return message(this.currentLocale).reserialize();
     }
     /**
      * Return a raw string representing the syntax of the original message, as

package/dist/message-loader.d.ts

@@ -48,7 +48,9 @@ export declare class MessageLoader {
     /**
      * Map of pre-parsed messages, keyed by the message key and locale
      */
-    _parseCache: Map<string, InternalIntlMessage>;
+    _parseCache: Record<LocaleId, {
+        [name: string]: InternalIntlMessage;
+    }>;
     /**
      * List of subscribers listening for changes to the current locale and
      * when it has loaded.

package/dist/message-loader.js

@@ -22,7 +22,7 @@ class MessageLoader {
         this.supportedLocales = Object.keys(localeImportMap);
         this.defaultLocale = defaultLocale;
         this._localeLoadingPromises = {};
-        this._parseCache = new Map();
+        this._parseCache = {};
         this._subscribers = new Set();
         this._loadLocale(this.defaultLocale);
         this.fallbackMessage = new message_1.InternalIntlMessage([], this.defaultLocale);
@@ -34,7 +34,7 @@ class MessageLoader {
                 // @ts-expect-error `hot` not defined in types.
                 module.hot.accept(file, () => __awaiter(this, void 0, void 0, function* () {
                     yield this._loadLocale(locale);
-                    this._parseCache.clear();
+                    this._parseCache = {};
                 }));
             }
         }
@@ -75,10 +75,11 @@ class MessageLoader {
      * returning.
      */
     getMessageValue(key, locale) {
-        const cacheKey = key + '@' + locale;
-        const cachedValue = this._parseCache.get(cacheKey);
-        if (cachedValue != null)
-            return cachedValue;
+        var _a, _b;
+        var _c;
+        const parsed = (_a = this._parseCache[locale]) === null || _a === void 0 ? void 0 : _a[key];
+        if (parsed)
+            return parsed;
         // Check whether the locale exists in memory. If not, start a request to
         // load the locale if one has not already started. It's impossible for
         // the request to finish within the same tick, so return undefined in any
@@ -93,7 +94,7 @@ class MessageLoader {
         if (key in this.messages[locale]) {
             const content = this.messages[locale][key];
             const message = new message_1.InternalIntlMessage(content, locale);
-            this._parseCache.set(cacheKey, message);
+            ((_b = (_c = this._parseCache)[locale]) !== null && _b !== void 0 ? _b : (_c[locale] = {}))[key] = message;
             return message;
         }
         // Otherwise just assume it doesn't exist.
@@ -107,12 +108,13 @@ class MessageLoader {
      */
     getBinds() {
         const onChange = this.onChange.bind(this);
-        return Object.keys(this.messageKeys).reduce((acc, key) => {
-            const bound = this.get.bind(this, key);
+        const result = {};
+        for (const key in this.messageKeys) {
+            const bound = (locale) => this.get(key, locale);
             bound.onChange = onChange;
-            acc[key] = bound;
-            return acc;
-        }, {});
+            result[key] = bound;
+        }
+        return result;
     }
     _loadLocale(locale) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/message.d.ts

@@ -1,7 +1,7 @@
 import { AstNode, FullFormatJsNode } from '@discord/intl-ast';
 export declare class InternalIntlMessage {
     locale: string;
-    ast: AstNode[];
+    ast: string | AstNode[];
     constructor(messageOrAst: AstNode[] | FullFormatJsNode[], locale: string);
     /**
      * Return a stringified serialization of this message's AST, with no

package/dist/message.js

@@ -12,6 +12,8 @@ class InternalIntlMessage {
      * formatting or values applied.
      */
     reserialize() {
+        if (typeof this.ast === 'string')
+            return this.ast;
         const result = { value: '' };
         serializeAst(this.ast, result);
         return result.value;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@discord/intl",
-  "version": "0.10.0-rc.1",
+  "version": "0.10.0-rc.3",
   "license": "MIT",
   "description": "Client runtime for managing messages and translations in a React project.",
   "main": "./dist/index.js",
   "exports": {
     ".": {
-      "default": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "files": [
@@ -19,7 +19,7 @@
     "@formatjs/intl": "^2.10.1",
     "@intrnl/xxhash64": "^0.1.2",
     "intl-messageformat": "^10.5.11",
-    "@discord/intl-ast": "0.10.0-rc.1"
+    "@discord/intl-ast": "0.10.0-rc.3"
   },
   "devDependencies": {
     "@swc/cli": "^0.3.12",

package/src/format.ts

@@ -238,7 +238,7 @@ export function bindFormatValuesWithBuilder<T, Builder extends FormatBuilder<T>>
 
 export function bindFormatValues<Result>(
   Builder: FormatBuilderConstructor<Result>,
-  nodes: AstNode[],
+  nodes: string | AstNode[],
   locales: string | string[],
   formatters: Formatters,
   formatConfig: FormatConfig,
@@ -246,14 +246,19 @@ export function bindFormatValues<Result>(
   currentPluralValue?: number,
 ): Result[] {
   const builder = new Builder();
-  bindFormatValuesWithBuilder(
-    builder,
-    nodes,
-    locales,
-    formatters,
-    formatConfig,
-    values,
-    currentPluralValue,
-  );
-  return builder.finish();
+  if (typeof nodes === 'string') {
+    builder.pushLiteralText(nodes);
+    return builder.finish();
+  } else {
+    bindFormatValuesWithBuilder(
+      builder,
+      nodes,
+      locales,
+      formatters,
+      formatConfig,
+      values,
+      currentPluralValue,
+    );
+    return builder.finish();
+  }
 }

package/src/intl-manager.ts

@@ -116,20 +116,7 @@ export class IntlManager {
    * immediately return the plain string value of the message in the current locale.
    */
   string<T extends TypedIntlMessageGetter<{}>>(message: T): string {
-    const resolved = message(this.currentLocale);
-    if (resolved == null || resolved.ast.length === 0) return '';
-
-    let result = '';
-    for (const element of resolved.ast) {
-      if (typeof element !== 'string') {
-        throw new Error(
-          'Attempted to call `string` formatting on a non-literal message: ' +
-            JSON.stringify(resolved),
-        );
-      }
-      result += element;
-    }
-    return result;
+    return message(this.currentLocale).reserialize();
   }
 
   /**

package/src/message-loader.ts

@@ -54,7 +54,7 @@ export class MessageLoader {
   /**
    * Map of pre-parsed messages, keyed by the message key and locale
    */
-  _parseCache: Map<string, InternalIntlMessage>;
+  _parseCache: Record<LocaleId, { [name: string]: InternalIntlMessage }>;
 
   /**
    * List of subscribers listening for changes to the current locale and
@@ -98,7 +98,7 @@ export class MessageLoader {
     this.defaultLocale = defaultLocale;
 
     this._localeLoadingPromises = {};
-    this._parseCache = new Map();
+    this._parseCache = {};
     this._subscribers = new Set();
 
     this._loadLocale(this.defaultLocale);
@@ -112,7 +112,7 @@ export class MessageLoader {
         // @ts-expect-error `hot` not defined in types.
         module.hot.accept(file, async () => {
           await this._loadLocale(locale);
-          this._parseCache.clear();
+          this._parseCache = {};
         });
       }
     }
@@ -160,9 +160,8 @@ export class MessageLoader {
    * returning.
    */
   getMessageValue(key: string, locale: LocaleId): InternalIntlMessage | undefined {
-    const cacheKey = key + '@' + locale;
-    const cachedValue = this._parseCache.get(cacheKey);
-    if (cachedValue != null) return cachedValue;
+    const parsed = this._parseCache[locale]?.[key];
+    if (parsed) return parsed;
 
     // Check whether the locale exists in memory. If not, start a request to
     // load the locale if one has not already started. It's impossible for
@@ -179,7 +178,7 @@ export class MessageLoader {
     if (key in this.messages[locale]) {
       const content = this.messages[locale][key];
       const message = new InternalIntlMessage(content, locale);
-      this._parseCache.set(cacheKey, message);
+      (this._parseCache[locale] ??= {})[key] = message;
       return message;
     }
 
@@ -195,15 +194,14 @@ export class MessageLoader {
    */
   getBinds(): Record<string, IntlMessageGetter> {
     const onChange = this.onChange.bind(this);
-    return Object.keys(this.messageKeys).reduce(
-      (acc, key) => {
-        const bound = this.get.bind(this, key) as IntlMessageGetter;
-        bound.onChange = onChange;
-        acc[key] = bound;
-        return acc;
-      },
-      {} as Record<string, IntlMessageGetter>,
-    );
+    const result: Record<string, IntlMessageGetter> = {};
+    for (const key in this.messageKeys) {
+      const bound = (locale: LocaleId) => this.get(key, locale);
+      bound.onChange = onChange;
+      result[key] = bound;
+    }
+
+    return result;
   }
 
   async _loadLocale(locale: LocaleId) {

package/src/message.ts

@@ -10,7 +10,7 @@ import {
 
 export class InternalIntlMessage {
   locale: string;
-  ast: AstNode[];
+  ast: string | AstNode[];
 
   constructor(messageOrAst: AstNode[] | FullFormatJsNode[], locale: string) {
     this.locale = locale;
@@ -22,6 +22,8 @@ export class InternalIntlMessage {
    * formatting or values applied.
    */
   reserialize(): string {
+    if (typeof this.ast === 'string') return this.ast;
+
     const result = { value: '' };
     serializeAst(this.ast, result);
     return result.value;