@discord/intl 0.2.1-canary.dff7875 → 0.2.1-rc.0

package/dist/formatters/ast.js

@@ -65,6 +65,14 @@ var RichTextNodeType;
      */
     RichTextNodeType["Object"] = "object";
 })(RichTextNodeType || (exports.RichTextNodeType = RichTextNodeType = {}));
+var RICH_TEXT_TAG_TYPES = {
+    $_: RichTextNodeType.Text,
+    $b: RichTextNodeType.Strong,
+    $i: RichTextNodeType.Emphasis,
+    $code: RichTextNodeType.Code,
+    $link: RichTextNodeType.Link,
+    $p: RichTextNodeType.Paragraph,
+};
 var AST_RICH_TEXT_ELEMENTS = {
     $_: function () { return ({ type: RichTextNodeType.Text, content: '' }); },
     $b: function (content) { return ({ type: RichTextNodeType.Strong, content: content }); },
@@ -92,7 +100,7 @@ var AstBuilder = /** @class */ (function (_super) {
         if (!(tag in AST_RICH_TEXT_ELEMENTS)) {
             throw "".concat(tag, " is not a known rich text formatting tag");
         }
-        var result = AST_RICH_TEXT_ELEMENTS[tag](children, 0);
+        var result = AST_RICH_TEXT_ELEMENTS[tag](children);
         if (Array.isArray(result)) {
             (_a = this.result).push.apply(_a, __spreadArray([], __read(result), false));
         }

package/dist/formatters/markdown.js

@@ -62,7 +62,7 @@ var MarkdownBuilder = /** @class */ (function (_super) {
         return _this;
     }
     MarkdownBuilder.prototype.pushRichTextTag = function (tag, children) {
-        this.result += MARKDOWN_RICH_TEXT_ELEMENTS[tag](children, 0);
+        this.result += MARKDOWN_RICH_TEXT_ELEMENTS[tag](children);
     };
     return MarkdownBuilder;
 }(string_1.StringBuilder));

package/dist/formatters/react.d.ts

@@ -18,10 +18,7 @@ export type ReactFunctionTypes = FunctionTypes<React.ReactNode, ReactClickHandle
     onContextMenu: ReactClickHandler;
 }>;
 export declare const DEFAULT_REACT_RICH_TEXT_ELEMENTS: RichTextFormattingMap<ReactFunctionTypes['hook']>;
-export type ReactIntlMessage = React.ReactElement<{}, typeof React.Fragment & {
-    __brand: 'discord-intl';
-}>;
-export declare function formatReact(this: IntlManager, message: AnyIntlMessage, values: object, Builder: FormatBuilderConstructor<React.ReactElement>): ReactIntlMessage;
+export declare function formatReact(this: IntlManager, message: AnyIntlMessage, values: object, Builder: FormatBuilderConstructor<React.ReactElement>): React.ReactElement;
 /**
  * Create a new React formatter with the given rich text elements replacing the defaults. Use this
  * function to inject custom components for things like links and paragraphs, which may be best

package/dist/formatters/react.js

@@ -48,15 +48,15 @@ var format_1 = require("../format");
 var h = React.createElement;
 exports.DEFAULT_REACT_RICH_TEXT_ELEMENTS = {
     $_: function () { return ''; },
-    $b: function (content, key) { return h('strong', { key: key }, content); },
-    $code: function (content, key) { return h('code', { key: key }, content); },
-    $i: function (content, key) { return h('em', { key: key }, content); },
+    $b: function (content) { return h('strong', undefined, content); },
+    $code: function (content) { return h('code', undefined, content); },
+    $i: function (content) { return h('em', undefined, content); },
     // $link will always be [href, <empty>, ...content]
-    $link: function (_a, key) {
+    $link: function (_a) {
         var _b = __read(_a), href = _b[0], content = _b.slice(1);
-        return h('a', { href: href, key: key }, content);
+        return h('a', { href: href }, content);
     },
-    $p: function (content, key) { return h('p', { key: key }, content); },
+    $p: function (content) { return h('p', undefined, content); },
 };
 /**
  * Creates a new `FormatBuilder` class that constructs a React element tree
@@ -70,12 +70,11 @@ function createReactBuilder(richTextElements) {
         __extends(class_1, _super);
         function class_1() {
             var _this = _super.apply(this, __spreadArray([], __read(arguments), false)) || this;
-            _this._nodeKey = 0;
             _this.result = [];
             return _this;
         }
         class_1.prototype.pushRichTextTag = function (tag, children) {
-            this.result.push(richTextElements[tag](children, this._nodeKey++));
+            this.result.push(richTextElements[tag](children));
         };
         class_1.prototype.pushLiteralText = function (text) {
             this.result.push(text);

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { RichTextNode } from './formatters';
 export * from './formatters';
 export { IntlManager, DEFAULT_LOCALE, type FormatFunction } from './intl-manager';
-export { createLoader, loadAllMessagesInLocale, waitForAllDefaultIntlMessagesLoaded, MessageLoader, } from './message-loader';
+export { createLoader, loadAllMessagesInLocale, waitForAllDefaultIntlMessagesLoaded, } from './message-loader';
 export type * from './types.d.ts';
 /**
  * A type representing any message that has been formatted using one of the

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageLoader = exports.waitForAllDefaultIntlMessagesLoaded = exports.loadAllMessagesInLocale = exports.createLoader = exports.DEFAULT_LOCALE = exports.IntlManager = void 0;
+exports.waitForAllDefaultIntlMessagesLoaded = exports.loadAllMessagesInLocale = exports.createLoader = exports.DEFAULT_LOCALE = exports.IntlManager = void 0;
 __exportStar(require("./formatters"), exports);
 var intl_manager_1 = require("./intl-manager");
 Object.defineProperty(exports, "IntlManager", { enumerable: true, get: function () { return intl_manager_1.IntlManager; } });
@@ -23,4 +23,3 @@ var message_loader_1 = require("./message-loader");
 Object.defineProperty(exports, "createLoader", { enumerable: true, get: function () { return message_loader_1.createLoader; } });
 Object.defineProperty(exports, "loadAllMessagesInLocale", { enumerable: true, get: function () { return message_loader_1.loadAllMessagesInLocale; } });
 Object.defineProperty(exports, "waitForAllDefaultIntlMessagesLoaded", { enumerable: true, get: function () { return message_loader_1.waitForAllDefaultIntlMessagesLoaded; } });
-Object.defineProperty(exports, "MessageLoader", { enumerable: true, get: function () { return message_loader_1.MessageLoader; } });

package/dist/types.d.ts

@@ -198,8 +198,8 @@ export interface FunctionTypeMap {
 }
 
 export interface FunctionTypes<Result, HandlerType = (content: Result[]) => Result | Result[]> {
-  link: undefined | ((content: Result[], key: number) => Result | Result[]);
-  hook: undefined | ((content: Result[], key: number) => Result | Result[]);
+  link: undefined | ((content: Result[]) => Result | Result[]);
+  hook: undefined | ((content: Result[]) => Result | Result[]);
   handler: undefined | HandlerType;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discord/intl",
-  "version": "0.2.1-canary.dff7875",
+  "version": "0.2.1-rc.0",
   "license": "MIT",
   "description": "Client runtime for managing messages and translations in a React project.",
   "main": "./dist/index.js",

package/src/formatters/ast.ts

@@ -36,6 +36,15 @@ export enum RichTextNodeType {
   Object = 'object',
 }
 
+const RICH_TEXT_TAG_TYPES: Record<RichTextTagNames, RichTextNodeType> = {
+  $_: RichTextNodeType.Text,
+  $b: RichTextNodeType.Strong,
+  $i: RichTextNodeType.Emphasis,
+  $code: RichTextNodeType.Code,
+  $link: RichTextNodeType.Link,
+  $p: RichTextNodeType.Paragraph,
+};
+
 interface RichTextNodeBase<ContentType> {
   type: RichTextNodeType;
   content: ContentType;
@@ -92,7 +101,7 @@ class AstBuilder extends FormatBuilder<RichTextNode> {
     if (!(tag in AST_RICH_TEXT_ELEMENTS)) {
       throw `${tag} is not a known rich text formatting tag`;
     }
-    const result = AST_RICH_TEXT_ELEMENTS[tag](children, 0);
+    const result = AST_RICH_TEXT_ELEMENTS[tag](children);
     if (Array.isArray(result)) {
       this.result.push(...result);
     } else {

package/src/formatters/markdown.ts

@@ -31,7 +31,7 @@ class MarkdownBuilder extends StringBuilder {
   result: string = '';
 
   pushRichTextTag(tag: RichTextTagNames, children: string[]) {
-    this.result += MARKDOWN_RICH_TEXT_ELEMENTS[tag](children, 0);
+    this.result += MARKDOWN_RICH_TEXT_ELEMENTS[tag](children);
   }
 }
 

package/src/formatters/react.ts

@@ -28,12 +28,12 @@ export type ReactFunctionTypes = FunctionTypes<
 const h = React.createElement;
 export const DEFAULT_REACT_RICH_TEXT_ELEMENTS: RichTextFormattingMap<ReactFunctionTypes['hook']> = {
   $_: () => '',
-  $b: (content, key) => h('strong', { key }, content),
-  $code: (content, key) => h('code', { key }, content),
-  $i: (content, key) => h('em', { key }, content),
+  $b: (content) => h('strong', undefined, content),
+  $code: (content) => h('code', undefined, content),
+  $i: (content) => h('em', undefined, content),
   // $link will always be [href, <empty>, ...content]
-  $link: ([href, ...content], key) => h('a', { href, key }, content),
-  $p: (content, key) => h('p', { key }, content),
+  $link: ([href, ...content]) => h('a', { href }, content),
+  $p: (content) => h('p', undefined, content),
 };
 
 /**
@@ -47,11 +47,10 @@ function createReactBuilder(richTextElements: RichTextFormattingMap<ReactFunctio
   new (): FormatBuilder<React.ReactNode>;
 } {
   return class extends FormatBuilder<React.ReactNode> {
-    _nodeKey: number = 0;
     result: React.ReactNode[] = [];
 
     pushRichTextTag(tag: RichTextTagNames, children: React.ReactNode[]) {
-      this.result.push(richTextElements[tag](children, this._nodeKey++));
+      this.result.push(richTextElements[tag](children));
     }
 
     pushLiteralText(text: string) {
@@ -70,23 +69,18 @@ function createReactBuilder(richTextElements: RichTextFormattingMap<ReactFunctio
   };
 }
 
-export type ReactIntlMessage = React.ReactElement<
-  {},
-  typeof React.Fragment & { __brand: 'discord-intl' }
->;
-
 export function formatReact(
   this: IntlManager,
   message: AnyIntlMessage,
   values: object,
   Builder: FormatBuilderConstructor<React.ReactElement>,
-): ReactIntlMessage {
+): React.ReactElement {
   if (typeof message === 'string') {
-    return React.createElement(React.Fragment, undefined, message) as ReactIntlMessage;
+    return React.createElement(React.Fragment, undefined, message);
   }
 
   const parts = this.bindFormatValues(Builder, message, values);
-  return React.createElement(React.Fragment, undefined, parts) as ReactIntlMessage;
+  return React.createElement(React.Fragment, undefined, parts);
 }
 
 /**

package/src/index.ts

@@ -7,7 +7,6 @@ export {
   createLoader,
   loadAllMessagesInLocale,
   waitForAllDefaultIntlMessagesLoaded,
-  MessageLoader,
 } from './message-loader';
 export type * from './types.d.ts';
 
@@ -26,7 +25,6 @@ export type * from './types.d.ts';
  * intl message, even if the actual value comes from elsewhere (like a
  * user-generated string).
  */
-// TODO: Replace this with ReactIntlMessage from `formatters/react`.
 export type ReactIntlMessage = string | React.ReactElement;
 
 /**

package/src/types.d.ts

@@ -198,8 +198,8 @@ export interface FunctionTypeMap {
 }
 
 export interface FunctionTypes<Result, HandlerType = (content: Result[]) => Result | Result[]> {
-  link: undefined | ((content: Result[], key: number) => Result | Result[]);
-  hook: undefined | ((content: Result[], key: number) => Result | Result[]);
+  link: undefined | ((content: Result[]) => Result | Result[]);
+  hook: undefined | ((content: Result[]) => Result | Result[]);
   handler: undefined | HandlerType;
 }