release v0.2.0

.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": []
-}

.changeset/five-wolves-destroy.md

@@ -1,5 +0,0 @@
----
-"reacord": minor
----
-
-breaking: more descriptive component event types

.changeset/many-pets-melt.md

@@ -1,33 +0,0 @@
----
-"reacord": minor
----
-
-add new descriptive adapter methods
-
-The reacord instance names have been updated, and the old names are now deprecated.
-
-- `send` -> `createChannelMessage`
-- `reply` -> `createInteractionReply`
-
-These new methods also accept discord JS options. Usage example:
-
-```ts
-// can accept either a channel object or a channel ID
-reacord.createChannelMessage(channel)
-reacord.createChannelMessage(channel, {
-	tts: true,
-})
-reacord.createChannelMessage(channel, {
-	reply: {
-		messageReference: "123456789012345678",
-		failIfNotExists: false,
-	},
-})
-
-reacord.createInteractionReply(interaction)
-reacord.createInteractionReply(interaction, {
-	ephemeral: true,
-})
-```
-
-These new methods replace the old ones, which are now deprecated.

.eslintrc.json

@@ -0,0 +1,26 @@
+{
+  "extends": ["./node_modules/@itsmapleleaf/configs/eslint"],
+  "ignorePatterns": [
+    "**/node_modules/**",
+    "**/.cache/**",
+    "**/build/**",
+    "**/dist/**",
+    "**/coverage/**",
+    "**/public/**"
+  ],
+  "parserOptions": {
+    "project": "./tsconfig.base.json"
+  },
+  "rules": {
+    "import/no-unused-modules": "off",
+    "unicorn/prevent-abbreviations": "off"
+  },
+  "overrides": [
+    {
+      "files": ["packages/website/cypress/**"],
+      "parserOptions": {
+        "project": "./packages/website/cypress/tsconfig.json"
+      }
+    }
+  ]
+}

.github/workflows/deploy-website.yml

@@ -0,0 +1,17 @@
+name: deploy website
+on:
+  push:
+    branches: [main]
+    paths:
+      - "packages/website/**"
+      - "reacord/library/**/*.{ts,tsx}"
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: superfly/flyctl-actions@master
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+        with:
+          args: "deploy"

.github/workflows/main.yml

@@ -0,0 +1,41 @@
+name: main
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+env:
+  TEST_BOT_TOKEN: ${{ secrets.TEST_BOT_TOKEN }}
+  TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
+  TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
+
+jobs:
+  run-commands:
+    strategy:
+      fail-fast: false
+      matrix:
+        command:
+          # if these run in the same process, it dies,
+          # so we test them separate
+          - name: test reacord
+            run: pnpm test -C packages/reacord
+          - name: test website
+            run: pnpm test -C packages/website
+          - name: build
+            run: pnpm build --recursive
+          - name: lint
+            run: pnpm lint
+          - name: typecheck
+            run: pnpm typecheck --parallel
+    name: ${{ matrix.command.name }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          # https://github.com/actions/setup-node#supported-version-syntax
+          node-version: "16"
+      - run: npm i -g pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: ${{ matrix.command.run }}

.github/workflows/release.yml

@@ -1,33 +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:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: pnpm
-      - 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 }}

.github/workflows/tests.yml

@@ -1,44 +0,0 @@
-name: tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-env:
-  TEST_BOT_TOKEN: ${{ secrets.TEST_BOT_TOKEN }}
-  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:
-  tests:
-    name: ${{ matrix.script }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        script:
-          - lint
-          - build
-          - test
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('**/pnpm-lock.yaml') }}
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: pnpm
-      - run: pnpm install --frozen-lockfile
-      - run: pnpm run ${{ matrix.script }}
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        if: always()

.gitignore

@@ -3,9 +3,4 @@ node_modules
 .vscode
 coverage
 .env
-*.code-workspace
+
-.pnpm-debug.log
-build
-.cache
-.vercel
-*.tsbuildinfo

.npmrc

@@ -1 +0,0 @@
-ignore-workspace-root-check = true

.prettierignore

@@ -1,3 +1,6 @@
+node_modules
+dist
+coverage
 pnpm-lock.yaml
-/packages/website/public/api
+build
-.astro
+.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

README.md

@@ -1,9 +1,7 @@
-<center>
+# reacord
-  <img src="packages/website/src/assets/banner.png" alt="Reacord: Create interactive Discord messages using React">
+Create interactive Discord messages using React!
-</center>
-
-## Installation ∙ [![npm](https://img.shields.io/npm/v/reacord?color=blue&style=flat-square)](https://www.npmjs.com/package/reacord)
 
+## Installation
 ```console
 # npm
 npm install reacord react discord.js
@@ -17,11 +15,9 @@ pnpm add reacord react discord.js
 ```
 
 ## Get Started
