@discord/intl 0.6.1 → 0.7.0

package/dist/format.js

@@ -37,16 +37,17 @@ 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 && nodes[0][intl_ast_1.AstNodeIndices.Type] === intl_ast_1.FormatJsNodeType.Literal) {
-        builder.pushLiteralText(nodes[0][intl_ast_1.AstNodeIndices.Value]);
+    if (nodes.length === 1 && typeof nodes[0][0] === 'string') {
+        builder.pushLiteralText(nodes[0][0]);
         return;
     }
     for (const node of nodes) {
         const nodeType = node[intl_ast_1.AstNodeIndices.Type];
+        if (typeof nodeType === 'string') {
+            builder.pushLiteralText(nodeType);
+            continue;
+        }
         switch (nodeType) {
-            case intl_ast_1.FormatJsNodeType.Literal:
-                builder.pushLiteralText(node[intl_ast_1.AstNodeIndices.Value]);
-                continue;
             case intl_ast_1.FormatJsNodeType.Pound:
                 // Replace `#` in plural rules with the actual numeric value. Only
                 // numeric values are replaced, otherwise the value is completed ignored?
@@ -150,7 +151,7 @@ function bindFormatValuesWithBuilder(builder, nodes, locales, formatters, format
                 if (option == null) {
                     throw `${value} is not a known option for select value ${variableName}. Valid options are ${Object.keys(options).join(', ')}`;
                 }
-                bindFormatValuesWithBuilder(builder, option.value, locales, formatters, formatConfig, values);
+                bindFormatValuesWithBuilder(builder, option, locales, formatters, formatConfig, values);
                 break;
             }
             case intl_ast_1.FormatJsNodeType.Plural: {
@@ -172,7 +173,7 @@ function bindFormatValuesWithBuilder(builder, nodes, locales, formatters, format
                 if (option == null) {
                     throw `${value} is not a known option for plural value ${variableName}. Valid options are ${Object.keys(options).join(', ')}`;
                 }
-                bindFormatValuesWithBuilder(builder, option.value, locales, formatters, formatConfig, values, 
+                bindFormatValuesWithBuilder(builder, option, locales, formatters, formatConfig, values, 
                 // @ts-expect-error assert this `as number` properly.
                 value - ((_b = node.offset) !== null && _b !== void 0 ? _b : 0));
                 break;

package/dist/intl-manager.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntlManager = exports.DEFAULT_LOCALE = void 0;
-const intl_ast_1 = require("@discord/intl-ast");
 const intl_1 = require("@formatjs/intl");
 const format_1 = require("./format");
 const format_config_1 = require("./format-config");
@@ -72,12 +71,17 @@ class IntlManager {
         const resolved = message(this.currentLocale);
         if (resolved == null || resolved.ast.length === 0)
             return '';
+        const value = resolved.ast[0];
+        if (typeof value[0] !== 'string') {
+            throw new Error('Attempted to call `string` formatting on a non-literal message: ' +
+                JSON.stringify(resolved));
+        }
         // 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 resolved.ast[0][intl_ast_1.AstNodeIndices.Value];
+        return value[0];
     }
     /**
      * Return a raw string representing the syntax of the original message, as

package/dist/message.js

@@ -22,10 +22,11 @@ exports.InternalIntlMessage = InternalIntlMessage;
 // appended, rather than creating a bunch of intermediate strings.
 function serializeAst(ast, result) {
     for (const node of ast) {
+        if (typeof node[0] === 'string') {
+            result.value += node[0];
+            return;
+        }
         switch (node[intl_ast_1.AstNodeIndices.Type]) {
-            case intl_ast_1.FormatJsNodeType.Literal:
-                result.value += node[intl_ast_1.AstNodeIndices.Value];
-                return;
             case intl_ast_1.FormatJsNodeType.Argument:
                 // Empties are an artifact of our parsing strategy, not necessary here.
                 if (result.value === '$_')
@@ -61,7 +62,7 @@ function serializeAst(ast, result) {
                 }
                 for (const [name, arm] of Object.entries(node[intl_ast_1.AstNodeIndices.Options])) {
                     result.value += ' ' + name + ' {';
-                    serializeAst(arm.value, result);
+                    serializeAst(arm, result);
                     result.value += '}';
                 }
                 return;
@@ -73,7 +74,7 @@ function serializeAst(ast, result) {
                 result.value += '{' + node[intl_ast_1.AstNodeIndices.Value] + ', select, ';
                 for (const [name, arm] of Object.entries(node[intl_ast_1.AstNodeIndices.Options])) {
                     result.value += ' ' + name + ' {';
-                    serializeAst(arm.value, result);
+                    serializeAst(arm, result);
                     result.value += '}';
                 }
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discord/intl",
-  "version": "0.6.1",
+  "version": "0.7.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.6.1"
+    "@discord/intl-ast": "0.7.0"
   },
   "devDependencies": {
     "@swc/cli": "^0.3.12",

package/src/format.ts

@@ -56,18 +56,18 @@ 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 && nodes[0][AstNodeIndices.Type] === FormatJsNodeType.Literal) {
-    builder.pushLiteralText(nodes[0][AstNodeIndices.Value]);
+  if (nodes.length === 1 && typeof nodes[0][0] === 'string') {
+    builder.pushLiteralText(nodes[0][0]);
     return;
   }
 
   for (const node of nodes) {
     const nodeType = node[AstNodeIndices.Type];
+    if (typeof nodeType === 'string') {
+      builder.pushLiteralText(nodeType);
+      continue;
+    }
     switch (nodeType) {
-      case FormatJsNodeType.Literal:
-        builder.pushLiteralText(node[AstNodeIndices.Value]);
-        continue;
-
       case FormatJsNodeType.Pound:
         // Replace `#` in plural rules with the actual numeric value. Only
         // numeric values are replaced, otherwise the value is completed ignored?
@@ -184,14 +184,7 @@ export function bindFormatValuesWithBuilder<T, Builder extends FormatBuilder<T>>
         if (option == null) {
           throw `${value} is not a known option for select value ${variableName}. Valid options are ${Object.keys(options).join(', ')}`;
         }
-        bindFormatValuesWithBuilder(
-          builder,
-          option.value,
-          locales,
-          formatters,
-          formatConfig,
-          values,
-        );
+        bindFormatValuesWithBuilder(builder, option, locales, formatters, formatConfig, values);
         break;
       }
 
@@ -215,7 +208,7 @@ export function bindFormatValuesWithBuilder<T, Builder extends FormatBuilder<T>>
         }
         bindFormatValuesWithBuilder(
           builder,
-          option.value,
+          option,
           locales,
           formatters,
           formatConfig,

package/src/intl-manager.ts

@@ -1,4 +1,4 @@
-import { AstNodeIndices } from '@discord/intl-ast';
+import { LiteralNode } from '@discord/intl-ast';
 import { createIntl, IntlShape } from '@formatjs/intl';
 import { Formatters } from 'intl-messageformat';
 
@@ -120,12 +120,20 @@ 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[0] !== 'string') {
+      throw new Error(
+        'Attempted to call `string` formatting on a non-literal message: ' +
+          JSON.stringify(resolved),
+      );
+    }
+
     // 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 resolved.ast[0][AstNodeIndices.Value];
+    return value[0];
   }
 
   /**

package/src/message.ts

@@ -32,10 +32,12 @@ export class InternalIntlMessage {
 // appended, rather than creating a bunch of intermediate strings.
 function serializeAst(ast: AstNode[], result: { value: string }) {
   for (const node of ast) {
+    if (typeof node[0] === 'string') {
+      result.value += node[0];
+      return;
+    }
+
     switch (node[AstNodeIndices.Type]) {
-      case FormatJsNodeType.Literal:
-        result.value += node[AstNodeIndices.Value];
-        return;
       case FormatJsNodeType.Argument:
         // Empties are an artifact of our parsing strategy, not necessary here.
         if (result.value === '$_') return;
@@ -71,7 +73,7 @@ function serializeAst(ast: AstNode[], result: { value: string }) {
         }
         for (const [name, arm] of Object.entries(node[AstNodeIndices.Options])) {
           result.value += ' ' + name + ' {';
-          serializeAst(arm.value, result);
+          serializeAst(arm, result);
           result.value += '}';
         }
         return;
@@ -83,7 +85,7 @@ function serializeAst(ast: AstNode[], result: { value: string }) {
         result.value += '{' + node[AstNodeIndices.Value] + ', select, ';
         for (const [name, arm] of Object.entries(node[AstNodeIndices.Options])) {
           result.value += ' ' + name + ' {';
-          serializeAst(arm.value, result);
+          serializeAst(arm, result);
           result.value += '}';
         }
         return;