@discord/intl 0.7.1-rc.0 → 0.8.0-rc.0

package/dist/format.js

@@ -37,16 +37,16 @@ exports.FormatBuilder = FormatBuilder;
 function bindFormatValuesWithBuilder(builder, nodes, locales, formatters, formatConfig, values = {}, currentPluralValue, originalMessage) {
     var _a, _b;
     // Hot path for static messages that are just parsed as a single string element.
-    if (nodes.length === 1 && typeof nodes[0][0] === 'string') {
-        builder.pushLiteralText(nodes[0][0]);
+    if (nodes.length === 1 && typeof nodes[0] === 'string') {
+        builder.pushLiteralText(nodes[0]);
         return;
     }
     for (const node of nodes) {
-        const nodeType = node[intl_ast_1.AstNodeIndices.Type];
-        if (typeof nodeType === 'string') {
-            builder.pushLiteralText(nodeType);
+        if (typeof node === 'string') {
+            builder.pushLiteralText(node);
             continue;
         }
+        const nodeType = node[intl_ast_1.AstNodeIndices.Type];
         switch (nodeType) {
             case intl_ast_1.FormatJsNodeType.Pound:
                 // Replace `#` in plural rules with the actual numeric value. Only

package/dist/formatters/react.js

@@ -34,7 +34,13 @@ function createReactBuilder(richTextElements) {
             this.result.push(richTextElements[tag](children, `${this._nodeKey++}`));
         }
         pushLiteralText(text) {
-            this.result.push(text);
+            const last = this.result[this.result.length - 1];
+            if (typeof last === 'string') {
+                this.result[this.result.length - 1] += text;
+            }
+            else {
+                this.result.push(text);
+            }
         }
         pushObject(value) {
             // @ts-expect-error this is technically invalid, but we'll just assume that if a format returns

package/dist/intl-manager.js

@@ -71,17 +71,15 @@ class IntlManager {
         const resolved = message(this.currentLocale);
         if (resolved == null || resolved.ast.length === 0)
             return '';
-        const value = resolved.ast[0];
-        if (typeof value !== 'string') {
-            throw new Error('Attempted to call `string` formatting on a non-literal message: ' +
-                JSON.stringify(resolved));
+        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;
         }
-        // TODO: Figure out how to make this typing exact. This currently relies on
-        // the generic typing being sound enough to know that the message can only
-        // contain a single static text node and no placeholders or rich text.
-        // As it stands, this is _technically_ typed as string | undefined, even though
-        // TypeScript doesn't actually complain about it.
-        return value;
+        return result;
     }
     /**
      * Return a raw string representing the syntax of the original message, as

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discord/intl",
-  "version": "0.7.1-rc.0",
+  "version": "0.8.0-rc.0",
   "license": "MIT",
   "description": "Client runtime for managing messages and translations in a React project.",
   "main": "./dist/index.js",
@@ -19,7 +19,7 @@
     "@formatjs/intl": "^2.10.1",
     "@intrnl/xxhash64": "^0.1.2",
     "intl-messageformat": "^10.5.11",
-    "@discord/intl-ast": "0.7.1-rc.0"
+    "@discord/intl-ast": "0.8.0-rc.0"
   },
   "devDependencies": {
     "@swc/cli": "^0.3.12",

package/src/format.ts

@@ -56,17 +56,17 @@ export function bindFormatValuesWithBuilder<T, Builder extends FormatBuilder<T>>
   originalMessage?: string,
 ) {
   // Hot path for static messages that are just parsed as a single string element.
-  if (nodes.length === 1 && typeof nodes[0][0] === 'string') {
-    builder.pushLiteralText(nodes[0][0]);
+  if (nodes.length === 1 && typeof nodes[0] === 'string') {
+    builder.pushLiteralText(nodes[0]);
     return;
   }
 
   for (const node of nodes) {
-    const nodeType = node[AstNodeIndices.Type];
-    if (typeof nodeType === 'string') {
-      builder.pushLiteralText(nodeType);
+    if (typeof node === 'string') {
+      builder.pushLiteralText(node);
       continue;
     }
+    const nodeType = node[AstNodeIndices.Type];
     switch (nodeType) {
       case FormatJsNodeType.Pound:
         // Replace `#` in plural rules with the actual numeric value. Only

package/src/formatters/react.ts

@@ -56,7 +56,12 @@ function createReactBuilder(richTextElements: RichTextFormattingMap<ReactFunctio
     }
 
     pushLiteralText(text: string) {
-      this.result.push(text);
+      const last = this.result[this.result.length - 1];
+      if (typeof last === 'string') {
+        this.result[this.result.length - 1] += text;
+      } else {
+        this.result.push(text);
+      }
     }
 
     pushObject(value: object) {

package/src/intl-manager.ts

@@ -120,20 +120,17 @@ export class IntlManager {
     const resolved = message(this.currentLocale);
     if (resolved == null || resolved.ast.length === 0) return '';
 
-    const value = resolved.ast[0] as LiteralNode;
-    if (typeof value !== 'string') {
-      throw new Error(
-        'Attempted to call `string` formatting on a non-literal message: ' +
-          JSON.stringify(resolved),
-      );
+    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;
     }
-
-    // TODO: Figure out how to make this typing exact. This currently relies on
-    // the generic typing being sound enough to know that the message can only
-    // contain a single static text node and no placeholders or rich text.
-    // As it stands, this is _technically_ typed as string | undefined, even though
-    // TypeScript doesn't actually complain about it.
-    return value;
+    return result;
   }
 
   /**