-
+[Visit the docs to get started.](https://reacord.fly.dev/guides/getting-started)
-[Visit the docs to get started.](https://reacord.mapleleaf.dev/guides/getting-started)
 
 ## Example
-
 <!-- prettier-ignore -->
 ```tsx
 import * as React from "react"

fly.toml

@@ -0,0 +1,40 @@
+# fly.toml file generated for reacord on 2021-12-29T14:06:41-06:00
+
+app = "reacord"
+
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[env]
+PORT = 8080
+
+[experimental]
+allowed_public_ports = []
+auto_rollback = true
+
+[[services]]
+http_checks = []
+internal_port = 8080
+processes = ["app"]
+protocol = "tcp"
+script_checks = []
+
+[services.concurrency]
+hard_limit = 25
+soft_limit = 20
+type = "connections"
+
+[[services.ports]]
+handlers = ["http"]
+port = 80
+
+[[services.ports]]
+handlers = ["tls", "http"]
+port = 443
+
+[[services.tcp_checks]]
+grace_period = "1s"
+interval = "15s"
+restart_limit = 0
+timeout = "2s"

package.json

@@ -1,44 +1,29 @@
 {
-  "name": "reacord-monorepo",
   "private": true,
   "scripts": {
-    "lint": "run-s --continue-on-error lint:*",
+    "lint": "eslint --ext js,ts,tsx .",
-    "lint:eslint": "eslint . --fix --cache --cache-file=node_modules/.cache/.eslintcache --report-unused-disable-directives",
+    "lint-fix": "pnpm lint -- --fix",
-    "lint:prettier": "prettier . \"**/*.astro\" --write --cache --list-different",
+    "format": "prettier --write ."
-    "lint:types": "tsc -b & pnpm -r --parallel run typecheck",
+  },
-    "astro-sync": "pnpm --filter website exec astro sync",
+  "dependencies": {
-    "test": "vitest",
+    "@itsmapleleaf/configs": "^1.1.2"
-    "build": "pnpm -r run build",
-    "build:website": "pnpm --filter website... run build",
-    "start": "pnpm -C packages/website run start",
-    "start:website": "pnpm -C packages/website run start",
-    "release": "pnpm -r run build && changeset publish"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.26.2",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@itsmapleleaf/configs": "github:itsMapleLeaf/configs",
+    "@typescript-eslint/parser": "^5.9.1",
-    "eslint": "^8.51.0",
+    "eslint": "^8.6.0",
-    "npm-run-all": "^4.1.5",
+    "eslint-config-prettier": "^8.3.0",
-    "prettier": "^3.0.3",
+    "eslint-import-resolver-typescript": "^2.5.0",
-    "react": "^18.2.0",
+    "eslint-plugin-import": "^2.25.4",
-    "tailwindcss": "^3.3.3",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
-    "typescript": "^5.2.2",
+    "eslint-plugin-react": "^7.28.0",
-    "vitest": "^0.34.6"
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint-plugin-unicorn": "^40.0.0",
+    "prettier": "^2.5.1",
+    "typescript": "^4.5.4"
   },
-  "prettier": "@itsmapleleaf/configs/prettier",
+  "resolutions": {
-  "eslintConfig": {
+    "esbuild": "latest"
-    "extends": [
+  },
-      "./node_modules/@itsmapleleaf/configs/eslint.config.cjs",
+  "prettier": "@itsmapleleaf/configs/prettier"
-      "./node_modules/@itsmapleleaf/configs/eslint.config.react.cjs"
-    ],
-    "ignorePatterns": [
-      "node_modules",
-      "dist",
-      "packages/website/public/api"
-    ],
-    "rules": {
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/require-await": "off"
-    }
-  }
 }

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

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

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

@@ -1,35 +0,0 @@
-import { camelCase, isObject, snakeCase } from "lodash-es"
-import type {
-	CamelCasedPropertiesDeep,
-	SnakeCasedPropertiesDeep,
-	UnknownRecord,
-} 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 = {} as UnknownRecord
-	for (const [key, value] of Object.entries(input)) {
-		output[convertKey(key)] = convertKeyCaseDeep(value, convertKey)
-	}
-	return output as 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)
-}

packages/helpers/is-instance-of.ts

@@ -1,7 +0,0 @@
-/** For narrowing instance types with array.filter */
-export const isInstanceOf =
-	<Instance, Args extends unknown[]>(
-		constructor: new (...args: Args) => Instance,
-	) =>
-	(value: unknown): value is Instance =>
-		value instanceof constructor

packages/helpers/is-object.ts

@@ -1,3 +0,0 @@
-export function isObject(value: unknown): value is object {
-	return typeof value === "object" && value !== null
-}

packages/helpers/json.ts

@@ -1,7 +0,0 @@
-export function safeJsonStringify(value: unknown): string {
-	try {
-		return JSON.stringify(value)
-	} catch {
-		return String(value)
-	}
-}

packages/helpers/log-pretty.ts

@@ -1,11 +0,0 @@
-import { inspect } from "node:util"
-
-export function logPretty(value: unknown) {
-	console.info(
-		inspect(value, {
-			// depth: Number.POSITIVE_INFINITY,
-			depth: 10,
-			colors: true,
-		}),
-	)
-}

packages/helpers/omit.test.ts

@@ -1,7 +0,0 @@
-import { expect, test } from "vitest"
-import { omit } from "./omit.ts"
-
-test("omit", () => {
-	const subject = { a: 1, b: true }
-	expect(omit(subject, ["a"])).toStrictEqual({ b: true })
-})

packages/helpers/omit.test.types.ts

@@ -1,3 +0,0 @@
-import { omit } from "./omit.ts"
-
-omit({ a: 1, b: true }, ["a"]) satisfies { b: boolean }

packages/helpers/omit.ts

@@ -1,10 +0,0 @@
-export function omit<Subject extends object, Key extends PropertyKey>(
-	subject: Subject,
-	keys: Key[],
-) {
-	const keySet = new Set<PropertyKey>(keys)
-	return Object.fromEntries(
-		Object.entries(subject).filter(([key]) => !keySet.has(key)),
-		// hack: conditional type preserves unions
-	) as Subject extends unknown ? Omit<Subject, Key> : never
-}

packages/helpers/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@reacord/helpers",
-  "type": "module",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "typecheck": "tsc -b"
-  },
-  "dependencies": {
-    "@types/lodash-es": "^4.17.9",
-    "lodash-es": "^4.17.21",
-    "type-fest": "^4.4.0",
-    "vitest": "^0.34.6"
-  }
-}

packages/helpers/pick.ts

@@ -1,11 +0,0 @@
-import type { LoosePick } from "./types"
-
-export function pick<T extends object, K extends keyof T | PropertyKey>(
-	object: T,
-	keys: K[],
-) {
-	const keySet = new Set<PropertyKey>(keys)
-	return Object.fromEntries(
-		Object.entries(object).filter(([key]) => keySet.has(key)),
-	) as LoosePick<T, K>
-}

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

@@ -1,34 +0,0 @@
-import { expect, test } from "vitest"
-import type { PruneNullishValues } from "./prune-nullish-values"
-import { pruneNullishValues } from "./prune-nullish-values"
-
-test("pruneNullishValues", () => {
-	interface InputType {
-		a: string
-		b: string | null | undefined
-		c?: string
-		d: {
-			a: string
-			b: string | undefined
-		}
-	}
-
-	const input: InputType = {
-		a: "a",
-		b: null,
-		c: undefined,
-		d: {
-			a: "a",
-			b: undefined,
-		},
-	}
-
-	const output: PruneNullishValues<InputType> = {
-		a: "a",
-		d: {
-			a: "a",
-		},
-	}
-
-	expect(pruneNullishValues(input)).toEqual(output)
-})

packages/helpers/prune-nullish-values.ts

@@ -1,46 +0,0 @@
-import { isObject } from "./is-object"
-
-export function pruneNullishValues<T>(input: T): PruneNullishValues<T> {
-	if (!isObject(input)) {
-		return input as PruneNullishValues<T>
-	}
-
-	if (Array.isArray(input)) {
-		return input
-			.filter(Boolean)
-			.map(
-				(item) => pruneNullishValues(item) as unknown,
-			) as PruneNullishValues<T>
-	}
-
-	const result: Record<string, unknown> = {}
-	for (const [key, value] of Object.entries(input)) {
-		if (value != undefined) {
-			result[key] = pruneNullishValues(value)
-		}
-	}
-	return result as PruneNullishValues<T>
-}
-
-export type PruneNullishValues<Input> = Input extends object
-	? OptionalKeys<
-			{ [Key in keyof Input]: NonNullable<PruneNullishValues<Input[Key]>> },
-			KeysWithNullishValues<Input>
-	  >
-	: Input
-
-type OptionalKeys<Input, Keys extends keyof Input> = Omit<Input, Keys> & {
-	[Key in Keys]?: Input[Key]
-}
-
-type KeysWithNullishValues<Input> = NonNullable<
-	Values<{
-		[Key in keyof Input]: null extends Input[Key]
-			? Key
-			: undefined extends Input[Key]
-			? Key
-			: never
-	}>
->
-
-type Values<Input> = Input[keyof Input]

packages/helpers/retry-with-timeout.ts

@@ -1,21 +0,0 @@
-import { setTimeout } from "node:timers/promises"
-
-const maxTime = 500
-const waitPeriod = 50
-
-export async function retryWithTimeout<T>(
-	callback: () => Promise<T> | T,
-): Promise<T> {
-	const startTime = Date.now()
-	// eslint-disable-next-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
-	while (true) {
-		try {
-			return await callback()
-		} catch (error) {
-			if (Date.now() - startTime > maxTime) {
-				throw error
-			}
-			await setTimeout(waitPeriod)
-		}
-	}
-}

packages/helpers/to-error.ts

@@ -1,3 +0,0 @@
-export function toError(value: unknown) {
-	return value instanceof Error ? value : new Error(String(value))
-}

packages/helpers/tsconfig.json

@@ -1,3 +0,0 @@
-{
-	"extends": "../../tsconfig.base.json"
-}

packages/helpers/types.test.types.ts

@@ -1,4 +0,0 @@
-import { type LooseOmit, type LoosePick, typeEquals } from "./types.ts"
-
-typeEquals<LoosePick<{ a: 1; b: 2 }, "a">, { a: 1 }>(true)
-typeEquals<LooseOmit<{ a: 1; b: 2 }, "a">, { b: 2 }>(true)

packages/helpers/types.ts

@@ -1,21 +0,0 @@
-import { raise } from "./raise.ts"
-
-export type MaybePromise<T> = T | PromiseLike<T>
-
-export type ValueOf<Type> = Type extends ReadonlyArray<infer Value>
-	? Value
-	: Type[keyof Type]
-
-export type LoosePick<Shape, Keys extends PropertyKey> = Simplify<{
-	[Key in Extract<Keys, keyof Shape>]: Shape[Key]
-}>
-
-export type LooseOmit<Shape, Keys extends PropertyKey> = Simplify<{
-	[Key in Exclude<keyof Shape, Keys>]: Shape[Key]
-}>
-
-export type Simplify<T> = { [Key in keyof T]: T[Key] } & NonNullable<unknown>
-
-export const typeEquals = <A, B>(
-	_result: A extends B ? (B extends A ? true : false) : false,
-) => raise("typeEquals() should not be called at runtime")

packages/helpers/wait-for.ts

@@ -1,23 +0,0 @@
-import { setTimeout } from "node:timers/promises"
-import type { MaybePromise } from "./types.ts"
-
-const maxTime = 1000
-
-export async function waitFor<Result>(
-	predicate: () => MaybePromise<Result>,
-): Promise<Awaited<Result>> {
-	const startTime = Date.now()
-	let lastError: unknown
-
-	while (Date.now() - startTime < maxTime) {
-		try {
-			return await predicate()
-		} catch (error) {
-			lastError = error
-			await setTimeout(50)
-		}
-	}
-
-	// eslint-disable-next-line @typescript-eslint/no-throw-literal
-	throw lastError ?? new Error("Timeout")
-}

packages/helpers/with-logged-method-calls.ts

@@ -1,24 +0,0 @@
-import { inspect } from "node:util"
-
-export function withLoggedMethodCalls<T extends object>(value: T) {
-	return new Proxy(value as Record<string | symbol, unknown>, {
-		get(target, property) {
-			const value = target[property]
-			if (typeof value !== "function") {
-				return value
-			}
-			return (...values: unknown[]) => {
-				console.info(
-					`${String(property)}(${values
-						.map((value) =>
-							typeof value === "object" && value !== null
-								? value.constructor.name
-								: inspect(value, { colors: true }),
-						)
-						.join(", ")})`,
-				)
-				return value.apply(target, values) as unknown
-			}
-		},
-	}) as T
-}

packages/reacord/.gitignore

@@ -1,2 +0,0 @@
-/README.md
-/LICENSE

packages/reacord/CHANGELOG.md

@@ -1,50 +0,0 @@
-# reacord
-
-## 0.5.5
-
-### Patch Changes
-
-- ced48a3: distribute d.ts files again instead of the source
-
-  distributing the source causes typecheck errors when the modules it imports from (in this case, `@reacord/helpers`) don't exist in the end users' projects, so we'll just distribute d.ts files instead like normal. failed experiment :(
-
-## 0.5.4
-
-### Patch Changes
-
-- 41c87e3: fix type definitions
-
-  `"types"` wasn't updated, oops!
-
-  technically the typedefs were already correctly defined via `"exports"`, but this may not be picked up depending on the tsconfig, so I'll ensure both are used for compatibility purposes. but this might be worth a note in the docs; pretty much every modern TS Node project should be using a tsconfig that doesn't require setting `"types"`
-
-## 0.5.3
-
-### Patch Changes
-
-- 104b175: ensure message is edited from arbitrary component updates
-- 156cf90: fix interaction handling
-- 0bab505: fix DJS deprecation warning on isStringSelectMenu
-- d76f316: ensure action rows handle child interactions
-
-## 0.5.2
-
-### Patch Changes
-
-- 9813a01: import react-reconciler/constants.js for esm
-
-  ESM projects which tried to import reacord would fail due to the lack of .js on this import
-
-## 0.5.1
-
-### Patch Changes
-
-- 72f4a4a: upgrade dependencies and remove some unneeded
-- 7536bde: add types in exports to work with TS nodenext
-- e335165: fix links
-
-## 0.5.0
-
-### Minor Changes
-
-- aa65da5: allow JSX in more places

packages/reacord/env.d.ts

@@ -1 +0,0 @@
-/// <reference types="@total-typescript/ts-reset" />

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

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

packages/reacord/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)
+}

packages/reacord/helpers/get-environment-value.ts

@@ -1,5 +1,5 @@
 import { raise } from "./raise.js"
 
 export function getEnvironmentValue(name: string) {
-	return process.env[name] ?? raise(`Missing environment variable: ${name}`)
+  return process.env[name] ?? raise(`Missing environment variable: ${name}`)
 }

packages/reacord/helpers/is-instance-of.ts

@@ -0,0 +1,7 @@
+/**
+ * for narrowing instance types with array.filter
+ */
+export const isInstanceOf =
+  <T>(Constructor: new (...args: any[]) => T) =>
+  (value: unknown): value is T =>
+    value instanceof Constructor

packages/reacord/helpers/is-object.ts

@@ -0,0 +1,7 @@
+export function isObject<T>(
+  value: T,
+): value is Exclude<T, Primitive | AnyFunction> {
+  return typeof value === "object" && value !== null
+}
+type Primitive = string | number | boolean | undefined | null
+type AnyFunction = (...args: any[]) => any

packages/reacord/helpers/last.ts

@@ -1,3 +1,3 @@
 export function last<T>(array: T[]): T | undefined {
-	return array[array.length - 1]
+  return array[array.length - 1]
 }

packages/reacord/helpers/log-pretty.ts

@@ -0,0 +1,12 @@
+import { inspect } from "node:util"
+
+// eslint-disable-next-line import/no-unused-modules
+export function logPretty(value: unknown) {
+  console.info(
+    inspect(value, {
+      // depth: Number.POSITIVE_INFINITY,
+      depth: 10,
+      colors: true,
+    }),
+  )
+}

packages/reacord/helpers/omit.ts

@@ -0,0 +1,14 @@
+// eslint-disable-next-line import/no-unused-modules
+export function omit<Subject extends object, Key extends PropertyKey>(
+  subject: Subject,
+  keys: Key[],
+  // hack: using a conditional type preserves union types
+): Subject extends any ? Omit<Subject, Key> : never {
+  const result: any = {}
+  for (const key in subject) {
+    if (!keys.includes(key as unknown as Key)) {
+      result[key] = subject[key]
+    }
+  }
+  return result
+}

packages/reacord/helpers/pick.ts

@@ -0,0 +1,16 @@
+import type { LoosePick, UnknownRecord } from "./types"
+
+// eslint-disable-next-line import/no-unused-modules
+export function pick<T, K extends keyof T | PropertyKey>(
+  object: T,
+  keys: K[],
+): LoosePick<T, K> {
+  const result: any = {}
+  for (const key of keys) {
+    const value = (object as UnknownRecord)[key]
+    if (value !== undefined) {
+      result[key] = value
+    }
+  }
+  return result
+}

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

@@ -0,0 +1,27 @@
+import { isObject } from "./is-object"
+
+export function pruneNullishValues<T>(input: T): PruneNullishValues<T> {
+  if (Array.isArray(input)) {
+    return input.filter(Boolean).map((item) => pruneNullishValues(item)) as any
+  }
+
+  if (!isObject(input)) {
+    return input as any
+  }
+
+  const result: any = {}
+  for (const [key, value] of Object.entries(input)) {
+    if (value != undefined) {
+      result[key] = isObject(value) ? pruneNullishValues(value) : value
+    }
+  }
+  return result
+}
+
+type PruneNullishValues<Input> = Input extends ReadonlyArray<infer Value>
+  ? ReadonlyArray<NonNullable<Value>>
+  : Input extends object
+  ? {
+      [Key in keyof Input]: NonNullable<Input[Key]>
+    }
+  : Input

packages/reacord/helpers/raise.ts

@@ -1,5 +1,5 @@
 import { toError } from "./to-error.js"
 
 export function raise(error: unknown): never {
-	throw toError(error)
+  throw toError(error)
 }

packages/reacord/helpers/reject-after.ts

@@ -1,10 +1,10 @@
-import { toError } from "./to-error.js"
 import { setTimeout } from "node:timers/promises"
+import { toError } from "./to-error.js"
 
 export async function rejectAfter(
-	timeMs: number,
+  timeMs: number,
-	error: unknown = `rejected after ${timeMs}ms`,
+  error: unknown = `rejected after ${timeMs}ms`,
 ): Promise<never> {
-	await setTimeout(timeMs)
+  await setTimeout(timeMs)
-	throw toError(error)
+  throw toError(error)
 }

packages/reacord/helpers/retry-with-timeout.ts

@@ -0,0 +1,21 @@
+import { setTimeout } from "node:timers/promises"
+
+const maxTime = 500
+const waitPeriod = 50
+
+export async function retryWithTimeout<T>(
+  callback: () => Promise<T> | T,
+): Promise<T> {
+  const startTime = Date.now()
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    try {
+      return await callback()
+    } catch (error) {
+      if (Date.now() - startTime > maxTime) {
+        throw error
+      }
+      await setTimeout(waitPeriod)
+    }
+  }
+}

packages/reacord/helpers/to-error.ts

@@ -0,0 +1,3 @@
+export function toError(value: unknown) {
+  return value instanceof Error ? value : new Error(String(value))
+}

packages/reacord/helpers/to-upper.ts

@@ -1,4 +1,4 @@
 /** A typesafe version of toUpperCase */
 export function toUpper<S extends string>(string: S) {
-	return string.toUpperCase() as Uppercase<S>
+  return string.toUpperCase() as Uppercase<S>
 }

packages/reacord/helpers/types.ts

@@ -0,0 +1,12 @@
+/* eslint-disable import/no-unused-modules */
+export type MaybePromise<T> = T | Promise<T>
+
+export type ValueOf<Type> = Type extends ReadonlyArray<infer Value>
+  ? Value
+  : Type[keyof Type]
+
+export type UnknownRecord = Record<PropertyKey, unknown>
+
+export type LoosePick<Shape, Keys extends PropertyKey> = {
+  [Key in Keys]: Shape extends Record<Key, infer Value> ? Value : never
+}

packages/reacord/helpers/with-logged-method-calls.ts

@@ -0,0 +1,25 @@
+import { inspect } from "node:util"
+
+// eslint-disable-next-line import/no-unused-modules
+export function withLoggedMethodCalls<T extends object>(value: T) {
+  return new Proxy(value as Record<string | symbol, unknown>, {
+    get(target, property) {
+      const value = target[property]
+      if (typeof value !== "function") {
+        return value
+      }
+      return (...values: any[]) => {
+        console.info(
+          `${String(property)}(${values
+            .map((value) =>
+              typeof value === "object" && value !== null
+                ? value.constructor.name
+                : inspect(value, { colors: true }),
+            )
+            .join(", ")})`,
+        )
+        return value.apply(target, values)
+      }
+    },
+  }) as T
+}

packages/reacord/library/core/component-event.ts

@@ -1,113 +1,113 @@
 import type { ReactNode } from "react"
 import type { ReacordInstance } from "./instance"
 
-/** @category Component Event */
+/**
-export interface ComponentEvent {
+ * @category Component Event
-	/**
+ */
-	 * The message associated with this event. For example: with a button click,
+export type ComponentEvent = {
-	 * this is the message that the button is on.
+  /**
-	 *
+   * The message associated with this event.
-	 * @see https://discord.com/developers/docs/resources/channel#message-object
+   * For example: with a button click,
-	 */
+   * this is the message that the button is on.
-	message: ComponentEventMessage
+   * @see https://discord.com/developers/docs/resources/channel#message-object
+   */
+  message: MessageInfo
 
-	/**
+  /**
-	 * The channel that this event occurred in.
+   * The channel that this event occurred in.
-	 *
+   * @see https://discord.com/developers/docs/resources/channel#channel-object
-	 * @see https://discord.com/developers/docs/resources/channel#channel-object
+   */
-	 */
+  channel: ChannelInfo
-	channel: ComponentEventChannel
 
-	/**
+  /**
-	 * The user that triggered this event.
+   * The user that triggered this event.
-	 *
+   * @see https://discord.com/developers/docs/resources/user#user-object
-	 * @see https://discord.com/developers/docs/resources/user#user-object
+   */
-	 */
+  user: UserInfo
-	user: ComponentEventUser
 
-	/**
+  /**
-	 * The guild that this event occurred in.
+   * The guild that this event occurred in.
-	 *
+   * @see https://discord.com/developers/docs/resources/guild#guild-object
-	 * @see https://discord.com/developers/docs/resources/guild#guild-object
+   */
-	 */
+  guild?: GuildInfo
-	guild?: ComponentEventGuild
 
-	/** Create a new reply to this event. */
+  /**
-	reply(
+   * Create a new reply to this event.
-		content?: ReactNode,
+   */
-		options?: ComponentEventReplyOptions,
+  reply(content?: ReactNode): ReacordInstance
-	): ReacordInstance
 
-	/**
+  /**
-	 * Create an ephemeral reply to this event, shown only to the user who
+   * Create an ephemeral reply to this event,
-	 * triggered it.
+   * shown only to the user who triggered it.
-	 *
+   */
-	 * @deprecated Use event.reply(content, { ephemeral: true })
+  ephemeralReply(content?: ReactNode): ReacordInstance
-	 */
-	ephemeralReply(content?: ReactNode): ReacordInstance
 }
 
-/** @category Component Event */
+/**
-export interface ComponentEventReplyOptions {
+ * @category Component Event
-	ephemeral?: boolean
+ */
-	tts?: boolean
+export type ChannelInfo = {
+  id: string
+  name?: string
+  topic?: string
+  nsfw?: boolean
+  lastMessageId?: string
+  ownerId?: string
+  parentId?: string
+  rateLimitPerUser?: number
 }
 
-/** @category Component Event */
+/**
-export interface ComponentEventChannel {
+ * @category Component Event
-	id: string
+ */
-	name?: string
+export type MessageInfo = {
-	topic?: string
+  id: string
-	nsfw?: boolean
+  channelId: string
-	lastMessageId?: string
+  authorId: UserInfo
-	ownerId?: string
+  member?: GuildMemberInfo
-	parentId?: string
+  content: string
-	rateLimitPerUser?: number
+  timestamp: string
+  editedTimestamp?: string
+  tts: boolean
+  mentionEveryone: boolean
+  /** The IDs of mentioned users */
+  mentions: string[]
 }
 
-/** @category Component Event */
+/**
-export interface ComponentEventMessage {
+ * @category Component Event
-	id: string
+ */
-	channelId: string
+export type GuildInfo = {
-	authorId: string
+  id: string
-	member?: ComponentEventGuildMember
+  name: string
-	content: string
+  member: GuildMemberInfo
-	timestamp: string
-	editedTimestamp?: string
-	tts: boolean
-	mentionEveryone: boolean
-	/** The IDs of mentioned users */
-	mentions: string[]
 }
 
-/** @category Component Event */
+/**
-export interface ComponentEventGuild {
+ * @category Component Event
-	id: string
+ */
-	name: string
+export type GuildMemberInfo = {
-	member: ComponentEventGuildMember
+  id: string
+  nick?: string
+  displayName: string
+  avatarUrl?: string
+  displayAvatarUrl: string
+  roles: string[]
+  color: number
+  joinedAt?: string
+  premiumSince?: string
+  pending?: boolean
+  communicationDisabledUntil?: string
 }
 
-/** @category Component Event */
+/**
-export interface ComponentEventGuildMember {
+ * @category Component Event
-	id: string
+ */
-	nick?: string
+export type UserInfo = {
-	displayName: string
+  id: string
-	avatarUrl?: string
+  username: string
-	displayAvatarUrl: string
+  discriminator: string
-	roles: string[]
+  tag: string
-	color: number
+  avatarUrl: string
-	joinedAt?: string
+  accentColor?: number
-	premiumSince?: string
-	pending?: boolean
-	communicationDisabledUntil?: string
-}
-
-/** @category Component Event */
-export interface ComponentEventUser {
-	id: string
-	username: string
-	discriminator: string
-	tag: string
-	avatarUrl: string | null
-	accentColor?: number
 }

packages/reacord/library/core/components/action-row.tsx

@@ -1,56 +1,47 @@
 import type { ReactNode } from "react"
+import React from "react"
 import { ReacordElement } from "../../internal/element.js"
 import type { MessageOptions } from "../../internal/message"
 import { Node } from "../../internal/node.js"
-import type { ComponentInteraction } from "../../internal/interaction.js"
 
 /**
  * Props for an action row
- *
  * @category Action Row
  */
-export interface ActionRowProps {
+export type ActionRowProps = {
-	children?: ReactNode
+  children?: ReactNode
 }
 
 /**
  * An action row is a top-level container for message components.
  *
- * You don't need to use this; Reacord automatically creates action rows for
+ * You don't need to use this; Reacord automatically creates action rows for you.
- * you. But this can be useful if you want a specific layout.
+ * But this can be useful if you want a specific layout.
  *
  * ```tsx
  * // put buttons on two separate rows
  * <ActionRow>
- *   <Button label="First" onClick={handleFirst} />
+ *   <Button onClick={handleFirst}>First</Button>
  * </ActionRow>
- * <Button label="Second" onClick={handleSecond} />
+ * <Button onClick={handleSecond}>Second</Button>
  * ```
  *
  * @category Action Row
  * @see https://discord.com/developers/docs/interactions/message-components#action-rows
  */
 export function ActionRow(props: ActionRowProps) {
-	return (
+  return (
-		<ReacordElement props={props} createNode={() => new ActionRowNode(props)}>
+    <ReacordElement props={props} createNode={() => new ActionRowNode(props)}>
-			{props.children}
+      {props.children}
-		</ReacordElement>
+    </ReacordElement>
-	)
+  )
 }
 
-class ActionRowNode extends Node<ActionRowProps> {
+class ActionRowNode extends Node<{}> {
-	override modifyMessageOptions(options: MessageOptions): void {
+  override modifyMessageOptions(options: MessageOptions): void {
-		options.actionRows.push([])
+    options.actionRows.push([])
-		for (const child of this.children) {
+    for (const child of this.children) {
-			child.modifyMessageOptions(options)
+      child.modifyMessageOptions(options)
-		}
+    }
-	}
+  }
-	handleComponentInteraction(interaction: ComponentInteraction) {
-		for (const child of this.children) {
-			if (child.handleComponentInteraction(interaction)) {
-				return true
-			}
-		}
-		return false
-	}
 }

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

@@ -1,24 +1,22 @@
-import type { ReactNode } from "react"
-
 /**
  * Common props between button-like components
- *
  * @category Button
  */
-export interface ButtonSharedProps {
+export type ButtonSharedProps = {
-	/** The text on the button. Rich formatting (markdown) is not supported here. */
+  /** 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. */
+  /** When true, the button will be slightly faded, and cannot be clicked. */
-	disabled?: boolean
+  disabled?: boolean
 
-	/**
+  /**
-	 * Renders an emoji to the left of the text. Has to be a literal emoji
+   * Renders an emoji to the left of the text.
-	 * character (e.g. 🍍), or an emoji code, like
+   * Has to be a literal emoji character (e.g. 🍍),
-	 * `<:plus_one:778531744860602388>`.
+   * or an emoji code, like `<:plus_one:778531744860602388>`.
-	 *
+   *
-	 * To get an emoji code, type your emoji in Discord chat with a backslash `\`
+   * To get an emoji code, type your emoji in Discord chat
-	 * in front. The bot has to be in the emoji's guild to use it.
+   * with a backslash `\` in front.
-	 */
+   * The bot has to be in the emoji's guild to use it.
-	emoji?: string
+   */
+  emoji?: string
 }

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

@@ -1,4 +1,5 @@
-import { randomUUID } from "node:crypto"
+import { nanoid } from "nanoid"
+import React from "react"
 import { ReacordElement } from "../../internal/element.js"
 import type { ComponentInteraction } from "../../internal/interaction"
 import type { MessageOptions } from "../../internal/message"
@@ -7,63 +8,58 @@ import { Node } from "../../internal/node.js"
 import type { ComponentEvent } from "../component-event"
 import type { ButtonSharedProps } from "./button-shared-props"
 
-/** @category Button */
+/**
+ * @category Button
+ */
 export type ButtonProps = ButtonSharedProps & {
-	/**
+  /**
-	 * The style determines the color of the button and signals intent.
+   * The style determines the color of the button and signals intent.
-	 *
+   * @see https://discord.com/developers/docs/interactions/message-components#button-object-button-styles
-	 * @see https://discord.com/developers/docs/interactions/message-components#button-object-button-styles
+   */
-	 */
+  style?: "primary" | "secondary" | "success" | "danger"
-	style?: "primary" | "secondary" | "success" | "danger"
 
-	/** Happens when a user clicks the button. */
+  /**
-	onClick: (event: ButtonClickEvent) => void
+   * Happens when a user clicks the button.
+   */
+  onClick: (event: ButtonClickEvent) => void
 }
 
-/** @category Button */
+/**
+ * @category Button
+ */
 export type ButtonClickEvent = ComponentEvent
 
-/** @category Button */
+/**
+ * @category Button
+ */
 export function Button(props: ButtonProps) {
-	return (
+  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 = randomUUID()
+  private customId = nanoid()
 
-	// this has text children, but buttons themselves shouldn't yield text
+  override modifyMessageOptions(options: MessageOptions): void {
-	// eslint-disable-next-line @typescript-eslint/class-literal-property-style
+    getNextActionRow(options).push({
-	override get text() {
+      type: "button",
-		return ""
+      customId: this.customId,
-	}
+      style: this.props.style ?? "secondary",
+      disabled: this.props.disabled,
+      emoji: this.props.emoji,
+      label: this.props.label,
+    })
+  }
 
-	override modifyMessageOptions(options: MessageOptions): void {
+  override handleComponentInteraction(interaction: ComponentInteraction) {
-		getNextActionRow(options).push({
+    if (
-			type: "button",
+      interaction.type === "button" &&
-			customId: this.customId,
+      interaction.customId === this.customId
-			style: this.props.style ?? "secondary",
+    ) {
-			disabled: this.props.disabled,
+      this.props.onClick(interaction.event)
-			emoji: this.props.emoji,
+      return true
-			label: this.children.findType(ButtonLabelNode)?.text,
+    }
-		})
+    return false
-	}
+  }
-
-	override handleComponentInteraction(interaction: ComponentInteraction) {
-		if (
-			interaction.type === "button" &&
-			interaction.customId === this.customId
-		) {
-			this.props.onClick(interaction.event)
-			return true
-		}
-		return false
-	}
 }
-
-class ButtonLabelNode extends Node<Record<string, never>> {}

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

@@ -1,36 +1,36 @@
-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"
 
-/** @category Embed */
+/**
-export interface EmbedAuthorProps {
+ * @category Embed
-	name?: ReactNode
+ */
-	children?: ReactNode
+export type EmbedAuthorProps = {
-	url?: string
+  name?: string
-	iconUrl?: string
+  children?: string
+  url?: string
+  iconUrl?: string
 }
 
-/** @category Embed */
+/**
+ * @category Embed
+ */
 export function EmbedAuthor(props: EmbedAuthorProps) {
-	return (
+  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 {
+  override modifyEmbedOptions(options: EmbedOptions): void {
-		options.author = {
+    options.author = {
-			name: this.children.findType(AuthorTextNode)?.text ?? "",
+      name: this.props.name ?? this.props.children ?? "",
-			url: this.props.url,
+      url: this.props.url,
-			icon_url: this.props.iconUrl,
+      icon_url: this.props.iconUrl,
-		}
+    }
-	}
+  }
 }
-
-class AuthorTextNode extends Node<Record<string, never>> {}

packages/reacord/library/core/components/embed-child.ts

@@ -2,5 +2,5 @@ import { Node } from "../../internal/node.js"
 import type { EmbedOptions } from "./embed-options"
 
 export abstract class EmbedChildNode<Props> extends Node<Props> {
-	abstract modifyEmbedOptions(options: EmbedOptions): void
+  abstract modifyEmbedOptions(options: EmbedOptions): void
 }

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

@@ -1,41 +1,37 @@
-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"
 
-/** @category Embed */
+/**
-export interface EmbedFieldProps {
+ * @category Embed
-	name: ReactNode
+ */
-	value?: ReactNode
+export type EmbedFieldProps = {
-	inline?: boolean
+  name: string
-	children?: ReactNode
+  value?: string
+  inline?: boolean
+  children?: string
 }
 
-/** @category Embed */
+/**
+ * @category Embed
+ */
 export function EmbedField(props: EmbedFieldProps) {
-	return (
+  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>
-	)
 }
 
 class EmbedFieldNode extends EmbedChildNode<EmbedFieldProps> {
-	override modifyEmbedOptions(options: EmbedOptions): void {
+  override modifyEmbedOptions(options: EmbedOptions): void {
-		options.fields ??= []
+    options.fields ??= []
-		options.fields.push({
+    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,
+      inline: this.props.inline,
-		})
+    })
-	}
+  }
 }
-
-class FieldNameNode extends Node<Record<string, never>> {}
-class FieldValueNode extends Node<Record<string, never>> {}

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

@@ -1,40 +1,38 @@
-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"
 
-/** @category Embed */
+/**
-export interface EmbedFooterProps {
+ * @category Embed
-	text?: ReactNode
+ */
-	children?: ReactNode
+export type EmbedFooterProps = {
-	iconUrl?: string
+  text?: string
-	timestamp?: string | number | Date
+  children?: string
+  iconUrl?: string
+  timestamp?: string | number | Date
 }
 
-/** @category Embed */
+/**
-export function EmbedFooter({ text, children, ...props }: EmbedFooterProps) {
+ * @category Embed
-	return (
+ */
-		<ReacordElement props={props} createNode={() => new EmbedFooterNode(props)}>
+export function EmbedFooter(props: EmbedFooterProps) {
-			<ReacordElement props={{}} createNode={() => new FooterTextNode({})}>
+  return (
-				{text ?? children}
+    <ReacordElement
-			</ReacordElement>
+      props={props}
-		</ReacordElement>
+      createNode={() => new EmbedFooterNode(props)}
-	)
+    />
+  )
 }
 
-class EmbedFooterNode extends EmbedChildNode<
+class EmbedFooterNode extends EmbedChildNode<EmbedFooterProps> {
-	Omit<EmbedFooterProps, "text" | "children">
+  override modifyEmbedOptions(options: EmbedOptions): void {
-> {
+    options.footer = {
-	override modifyEmbedOptions(options: EmbedOptions): void {
+      text: this.props.text ?? this.props.children ?? "",
-		options.footer = {
+      icon_url: this.props.iconUrl,
-			text: this.children.findType(FooterTextNode)?.text ?? "",
+    }
-			icon_url: this.props.iconUrl,
+    options.timestamp = this.props.timestamp
-		}
+      ? new Date(this.props.timestamp).toISOString()
-		options.timestamp = this.props.timestamp
+      : undefined
-			? new Date(this.props.timestamp).toISOString()
+  }
-			: undefined
-	}
 }
-
-class FooterTextNode extends Node<Record<string, never>> {}

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

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

packages/reacord/library/core/components/embed-options.ts

@@ -1,8 +1,8 @@
-import type { EmbedProps } from "./embed"
 import type { Except, SnakeCasedPropertiesDeep } from "type-fest"
+import type { EmbedProps } from "./embed"
 
 export type EmbedOptions = SnakeCasedPropertiesDeep<
-	Except<EmbedProps, "timestamp" | "children"> & {
+  Except<EmbedProps, "timestamp" | "children"> & {
-		timestamp?: string
+    timestamp?: string
-	}
+  }
 >

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

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

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

@@ -1,31 +1,31 @@
-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"
 
-/** @category Embed */
+/**
-export interface EmbedTitleProps {
+ * @category Embed
-	children: ReactNode
+ */
-	url?: string
+export type EmbedTitleProps = {
+  children: string
+  url?: string
 }
 
-/** @category Embed */
+/**
-export function EmbedTitle({ children, ...props }: EmbedTitleProps) {
+ * @category Embed
-	return (
+ */
-		<ReacordElement props={props} createNode={() => new EmbedTitleNode(props)}>
+export function EmbedTitle(props: EmbedTitleProps) {
-			<ReacordElement props={{}} createNode={() => new TitleTextNode({})}>
+  return (
-				{children}
+    <ReacordElement
-			</ReacordElement>
+      props={props}
-		</ReacordElement>
+      createNode={() => new EmbedTitleNode(props)}
-	)
+    />
+  )
 }
 
-class EmbedTitleNode extends EmbedChildNode<Omit<EmbedTitleProps, "children">> {
+class EmbedTitleNode extends EmbedChildNode<EmbedTitleProps> {
-	override modifyEmbedOptions(options: EmbedOptions): void {
+  override modifyEmbedOptions(options: EmbedOptions): void {
-		options.title = this.children.findType(TitleTextNode)?.text ?? ""
+    options.title = this.props.children
-		options.url = this.props.url
+    options.url = this.props.url
-	}
+  }
 }
-
-class TitleTextNode extends Node<Record<string, never>> {}

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

@@ -1,6 +1,6 @@
-import { snakeCaseDeep } from "@reacord/helpers/convert-object-property-case"
+import React from "react"
-import { omit } from "@reacord/helpers/omit"
+import { snakeCaseDeep } from "../../../helpers/convert-object-property-case"
-import type React from "react"
+import { omit } from "../../../helpers/omit"
 import { ReacordElement } from "../../internal/element.js"
 import type { MessageOptions } from "../../internal/message"
 import { Node } from "../../internal/node.js"
@@ -12,19 +12,19 @@ import type { EmbedOptions } from "./embed-options"
  * @category Embed
  * @see https://discord.com/developers/docs/resources/channel#embed-object
  */
-export interface EmbedProps {
+export type EmbedProps = {
-	title?: string
+  title?: string
-	description?: string
+  description?: string
-	url?: string
+  url?: string
-	color?: number
+  color?: number
-	fields?: Array<{ name: string; value: string; inline?: boolean }>
+  fields?: Array<{ name: string; value: string; inline?: boolean }>
-	author?: { name: string; url?: string; iconUrl?: string }
+  author?: { name: string; url?: string; iconUrl?: string }
-	thumbnail?: { url: string }
+  thumbnail?: { url: string }
-	image?: { url: string }
+  image?: { url: string }
-	video?: { url: string }
+  video?: { url: string }
-	footer?: { text: string; iconUrl?: string }
+  footer?: { text: string; iconUrl?: string }
-	timestamp?: string | number | Date
+  timestamp?: string | number | Date
-	children?: React.ReactNode
+  children?: React.ReactNode
 }
 
 /**
@@ -32,31 +32,31 @@ export interface EmbedProps {
  * @see https://discord.com/developers/docs/resources/channel#embed-object
  */
 export function Embed(props: EmbedProps) {
-	return (
+  return (
-		<ReacordElement props={props} createNode={() => new EmbedNode(props)}>
+    <ReacordElement props={props} createNode={() => new EmbedNode(props)}>
-			{props.children}
+      {props.children}
-		</ReacordElement>
+    </ReacordElement>
-	)
+  )
 }
 
 class EmbedNode extends Node<EmbedProps> {
-	override modifyMessageOptions(options: MessageOptions): void {
+  override modifyMessageOptions(options: MessageOptions): void {
-		const embed: EmbedOptions = {
+    const embed: EmbedOptions = {
-			...snakeCaseDeep(omit(this.props, ["children", "timestamp"])),
+      ...snakeCaseDeep(omit(this.props, ["children", "timestamp"])),
-			timestamp: this.props.timestamp
+      timestamp: this.props.timestamp
-				? new Date(this.props.timestamp).toISOString()
+        ? new Date(this.props.timestamp).toISOString()
-				: undefined,
+        : undefined,
-		}
+    }
 
-		for (const child of this.children) {
+    for (const child of this.children) {
-			if (child instanceof EmbedChildNode) {
+      if (child instanceof EmbedChildNode) {
-				child.modifyEmbedOptions(embed)
+        child.modifyEmbedOptions(embed)
-			}
+      }
-			if (child instanceof TextNode) {
+      if (child instanceof TextNode) {
-				embed.description = (embed.description ?? "") + child.props
+        embed.description = (embed.description || "") + child.props
-			}
+      }
-		}
+    }
 
-		options.embeds.push(embed)
+    options.embeds.push(embed)
-	}
+  }
 }

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

@@ -1,38 +1,35 @@
+import React from "react"
 import { ReacordElement } from "../../internal/element.js"
 import type { MessageOptions } from "../../internal/message"
 import { getNextActionRow } from "../../internal/message"
 import { Node } from "../../internal/node.js"
 import type { ButtonSharedProps } from "./button-shared-props"
 
-/** @category Link */
+/**
+ * @category Link
+ */
 export type LinkProps = ButtonSharedProps & {
-	/** The URL the link should lead to */
+  /** The URL the link should lead to */
-	url: string
+  url: string
-	/** The link text */
+  /** The link text */
-	children?: string
+  children?: string
 }
 
-/** @category Link */
+/**
-export function Link({ label, children, ...props }: LinkProps) {
+ * @category Link
-	return (
+ */
-		<ReacordElement props={props} createNode={() => new LinkNode(props)}>
+export function Link(props: LinkProps) {
-			<ReacordElement props={{}} createNode={() => new LinkTextNode({})}>
+  return <ReacordElement props={props} createNode={() => new LinkNode(props)} />
-				{label ?? children}
-			</ReacordElement>
-		</ReacordElement>
-	)
 }
 
-class LinkNode extends Node<Omit<LinkProps, "label" | "children">> {
+class LinkNode extends Node<LinkProps> {
-	override modifyMessageOptions(options: MessageOptions): void {
+  override modifyMessageOptions(options: MessageOptions): void {
-		getNextActionRow(options).push({
+    getNextActionRow(options).push({
-			type: "link",
+      type: "link",
-			disabled: this.props.disabled,
+      disabled: this.props.disabled,
-			emoji: this.props.emoji,
+      emoji: this.props.emoji,
-			label: this.children.findType(LinkTextNode)?.text,
+      label: this.props.label || this.props.children,
-			url: this.props.url,
+      url: this.props.url,
-		})
+    })
-	}
+  }
 }
-
-class LinkTextNode extends Node<Record<string, never>> {}

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 {
-	get options(): MessageSelectOptionOptions {
+      label: this.props.children || this.props.label || this.props.value,
-		return {
+      value: this.props.value,
-			label: this.children.findType(OptionLabelNode)?.text ?? this.props.value,
+      description: this.props.description,
-			value: this.props.value,
+      emoji: this.props.emoji,
-			description: this.children.findType(OptionDescriptionNode)?.text,
+    }
-			emoji: this.props.emoji,
+  }
-		}
-	}
 }
-
-export class OptionLabelNode extends Node<Record<string, never>> {}
-export class OptionDescriptionNode extends Node<Record<string, never>> {}

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

@@ -1,56 +1,38 @@
-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 */
+/**
-export interface OptionProps {
+ * @category Select
-	/** The internal value of this option */
+ */
-	value: string
+export type OptionProps = {
-	/** The text shown to the user. This takes priority over `children` */
+  /** The internal value of this option */
-	label?: ReactNode
+  value: string
-	/** The text shown to the user */
+  /** The text shown to the user. This takes priority over `children` */
-	children?: ReactNode
+  label?: string
-	/** Description for the option, shown to the user */
+  /** The text shown to the user */
-	description?: ReactNode
+  children?: string
+  /** Description for the option, shown to the user */
+  description?: string
 
-	/**
+  /**
-	 * Renders an emoji to the left of the text.
+   * Renders an emoji to the left of the text.
-	 *
+   *
-	 * Has to be a literal emoji character (e.g. 🍍), or an emoji code, like
+   * Has to be a literal emoji character (e.g. 🍍),
-	 * `<:plus_one:778531744860602388>`.
+   * or an emoji code, like `<:plus_one:778531744860602388>`.
-	 *
+   *
-	 * To get an emoji code, type your emoji in Discord chat with a backslash `\`
+   * To get an emoji code, type your emoji in Discord chat
-	 * in front. The bot has to be in the emoji's guild to use it.
+   * with a backslash `\` in front.
-	 */
+   * The bot has to be in the emoji's guild to use it.
-	emoji?: string
+   */
+  emoji?: string
 }
 
-/** @category Select */
+/**
-export function Option({
+ * @category Select
-	label,
+ */
-	children,
+export function Option(props: OptionProps) {
-	description,
+  return (
-	...props
+    <ReacordElement props={props} createNode={() => new OptionNode(props)} />
-}: OptionProps) {
+  )
-	return (
-		<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/components/select.tsx

@@ -1,152 +1,153 @@
-import { isInstanceOf } from "@reacord/helpers/is-instance-of"
+import { nanoid } from "nanoid"
-import { randomUUID } from "node:crypto"
 import type { ReactNode } from "react"
+import React from "react"
+import { isInstanceOf } from "../../../helpers/is-instance-of"
 import { ReacordElement } from "../../internal/element.js"
 import type { ComponentInteraction } from "../../internal/interaction"
 import type {
-	ActionRow,
+  ActionRow,
-	ActionRowItem,
+  ActionRowItem,
-	MessageOptions,
+  MessageOptions,
 } from "../../internal/message"
 import { Node } from "../../internal/node.js"
 import type { ComponentEvent } from "../component-event"
 import { OptionNode } from "./option-node"
-import { omit } from "@reacord/helpers/omit.js"
 
-/** @category Select */
+/**
-export interface SelectProps {
+ * @category Select
-	children?: ReactNode
+ */
-	/** Sets the currently selected value */
+export type SelectProps = {
-	value?: string
+  children?: ReactNode
+  /** Sets the currently selected value */
+  value?: string
 
-	/** Sets the currently selected values, for use with `multiple` */
+  /** Sets the currently selected values, for use with `multiple` */
-	values?: string[]
+  values?: string[]
 
-	/** The text shown when no value is selected */
+  /** The text shown when no value is selected */
-	placeholder?: string
+  placeholder?: string
 
-	/** Set to true to allow multiple selected values */
+  /** Set to true to allow multiple selected values */
-	multiple?: boolean
+  multiple?: boolean
 
-	/**
+  /**
-	 * With `multiple`, the minimum number of values that can be selected. When
+   * With `multiple`, the minimum number of values that can be selected.
-	 * `multiple` is false or not defined, this is always 1.
+   * When `multiple` is false or not defined, this is always 1.
-	 *
+   *
-	 * This only limits the number of values that can be received by the user.
+   * This only limits the number of values that can be received by the user.
-	 * This does not limit the number of values that can be displayed by you.
+   * This does not limit the number of values that can be displayed by you.
-	 */
+   */
-	minValues?: number
+  minValues?: number
 
-	/**
+  /**
-	 * With `multiple`, the maximum number of values that can be selected. When
+   * With `multiple`, the maximum number of values that can be selected.
-	 * `multiple` is false or not defined, this is always 1.
+   * When `multiple` is false or not defined, this is always 1.
-	 *
+   *
-	 * This only limits the number of values that can be received by the user.
+   * This only limits the number of values that can be received by the user.
-	 * This does not limit the number of values that can be displayed by you.
+   * This does not limit the number of values that can be displayed by you.
-	 */
+   */
-	maxValues?: number
+  maxValues?: number
 
-	/**
+  /** When true, the select will be slightly faded, and cannot be interacted with. */
-	 * When true, the select will be slightly faded, and cannot be interacted
+  disabled?: boolean
-	 * with.
-	 */
-	disabled?: boolean
 
-	/**
+  /**
-	 * Called when the user inputs a selection. Receives the entire select change
+   * Called when the user inputs a selection.
-	 * event, which can be used to create new replies, etc.
+   * Receives the entire select change event,
-	 */
+   * which can be used to create new replies, etc.
-	onChange?: (event: SelectChangeEvent) => void
+   */
+  onChange?: (event: SelectChangeEvent) => void
 
-	/**
+  /**
-	 * Convenience shorthand for `onChange`, which receives the first selected
+   * Convenience shorthand for `onChange`, which receives the first selected value.
-	 * value.
+   */
-	 */
+  onChangeValue?: (value: string, event: SelectChangeEvent) => void
-	onChangeValue?: (value: string, event: SelectChangeEvent) => void
 
-	/** Convenience shorthand for `onChange`, which receives all selected values. */
+  /**
-	onChangeMultiple?: (values: string[], event: SelectChangeEvent) => void
+   * Convenience shorthand for `onChange`, which receives all selected values.
+   */
+  onChangeMultiple?: (values: string[], event: SelectChangeEvent) => void
 }
 
-/** @category Select */
+/**
+ * @category Select
+ */
 export type SelectChangeEvent = ComponentEvent & {
-	values: string[]
+  values: string[]
 }
 
 /**
  * See [the select menu guide](/guides/select-menu) for a usage example.
- *
  * @category Select
  */
 export function Select(props: SelectProps) {
-	return (
+  return (
-		<ReacordElement props={props} createNode={() => new SelectNode(props)}>
+    <ReacordElement props={props} createNode={() => new SelectNode(props)}>
-			{props.children}
+      {props.children}
-		</ReacordElement>
+    </ReacordElement>
-	)
+  )
 }
 
 class SelectNode extends Node<SelectProps> {
-	readonly customId = randomUUID()
+  readonly customId = nanoid()
 
-	override modifyMessageOptions(message: MessageOptions): void {
+  override modifyMessageOptions(message: MessageOptions): void {
-		const actionRow: ActionRow = []
+    const actionRow: ActionRow = []
-		message.actionRows.push(actionRow)
+    message.actionRows.push(actionRow)
 
-		const options = [...this.children]
+    const options = [...this.children]
-			.filter(isInstanceOf(OptionNode))
+      .filter(isInstanceOf(OptionNode))
-			.map((node) => node.options)
+      .map((node) => node.options)
 
-		const {
+    const {
-			multiple,
+      multiple,
-			value,
+      value,
-			values,
+      values,
-			minValues = 0,
+      minValues = 0,
-			maxValues = 25,
+      maxValues = 25,
-			...props
+      children,
-		} = omit(this.props, [
+      onChange,
-			"children",
+      onChangeValue,
-			"onChange",
+      onChangeMultiple,
-			"onChangeValue",
+      ...props
-			"onChangeMultiple",
+    } = this.props
-		])
 
-		const item: ActionRowItem = {
+    const item: ActionRowItem = {
-			...props,
+      ...props,
-			type: "select",
+      type: "select",
-			customId: this.customId,
+      customId: this.customId,
-			options,
+      options,
-			values: [],
+      values: [],
-		}
+    }
 
-		if (multiple) {
+    if (multiple) {
-			item.minValues = minValues
+      item.minValues = minValues
-			item.maxValues = maxValues
+      item.maxValues = maxValues
-			if (values) item.values = values
+      if (values) item.values = values
-		}
+    }
 
-		if (!multiple && value != undefined) {
+    if (!multiple && value != undefined) {
-			item.values = [value]
+      item.values = [value]
-		}
+    }
 
-		actionRow.push(item)
+    actionRow.push(item)
-	}
+  }
 
-	override handleComponentInteraction(
+  override handleComponentInteraction(
-		interaction: ComponentInteraction,
+    interaction: ComponentInteraction,
-	): boolean {
+  ): boolean {
-		const isSelectInteraction =
+    const isSelectInteraction =
-			interaction.type === "select" &&
+      interaction.type === "select" &&
-			interaction.customId === this.customId &&
+      interaction.customId === this.customId &&
-			!this.props.disabled
+      !this.props.disabled
 
-		if (!isSelectInteraction) return false
+    if (!isSelectInteraction) return false
 
-		this.props.onChange?.(interaction.event)
+    this.props.onChange?.(interaction.event)
-		this.props.onChangeMultiple?.(interaction.event.values, interaction.event)
+    this.props.onChangeMultiple?.(interaction.event.values, interaction.event)
-		if (interaction.event.values[0]) {
+    if (interaction.event.values[0]) {
-			this.props.onChangeValue?.(interaction.event.values[0], interaction.event)
+      this.props.onChangeValue?.(interaction.event.values[0], interaction.event)
-		}
+    }
-		return true
+    return true
-	}
+  }
 }

packages/reacord/library/core/instance-context.tsx

@@ -1,20 +0,0 @@
-import type { ReacordInstance } from "./instance.js"
-import { raise } from "@reacord/helpers/raise.js"
-import * as React from "react"
-
-const Context = React.createContext<ReacordInstance | undefined>(undefined)
-
-export const InstanceProvider = Context.Provider
-
-/**
- * Get the associated instance for the current component.
- *
- * @category Core
- * @see https://reacord.mapleleaf.dev/guides/use-instance
- */
-export function useInstance(): ReacordInstance {
-	return (
-		React.useContext(Context) ??
-		raise("Could not find instance, was this component rendered via Reacord?")
-	)
-}

packages/reacord/library/core/instance.ts

@@ -2,19 +2,18 @@ import type { ReactNode } from "react"
 
 /**
  * Represents an interactive message, which can later be replaced or deleted.
- *
  * @category Core
  */
-export interface ReacordInstance {
+export type ReacordInstance = {
-	/** Render some JSX to this instance (edits the message) */
+  /** Render some JSX to this instance (edits the message) */
-	render: (content: ReactNode) => ReacordInstance
+  render: (content: ReactNode) => void
 
-	/** Remove this message */
+  /** Remove this message */
-	destroy: () => void
+  destroy: () => void
 
-	/**
+  /**
-	 * Same as destroy, but keeps the message and disables the components on it.
+   * Same as destroy, but keeps the message and disables the components on it.
-	 * This prevents it from listening to user interactions.
+   * This prevents it from listening to user interactions.
-	 */
+   */
-	deactivate: () => void
+  deactivate: () => void
 }

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

@@ -1,25 +1,21 @@
-import { safeJsonStringify } from "@reacord/helpers/json"
+/* eslint-disable class-methods-use-this */
-import { pick } from "@reacord/helpers/pick"
-import { pruneNullishValues } from "@reacord/helpers/prune-nullish-values"
-import { raise } from "@reacord/helpers/raise"
 import * as Discord from "discord.js"
 import type { ReactNode } from "react"
 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 {
-	ComponentEventChannel,
+  ChannelInfo,
-	ComponentEventGuild,
+  GuildInfo,
-	ComponentEventGuildMember,
+  GuildMemberInfo,
-	ComponentEventMessage,
+  MessageInfo,
-	ComponentEventReplyOptions,
+  UserInfo,
-	ComponentEventUser,
 } from "./component-event"
 import type { ReacordInstance } from "./instance"
 import type { ReacordConfig } from "./reacord"
@@ -27,404 +23,358 @@ import { Reacord } from "./reacord"
 
 /**
  * The Reacord adapter for Discord.js.
- *
  * @category Core
  */
 export class ReacordDiscordJs extends Reacord {
-	constructor(
+  constructor(private client: Discord.Client, config: ReacordConfig = {}) {
-		private client: Discord.Client,
+    super(config)
-		config: ReacordConfig = {},
-	) {
-		super(config)
 
-		client.on("interactionCreate", (interaction) => {
+    client.on("interactionCreate", (interaction) => {
-			if (interaction.isButton() || interaction.isStringSelectMenu()) {
+      if (interaction.isMessageComponent()) {
-				this.handleComponentInteraction(
+        this.handleComponentInteraction(
-					this.createReacordComponentInteraction(interaction),
+          this.createReacordComponentInteraction(interaction),
-				)
+        )
-			}
+      }
-		})
+    })
-	}
+  }
 
-	/**
+  /**
-	 * Sends a message to a channel.
+   * Sends a message to a channel.
-	 *
+   * @see https://reacord.fly.dev/guides/sending-messages
-	 * @param target Discord channel object.
+   */
-	 * @param [options] Options for the channel message
+  override send(
-	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
+    channelId: string,
-	 * @see {@link Discord.MessageCreateOptions}
+    initialContent?: React.ReactNode,
-	 */
+  ): ReacordInstance {
-	public createChannelMessage(
+    return this.createInstance(
-		target: Discord.ChannelResolvable,
+      this.createChannelRenderer(channelId),
-		options: Discord.MessageCreateOptions = {},
+      initialContent,
-	): ReacordInstance {
+    )
-		return this.createInstance(
+  }
-			this.createChannelMessageRenderer(target, options),
-		)
-	}
 
-	/**
+  /**
-	 * Replies to a command interaction by sending a message.
+   * Sends a message as a reply to a command interaction.
-	 *
+   * @see https://reacord.fly.dev/guides/sending-messages
-	 * @param interaction Discord command interaction object.
+   */
-	 * @param [options] Custom options for the interaction reply method.
+  override reply(
-	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
+    interaction: Discord.CommandInteraction,
-	 * @see {@link Discord.InteractionReplyOptions}
+    initialContent?: React.ReactNode,
-	 */
+  ): ReacordInstance {
-	public createInteractionReply(
+    return this.createInstance(
-		interaction: Discord.CommandInteraction,
+      this.createInteractionReplyRenderer(interaction),
-		options: Discord.InteractionReplyOptions = {},
+      initialContent,
-	): ReacordInstance {
+    )
-		return this.createInstance(
+  }
-			this.createInteractionReplyRenderer(interaction, options),
-		)
-	}
 
-	/**
+  /**
-	 * Sends a message to a channel.
+   * Sends an ephemeral message as a reply to a command interaction.
-	 *
+   * @see https://reacord.fly.dev/guides/sending-messages
-	 * @deprecated Use reacord.createChannelMessage() instead.
+   */
-	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
+  override ephemeralReply(
-	 */
+    interaction: Discord.CommandInteraction,
-	public send(
+    initialContent?: React.ReactNode,
-		channel: Discord.ChannelResolvable,
+  ): ReacordInstance {
-		initialContent?: React.ReactNode,
+    return this.createInstance(
-	): ReacordInstance {
+      this.createEphemeralInteractionReplyRenderer(interaction),
-		return this.createInstance(
+      initialContent,
-			this.createChannelMessageRenderer(channel, {}),
+    )
-			initialContent,
+  }
-		)
-	}
 
-	/**
+  private createChannelRenderer(channelId: string) {
-	 * Sends a message as a reply to a command interaction.
+    return new ChannelMessageRenderer({
-	 *
+      send: async (options) => {
-	 * @deprecated Use reacord.createInteractionReply() instead.
+        const channel =
-	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
+          this.client.channels.cache.get(channelId) ??
-	 */
+          (await this.client.channels.fetch(channelId)) ??
-	public reply(
+          raise(`Channel ${channelId} not found`)
-		interaction: Discord.CommandInteraction,
-		initialContent?: React.ReactNode,
-	): ReacordInstance {
-		return this.createInstance(
-			this.createInteractionReplyRenderer(interaction, {}),
-			initialContent,
-		)
-	}
 
-	/**
+        if (!channel.isText()) {
-	 * Sends an ephemeral message as a reply to a command interaction.
+          raise(`Channel ${channelId} is not a text channel`)
-	 *
+        }
-	 * @deprecated Use reacord.createInteractionReply(interaction, { ephemeral:
-	 *   true })
-	 * @see https://reacord.mapleleaf.dev/guides/sending-messages
-	 */
-	public ephemeralReply(
-		interaction: Discord.CommandInteraction,
-		initialContent?: React.ReactNode,
-	): ReacordInstance {
-		return this.createInstance(
-			this.createInteractionReplyRenderer(interaction, {
-				ephemeral: true,
-			}),
-			initialContent,
-		)
-	}
 
-	private createChannelMessageRenderer(
+        const message = await channel.send(getDiscordMessageOptions(options))
-		channelResolvable: Discord.ChannelResolvable,
+        return createReacordMessage(message)
-		messageCreateOptions?: Discord.MessageCreateOptions,
+      },
-	) {
+    })
-		return new ChannelMessageRenderer({
+  }
-			send: async (messageOptions) => {
-				let channel = this.client.channels.resolve(channelResolvable)
-				if (!channel && typeof channelResolvable === "string") {
-					channel = await this.client.channels.fetch(channelResolvable)
-				}
 
-				if (!channel) {
+  private createInteractionReplyRenderer(
-					const id =
+    interaction:
-						typeof channelResolvable === "string"
+      | Discord.CommandInteraction
-							? channelResolvable
+      | Discord.MessageComponentInteraction,
-							: channelResolvable.id
+  ) {
-					raise(`Channel ${id} not found`)
+    return new InteractionReplyRenderer({
-				}
+      type: "command",
+      id: interaction.id,
+      reply: async (options) => {
+        const message = await interaction.reply({
+          ...getDiscordMessageOptions(options),
+          fetchReply: true,
+        })
+        return createReacordMessage(message as Discord.Message)
+      },
+      followUp: async (options) => {
+        const message = await interaction.followUp({
+          ...getDiscordMessageOptions(options),
+          fetchReply: true,
+        })
+        return createReacordMessage(message as Discord.Message)
+      },
+    })
+  }
 
-				if (!channel.isTextBased()) {
+  private createEphemeralInteractionReplyRenderer(
-					raise(`Channel ${channel.id} must be a text channel`)
+    interaction:
-				}
+      | Discord.CommandInteraction
+      | Discord.MessageComponentInteraction,
+  ) {
+    return new InteractionReplyRenderer({
+      type: "command",
+      id: interaction.id,
+      reply: async (options) => {
+        await interaction.reply({
+          ...getDiscordMessageOptions(options),
+          ephemeral: true,
+        })
+        return createEphemeralReacordMessage()
+      },
+      followUp: async (options) => {
+        await interaction.followUp({
+          ...getDiscordMessageOptions(options),
+          ephemeral: true,
+        })
+        return createEphemeralReacordMessage()
+      },
+    })
+  }
 
-				const message = await channel.send({
+  private createReacordComponentInteraction(
-					...getDiscordMessageOptions(messageOptions),
+    interaction: Discord.MessageComponentInteraction,
-					...messageCreateOptions,
+  ): ComponentInteraction {
-				})
+    // todo please dear god clean this up
-				return createReacordMessage(message)
+    const channel: ChannelInfo = interaction.channel
-			},
+      ? {
-		})
+          ...pick(pruneNullishValues(interaction.channel), [
-	}
+            "topic",
+            "nsfw",
+            "lastMessageId",
+            "ownerId",
+            "parentId",
+            "rateLimitPerUser",
+          ]),
+          id: interaction.channelId,
+        }
+      : raise("Non-channel interactions are not supported")
 
-	private createInteractionReplyRenderer(
+    const message: MessageInfo =
-		interaction:
+      interaction.message instanceof Discord.Message
-			| Discord.CommandInteraction
+        ? {
-			| Discord.MessageComponentInteraction,
+            ...pick(interaction.message, [
-		interactionReplyOptions: Discord.InteractionReplyOptions,
+              "id",
-	) {
+              "channelId",
-		return new InteractionReplyRenderer({
+              "authorId",
-			interactionId: interaction.id,
+              "content",
-			reply: async (messageOptions) => {
+              "tts",
-				const message = await interaction.reply({
+              "mentionEveryone",
-					...getDiscordMessageOptions(messageOptions),
+            ]),
-					...interactionReplyOptions,
+            timestamp: new Date(
-					fetchReply: true,
+              interaction.message.createdTimestamp,
-				})
+            ).toISOString(),
-				return createReacordMessage(message)
+            editedTimestamp: interaction.message.editedTimestamp
-			},
+              ? new Date(interaction.message.editedTimestamp).toISOString()
-			followUp: async (messageOptions) => {
+              : undefined,
-				const message = await interaction.followUp({
+            mentions: interaction.message.mentions.users.map((u) => u.id),
-					...getDiscordMessageOptions(messageOptions),
+          }
-					...interactionReplyOptions,
+        : raise("Message not found")
-					fetchReply: true,
-				})
-				return createReacordMessage(message)
-			},
-		})
-	}
 
-	private createReacordComponentInteraction(
+    const member: GuildMemberInfo | undefined =
-		interaction: Discord.MessageComponentInteraction,
+      interaction.member instanceof Discord.GuildMember
-	): ComponentInteraction {
+        ? {
-		// todo please dear god clean this up
+            ...pick(pruneNullishValues(interaction.member), [
-		const channel: ComponentEventChannel = interaction.channel
+              "id",
-			? {
+              "nick",
-					...pruneNullishValues(
+              "displayName",
-						pick(interaction.channel, [
+              "avatarUrl",
-							"topic",
+              "displayAvatarUrl",
-							"nsfw",
+              "color",
-							"lastMessageId",
+              "pending",
-							"ownerId",
+            ]),
-							"parentId",
+            displayName: interaction.member.displayName,
-							"rateLimitPerUser",
+            roles: [...interaction.member.roles.cache.map((role) => role.id)],
-						]),
+            joinedAt: interaction.member.joinedAt?.toISOString(),
-					),
+            premiumSince: interaction.member.premiumSince?.toISOString(),
-					id: interaction.channelId,
+            communicationDisabledUntil:
-			  }
+              interaction.member.communicationDisabledUntil?.toISOString(),
-			: raise("Non-channel interactions are not supported")
+          }
+        : undefined
 
-		const message: ComponentEventMessage =
+    const guild: GuildInfo | undefined = interaction.guild
-			interaction.message instanceof Discord.Message
+      ? {
-				? {
+          ...pick(pruneNullishValues(interaction.guild), ["id", "name"]),
-						...pick(interaction.message, [
+          member: member ?? raise("unexpected: member is undefined"),
-							"id",
+        }
-							"channelId",
+      : undefined
-							"authorId",
-							"content",
-							"tts",
-							"mentionEveryone",
-						]),
-						timestamp: new Date(
-							interaction.message.createdTimestamp,
-						).toISOString(),
-						editedTimestamp: interaction.message.editedTimestamp
-							? new Date(interaction.message.editedTimestamp).toISOString()
-							: undefined,
-						mentions: interaction.message.mentions.users.map((u) => u.id),
-						authorId: interaction.message.author.id,
-						mentionEveryone: interaction.message.mentions.everyone,
-				  }
-				: raise("Message not found")
 
-		const member: ComponentEventGuildMember | undefined =
+    const user: UserInfo = {
-			interaction.member instanceof Discord.GuildMember
+      ...pick(pruneNullishValues(interaction.user), [
-				? {
+        "id",
-						...pruneNullishValues(
+        "username",
-							pick(interaction.member, [
+        "discriminator",
-								"id",
+        "tag",
-								"nick",
+      ]),
-								"displayName",
+      avatarUrl: interaction.user.avatarURL()!,
-								"avatarUrl",
+      accentColor: interaction.user.accentColor ?? undefined,
-								"displayAvatarUrl",
+    }
-								"color",
-								"pending",
-							]),
-						),
-						displayName: interaction.member.displayName,
-						roles: interaction.member.roles.cache.map((role) => role.id),
-						joinedAt: interaction.member.joinedAt?.toISOString(),
-						premiumSince: interaction.member.premiumSince?.toISOString(),
-						communicationDisabledUntil:
-							interaction.member.communicationDisabledUntil?.toISOString(),
-						color: interaction.member.displayColor,
-						displayAvatarUrl: interaction.member.displayAvatarURL(),
-				  }
-				: undefined
 
-		const guild: ComponentEventGuild | undefined = interaction.guild
+    const baseProps: Except<ComponentInteraction, "type"> = {
-			? {
+      id: interaction.id,
-					...pruneNullishValues(pick(interaction.guild, ["id", "name"])),
+      customId: interaction.customId,
-					member: member ?? raise("unexpected: member is undefined"),
+      update: async (options: MessageOptions) => {
-			  }
+        await interaction.update(getDiscordMessageOptions(options))
-			: undefined
+      },
+      deferUpdate: async () => {
+        if (interaction.replied || interaction.deferred) return
+        await interaction.deferUpdate()
+      },
+      reply: async (options) => {
+        const message = await interaction.reply({
+          ...getDiscordMessageOptions(options),
+          fetchReply: true,
+        })
+        return createReacordMessage(message as Discord.Message)
+      },
+      followUp: async (options) => {
+        const message = await interaction.followUp({
+          ...getDiscordMessageOptions(options),
+          fetchReply: true,
+        })
+        return createReacordMessage(message as Discord.Message)
+      },
+      event: {
+        channel,
+        message,
+        user,
+        guild,
 
-		const user: ComponentEventUser = {
+        reply: (content?: ReactNode) =>
-			...pruneNullishValues(
+          this.createInstance(
-				pick(interaction.user, ["id", "username", "discriminator", "tag"]),
+            this.createInteractionReplyRenderer(interaction),
-			),
+            content,
-			avatarUrl: interaction.user.avatarURL(),
+          ),
-			accentColor: interaction.user.accentColor ?? undefined,
-		}
 
-		const baseProps: Except<ComponentInteraction, "type"> = {
+        ephemeralReply: (content: ReactNode) =>
-			id: interaction.id,
+          this.createInstance(
-			customId: interaction.customId,
+            this.createEphemeralInteractionReplyRenderer(interaction),
-			update: async (options: MessageOptions) => {
+            content,
-				if (interaction.deferred || interaction.replied) {
+          ),
-					await interaction.message.edit(getDiscordMessageOptions(options))
+      },
-				} else {
+    }
-					await interaction.update(getDiscordMessageOptions(options))
-				}
-			},
-			deferUpdate: async () => {
-				if (interaction.replied || interaction.deferred) return
-				await interaction.deferUpdate()
-			},
-			reply: async (options) => {
-				const message = await interaction.reply({
-					...getDiscordMessageOptions(options),
-					fetchReply: true,
-				})
-				return createReacordMessage(message)
-			},
-			followUp: async (options) => {
-				const message = await interaction.followUp({
-					...getDiscordMessageOptions(options),
-					fetchReply: true,
-				})
-				return createReacordMessage(message)
-			},
-			event: {
-				channel,
-				message,
-				user,
-				guild,
 
-				reply: (content?: ReactNode, options?: ComponentEventReplyOptions) =>
+    if (interaction.isButton()) {
-					this.createInstance(
+      return {
-						this.createInteractionReplyRenderer(interaction, options ?? {}),
+        ...baseProps,
-						content,
+        type: "button",
-					),
+      }
+    }
 
-				/** @deprecated Use event.reply(content, { ephemeral: true }) */
+    if (interaction.isSelectMenu()) {
-				ephemeralReply: (content: ReactNode) =>
+      return {
-					this.createInstance(
+        ...baseProps,
-						this.createInteractionReplyRenderer(interaction, {
+        type: "select",
-							ephemeral: true,
+        event: {
-						}),
+          ...baseProps.event,
-						content,
+          values: interaction.values,
-					),
+        },
-			},
+      }
-		}
+    }
 
-		if (interaction.isButton()) {
+    raise(`Unsupported component interaction type: ${interaction.type}`)
-			return {
+  }
-				...baseProps,
-				type: "button",
-			}
-		}
-
-		if (interaction.isStringSelectMenu()) {
-			return {
-				...baseProps,
-				type: "select",
-				event: {
-					...baseProps.event,
-					values: interaction.values,
-				},
-			}
-		}
-
-		raise(`Unsupported component interaction type: ${interaction.type}`)
-	}
 }
 
 function createReacordMessage(message: Discord.Message): Message {
-	return {
+  return {
-		edit: async (options) => {
+    edit: async (options) => {
-			await message.edit(getDiscordMessageOptions(options))
+      await message.edit(getDiscordMessageOptions(options))
-		},
+    },
-		delete: async () => {
+    disableComponents: async () => {
-			await message.delete()
+      for (const actionRow of message.components) {
-		},
+        for (const component of actionRow.components) {
-	}
+          component.setDisabled(true)
+        }
+      }
+
+      await message.edit({
+        components: message.components,
+      })
+    },
+    delete: async () => {
+      await message.delete()
+    },
+  }
 }
 
-function convertButtonStyleToEnum(style: MessageButtonOptions["style"]) {
+function createEphemeralReacordMessage(): Message {
-	const styleMap = {
+  return {
-		primary: Discord.ButtonStyle.Primary,
+    edit: () => {
-		secondary: Discord.ButtonStyle.Secondary,
+      console.warn("Ephemeral messages can't be edited")
-		success: Discord.ButtonStyle.Success,
+      return Promise.resolve()
-		danger: Discord.ButtonStyle.Danger,
+    },
-	} as const
+    disableComponents: () => {
-
+      console.warn("Ephemeral messages can't be edited")
-	return styleMap[style ?? "secondary"]
+      return Promise.resolve()
+    },
+    delete: () => {
+      console.warn("Ephemeral messages can't be deleted")
+      return Promise.resolve()
+    },
+  }
 }
 
 // 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,
-		content: reacordOptions.content || undefined,
+): Discord.MessageOptions {
-		embeds: reacordOptions.embeds,
+  const options: Discord.MessageOptions = {
-		components: reacordOptions.actionRows.map((row) => ({
+    // eslint-disable-next-line unicorn/no-null
-			type: Discord.ComponentType.ActionRow,
+    content: reacordOptions.content || null,
-			components: row.map(
+    embeds: reacordOptions.embeds,
-				(component): Discord.MessageActionRowComponentData => {
+    components: reacordOptions.actionRows.map((row) => ({
-					if (component.type === "button") {
+      type: "ACTION_ROW",
-						return {
+      components: row.map(
-							type: Discord.ComponentType.Button,
+        (component): Discord.MessageActionRowComponentOptions => {
-							customId: component.customId,
+          if (component.type === "button") {
-							label: component.label ?? "",
+            return {
-							style: convertButtonStyleToEnum(component.style),
+              type: "BUTTON",
-							disabled: component.disabled,
+              customId: component.customId,
-							emoji: component.emoji,
+              label: component.label ?? "",
-						}
+              style: toUpper(component.style ?? "secondary"),
-					}
+              disabled: component.disabled,
+              emoji: component.emoji,
+            }
+          }
 
-					if (component.type === "link") {
+          if (component.type === "select") {
-						return {
+            return {
-							type: Discord.ComponentType.Button,
+              ...component,
-							url: component.url,
+              type: "SELECT_MENU",
-							label: component.label ?? "",
+              options: component.options.map((option) => ({
-							style: Discord.ButtonStyle.Link,
+                ...option,
-							disabled: component.disabled,
+                default: component.values?.includes(option.value),
-							emoji: component.emoji,
+              })),
-						}
+            }
-					}
+          }
 
-					// future proofing
+          raise(`Unsupported component type: ${component.type}`)
-					// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        },
-					if (component.type === "select") {
+      ),
-						return {
+    })),
-							...component,
+  }
-							type: Discord.ComponentType.SelectMenu,
-							options: component.options.map((option) => ({
-								...option,
-								default: component.values?.includes(option.value),
-							})),
-						}
-					}
 
-					component satisfies never
+  if (!options.content && !options.embeds?.length) {
-					throw new Error(
+    options.content = "_ _"
-						`Invalid component type ${safeJsonStringify(component)}}`,
+  }
-					)
-				},
-			),
-		})),
-	}
 
-	if (!options.content && !options.embeds.length) {
+  return options
-		options.content = "_ _"
-	}
-
-	return options
 }

packages/reacord/library/core/reacord.ts

@@ -0,0 +1,72 @@
+import type { ReactNode } from "react"
+import type { ComponentInteraction } from "../internal/interaction"
+import { reconciler } from "../internal/reconciler.js"
+import type { Renderer } from "../internal/renderers/renderer"
+import type { ReacordInstance } from "./instance"
+
+/**
+ * @category Core
+ */
+export type ReacordConfig = {
+  /**
+   * The max number of active instances.
+   * When this limit is exceeded, the oldest instances will be disabled.
+   */
+  maxInstances?: number
+}
+
+/**
+ * The main Reacord class that other Reacord adapters should extend.
+ * Only use this directly if you're making [a custom adapter](/guides/custom-adapters).
+ */
+export abstract class Reacord {
+  private renderers: Renderer[] = []
+
+  constructor(private readonly config: ReacordConfig = {}) {}
+
+  abstract send(...args: unknown[]): ReacordInstance
+  abstract reply(...args: unknown[]): ReacordInstance
+  abstract ephemeralReply(...args: unknown[]): ReacordInstance
+
+  protected handleComponentInteraction(interaction: ComponentInteraction) {
+    for (const renderer of this.renderers) {
+      if (renderer.handleComponentInteraction(interaction)) return
+    }
+  }
+
+  private get maxInstances() {
+    return this.config.maxInstances ?? 50
+  }
+
+  protected createInstance(renderer: Renderer, initialContent?: ReactNode) {
+    if (this.renderers.length > this.maxInstances) {
+      this.deactivate(this.renderers[0]!)
+    }
+
+    this.renderers.push(renderer)
+
+    const container = reconciler.createContainer(renderer, 0, false, {})
+
+    if (initialContent !== undefined) {
+      reconciler.updateContainer(initialContent, container)
+    }
+
+    return {
+      render: (content: ReactNode) => {
+        reconciler.updateContainer(content, container)
+      },
+      deactivate: () => {
+        this.deactivate(renderer)
+      },
+      destroy: () => {
+        this.renderers = this.renderers.filter((it) => it !== renderer)
+        renderer.destroy()
+      },
+    }
+  }
+
+  private deactivate(renderer: Renderer) {
+    this.renderers = this.renderers.filter((it) => it !== renderer)
+    renderer.deactivate()
+  }
+}

packages/reacord/library/core/reacord.tsx

@@ -1,82 +0,0 @@
-import type { ReactNode } from "react"
-import type { ComponentInteraction } from "../internal/interaction.js"
-import { reconciler } from "../internal/reconciler.js"
-import type { Renderer } from "../internal/renderers/renderer.js"
-import { InstanceProvider } from "./instance-context.js"
-import type { ReacordInstance } from "./instance.js"
-
-/** @category Core */
-export interface ReacordConfig {
-	/**
-	 * The max number of active instances. When this limit is exceeded, the oldest
-	 * instances will be disabled.
-	 */
-	maxInstances?: number
-}
-
-/**
- * The main Reacord class that other Reacord adapters should extend. Only use
- * this directly if you're making [a custom adapter](/guides/custom-adapters).
- */
-export abstract class Reacord {
-	private renderers: Renderer[] = []
-
-	constructor(private readonly config: ReacordConfig = {}) {}
-
-	protected handleComponentInteraction(interaction: ComponentInteraction) {
-		for (const renderer of this.renderers) {
-			if (renderer.handleComponentInteraction(interaction)) return
-		}
-	}
-
-	private get maxInstances() {
-		return this.config.maxInstances ?? 50
-	}
-
-	protected createInstance(renderer: Renderer, initialContent?: ReactNode) {
-		if (this.renderers.length > this.maxInstances && this.renderers[0]) {
-			this.deactivate(this.renderers[0])
-		}
-
-		this.renderers.push(renderer)
-
-		const container: unknown = reconciler.createContainer(
-			renderer,
-			0,
-			null,
-			false,
-			null,
-			"reacord",
-			() => {},
-			null,
-		)
-
-		const instance: ReacordInstance = {
-			render: (content: ReactNode) => {
-				reconciler.updateContainer(
-					<InstanceProvider value={instance}>{content}</InstanceProvider>,
-					container,
-				)
-				return instance
-			},
-			deactivate: () => {
-				this.deactivate(renderer)
-			},
-			destroy: () => {
-				this.renderers = this.renderers.filter((it) => it !== renderer)
-				renderer.destroy()
-			},
-		}
-
-		if (initialContent !== undefined) {
-			instance.render(initialContent)
-		}
-
-		return instance
-	}
-
-	private deactivate(renderer: Renderer) {
-		this.renderers = this.renderers.filter((it) => it !== renderer)
-		renderer.deactivate()
-	}
-}

packages/reacord/library/internal/channel.ts

@@ -1,5 +1,5 @@
 import type { Message, MessageOptions } from "./message"
 
-export interface Channel {
+export type Channel = {
-	send(message: MessageOptions): Promise<Message>
+  send(message: MessageOptions): Promise<Message>
 }

packages/reacord/library/internal/container.ts

@@ -1,39 +1,27 @@
 export class Container<T> {
-	private items: T[] = []
+  private items: T[] = []
 
-	add(...items: T[]) {
+  add(...items: T[]) {
-		this.items.push(...items)
+    this.items.push(...items)
-	}
+  }
 
-	addBefore(item: T, before: T) {
+  addBefore(item: T, before: T) {
-		let index = this.items.indexOf(before)
+    let index = this.items.indexOf(before)
-		if (index === -1) {
+    if (index === -1) {
-			index = this.items.length
+      index = this.items.length
-		}
+    }
-		this.items.splice(index, 0, item)
+    this.items.splice(index, 0, item)
-	}
+  }
 
-	remove(toRemove: T) {
+  remove(toRemove: T) {
-		this.items = this.items.filter((item) => item !== toRemove)
+    this.items = this.items.filter((item) => item !== toRemove)
-	}
+  }
 
-	clear() {
+  clear() {
-		this.items = []
+    this.items = []
-	}
+  }
 
-	find(predicate: (item: T) => boolean): T | undefined {
+  [Symbol.iterator]() {
-		return this.items.find(predicate)
+    return this.items[Symbol.iterator]()
-	}
+  }
-
-	findType<U extends T>(
-		type: new (...args: Array<NonNullable<unknown>>) => 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/element.ts

@@ -1,11 +1,11 @@
-import type { Node } from "./node"
 import type { ReactNode } from "react"
 import React from "react"
+import type { Node } from "./node"
 
 export function ReacordElement<Props>(props: {
-	props: Props
+  props: Props
-	createNode: () => Node<Props>
+  createNode: () => Node<Props>
-	children?: ReactNode
+  children?: ReactNode
 }) {
-	return React.createElement("reacord-element", props)
+  return React.createElement("reacord-element", props)
 }

packages/reacord/library/internal/interaction.ts

@@ -8,28 +8,28 @@ export type ComponentInteraction = ButtonInteraction | SelectInteraction
 export type CommandInteraction = BaseInteraction<"command">
 
 export type ButtonInteraction = BaseComponentInteraction<
-	"button",
+  "button",
-	ButtonClickEvent
+  ButtonClickEvent
 >
 
 export type SelectInteraction = BaseComponentInteraction<
-	"select",
+  "select",
-	SelectChangeEvent
+  SelectChangeEvent
 >
 
-export interface BaseInteraction<Type extends string> {
+export type BaseInteraction<Type extends string> = {
-	type: Type
+  type: Type
-	id: string
+  id: string
-	reply(messageOptions: MessageOptions): Promise<Message>
+  reply(messageOptions: MessageOptions): Promise<Message>
-	followUp(messageOptions: MessageOptions): Promise<Message>
+  followUp(messageOptions: MessageOptions): Promise<Message>
 }
 
 export type BaseComponentInteraction<
-	Type extends string,
+  Type extends string,
-	Event extends ComponentEvent,
+  Event extends ComponentEvent,
 > = BaseInteraction<Type> & {
-	event: Event
+  event: Event
-	customId: string
+  customId: string
-	update(options: MessageOptions): Promise<void>
+  update(options: MessageOptions): Promise<void>
-	deferUpdate(): Promise<void>
+  deferUpdate(): Promise<void>
 }

packages/reacord/library/internal/limited-collection.ts

@@ -1,24 +1,24 @@
 export class LimitedCollection<T> {
-	private items: T[] = []
+  private items: T[] = []
 
-	constructor(private readonly size: number) {}
+  constructor(private readonly size: number) {}
 
-	add(item: T) {
+  add(item: T) {
-		if (this.items.length >= this.size) {
+    if (this.items.length >= this.size) {
-			this.items.shift()
+      this.items.shift()
-		}
+    }
-		this.items.push(item)
+    this.items.push(item)
-	}
+  }
 
-	has(item: T) {
+  has(item: T) {
-		return this.items.includes(item)
+    return this.items.includes(item)
-	}
+  }
 
-	values(): readonly T[] {
+  values(): readonly T[] {
-		return this.items
+    return this.items
-	}
+  }
 
-	[Symbol.iterator]() {
+  [Symbol.iterator]() {
-		return this.items[Symbol.iterator]()
+    return this.items[Symbol.iterator]()
-	}
+  }
 }

packages/reacord/library/internal/message.ts

@@ -1,65 +1,66 @@
+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 { last } from "@reacord/helpers/last"
-import type { Except } from "type-fest"
 
-export interface MessageOptions {
+export type MessageOptions = {
-	content: string
+  content: string
-	embeds: EmbedOptions[]
+  embeds: EmbedOptions[]
-	actionRows: ActionRow[]
+  actionRows: ActionRow[]
 }
 
 export type ActionRow = ActionRowItem[]
 
 export type ActionRowItem =
-	| MessageButtonOptions
+  | MessageButtonOptions
-	| MessageLinkOptions
+  | MessageLinkOptions
-	| MessageSelectOptions
+  | MessageSelectOptions
 
-export interface MessageButtonOptions {
+export type MessageButtonOptions = {
-	type: "button"
+  type: "button"
-	customId: string
+  customId: string
-	label?: string
+  label?: string
-	style?: "primary" | "secondary" | "success" | "danger"
+  style?: "primary" | "secondary" | "success" | "danger"
-	disabled?: boolean
+  disabled?: boolean
-	emoji?: string
+  emoji?: string
 }
 
-export interface MessageLinkOptions {
+export type MessageLinkOptions = {
-	type: "link"
+  type: "link"
-	url: string
+  url: string
-	label?: string
+  label?: string
-	emoji?: string
+  emoji?: string
-	disabled?: boolean
+  disabled?: boolean
 }
 
 export type MessageSelectOptions = Except<SelectProps, "children" | "value"> & {
-	type: "select"
+  type: "select"
-	customId: string
+  customId: string
-	options: MessageSelectOptionOptions[]
+  options: MessageSelectOptionOptions[]
 }
 
-export interface MessageSelectOptionOptions {
+export type MessageSelectOptionOptions = {
-	label: string
+  label: string
-	value: string
+  value: string
-	description?: string
+  description?: string
-	emoji?: string
+  emoji?: string
 }
 
-export interface Message {
+export type Message = {
-	edit(options: MessageOptions): Promise<void>
+  edit(options: MessageOptions): Promise<void>
-	delete(): Promise<void>
+  delete(): Promise<void>
+  disableComponents(): Promise<void>
 }
 
 export function getNextActionRow(options: MessageOptions): ActionRow {
-	let actionRow = last(options.actionRows)
+  let actionRow = last(options.actionRows)
-	if (
+  if (
-		actionRow == undefined ||
+    actionRow == undefined ||
-		actionRow.length >= 5 ||
+    actionRow.length >= 5 ||
-		actionRow[0]?.type === "select"
+    actionRow[0]?.type === "select"
-	) {
+  ) {
-		actionRow = []
+    actionRow = []
-		options.actionRows.push(actionRow)
+    options.actionRows.push(actionRow)
-	}
+  }
-	return actionRow
+  return actionRow
 }

packages/reacord/library/internal/node.ts

@@ -1,21 +1,16 @@
+/* eslint-disable class-methods-use-this */
 import { Container } from "./container.js"
 import type { ComponentInteraction } from "./interaction"
 import type { MessageOptions } from "./message"
 
 export abstract class Node<Props> {
-	readonly children = new Container<Node<unknown>>()
+  readonly children = new Container<Node<unknown>>()
 
-	constructor(public props: Props) {}
+  constructor(public props: Props) {}
 
-	modifyMessageOptions(_options: MessageOptions) {
+  modifyMessageOptions(options: MessageOptions) {}
-		// noop
-	}
 
-	handleComponentInteraction(_interaction: ComponentInteraction): boolean {
+  handleComponentInteraction(interaction: ComponentInteraction): boolean {
-		return false
+    return false
-	}
+  }
-
-	get text(): string {
-		return [...this.children].map((child) => child.text).join("")
-	}
 }

packages/reacord/library/internal/reconciler.ts

@@ -1,107 +1,102 @@
-import { raise } from "@reacord/helpers/raise.js"
 import type { HostConfig } from "react-reconciler"
 import ReactReconciler from "react-reconciler"
-import { DefaultEventPriority } from "react-reconciler/constants.js"
+import { raise } from "../../helpers/raise.js"
 import { Node } from "./node.js"
 import type { Renderer } from "./renderers/renderer"
 import { TextNode } from "./text-node.js"
 
 const config: HostConfig<
-	string, // Type,
+  string, // Type,
-	Record<string, unknown>, // Props,
+  Record<string, unknown>, // Props,
-	Renderer, // Container,
+  Renderer, // Container,
-	Node<unknown>, // Instance,
+  Node<unknown>, // Instance,
-	TextNode, // TextInstance,
+  TextNode, // TextInstance,
-	never, // SuspenseInstance,
+  never, // SuspenseInstance,
-	never, // HydratableInstance,
+  never, // HydratableInstance,
-	never, // PublicInstance,
+  never, // PublicInstance,
-	never, // HostContext,
+  never, // HostContext,
-	true, // UpdatePayload,
+  true, // UpdatePayload,
-	never, // ChildSet,
+  never, // ChildSet,
-	number, // TimeoutHandle,
+  number, // TimeoutHandle,
-	number // NoTimeout,
+  number // NoTimeout,
 > = {
-	supportsMutation: true,
+  // config
-	supportsPersistence: false,
+  now: Date.now,
-	supportsHydration: false,
+  supportsMutation: true,
-	isPrimaryRenderer: true,
+  supportsPersistence: false,
-	scheduleTimeout: global.setTimeout,
+  supportsHydration: false,
-	cancelTimeout: global.clearTimeout,
+  isPrimaryRenderer: true,
-	noTimeout: -1,
+  scheduleTimeout: global.setTimeout,
+  cancelTimeout: global.clearTimeout,
+  noTimeout: -1,
 
-	getRootHostContext: () => null,
+  // eslint-disable-next-line unicorn/no-null
-	getChildHostContext: (parentContext) => parentContext,
+  getRootHostContext: () => null,
+  getChildHostContext: (parentContext) => parentContext,
 
-	createInstance: (type, props) => {
+  createInstance: (type, props) => {
-		if (type !== "reacord-element") {
+    if (type !== "reacord-element") {
-			raise(`Unknown element type: ${type}`)
+      raise(`Unknown element type: ${type}`)
-		}
+    }
 
-		if (typeof props.createNode !== "function") {
+    if (typeof props.createNode !== "function") {
-			raise(`Missing createNode function`)
+      raise(`Missing createNode function`)
-		}
+    }
 
-		const node: unknown = props.createNode(props.props)
+    const node = props.createNode(props.props)
-		if (!(node instanceof Node)) {
+    if (!(node instanceof Node)) {
-			raise(`createNode function did not return a Node`)
+      raise(`createNode function did not return a Node`)
-		}
+    }
 
-		return node
+    return node
-	},
+  },
-	createTextInstance: (text) => new TextNode(text),
+  createTextInstance: (text) => new TextNode(text),
-	shouldSetTextContent: () => false,
+  shouldSetTextContent: () => false,
-	detachDeletedInstance: (_instance) => {},
-	beforeActiveInstanceBlur: () => {},
-	afterActiveInstanceBlur: () => {},
-	getInstanceFromNode: (_node: unknown) => null,
-	getInstanceFromScope: (_scopeInstance: unknown) => null,
 
-	clearContainer: (renderer) => {
+  clearContainer: (renderer) => {
-		renderer.nodes.clear()
+    renderer.nodes.clear()
-	},
+  },
-	appendChildToContainer: (renderer, child) => {
+  appendChildToContainer: (renderer, child) => {
-		renderer.nodes.add(child)
+    renderer.nodes.add(child)
-	},
+  },
-	removeChildFromContainer: (renderer, child) => {
+  removeChildFromContainer: (renderer, child) => {
-		renderer.nodes.remove(child)
+    renderer.nodes.remove(child)
-	},
+  },
-	insertInContainerBefore: (renderer, child, before) => {
+  insertInContainerBefore: (renderer, child, before) => {
-		renderer.nodes.addBefore(child, before)
+    renderer.nodes.addBefore(child, before)
-	},
+  },
 
-	appendInitialChild: (parent, child) => {
+  appendInitialChild: (parent, child) => {
-		parent.children.add(child)
+    parent.children.add(child)
-	},
+  },
-	appendChild: (parent, child) => {
+  appendChild: (parent, child) => {
-		parent.children.add(child)
+    parent.children.add(child)
-	},
+  },
-	removeChild: (parent, child) => {
+  removeChild: (parent, child) => {
-		parent.children.remove(child)
+    parent.children.remove(child)
-	},
+  },
-	insertBefore: (parent, child, before) => {
+  insertBefore: (parent, child, before) => {
-		parent.children.addBefore(child, before)
+    parent.children.addBefore(child, before)
-	},
+  },
 
-	prepareUpdate: () => true,
+  prepareUpdate: () => true,
-	commitUpdate: (node, payload, type, oldProps, newProps) => {
+  commitUpdate: (node, payload, type, oldProps, newProps) => {
-		node.props = newProps.props
+    node.props = newProps.props
-	},
+  },
-	commitTextUpdate: (node, oldText, newText) => {
+  commitTextUpdate: (node, oldText, newText) => {
-		node.props = newText
+    node.props = newText
-	},
+  },
 
-	prepareForCommit: () => null,
+  // eslint-disable-next-line unicorn/no-null
-	resetAfterCommit: (renderer) => {
+  prepareForCommit: () => null,
-		renderer.render()
+  resetAfterCommit: (renderer) => {
-	},
+    renderer.render()
-	prepareScopeUpdate: (_scopeInstance: unknown, _instance: unknown) => {},
+  },
 
-	preparePortalMount: () => raise("Portals are not supported"),
+  preparePortalMount: () => raise("Portals are not supported"),
-	getPublicInstance: () => raise("Refs are currently not supported"),
+  getPublicInstance: () => raise("Refs are currently not supported"),
 
-	finalizeInitialChildren: () => false,
+  finalizeInitialChildren: () => false,
-
-	getCurrentEventPriority: () => DefaultEventPriority,
 }
 
 export const reconciler = ReactReconciler(config)

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

@@ -3,11 +3,11 @@ import type { Message, MessageOptions } from "../message"
 import { Renderer } from "./renderer"
 
 export class ChannelMessageRenderer extends Renderer {
-	constructor(private channel: Channel) {
+  constructor(private channel: Channel) {
-		super()
+    super()
-	}
+  }
 
-	protected createMessage(options: MessageOptions): Promise<Message> {
+  protected createMessage(options: MessageOptions): Promise<Message> {
-		return this.channel.send(options)
+    return this.channel.send(options)
-	}
+  }
 }

packages/reacord/library/internal/renderers/interaction-reply-renderer.ts

@@ -1,3 +1,4 @@
+import type { Interaction } from "../interaction"
 import type { Message, MessageOptions } from "../message"
 import { Renderer } from "./renderer"
 
@@ -5,23 +6,17 @@ import { Renderer } from "./renderer"
 // so we know whether to call reply() or followUp()
 const repliedInteractionIds = new Set<string>()
 
-export type InteractionReplyRendererImplementation = {
-	interactionId: string
-	reply: (options: MessageOptions) => Promise<Message>
-	followUp: (options: MessageOptions) => Promise<Message>
-}
-
 export class InteractionReplyRenderer extends Renderer {
-	constructor(private implementation: InteractionReplyRendererImplementation) {
+  constructor(private interaction: Interaction) {
-		super()
+    super()
-	}
+  }
 
-	protected createMessage(options: MessageOptions): Promise<Message> {
+  protected createMessage(options: MessageOptions): Promise<Message> {
-		if (repliedInteractionIds.has(this.implementation.interactionId)) {
+    if (repliedInteractionIds.has(this.interaction.id)) {
-			return this.implementation.followUp(options)
+      return this.interaction.followUp(options)
-		}
+    }
 
-		repliedInteractionIds.add(this.implementation.interactionId)
+    repliedInteractionIds.add(this.interaction.id)
-		return this.implementation.reply(options)
+    return this.interaction.reply(options)
-	}
+  }
 }

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

@@ -1,117 +1,109 @@
+import { Subject } from "rxjs"
+import { concatMap } from "rxjs/operators"
 import { Container } from "../container.js"
 import type { ComponentInteraction } from "../interaction"
 import type { Message, MessageOptions } from "../message"
 import type { Node } from "../node.js"
-import { Subject } from "rxjs"
-import { concatMap } from "rxjs/operators"
 
 type UpdatePayload =
-	| { action: "update" | "deactivate"; options: MessageOptions }
+  | { action: "update" | "deactivate"; options: MessageOptions }
-	| { action: "deferUpdate"; interaction: ComponentInteraction }
+  | { action: "deferUpdate"; interaction: ComponentInteraction }
-	| { action: "destroy" }
+  | { action: "destroy" }
 
 export abstract class Renderer {
-	readonly nodes = new Container<Node<unknown>>()
+  readonly nodes = new Container<Node<unknown>>()
-	private componentInteraction?: ComponentInteraction
+  private componentInteraction?: ComponentInteraction
-	private message?: Message
+  private message?: Message
-	private active = true
+  private active = true
-	private updates = new Subject<UpdatePayload>()
+  private updates = new Subject<UpdatePayload>()
 
-	private updateSubscription = this.updates
+  private updateSubscription = this.updates
-		.pipe(concatMap((payload) => this.updateMessage(payload)))
+    .pipe(concatMap((payload) => this.updateMessage(payload)))
-		.subscribe({ error: console.error })
+    .subscribe({ error: console.error })
 
-	render() {
+  render() {
-		if (!this.active) {
+    if (!this.active) {
-			console.warn("Attempted to update a deactivated message")
+      console.warn("Attempted to update a deactivated message")
-			return
+      return
-		}
+    }
 
-		this.updates.next({
+    this.updates.next({
-			options: this.getMessageOptions(),
+      options: this.getMessageOptions(),
-			action: "update",
+      action: "update",
-		})
+    })
-	}
+  }
 
-	deactivate() {
+  deactivate() {
-		this.active = false
+    this.active = false
-		this.updates.next({
+    this.updates.next({
-			options: this.getMessageOptions(),
+      options: this.getMessageOptions(),
-			action: "deactivate",
+      action: "deactivate",
-		})
+    })
-	}
+  }
 
-	destroy() {
+  destroy() {
-		this.active = false
+    this.active = false
-		this.updates.next({ action: "destroy" })
+    this.updates.next({ action: "destroy" })
-	}
+  }
 
-	handleComponentInteraction(interaction: ComponentInteraction) {
+  handleComponentInteraction(interaction: ComponentInteraction) {
-		for (const node of this.nodes) {
+    this.componentInteraction = interaction
-			if (node.handleComponentInteraction(interaction)) {
-				this.componentInteraction = interaction
-				setTimeout(() => {
-					this.updates.next({ action: "deferUpdate", interaction })
-				}, 500)
-				return true
-			}
-		}
-	}
 
-	protected abstract createMessage(options: MessageOptions): Promise<Message>
+    setTimeout(() => {
+      this.updates.next({ action: "deferUpdate", interaction })
+    }, 500)
 
-	private getMessageOptions(): MessageOptions {
+    for (const node of this.nodes) {
-		const options: MessageOptions = {
+      if (node.handleComponentInteraction(interaction)) {
-			content: "",
+        return true
-			embeds: [],
+      }
-			actionRows: [],
+    }
-		}
+  }
-		for (const node of this.nodes) {
-			node.modifyMessageOptions(options)
-		}
-		return options
-	}
 
-	private async updateMessage(payload: UpdatePayload) {
+  protected abstract createMessage(options: MessageOptions): Promise<Message>
-		if (payload.action === "destroy") {
-			this.updateSubscription.unsubscribe()
-			await this.message?.delete()
-			return
-		}
 
-		if (payload.action === "deactivate") {
+  private getMessageOptions(): MessageOptions {
-			this.updateSubscription.unsubscribe()
+    const options: MessageOptions = {
+      content: "",
+      embeds: [],
+      actionRows: [],
+    }
+    for (const node of this.nodes) {
+      node.modifyMessageOptions(options)
+    }
+    return options
+  }
 
-			await this.message?.edit({
+  private async updateMessage(payload: UpdatePayload) {
-				...payload.options,
+    if (payload.action === "destroy") {
-				actionRows: payload.options.actionRows.map((row) =>
+      this.updateSubscription.unsubscribe()
-					row.map((component) => ({
+      await this.message?.delete()
-						...component,
+      return
-						disabled: true,
+    }
-					})),
-				),
-			})
 
-			return
+    if (payload.action === "deactivate") {
-		}
+      this.updateSubscription.unsubscribe()
+      await this.message?.disableComponents()
+      return
+    }
 
-		if (payload.action === "deferUpdate") {
+    if (payload.action === "deferUpdate") {
-			await payload.interaction.deferUpdate()
+      await payload.interaction.deferUpdate()
-			return
+      return
-		}
+    }
 
-		if (this.componentInteraction) {
+    if (this.componentInteraction) {
-			const promise = this.componentInteraction.update(payload.options)
+      const promise = this.componentInteraction.update(payload.options)
-			this.componentInteraction = undefined
+      this.componentInteraction = undefined
-			await promise
+      await promise
-			return
+      return
-		}
+    }
 
-		if (this.message) {
+    if (this.message) {
-			await this.message.edit(payload.options)
+      await this.message.edit(payload.options)
-			return
+      return
-		}
+    }
 
-		this.message = await this.createMessage(payload.options)
+    this.message = await this.createMessage(payload.options)
-	}
+  }
 }

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

@@ -2,11 +2,7 @@ import type { MessageOptions } from "./message"
 import { Node } from "./node.js"
 
 export class TextNode extends Node<string> {
-	override modifyMessageOptions(options: MessageOptions) {
+  override modifyMessageOptions(options: MessageOptions) {
-		options.content = options.content + this.props
+    options.content = options.content + this.props
-	}
+  }
-
-	override get text() {
-		return this.props
-	}
 }

packages/reacord/library/internal/timeout.ts

@@ -1,20 +1,20 @@
 export class Timeout {
-	private timeoutId?: NodeJS.Timeout
+  private timeoutId?: NodeJS.Timeout
 
-	constructor(
+  constructor(
-		private readonly time: number,
+    private readonly time: number,
-		private readonly callback: () => void,
+    private readonly callback: () => void,
-	) {}
+  ) {}
 
-	run() {
+  run() {
-		this.cancel()
+    this.cancel()
-		this.timeoutId = setTimeout(this.callback, this.time)
+    this.timeoutId = setTimeout(this.callback, this.time)
-	}
+  }
 
-	cancel() {
+  cancel() {
-		if (this.timeoutId) {
+    if (this.timeoutId) {
-			clearTimeout(this.timeoutId)
+      clearTimeout(this.timeoutId)
-			this.timeoutId = undefined
+      this.timeoutId = undefined
-		}
+    }
-	}
+  }
 }

packages/reacord/library/main.ts

@@ -13,6 +13,5 @@ export * from "./core/components/link"
 export * from "./core/components/option"
 export * from "./core/components/select"
 export * from "./core/instance"
-export { useInstance } from "./core/instance-context"
 export * from "./core/reacord"
 export * from "./core/reacord-discord-js"

packages/reacord/package.json

@@ -2,33 +2,15 @@
   "name": "reacord",
   "type": "module",
   "description": "Create interactive Discord messages using React.",
-  "version": "0.5.5",
+  "version": "0.2.0",
-  "homepage": "https://reacord.mapleleaf.dev",
-  "repository": "https://github.com/itsMapleLeaf/reacord.git",
-  "changelog": "https://github.com/itsMapleLeaf/reacord/releases",
-  "license": "MIT",
-  "keywords": [
-    "discord",
-    "discord-js",
-    "react",
-    "react-js",
-    "react-renderer",
-    "interaction",
-    "message",
-    "embed",
-    "reacord"
-  ],
-  "files": [
-    "dist",
-    "README.md",
-    "LICENSE"
-  ],
   "types": "./dist/main.d.ts",
+  "files": [
+    "dist"
+  ],
   "exports": {
     ".": {
       "import": "./dist/main.js",
-      "require": "./dist/main.cjs",
+      "require": "./dist/main.cjs"
-      "types": "./dist/main.d.ts"
     },
     "./package.json": {
       "import": "./package.json",
@@ -36,22 +18,24 @@
     }
   },
   "scripts": {
-    "build": "cpy ../../README.md ../../LICENSE . && tsup library/main.ts --target node18 --format cjs,esm --sourcemap --dts --dts-resolve",
+    "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",
-    "typecheck": "tsc -b"
+    "playground": "nodemon --exec esmo --ext ts,tsx ./playground/main.tsx",
+    "release": "release-it"
   },
   "dependencies": {
-    "@types/node": "^20.8.4",
+    "@types/node": "*",
-    "@types/react": "^18.2.27",
+    "@types/react": "*",
-    "@types/react-reconciler": "^0.28.5",
+    "@types/react-reconciler": "^0.26.4",
-    "react-reconciler": "^0.29.0",
+    "nanoid": "^3.1.30",
-    "rxjs": "^7.8.1"
+    "react-reconciler": "^0.26.2",
+    "rxjs": "^7.5.2"
   },
   "peerDependencies": {
-    "discord.js": "^14",
+    "discord.js": "^13.3",
     "react": ">=17"
   },
   "peerDependenciesMeta": {
@@ -60,20 +44,27 @@
     }
   },
   "devDependencies": {
-    "@reacord/helpers": "workspace:*",
+    "@types/lodash-es": "^4.17.5",
-    "@types/lodash-es": "^4.17.9",
+    "c8": "^7.11.0",
-    "c8": "^8.0.1",
+    "discord.js": "^13.5.1",
-    "cpy-cli": "^5.0.0",
+    "dotenv": "^10.0.0",
-    "discord.js": "^14.13.0",
+    "esbuild": "latest",
-    "dotenv": "^16.3.1",
+    "esbuild-jest": "^0.5.0",
+    "esmo": "^0.13.0",
     "lodash-es": "^4.17.21",
-    "nodemon": "^3.0.1",
+    "nodemon": "^2.0.15",
-    "prettier": "^3.0.3",
+    "prettier": "^2.5.1",
-    "pretty-ms": "^8.0.0",
+    "pretty-ms": "^7.0.1",
-    "react": "^18.2.0",
+    "react": "^17.0.2",
-    "tsup": "^7.2.0",
+    "release-it": "^14.12.1",
-    "tsx": "^3.13.0",
+    "tsup": "^5.11.11",
-    "type-fest": "^4.4.0"
+    "type-fest": "^2.9.0",
+    "typescript": "^4.5.4",
+    "vite": "^2.7.10",
+    "vitest": "^0.0.140"
+  },
+  "resolutions": {
+    "esbuild": "latest"
   },
   "release-it": {
     "git": {
@@ -83,8 +74,5 @@
       "release": true,
       "web": true
     }
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }

packages/reacord/playground/command-handler.ts

@@ -0,0 +1,38 @@
+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 command of commands) {
+      for (const guild of client.guilds.cache.values()) {
+        await client.application?.commands.create(
+          {
+            name: command.name,
+            description: command.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,98 @@
+import { Client } from "discord.js"
+import "dotenv/config"
+import React from "react"
+import { Button, ReacordDiscordJs } 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")}
+          />
+        </>,
+      )
+    },
+  },
+])
+
+await client.login(process.env.TEST_BOT_TOKEN)

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

@@ -1,144 +0,0 @@
-import { raise } from "@reacord/helpers/raise.js"
-import {
-	Button,
-	Link,
-	Option,
-	ReacordDiscordJs,
-	Select,
-	useInstance,
-} from "../library/main.js"
-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"
-
-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 ?? raise("TEST_GUILD_ID not defined"),
-)
-
-const category = await guild.channels.fetch(
-	process.env.TEST_CATEGORY_ID ?? raise("TEST_CATEGORY_ID not defined"),
-)
-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) => 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.createChannelMessage(channel).render("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.createChannelMessage(channel).render(<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.createChannelMessage(channel).render(
-		<FruitSelect
-			onConfirm={(value) => {
-				instance.render(`you chose ${value}`)
-				instance.deactivate()
-			}}
-		/>,
-	)
-})
-
-await createTest("ephemeral button", (channel) => {
-	reacord.createChannelMessage(channel).render(
-		<>
-			<Button
-				label="public clic"
-				onClick={(event) =>
-					event.reply(`${event.guild?.member.displayName} clic`)
-				}
-			/>
-			<Button
-				label="clic"
-				onClick={(event) => event.reply("you clic", { ephemeral: true })}
-			/>
-		</>,
-	)
-})
-
-await createTest("delete this", (channel) => {
-	function DeleteThis() {
-		const instance = useInstance()
-		return <Button label="delete this" onClick={() => instance.destroy()} />
-	}
-	reacord.createChannelMessage(channel).render(<DeleteThis />)
-})
-
-await createTest("link", (channel) => {
-	reacord
-		.createChannelMessage(channel)
-		.render(<Link label="hi" url="https://mapleleaf.dev" />)
-})

packages/reacord/test/action-row.test.tsx

@@ -1,3 +1,4 @@
+import React from "react"
 import { test } from "vitest"
 import { ActionRow, Button, Select } from "../library/main"
 import { ReacordTester } from "./test-adapter"
@@ -5,36 +6,36 @@ import { ReacordTester } from "./test-adapter"
 const testing = new ReacordTester()
 
 test("action row", async () => {
-	await testing.assertRender(
+  await testing.assertRender(
-		<>
+    <>
-			<Button label="outside button" onClick={() => {}} />
+      <Button label="outside button" onClick={() => {}} />
-			<ActionRow>
+      <ActionRow>
-				<Button label="button inside action row" onClick={() => {}} />
+        <Button label="button inside action row" onClick={() => {}} />
-			</ActionRow>
+      </ActionRow>
-			<Select />
+      <Select />
-			<Button label="last row 1" onClick={() => {}} />
+      <Button label="last row 1" onClick={() => {}} />
-			<Button label="last row 2" onClick={() => {}} />
+      <Button label="last row 2" onClick={() => {}} />
-		</>,
+    </>,
-		[
+    [
-			{
+      {
-				content: "",
+        content: "",
-				embeds: [],
+        embeds: [],
-				actionRows: [
+        actionRows: [
-					[{ type: "button", style: "secondary", label: "outside button" }],
+          [{ type: "button", style: "secondary", label: "outside button" }],
-					[
+          [
-						{
+            {
-							type: "button",
+              type: "button",
-							style: "secondary",
+              style: "secondary",
-							label: "button inside action row",
+              label: "button inside action row",
-						},
+            },
-					],
+          ],
-					[{ type: "select", options: [], values: [] }],
+          [{ type: "select", options: [], values: [] }],
-					[
+          [
-						{ type: "button", style: "secondary", label: "last row 1" },
+            { type: "button", style: "secondary", label: "last row 1" },
-						{ type: "button", style: "secondary", label: "last row 2" },
+            { type: "button", style: "secondary", label: "last row 2" },
-					],
+          ],
-				],
+        ],
-			},
+      },
-		],
+    ],
-	)
+  )
 })