finish embed components

helpers/convert-object-property-case.test.ts

@@ -0,0 +1,37 @@
+import type {
+  CamelCasedPropertiesDeep,
+  SnakeCasedPropertiesDeep,
+} from "type-fest"
+import { camelCaseDeep, snakeCaseDeep } from "./convert-object-property-case"
+
+test("camelCaseDeep", () => {
+  const input = {
+    some_prop: {
+      some_deep_prop: "some_deep_value",
+    },
+    someOtherProp: "someOtherValue",
+  }
+
+  expect(camelCaseDeep(input)).toEqual<CamelCasedPropertiesDeep<typeof input>>({
+    someProp: {
+      someDeepProp: "some_deep_value",
+    },
+    someOtherProp: "someOtherValue",
+  })
+})
+
+test("snakeCaseDeep", () => {
+  const input = {
+    someProp: {
+      someDeepProp: "someDeepValue",
+    },
+    some_other_prop: "someOtherValue",
+  }
+
+  expect(snakeCaseDeep(input)).toEqual<SnakeCasedPropertiesDeep<typeof input>>({
+    some_prop: {
+      some_deep_prop: "someDeepValue",
+    },
+    some_other_prop: "someOtherValue",
+  })
+})

helpers/convert-object-property-case.ts

@@ -0,0 +1,34 @@
+import { camelCase, isObject, snakeCase } from "lodash-es"
+import type {
+  CamelCasedPropertiesDeep,
+  SnakeCasedPropertiesDeep,
+} from "type-fest"
+
+function convertKeyCaseDeep<Input, Output>(
+  input: Input,
+  convertKey: (key: string) => string,
+): Output {
+  if (!isObject(input)) {
+    return input as unknown as Output
+  }
+
+  if (Array.isArray(input)) {
+    return input.map((item) =>
+      convertKeyCaseDeep(item, convertKey),
+    ) as unknown as Output
+  }
+
+  const output: any = {}
+  for (const [key, value] of Object.entries(input)) {
+    output[convertKey(key)] = convertKeyCaseDeep(value, convertKey)
+  }
+  return output
+}
+
+export function camelCaseDeep<T>(input: T): CamelCasedPropertiesDeep<T> {
+  return convertKeyCaseDeep(input, camelCase)
+}
+
+export function snakeCaseDeep<T>(input: T): SnakeCasedPropertiesDeep<T> {
+  return convertKeyCaseDeep(input, snakeCase)
+}

library/embed/embed-author.tsx

@@ -0,0 +1,30 @@
+import React from "react"
+import { ReacordElement } from "../element.js"
+import { EmbedChildNode } from "./embed-child.js"
+import type { EmbedOptions } from "./embed-options"
+
+export type EmbedAuthorProps = {
+  name?: string
+  children?: string
+  url?: string
+  iconUrl?: string
+}
+
+export function EmbedAuthor(props: EmbedAuthorProps) {
+  return (
+    <ReacordElement
+      props={props}
+      createNode={() => new EmbedAuthorNode(props)}
+    />
+  )
+}
+
+class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
+  override modifyEmbedOptions(options: EmbedOptions): void {
+    options.author = {
+      name: this.props.name ?? this.props.children ?? "",
+      url: this.props.url,
+      icon_url: this.props.iconUrl,
+    }
+  }
+}

library/embed/embed-field.tsx

