first attempt at files api

.changeset/README.md

@@ -1,8 +0,0 @@
-# Changesets
-
-Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
-with multi-package repos, or single-package repos to help you version and publish your code. You can
-find the full documentation for it [in our repository](https://github.com/changesets/changesets)
-
-We have a quick list of common questions to get you started engaging with this project in
-[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config@2.1.0/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "public",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
-  "ignore": []
-}

.github/workflows/main.yml

@@ -10,10 +10,6 @@ env:
   TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
   TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   run-commands:
     strategy:
@@ -23,15 +19,15 @@ jobs:
           # if these run in the same process, it dies,
           # so we test them separate
           - name: test reacord
-            run: pnpm -C packages/reacord test
+            run: pnpm test -C packages/reacord
           - name: test website
-            run: pnpm -C packages/website test
+            run: pnpm test -C packages/website
           - name: build
-            run: pnpm --recursive run build
+            run: pnpm build --recursive
           - name: lint
-            run: pnpm run lint
+            run: pnpm lint
           - name: typecheck
-            run: pnpm --recursive run typecheck
+            run: pnpm typecheck --parallel
     name: ${{ matrix.command.name }}
     runs-on: ubuntu-latest
     steps:
@@ -40,6 +36,6 @@ jobs:
         with:
           # https://github.com/actions/setup-node#supported-version-syntax
           node-version: "16"
-      - run: npm i -g pnpm@7.5.0
+      - run: npm i -g pnpm
       - run: pnpm install --frozen-lockfile
       - run: ${{ matrix.command.run }}

.github/workflows/release.yml

@@ -1,37 +0,0 @@
-# https://pnpm.io/using-changesets
-name: release
-
-on:
-  push:
-    branches:
-      - main
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    name: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16
-
-      - name: install pnpm
-        run: npm install -g pnpm
-
-      - name: install deps
-        run: pnpm install --frozen-lockfile
-
-      - name: changesets release
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          publish: pnpm run release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -4,7 +4,6 @@ node_modules
 coverage
 .env
 *.code-workspace
-.pnpm-debug.log
 
 build
 .cache

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:lts-slim
+
+ENV CYPRESS_INSTALL_BINARY=0
+
+WORKDIR /app
+
+COPY / ./
+RUN ls -R
+
+RUN npm install -g pnpm
+RUN pnpm install --unsafe-perm --frozen-lockfile
+RUN pnpm run build -C packages/website
+
+ENV NODE_ENV=production
+CMD [ "pnpm", "-C", "packages/website", "start" ]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 itsMapleLeaf
+Copyright (c) 2022  itsMapleLeaf
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,21 +1,15 @@
 {
-  "name": "reacord-monorepo",
   "private": true,
   "scripts": {
     "lint": "eslint --ext js,ts,tsx .",
     "lint-fix": "pnpm lint -- --fix",
-    "format": "prettier --write .",
+    "format": "prettier --write ."
-    "build": "pnpm -r run build",
-    "start": "pnpm -C packages/website run start",
-    "release": "pnpm -r run build && changeset publish"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.24.0",
     "@itsmapleleaf/configs": "^1.1.3",
     "@rushstack/eslint-patch": "^1.1.3",
     "@types/eslint": "^8.4.1",
     "eslint": "^8.14.0",
-    "node": "^16",
     "prettier": "^2.6.2",
     "typescript": "^4.6.3"
   },

packages/reacord/CHANGELOG.md

@@ -1,7 +0,0 @@
-# reacord
-
-## 0.5.0
-
-### Minor Changes
-
-- aa65da5: allow JSX in more places

packages/reacord/helpers/prune-nullish-values.test.ts

@@ -1,6 +1,5 @@
 import { expect, test } from "vitest"
-import type { PruneNullishValues } from "./prune-nullish-values"
+import { PruneNullishValues, pruneNullishValues } from "./prune-nullish-values"
-import { pruneNullishValues } from "./prune-nullish-values"
 
 test("pruneNullishValues", () => {
   type InputType = {
@@ -15,7 +14,6 @@ test("pruneNullishValues", () => {
 
   const input: InputType = {
     a: "a",
-    // eslint-disable-next-line unicorn/no-null
     b: null,
     c: undefined,
     d: {

packages/reacord/helpers/types.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-unused-modules */
 export type MaybePromise<T> = T | Promise<T>
 
 export type ValueOf<Type> = Type extends ReadonlyArray<infer Value>

packages/reacord/helpers/wait-for.ts

@@ -1,4 +1,4 @@
-import { setTimeout } from "node:timers/promises"
+import { setTimeout } from "timers/promises"
 
 const maxTime = 1000
 

packages/reacord/library/core/components/button-shared-props.ts

@@ -1,12 +1,10 @@
-import type { ReactNode } from "react"
-
 /**
  * Common props between button-like components
  * @category Button
  */
 export type ButtonSharedProps = {
   /** The text on the button. Rich formatting (markdown) is not supported here. */
-  label?: ReactNode
+  label?: string
 
   /** When true, the button will be slightly faded, and cannot be clicked. */
   disabled?: boolean

packages/reacord/library/core/components/button.tsx

@@ -34,23 +34,13 @@ export type ButtonClickEvent = ComponentEvent
  */
 export function Button(props: ButtonProps) {
   return (
-    <ReacordElement props={props} createNode={() => new ButtonNode(props)}>
+    <ReacordElement props={props} createNode={() => new ButtonNode(props)} />
-      <ReacordElement props={{}} createNode={() => new ButtonLabelNode({})}>
-        {props.label}
-      </ReacordElement>
-    </ReacordElement>
   )
 }
 
 class ButtonNode extends Node<ButtonProps> {
   private customId = nanoid()
 
-  // this has text children, but buttons themselves shouldn't yield text
-  // eslint-disable-next-line class-methods-use-this
-  override get text() {
-    return ""
-  }
-
   override modifyMessageOptions(options: MessageOptions): void {
     getNextActionRow(options).push({
       type: "button",
@@ -58,7 +48,7 @@ class ButtonNode extends Node<ButtonProps> {
       style: this.props.style ?? "secondary",
       disabled: this.props.disabled,
       emoji: this.props.emoji,
-      label: this.children.findType(ButtonLabelNode)?.text,
+      label: this.props.label,
     })
   }
 
@@ -73,5 +63,3 @@ class ButtonNode extends Node<ButtonProps> {
     return false
   }
 }
-
-class ButtonLabelNode extends Node<{}> {}

packages/reacord/library/core/components/embed-author.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,8 +7,8 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedAuthorProps = {
-  name?: ReactNode
+  name?: string
-  children?: ReactNode
+  children?: string
   url?: string
   iconUrl?: string
 }
@@ -20,22 +18,19 @@ export type EmbedAuthorProps = {
  */
 export function EmbedAuthor(props: EmbedAuthorProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedAuthorNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new AuthorTextNode({})}>
+      props={props}
-        {props.name ?? props.children}
+      createNode={() => new EmbedAuthorNode(props)}
-      </ReacordElement>
+    />
-    </ReacordElement>
   )
 }
 
 class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
   override modifyEmbedOptions(options: EmbedOptions): void {
     options.author = {
-      name: this.children.findType(AuthorTextNode)?.text ?? "",
+      name: this.props.name ?? this.props.children ?? "",
       url: this.props.url,
       icon_url: this.props.iconUrl,
     }
   }
 }
-
-class AuthorTextNode extends Node<{}> {}

packages/reacord/library/core/components/embed-field.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,10 +7,10 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedFieldProps = {
-  name: ReactNode
+  name: string
-  value?: ReactNode
+  value?: string
   inline?: boolean
-  children?: ReactNode
+  children?: string
 }
 
 /**
@@ -20,14 +18,10 @@ export type EmbedFieldProps = {
  */
 export function EmbedField(props: EmbedFieldProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedFieldNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new FieldNameNode({})}>
+      props={props}
-        {props.name}
+      createNode={() => new EmbedFieldNode(props)}
-      </ReacordElement>
+    />
-      <ReacordElement props={{}} createNode={() => new FieldValueNode({})}>
-        {props.value || props.children}
-      </ReacordElement>
-    </ReacordElement>
   )
 }
 
@@ -35,12 +29,9 @@ class EmbedFieldNode extends EmbedChildNode<EmbedFieldProps> {
   override modifyEmbedOptions(options: EmbedOptions): void {
     options.fields ??= []
     options.fields.push({
-      name: this.children.findType(FieldNameNode)?.text ?? "",
+      name: this.props.name,
-      value: this.children.findType(FieldValueNode)?.text ?? "",
+      value: this.props.value ?? this.props.children ?? "",
       inline: this.props.inline,
     })
   }
 }
-
-class FieldNameNode extends Node<{}> {}
-class FieldValueNode extends Node<{}> {}

packages/reacord/library/core/components/embed-footer.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,8 +7,8 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedFooterProps = {
-  text?: ReactNode
+  text?: string
-  children?: ReactNode
+  children?: string
   iconUrl?: string
   timestamp?: string | number | Date
 }
@@ -18,22 +16,19 @@ export type EmbedFooterProps = {
 /**
  * @category Embed
  */
-export function EmbedFooter({ text, children, ...props }: EmbedFooterProps) {
+export function EmbedFooter(props: EmbedFooterProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedFooterNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new FooterTextNode({})}>
+      props={props}
-        {text ?? children}
+      createNode={() => new EmbedFooterNode(props)}
-      </ReacordElement>
+    />
-    </ReacordElement>
   )
 }
 
-class EmbedFooterNode extends EmbedChildNode<
+class EmbedFooterNode extends EmbedChildNode<EmbedFooterProps> {
-  Omit<EmbedFooterProps, "text" | "children">
-> {
   override modifyEmbedOptions(options: EmbedOptions): void {
     options.footer = {
-      text: this.children.findType(FooterTextNode)?.text ?? "",
+      text: this.props.text ?? this.props.children ?? "",
       icon_url: this.props.iconUrl,
     }
     options.timestamp = this.props.timestamp
@@ -41,5 +36,3 @@ class EmbedFooterNode extends EmbedChildNode<
       : undefined
   }
 }
-
-class FooterTextNode extends Node<{}> {}

packages/reacord/library/core/components/embed-title.tsx

@@ -1,7 +1,5 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element.js"
-import { Node } from "../../internal/node.js"
 import { EmbedChildNode } from "./embed-child.js"
 import type { EmbedOptions } from "./embed-options"
 
@@ -9,28 +7,25 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  */
 export type EmbedTitleProps = {
-  children: ReactNode
+  children: string
   url?: string
 }
 
 /**
  * @category Embed
  */
-export function EmbedTitle({ children, ...props }: EmbedTitleProps) {
+export function EmbedTitle(props: EmbedTitleProps) {
   return (
-    <ReacordElement props={props} createNode={() => new EmbedTitleNode(props)}>
+    <ReacordElement
-      <ReacordElement props={{}} createNode={() => new TitleTextNode({})}>
+      props={props}
-        {children}
+      createNode={() => new EmbedTitleNode(props)}
-      </ReacordElement>
+    />
-    </ReacordElement>
   )
 }
 
-class EmbedTitleNode extends EmbedChildNode<Omit<EmbedTitleProps, "children">> {
+class EmbedTitleNode extends EmbedChildNode<EmbedTitleProps> {
   override modifyEmbedOptions(options: EmbedOptions): void {
-    options.title = this.children.findType(TitleTextNode)?.text ?? ""
+    options.title = this.props.children
     options.url = this.props.url
   }
 }
-
-class TitleTextNode extends Node<{}> {}

packages/reacord/library/core/components/link.tsx

@@ -18,26 +18,18 @@ export type LinkProps = ButtonSharedProps & {
 /**
  * @category Link
  */
-export function Link({ label, children, ...props }: LinkProps) {
+export function Link(props: LinkProps) {
-  return (
+  return <ReacordElement props={props} createNode={() => new LinkNode(props)} />
-    <ReacordElement props={props} createNode={() => new LinkNode(props)}>
-      <ReacordElement props={{}} createNode={() => new LinkTextNode({})}>
-        {label || children}
-      </ReacordElement>
-    </ReacordElement>
-  )
 }
 
-class LinkNode extends Node<Omit<LinkProps, "label" | "children">> {
+class LinkNode extends Node<LinkProps> {
   override modifyMessageOptions(options: MessageOptions): void {
     getNextActionRow(options).push({
       type: "link",
       disabled: this.props.disabled,
       emoji: this.props.emoji,
-      label: this.children.findType(LinkTextNode)?.text,
+      label: this.props.label || this.props.children,
       url: this.props.url,
     })
   }
 }
-
-class LinkTextNode extends Node<{}> {}

packages/reacord/library/core/components/option-node.ts

@@ -2,18 +2,13 @@ import type { MessageSelectOptionOptions } from "../../internal/message"
 import { Node } from "../../internal/node"
 import type { OptionProps } from "./option"
 
-export class OptionNode extends Node<
+export class OptionNode extends Node<OptionProps> {
-  Omit<OptionProps, "children" | "label" | "description">
-> {
   get options(): MessageSelectOptionOptions {
     return {
-      label: this.children.findType(OptionLabelNode)?.text ?? this.props.value,
+      label: this.props.children || this.props.label || this.props.value,
       value: this.props.value,
-      description: this.children.findType(OptionDescriptionNode)?.text,
+      description: this.props.description,
       emoji: this.props.emoji,
     }
   }
 }
-
-export class OptionLabelNode extends Node<{}> {}
-export class OptionDescriptionNode extends Node<{}> {}

packages/reacord/library/core/components/option.tsx

@@ -1,11 +1,6 @@
-import type { ReactNode } from "react"
 import React from "react"
 import { ReacordElement } from "../../internal/element"
-import {
+import { OptionNode } from "./option-node"
-  OptionDescriptionNode,
-  OptionLabelNode,
-  OptionNode,
-} from "./option-node"
 
 /**
  * @category Select
@@ -14,11 +9,11 @@ export type OptionProps = {
   /** The internal value of this option */
   value: string
   /** The text shown to the user. This takes priority over `children` */
-  label?: ReactNode
+  label?: string
   /** The text shown to the user */
-  children?: ReactNode
+  children?: string
   /** Description for the option, shown to the user */
-  description?: ReactNode
+  description?: string
 
   /**
    * Renders an emoji to the left of the text.
@@ -36,27 +31,8 @@ export type OptionProps = {
 /**
  * @category Select
  */
-export function Option({
+export function Option(props: OptionProps) {
-  label,
-  children,
-  description,
-  ...props
-}: OptionProps) {
   return (
-    <ReacordElement props={props} createNode={() => new OptionNode(props)}>
+    <ReacordElement props={props} createNode={() => new OptionNode(props)} />
-      {(label !== undefined || children !== undefined) && (
-        <ReacordElement props={{}} createNode={() => new OptionLabelNode({})}>
-          {label || children}
-        </ReacordElement>
-      )}
-      {description !== undefined && (
-        <ReacordElement
-          props={{}}
-          createNode={() => new OptionDescriptionNode({})}
-        >
-          {description}
-        </ReacordElement>
-      )}
-    </ReacordElement>
   )
 }

packages/reacord/library/core/file.ts

@@ -0,0 +1,7 @@
+import { Readable } from "node:stream"
+
+export type ReacordFile = {
+  name?: string
+  description?: string
+  data: Buffer | Readable | string
+}

packages/reacord/library/core/instance.ts

@@ -1,4 +1,5 @@
 import type { ReactNode } from "react"
+import { ReacordFile } from "./file"
 
 /**
  * Represents an interactive message, which can later be replaced or deleted.
@@ -16,4 +17,7 @@ export type ReacordInstance = {
    * This prevents it from listening to user interactions.
    */
   deactivate: () => void
+
+  /** Attach a file to the message for this instance */
+  attach: (file: ReacordFile) => void
 }

packages/reacord/library/core/reacord-discord-js.ts

@@ -5,12 +5,9 @@ import type { Except } from "type-fest"
 import { pick } from "../../helpers/pick"
 import { pruneNullishValues } from "../../helpers/prune-nullish-values"
 import { raise } from "../../helpers/raise"
+import { toUpper } from "../../helpers/to-upper"
 import type { ComponentInteraction } from "../internal/interaction"
-import type {
+import type { Message, MessageOptions } from "../internal/message"
-  Message,
-  MessageButtonOptions,
-  MessageOptions,
-} from "../internal/message"
 import { ChannelMessageRenderer } from "../internal/renderers/channel-message-renderer"
 import { InteractionReplyRenderer } from "../internal/renderers/interaction-reply-renderer"
 import type {
@@ -33,7 +30,7 @@ export class ReacordDiscordJs extends Reacord {
     super(config)
 
     client.on("interactionCreate", (interaction) => {
-      if (interaction.isButton() || interaction.isSelectMenu()) {
+      if (interaction.isMessageComponent()) {
         this.handleComponentInteraction(
           this.createReacordComponentInteraction(interaction),
         )
@@ -91,7 +88,7 @@ export class ReacordDiscordJs extends Reacord {
           (await this.client.channels.fetch(channelId)) ??
           raise(`Channel ${channelId} not found`)
 
-        if (!channel.isTextBased()) {
+        if (!channel.isText()) {
           raise(`Channel ${channelId} is not a text channel`)
         }
 
@@ -304,6 +301,15 @@ function createReacordMessage(message: Discord.Message): Message {
     delete: async () => {
       await message.delete()
     },
+    updateFiles: async (files) => {
+      await message.edit({
+        files: files.map(({ name, description, data }) => ({
+          name,
+          description,
+          attachment: data,
+        })),
+      })
+    },
   }
 }
 
@@ -313,6 +319,10 @@ function createEphemeralReacordMessage(): Message {
       console.warn("Ephemeral messages can't be edited")
       return Promise.resolve()
     },
+    updateFiles: () => {
+      console.warn("Ephemeral messages can't be edited")
+      return Promise.resolve()
+    },
     delete: () => {
       console.warn("Ephemeral messages can't be deleted")
       return Promise.resolve()
@@ -320,34 +330,25 @@ function createEphemeralReacordMessage(): Message {
   }
 }
 
-function convertButtonStyleToEnum(style: MessageButtonOptions["style"]) {
-  const styleMap = {
-    primary: Discord.ButtonStyle.Primary,
-    secondary: Discord.ButtonStyle.Secondary,
-    success: Discord.ButtonStyle.Success,
-    danger: Discord.ButtonStyle.Danger,
-  } as const
-
-  return styleMap[style ?? "secondary"]
-}
-
 // TODO: this could be a part of the core library,
 // and also handle some edge cases, e.g. empty messages
-function getDiscordMessageOptions(reacordOptions: MessageOptions) {
+function getDiscordMessageOptions(
-  const options = {
+  reacordOptions: MessageOptions,
+): Discord.MessageOptions {
+  const options: Discord.MessageOptions = {
     // eslint-disable-next-line unicorn/no-null
     content: reacordOptions.content || null,
     embeds: reacordOptions.embeds,
     components: reacordOptions.actionRows.map((row) => ({
-      type: Discord.ComponentType.ActionRow,
+      type: "ACTION_ROW",
       components: row.map(
-        (component): Discord.MessageActionRowComponentData => {
+        (component): Discord.MessageActionRowComponentOptions => {
           if (component.type === "button") {
             return {
-              type: Discord.ComponentType.Button,
+              type: "BUTTON",
               customId: component.customId,
               label: component.label ?? "",
-              style: convertButtonStyleToEnum(component.style),
+              style: toUpper(component.style ?? "secondary"),
               disabled: component.disabled,
               emoji: component.emoji,
             }
@@ -356,7 +357,7 @@ function getDiscordMessageOptions(reacordOptions: MessageOptions) {
           if (component.type === "select") {
             return {
               ...component,
-              type: Discord.ComponentType.SelectMenu,
+              type: "SELECT_MENU",
               options: component.options.map((option) => ({
                 ...option,
                 default: component.values?.includes(option.value),
@@ -370,7 +371,10 @@ function getDiscordMessageOptions(reacordOptions: MessageOptions) {
     })),
   }
 
-  if (!options.content && !options.embeds?.length) {
+  const hasContent =
+    options.content || options.embeds?.length || options.files?.length
+
+  if (!hasContent) {
     options.content = "_ _"
   }
 

packages/reacord/library/core/reacord.tsx

@@ -63,6 +63,9 @@ export abstract class Reacord {
         this.renderers = this.renderers.filter((it) => it !== renderer)
         renderer.destroy()
       },
+      attach: (file) => {
+        renderer.attach(file)
+      },
     }
 
     if (initialContent !== undefined) {

packages/reacord/library/internal/channel.ts

@@ -1,5 +1,7 @@
+import { ReacordFile } from "../core/file"
 import type { Message, MessageOptions } from "./message"
 
 export type Channel = {
   send(message: MessageOptions): Promise<Message>
+  sendFiles(files: readonly ReacordFile[]): Promise<Message>
 }

packages/reacord/library/internal/container.ts

@@ -21,16 +21,6 @@ export class Container<T> {
     this.items = []
   }
 
-  find(predicate: (item: T) => boolean): T | undefined {
-    return this.items.find(predicate)
-  }
-
-  findType<U extends T>(type: new (...args: any[]) => U): U | undefined {
-    for (const item of this.items) {
-      if (item instanceof type) return item
-    }
-  }
-
   [Symbol.iterator]() {
     return this.items[Symbol.iterator]()
   }

packages/reacord/library/internal/message.ts

@@ -2,6 +2,7 @@ import type { Except } from "type-fest"
 import { last } from "../../helpers/last"
 import type { EmbedOptions } from "../core/components/embed-options"
 import type { SelectProps } from "../core/components/select"
+import { ReacordFile } from "../main"
 
 export type MessageOptions = {
   content: string
@@ -49,6 +50,7 @@ export type MessageSelectOptionOptions = {
 export type Message = {
   edit(options: MessageOptions): Promise<void>
   delete(): Promise<void>
+  updateFiles(files: readonly ReacordFile[]): Promise<void>
 }
 
 export function getNextActionRow(options: MessageOptions): ActionRow {

packages/reacord/library/internal/node.ts

@@ -13,8 +13,4 @@ export abstract class Node<Props> {
   handleComponentInteraction(interaction: ComponentInteraction): boolean {
     return false
   }
-
-  get text(): string {
-    return [...this.children].map((child) => child.text).join("")
-  }
 }

packages/reacord/library/internal/renderers/channel-message-renderer.ts

@@ -1,3 +1,4 @@
+import { ReacordFile } from "../../core/file"
 import type { Channel } from "../channel"
 import type { Message, MessageOptions } from "../message"
 import { Renderer } from "./renderer"
@@ -10,4 +11,10 @@ export class ChannelMessageRenderer extends Renderer {
   protected createMessage(options: MessageOptions): Promise<Message> {
     return this.channel.send(options)
   }
+
+  protected createMessageFromFiles(
+    files: readonly ReacordFile[],
+  ): Promise<Message> {
+    return this.channel.sendFiles(files)
+  }
 }

packages/reacord/library/internal/renderers/renderer.ts

@@ -1,5 +1,6 @@
 import { Subject } from "rxjs"
 import { concatMap } from "rxjs/operators"
+import { ReacordFile } from "../../core/file"
 import { Container } from "../container.js"
 import type { ComponentInteraction } from "../interaction"
 import type { Message, MessageOptions } from "../message"
@@ -7,15 +8,21 @@ import type { Node } from "../node.js"
 
 type UpdatePayload =
   | { action: "update" | "deactivate"; options: MessageOptions }
+  | { action: "files"; files: readonly ReacordFile[] }
   | { action: "deferUpdate"; interaction: ComponentInteraction }
   | { action: "destroy" }
 
+type NewMessagePayload =
+  | { source: "content"; messageOptions?: MessageOptions }
+  | { source: "files"; files?: readonly ReacordFile[] }
+
 export abstract class Renderer {
   readonly nodes = new Container<Node<unknown>>()
   private componentInteraction?: ComponentInteraction
   private message?: Message
   private active = true
   private updates = new Subject<UpdatePayload>()
+  private files: readonly ReacordFile[] = []
 
   private updateSubscription = this.updates
     .pipe(concatMap((payload) => this.updateMessage(payload)))
@@ -46,6 +53,11 @@ export abstract class Renderer {
     this.updates.next({ action: "destroy" })
   }
 
+  attach(file: ReacordFile) {
+    const newFiles = (this.files = [...this.files, file])
+    this.updates.next({ action: "files", files: newFiles })
+  }
+
   handleComponentInteraction(interaction: ComponentInteraction) {
     this.componentInteraction = interaction
 
@@ -60,7 +72,7 @@ export abstract class Renderer {
     }
   }
 
-  protected abstract createMessage(options: MessageOptions): Promise<Message>
+  protected abstract createMessage(options: NewMessagePayload): Promise<Message>
 
   private getMessageOptions(): MessageOptions {
     const options: MessageOptions = {
@@ -102,6 +114,15 @@ export abstract class Renderer {
       return
     }
 
+    if (payload.action === "files") {
+      if (this.message) {
+        await this.message?.updateFiles(payload.files)
+      } else {
+        this.message = await this.createMessageFromFiles(payload.files)
+      }
+      return
+    }
+
     if (this.componentInteraction) {
       const promise = this.componentInteraction.update(payload.options)
       this.componentInteraction = undefined

packages/reacord/library/internal/text-node.ts

@@ -5,8 +5,4 @@ export class TextNode extends Node<string> {
   override modifyMessageOptions(options: MessageOptions) {
     options.content = options.content + this.props
   }
-
-  override get text() {
-    return this.props
-  }
 }

packages/reacord/library/main.ts

@@ -12,6 +12,7 @@ export * from "./core/components/embed-title"
 export * from "./core/components/link"
 export * from "./core/components/option"
 export * from "./core/components/select"
+export * from "./core/file"
 export * from "./core/instance"
 export { useInstance } from "./core/instance-context"
 export * from "./core/reacord"

packages/reacord/package.json

@@ -2,7 +2,7 @@
   "name": "reacord",
   "type": "module",
   "description": "Create interactive Discord messages using React.",
-  "version": "0.5.0",
+  "version": "0.3.5",
   "types": "./dist/main.d.ts",
   "homepage": "https://reacord.mapleleaf.dev",
   "repository": "https://github.com/itsMapleLeaf/reacord.git",
@@ -35,12 +35,12 @@
     }
   },
   "scripts": {
-    "build": "cp ../../README.md . && cp ../../LICENSE . && tsup library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
+    "build": "tsup-node library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
     "build-watch": "pnpm build -- --watch",
     "test": "vitest --coverage --no-watch",
     "test-dev": "vitest",
-    "test-manual": "nodemon --exec tsx --ext ts,tsx ./scripts/discordjs-manual-test.tsx",
     "typecheck": "tsc --noEmit",
+    "playground": "nodemon --exec esmo --ext ts,tsx --inspect=5858 --enable-source-maps ./playground/main.tsx",
     "release": "bash scripts/release.sh"
   },
   "dependencies": {
@@ -52,7 +52,7 @@
     "rxjs": "^7.5.5"
   },
   "peerDependencies": {
-    "discord.js": "^14",
+    "discord.js": "^13.3",
     "react": ">=17"
   },
   "peerDependenciesMeta": {
@@ -63,8 +63,11 @@
   "devDependencies": {
     "@types/lodash-es": "^4.17.6",
     "c8": "^7.11.2",
-    "discord.js": "^14.0.3",
+    "discord.js": "^13.6.0",
     "dotenv": "^16.0.0",
+    "esbuild": "latest",
+    "esbuild-jest": "^0.5.0",
+    "esmo": "^0.14.1",
     "lodash-es": "^4.17.21",
     "nodemon": "^2.0.15",
     "prettier": "^2.6.2",
@@ -72,11 +75,10 @@
     "react": "^18.0.0",
     "release-it": "^14.14.2",
     "tsup": "^5.12.6",
-    "tsx": "^3.8.0",
     "type-fest": "^2.12.2",
     "typescript": "^4.6.3",
     "vite": "^2.9.5",
-    "vitest": "^0.10.0"
+    "vitest": "^0.9.4"
   },
   "resolutions": {
     "esbuild": "latest"
@@ -89,8 +91,5 @@
       "release": true,
       "web": true
     }
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }

packages/reacord/playground/command-handler.ts

@@ -0,0 +1,36 @@
+import type { Client, CommandInteraction } from "discord.js"
+
+type Command = {
+  name: string
+  description: string
+  run: (interaction: CommandInteraction) => unknown
+}
+
+export function createCommandHandler(client: Client, commands: Command[]) {
+  client.on("ready", async () => {
+    for (const guild of client.guilds.cache.values()) {
+      client.application!.commands.set(
+        commands.map(({ name, description }) => ({
+          name,
+          description,
+        })),
+        guild.id,
+      )
+    }
+  })
+
+  client.on("interactionCreate", async (interaction) => {
+    if (!interaction.isCommand()) return
+
+    const command = commands.find(
+      (command) => command.name === interaction.commandName,
+    )
+    if (command) {
+      try {
+        await command.run(interaction)
+      } catch (error) {
+        console.error(error)
+      }
+    }
+  })
+}

packages/reacord/playground/counter.tsx

@@ -0,0 +1,36 @@
+import * as React from "react"
+import { Button, Embed, EmbedField, EmbedTitle } from "../library/main"
+
+export function Counter(props: { onDeactivate: () => void }) {
+  const [count, setCount] = React.useState(0)
+  const [embedVisible, setEmbedVisible] = React.useState(false)
+
+  return (
+    <>
+      this button was clicked {count} times
+      {embedVisible && (
+        <Embed>
+          <EmbedTitle>the counter</EmbedTitle>
+          {count > 0 && (
+            <EmbedField name="is it even?">
+              {count % 2 === 0 ? "yes" : "no"}
+            </EmbedField>
+          )}
+        </Embed>
+      )}
+      {embedVisible && (
+        <Button label="hide embed" onClick={() => setEmbedVisible(false)} />
+      )}
+      <Button
+        style="primary"
+        emoji="<:plus_one:778531744860602388>"
+        label="clicc"
+        onClick={() => setCount(count + 1)}
+      />
+      {!embedVisible && (
+        <Button label="show embed" onClick={() => setEmbedVisible(true)} />
+      )}
+      <Button style="danger" label="deactivate" onClick={props.onDeactivate} />
+    </>
+  )
+}

packages/reacord/playground/fruit-select.tsx

@@ -0,0 +1,31 @@
+import React, { useState } from "react"
+import { Button, Option, Select } from "../library/main"
+
+export function FruitSelect({
+  onConfirm,
+}: {
+  onConfirm: (choice: string) => void
+}) {
+  const [value, setValue] = useState<string>()
+
+  return (
+    <>
+      <Select
+        placeholder="choose a fruit"
+        value={value}
+        onChangeValue={setValue}
+      >
+        <Option value="🍎" />
+        <Option value="🍌" />
+        <Option value="🍒" />
+      </Select>
+      <Button
+        label="confirm"
+        disabled={value == undefined}
+        onClick={() => {
+          if (value) onConfirm(value)
+        }}
+      />
+    </>
+  )
+}

packages/reacord/playground/main.tsx

@@ -0,0 +1,125 @@
+import { Client } from "discord.js"
+import "dotenv/config"
+import { readFile } from "fs/promises"
+import { join } from "path"
+import React from "react"
+import { fileURLToPath } from "url"
+import { Button, ReacordDiscordJs, useInstance } from "../library/main"
+import { createCommandHandler } from "./command-handler"
+import { Counter } from "./counter"
+import { FruitSelect } from "./fruit-select"
+
+const client = new Client({
+  intents: ["GUILDS"],
+})
+
+const reacord = new ReacordDiscordJs(client)
+
+client.on("ready", () => {
+  console.info("ready 💖")
+
+  // const now = new Date()
+
+  // function UptimeCounter() {
+  //   const [uptime, setUptime] = React.useState(0)
+
+  //   React.useEffect(() => {
+  //     const interval = setInterval(() => {
+  //       setUptime(Date.now() - now.getTime())
+  //     }, 5000)
+  //     return () => clearInterval(interval)
+  //   }, [])
+
+  //   return (
+  //     <Embed>this bot has been running for {prettyMilliseconds(uptime)}</Embed>
+  //   )
+  // }
+
+  // reacord.send("671787605624487941", <UptimeCounter />)
+})
+
+createCommandHandler(client, [
+  {
+    name: "button",
+    description: "it's a button",
+    run: (interaction) => {
+      reacord.reply(
+        interaction,
+        <Button label="clic" onClick={() => console.info("was clic")} />,
+      )
+    },
+  },
+  {
+    name: "counter",
+    description: "shows a counter button",
+    run: (interaction) => {
+      const reply = reacord.reply(interaction)
+      reply.render(<Counter onDeactivate={() => reply.destroy()} />)
+    },
+  },
+  {
+    name: "select",
+    description: "shows a select",
+    run: (interaction) => {
+      const instance = reacord.reply(
+        interaction,
+        <FruitSelect
+          onConfirm={(value) => {
+            instance.render(`you chose ${value}`)
+            instance.deactivate()
+          }}
+        />,
+      )
+    },
+  },
+  {
+    name: "ephemeral-button",
+    description: "button which shows ephemeral messages",
+    run: (interaction) => {
+      reacord.reply(
+        interaction,
+        <>
+          <Button
+            label="public clic"
+            onClick={(event) =>
+              reacord.reply(
+                interaction,
+                `${event.guild?.member.displayName} clic`,
+              )
+            }
+          />
+          <Button
+            label="clic"
+            onClick={(event) => event.ephemeralReply("you clic")}
+          />
+        </>,
+      )
+    },
+  },
+  {
+    name: "delete-this",
+    description: "delete this",
+    run: (interaction) => {
+      function DeleteThis() {
+        const instance = useInstance()
+        return <Button label="delete this" onClick={() => instance.destroy()} />
+      }
+      reacord.reply(interaction, <DeleteThis />)
+    },
+  },
+  {
+    name: "anime",
+    description: "shows an anime image",
+    run: async (interaction) => {
+      const reply = reacord.reply(interaction)
+      const image = await readFile(
+        join(fileURLToPath(import.meta.url), "../anime.jpg"),
+      )
+
+      reply.attach({ name: "anime.jpg", data: image })
+      // reply.render("anime")
+    },
+  },
+])
+
+await client.login(process.env.TEST_BOT_TOKEN)

packages/reacord/scripts/discordjs-manual-test.tsx

@@ -1,134 +0,0 @@
-import type { TextChannel } from "discord.js"
-import { ChannelType, Client, IntentsBitField } from "discord.js"
-import "dotenv/config"
-import { kebabCase } from "lodash-es"
-import * as React from "react"
-import { useState } from "react"
-import {
-  Button,
-  Option,
-  ReacordDiscordJs,
-  Select,
-  useInstance,
-} from "../library/main"
-
-const client = new Client({ intents: IntentsBitField.Flags.Guilds })
-const reacord = new ReacordDiscordJs(client)
-
-await client.login(process.env.TEST_BOT_TOKEN)
-
-const guild = await client.guilds.fetch(process.env.TEST_GUILD_ID!)
-
-const category = await guild.channels.fetch(process.env.TEST_CATEGORY_ID!)
-if (category?.type !== ChannelType.GuildCategory) {
-  throw new Error(
-    `channel ${process.env.TEST_CATEGORY_ID} is not a guild category. received ${category?.type}`,
-  )
-}
-
-for (const [, channel] of category.children.cache) {
-  await channel.delete()
-}
-
-let prefix = 0
-const createTest = async (
-  name: string,
-  block: (channel: TextChannel) => void | Promise<unknown>,
-) => {
-  prefix += 1
-  const channel = await category.children.create({
-    type: ChannelType.GuildText,
-    name: `${String(prefix).padStart(3, "0")}-${kebabCase(name)}`,
-  })
-  await block(channel)
-}
-
-await createTest("basic", (channel) => {
-  reacord.send(channel.id, "Hello, world!")
-})
-
-await createTest("counter", (channel) => {
-  const Counter = () => {
-    const [count, setCount] = React.useState(0)
-    return (
-      <>
-        count: {count}
-        <Button
-          style="primary"
-          emoji="➕"
-          onClick={() => setCount(count + 1)}
-        />
-        <Button
-          style="primary"
-          emoji="➖"
-          onClick={() => setCount(count - 1)}
-        />
-        <Button label="reset" onClick={() => setCount(0)} />
-      </>
-    )
-  }
-  reacord.send(channel.id, <Counter />)
-})
-
-await createTest("select", (channel) => {
-  function FruitSelect({ onConfirm }: { onConfirm: (choice: string) => void }) {
-    const [value, setValue] = useState<string>()
-
-    return (
-      <>
-        <Select
-          placeholder="choose a fruit"
-          value={value}
-          onChangeValue={setValue}
-        >
-          <Option value="🍎" emoji="🍎" label="apple" description="it red" />
-          <Option value="🍌" emoji="🍌" label="banana" description="bnanbna" />
-          <Option value="🍒" emoji="🍒" label="cherry" description="heh" />
-        </Select>
-        <Button
-          label="confirm"
-          disabled={value == undefined}
-          onClick={() => {
-            if (value) onConfirm(value)
-          }}
-        />
-      </>
-    )
-  }
-
-  const instance = reacord.send(
-    channel.id,
-    <FruitSelect
-      onConfirm={(value) => {
-        instance.render(`you chose ${value}`)
-        instance.deactivate()
-      }}
-    />,
-  )
-})
-
-await createTest("ephemeral button", (channel) => {
-  reacord.send(
-    channel.id,
-    <>
-      <Button
-        label="public clic"
-        onClick={(event) =>
-          event.reply(`${event.guild?.member.displayName} clic`)
-        }
-      />
-      <Button
-        label="clic"
-        onClick={(event) => event.ephemeralReply("you clic")}
-      />
-    </>,
-  )
-})
-
-await createTest("delete this", (channel) => {
-  function DeleteThis() {
-    const instance = useInstance()
-    return <Button label="delete this" onClick={() => instance.destroy()} />
-  }
-  reacord.send(channel.id, <DeleteThis />)
-})

packages/reacord/scripts/release.sh

@@ -0,0 +1,4 @@
+pnpm build
+cp ../../README.md .
+cp ../../LICENSE .
+pnpx release-it

packages/reacord/test/commonjs-require.test.ts

@@ -1,12 +0,0 @@
-import { spawnSync } from "node:child_process"
-import { createRequire } from "node:module"
-import { beforeAll, expect, test } from "vitest"
-
-beforeAll(() => {
-  spawnSync("pnpm", ["run", "build"])
-})
-
-test("can require commonjs", () => {
-  const require = createRequire(import.meta.url)
-  expect(() => require("../dist/main.cjs")).not.toThrow()
-})

packages/reacord/test/text-children.test.tsx

@@ -1,89 +0,0 @@
-import * as React from "react"
-import { test } from "vitest"
-import {
-  Button,
-  Embed,
-  EmbedAuthor,
-  EmbedField,
-  EmbedFooter,
-  EmbedTitle,
-  Link,
-  Option,
-  Select,
-} from "../library/main"
-import { ReacordTester } from "./test-adapter"
-
-test("text children in other components", async () => {
-  const tester = new ReacordTester()
-
-  const SomeText = () => <>some text</>
-
-  await tester.assertRender(
-    <>
-      <Embed>
-        <EmbedTitle>
-          <SomeText />
-        </EmbedTitle>
-        <EmbedAuthor>
-          <SomeText />
-        </EmbedAuthor>
-        <EmbedField name={<SomeText />}>
-          <SomeText /> <Button label="ignore this" onClick={() => {}} />
-          nailed it
-        </EmbedField>
-        <EmbedFooter>
-          <SomeText />
-        </EmbedFooter>
-      </Embed>
-      <Button label={<SomeText />} onClick={() => {}} />
-      <Link url="https://discord.com" label={<SomeText />} />
-      <Select>
-        <Option value="1">
-          <SomeText />
-        </Option>
-        <Option value="2" label={<SomeText />} description={<SomeText />} />
-      </Select>
-    </>,
-    [
-      {
-        content: "",
-        embeds: [
-          {
-            title: "some text",
-            author: {
-              name: "some text",
-            },
-            fields: [{ name: "some text", value: "some text nailed it" }],
-            footer: {
-              text: "some text",
-            },
-          },
-        ],
-        actionRows: [
-          [
-            {
-              type: "button",
-              label: "some text",
-              style: "secondary",
-            },
-            {
-              type: "link",
-              url: "https://discord.com",
-              label: "some text",
-            },
-          ],
-          [
-            {
-              type: "select",
-              values: [],
-              options: [
-                { value: "1", label: "some text" },
-                { value: "2", label: "some text", description: "some text" },
-              ],
-            },
-          ],
-        ],
-      },
-    ],
-  )
-})

packages/website/CHANGELOG.md

@@ -1,8 +0,0 @@
-# website
-
-## 0.4.1
-
-### Patch Changes
-
-- Updated dependencies [aa65da5]
-  - reacord@0.5.0

packages/website/app/root.tsx

@@ -1,3 +1,4 @@
+import packageJson from "reacord/package.json"
 import type {
   LinksFunction,
   LoaderFunction,
@@ -12,7 +13,6 @@ import {
   ScrollRestoration,
   useLoaderData,
 } from "@remix-run/react"
-import packageJson from "reacord/package.json"
 import bannerUrl from "~/assets/banner.png"
 import faviconUrl from "~/assets/favicon.png"
 import { GuideLinksProvider } from "~/modules/navigation/guide-links-context"
@@ -77,7 +77,6 @@ export default function App() {
   return (
     <html lang="en" className="bg-slate-900 text-slate-100">
       <head>
-        {/* eslint-disable-next-line unicorn/text-encoding-identifier-case */}
         <meta charSet="utf-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
         <Meta />
@@ -85,10 +84,9 @@ export default function App() {
         {process.env.NODE_ENV === "production" && (
           <script
             async
-            defer
+            data-website-id="49c69ade-5593-4853-9686-c9ca9d519a18"
-            data-website-id="e3ce3a50-720e-4489-be37-cc091c1b7029"
+            src="https://umami-production-265f.up.railway.app/umami.js"
-            src="https://umami-production-72bc.up.railway.app/umami.js"
+          />
-          ></script>
         )}
       </head>
       <body>

packages/website/package.json

@@ -1,7 +1,6 @@
 {
-  "name": "website",
-  "version": "0.4.1",
   "private": true,
+  "name": "website",
   "scripts": {
     "dev": "concurrently 'typedoc --watch' 'pnpm tailwind -- --watch' 'remix dev'",
     "test": "node ./scripts/test.js",
@@ -12,7 +11,7 @@
     "typecheck": "tsc --noEmit && tsc --project cypress/tsconfig.json --noEmit"
   },
   "dependencies": {
-    "@headlessui/react": "^1.6.0",
+    "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.6",
     "@reach/rect": "^0.17.0",
     "@remix-run/node": "^1.4.1",
@@ -34,13 +33,13 @@
     "@remix-run/node": "^1.4.1",
     "@testing-library/cypress": "^8.0.2",
     "@types/node": "*",
-    "@types/react": "^18.0.7",
+    "@types/react": "^18.0.6",
     "@types/react-dom": "^18.0.2",
     "@types/tailwindcss": "^3.0.10",
     "@types/wait-on": "^5.3.1",
-    "autoprefixer": "^10.4.5",
+    "autoprefixer": "^10.4.4",
     "concurrently": "^7.1.0",
-    "cypress": "^9.6.0",
+    "cypress": "^9.5.4",
     "execa": "^6.1.0",
     "postcss": "^8.4.12",
     "rehype-prism-plus": "^1.3.2",
@@ -49,5 +48,8 @@
     "typescript": "^4.6.3",
     "wait-on": "^6.0.1"
   },
+  "engines": {
+    "node": ">=14"
+  },
   "sideEffects": false
 }

pnpm-workspace.yaml

@@ -1,2 +1 @@
-packages:
+workspaces: [packages/*]
-  - packages/*