@@ -5,8 +5,9 @@ import type { EmbedOptions } from "./embed-options"
 
 export type EmbedFieldProps = {
   name: string
+  value?: string
   inline?: boolean
-  children: string
+  children?: string
 }
 
 export function EmbedField(props: EmbedFieldProps) {
@@ -23,7 +24,7 @@ class EmbedFieldNode extends EmbedChildNode<EmbedFieldProps> {
     options.fields ??= []
     options.fields.push({
       name: this.props.name,
-      value: this.props.children,
+      value: this.props.value ?? this.props.children ?? "",
       inline: this.props.inline,
     })
   }

library/embed/embed-footer.tsx

@@ -0,0 +1,32 @@
+import React from "react"
+import { ReacordElement } from "../element.js"
+import { EmbedChildNode } from "./embed-child.js"
+import type { EmbedOptions } from "./embed-options"
+
+export type EmbedFooterProps = {
+  text?: string
+  children?: string
+  iconUrl?: string
+  timestamp?: string | number | Date
+}
+
+export function EmbedFooter(props: EmbedFooterProps) {
+  return (
+    <ReacordElement
+      props={props}
+      createNode={() => new EmbedFooterNode(props)}
+    />
+  )
+}
+
+class EmbedFooterNode extends EmbedChildNode<EmbedFooterProps> {
+  override modifyEmbedOptions(options: EmbedOptions): void {
+    options.footer = {
+      text: this.props.text ?? this.props.children ?? "",
+      icon_url: this.props.iconUrl,
+    }
+    options.timestamp = this.props.timestamp
+      ? new Date(this.props.timestamp).toISOString()
+      : undefined
+  }
+}

library/embed/embed-image.tsx

@@ -0,0 +1,23 @@
+import React from "react"
+import { ReacordElement } from "../element.js"
+import { EmbedChildNode } from "./embed-child.js"
+import type { EmbedOptions } from "./embed-options"
+
+export type EmbedImageProps = {
+  url: string
+}
+
+export function EmbedImage(props: EmbedImageProps) {
+  return (
+    <ReacordElement
+      props={props}
+      createNode={() => new EmbedImageNode(props)}
+    />
+  )
+}
+
+class EmbedImageNode extends EmbedChildNode<EmbedImageProps> {
+  override modifyEmbedOptions(options: EmbedOptions): void {
+    options.image = { url: this.props.url }
+  }
+}

library/embed/embed-thumbnail.tsx

@@ -0,0 +1,23 @@
+import React from "react"
+import { ReacordElement } from "../element.js"
+import { EmbedChildNode } from "./embed-child.js"
+import type { EmbedOptions } from "./embed-options"
+
+export type EmbedThumbnailProps = {
+  url: string
+}
+
+export function EmbedThumbnail(props: EmbedThumbnailProps) {
+  return (
+    <ReacordElement
+      props={props}
+      createNode={() => new EmbedThumbnailNode(props)}
+    />
+  )
+}
+
+class EmbedThumbnailNode extends EmbedChildNode<EmbedThumbnailProps> {
+  override modifyEmbedOptions(options: EmbedOptions): void {
+    options.thumbnail = { url: this.props.url }
+  }
+}

library/embed/embed.tsx

@@ -1,30 +1,18 @@
 import React from "react"
+import type { CamelCasedPropertiesDeep } from "type-fest"
+import { snakeCaseDeep } from "../../helpers/convert-object-property-case"
 import { omit } from "../../helpers/omit"
 import { ReacordElement } from "../element.js"
 import type { MessageOptions } from "../message"
 import { Node } from "../node.js"
 import { EmbedChildNode } from "./embed-child.js"
+import type { EmbedOptions } from "./embed-options"
 
-export type EmbedProps = {
+export type EmbedProps = Omit<
-  description?: string
+  CamelCasedPropertiesDeep<EmbedOptions>,
-  url?: string
+  "timestamp"
-  timestamp?: string
+> & {
-  color?: number
+  timestamp?: string | number | Date
-  footer?: {
-    text: string
-    iconURL?: string
-  }
-  image?: {
-    url: string
-  }
-  thumbnail?: {
-    url: string
-  }
-  author?: {
-    name: string
-    url?: string
-    iconURL?: string
-  }
   children?: React.ReactNode
 }
 
@@ -38,14 +26,19 @@ export function Embed(props: EmbedProps) {
 
 class EmbedNode extends Node<EmbedProps> {
   override modifyMessageOptions(options: MessageOptions): void {
-    const embed = omit(this.props, ["children"])
+    const embed: EmbedOptions = {
+      ...snakeCaseDeep(omit(this.props, ["children", "timestamp"])),
+      timestamp: this.props.timestamp
+        ? new Date(this.props.timestamp).toISOString()
+        : undefined,
+    }
+
     for (const child of this.children) {
       if (child instanceof EmbedChildNode) {
         child.modifyEmbedOptions(embed)
       }
     }
 
-    options.embeds ??= []
     options.embeds.push(embed)
   }
 }

library/main.ts

@@ -3,7 +3,11 @@ export * from "./adapter/discord-js-adapter"
 export * from "./adapter/test-adapter"
 export * from "./button"
 export * from "./embed/embed"
+export * from "./embed/embed-author"
 export * from "./embed/embed-field"
+export * from "./embed/embed-footer"
+export * from "./embed/embed-image"
+export * from "./embed/embed-thumbnail"
 export * from "./embed/embed-title"
 export * from "./interaction"
 export * from "./message"

notes.md

@@ -6,13 +6,14 @@
 - [x] message content
 - embed
   - [x] color
-  - [ ] author
+  - [x] author
   - [x] description
   - [x] title - text children, url
-  - [ ] footer - icon url, timestamp, text children
+  - [x] footer - icon url, timestamp, text children
-  - [ ] thumbnail - url
+  - [x] thumbnail - url
-  - [ ] image - url
+  - [x] image - url
   - [x] fields - name, value, inline
+  - [x] test
 - message components
   - [x] buttons
   - [ ] links
@@ -22,6 +23,7 @@
   - [ ] select onChange
 - [x] deactivate
 - [ ] destroy
+- [ ] docs
 
 # cool ideas / polish
 

test/assert-messages.ts

@@ -0,0 +1,23 @@
+import { nextTick } from "node:process"
+import { promisify } from "node:util"
+import { omit } from "../helpers/omit"
+import type { TestAdapter } from "../library/main"
+
+const nextTickPromise = promisify(nextTick)
+
+export async function assertMessages(
+  adapter: TestAdapter,
+  expected: ReturnType<typeof extractMessageDataSample>,
+) {
+  await nextTickPromise()
+  expect(extractMessageDataSample(adapter)).toEqual(expected)
+}
+
+function extractMessageDataSample(adapter: TestAdapter) {
+  return adapter.messages.map((message) => ({
+    ...message.options,
+    actionRows: message.options.actionRows.map((row) =>
+      row.map((component) => omit(component, ["customId"])),
+    ),
+  }))
+}

test/embed.test.tsx

@@ -0,0 +1,282 @@
+import React from "react"
+import {
+  Embed,
+  EmbedAuthor,
+  EmbedField,
+  EmbedFooter,
+  EmbedImage,
+  EmbedThumbnail,
+  EmbedTitle,
+  Reacord,
+  TestAdapter,
+  TestCommandInteraction,
+} from "../library/main"
+import { assertMessages } from "./assert-messages"
+
+const adapter = new TestAdapter()
+const reacord = new Reacord({ adapter })
+const reply = reacord.createCommandReply(new TestCommandInteraction(adapter))
+
+test("kitchen sink", async () => {
+  const now = new Date()
+
+  reply.render(
+    <>
+      <Embed color={0xfe_ee_ef}>
+        <EmbedAuthor name="author" iconUrl="https://example.com/author.png" />
+        <EmbedTitle>title text</EmbedTitle>
+        description text
+        <EmbedThumbnail url="https://example.com/thumbnail.png" />
+        <EmbedImage url="https://example.com/image.png" />
+        <EmbedField name="field name" value="field value" inline />
+        <EmbedField name="block field" value="block field value" />
+        <EmbedFooter
+          text="footer text"
+          iconUrl="https://example.com/footer.png"
+          timestamp={now}
+        />
+      </Embed>
+    </>,
+  )
+
+  await assertMessages(adapter, [
+    {
+      actionRows: [],
+      content: "",
+      embeds: [
+        {
+          author: {
+            icon_url: "https://example.com/author.png",
+            name: "author",
+          },
+          color: 0xfe_ee_ef,
+          fields: [
+            {
+              inline: true,
+              name: "field name",
+              value: "field value",
+            },
+            {
+              name: "block field",
+              value: "block field value",
+            },
+          ],
+          footer: {
+            icon_url: "https://example.com/footer.png",
+            text: "footer text",
+          },
+          image: {
+            url: "https://example.com/image.png",
+          },
+          thumbnail: {
+            url: "https://example.com/thumbnail.png",
+          },
+          timestamp: now.toISOString(),
+          title: "title text",
+        },
+      ],
+    },
+  ])
+})
+
+test("author variants", async () => {
+  reply.render(
+    <>
+      <Embed>
+        <EmbedAuthor iconUrl="https://example.com/author.png">
+          author name
+        </EmbedAuthor>
+      </Embed>
+      <Embed>
+        <EmbedAuthor iconUrl="https://example.com/author.png" />
+      </Embed>
+    </>,
+  )
+
+  await assertMessages(adapter, [
+    {
+      content: "",
+      actionRows: [],
+      embeds: [
+        {
+          author: {
+            icon_url: "https://example.com/author.png",
+            name: "author name",
+          },
+        },
+        {
+          author: {
+            icon_url: "https://example.com/author.png",
+            name: "",
+          },
+        },
+      ],
+    },
+  ])
+})
+
+test("field variants", async () => {
+  reply.render(
+    <>
+      <Embed>
+        <EmbedField name="field name" value="field value" />
+        <EmbedField name="field name" value="field value" inline />
+        <EmbedField name="field name" inline>
+          field value
+        </EmbedField>
+        <EmbedField name="field name" />
+      </Embed>
+    </>,
+  )
+
+  await assertMessages(adapter, [
+    {
+      content: "",
+      actionRows: [],
+      embeds: [
+        {
+          fields: [
+            {
+              name: "field name",
+              value: "field value",
+            },
+            {
+              inline: true,
+              name: "field name",
+              value: "field value",
+            },
+            {
+              inline: true,
+              name: "field name",
+              value: "field value",
+            },
+            {
+              name: "field name",
+              value: "",
+            },
+          ],
+        },
+      ],
+    },
+  ])
+})
+
+test("footer variants", async () => {
+  const now = new Date()
+  reply.render(
+    <>
+      <Embed>
+        <EmbedFooter text="footer text" />
+      </Embed>
+      <Embed>
+        <EmbedFooter
+          text="footer text"
+          iconUrl="https://example.com/footer.png"
+        />
+      </Embed>
+      <Embed>
+        <EmbedFooter timestamp={now}>footer text</EmbedFooter>
+      </Embed>
+      <Embed>
+        <EmbedFooter iconUrl="https://example.com/footer.png" timestamp={now} />
+      </Embed>
+    </>,
+  )
+
+  await assertMessages(adapter, [
+    {
+      content: "",
+      actionRows: [],
+      embeds: [
+        {
+          footer: {
+            text: "footer text",
+          },
+        },
+        {
+          footer: {
+            icon_url: "https://example.com/footer.png",
+            text: "footer text",
+          },
+        },
+        {
+          footer: {
+            text: "footer text",
+          },
+          timestamp: now.toISOString(),
+        },
+        {
+          footer: {
+            icon_url: "https://example.com/footer.png",
+            text: "",
+          },
+          timestamp: now.toISOString(),
+        },
+      ],
+    },
+  ])
+})
+
+test("embed props", async () => {
+  const now = new Date()
+
+  reply.render(
+    <Embed
+      title="title text"
+      description="description text"
+      url="https://example.com/"
+      color={0xfe_ee_ef}
+      timestamp={now}
+      author={{
+        name: "author name",
+        url: "https://example.com/author",
+        iconUrl: "https://example.com/author.png",
+      }}
+      thumbnail={{
+        url: "https://example.com/thumbnail.png",
+      }}
+      image={{
+        url: "https://example.com/image.png",
+      }}
+      footer={{
+        text: "footer text",
+        iconUrl: "https://example.com/footer.png",
+      }}
+      fields={[
+        { name: "field name", value: "field value", inline: true },
+        { name: "block field", value: "block field value" },
+      ]}
+    />,
+  )
+
+  await assertMessages(adapter, [
+    {
+      content: "",
+      actionRows: [],
+      embeds: [
+        {
+          title: "title text",
+          description: "description text",
+          url: "https://example.com/",
+          color: 0xfe_ee_ef,
+          timestamp: now.toISOString(),
+          author: {
+            name: "author name",
+            url: "https://example.com/author",
+            icon_url: "https://example.com/author.png",
+          },
+          thumbnail: { url: "https://example.com/thumbnail.png" },
+          image: { url: "https://example.com/image.png" },
+          footer: {
+            text: "footer text",
+            icon_url: "https://example.com/footer.png",
+          },
+          fields: [
+            { name: "field name", value: "field value", inline: true },
+            { name: "block field", value: "block field value" },
+          ],
+        },
+      ],
+    },
+  ])
+})

test/reacord.test.tsx

@@ -1,7 +1,4 @@
-import { nextTick } from "node:process"
-import { promisify } from "node:util"
 import * as React from "react"
-import { omit } from "../helpers/omit"
 import {
   Button,
   Embed,
@@ -11,10 +8,9 @@ import {
   TestAdapter,
   TestCommandInteraction,
 } from "../library/main"
+import { assertMessages } from "./assert-messages"
 
-const nextTickPromise = promisify(nextTick)
+test("rendering behavior", async () => {
-
-test("kitchen-sink", async () => {
   const adapter = new TestAdapter()
   const reacord = new Reacord({ adapter })
 
@@ -285,20 +281,3 @@ function KitchenSinkCounter(props: { onDeactivate: () => void }) {
     </>
   )
 }
-
-function extractMessageDataSample(adapter: TestAdapter) {
-  return adapter.messages.map((message) => ({
-    ...message.options,
-    actionRows: message.options.actionRows.map((row) =>
-      row.map((component) => omit(component, ["customId"])),
-    ),
-  }))
-}
-
-async function assertMessages(
-  adapter: TestAdapter,
-  expected: ReturnType<typeof extractMessageDataSample>,
-) {
-  await nextTickPromise()
-  expect(extractMessageDataSample(adapter)).toEqual(expected)
-}