Compare commits
123 Commits
files
...
reacord@0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b210670b2a | ||
|
|
2b9110bf2c | ||
|
|
5d4dde4e0c | ||
|
|
31baa23076 | ||
|
|
d76f316bb7 | ||
|
|
47b0645a90 | ||
|
|
0bab505994 | ||
|
|
104b175931 | ||
|
|
156cf90919 | ||
|
|
b463ce3cf4 | ||
|
|
576dd2e35e | ||
|
|
0d4294ee8c | ||
|
|
25fcc53d91 | ||
|
|
34bc293df5 | ||
|
|
b7b237f2f5 | ||
|
|
e2c3de4fae | ||
|
|
ffe0a86a33 | ||
|
|
6ce9241080 | ||
|
|
5d96d517df | ||
|
|
2c706f6791 | ||
|
|
2abb61493e | ||
|
|
3db1013b74 | ||
|
|
3e2c6ba5d6 | ||
|
|
0172534d13 | ||
|
|
1a49423beb | ||
|
|
3824859352 | ||
|
|
0dad3c9ecd | ||
|
|
eea1a7ee9d | ||
|
|
e9e5a1617b | ||
|
|
7ac1a9cdce | ||
|
|
33841a0c84 | ||
|
|
69b3112d32 | ||
|
|
b4fb6bc47c | ||
|
|
7aaef5f85f | ||
|
|
b755290569 | ||
|
|
f0ad743080 | ||
|
|
af3d1c5058 | ||
|
|
bdee9454f2 | ||
|
|
84348d287f | ||
|
|
6da6008d2c | ||
|
|
bece6c42fc | ||
|
|
abc809c9fb | ||
|
|
d35659f6f6 | ||
|
|
3969e6471f | ||
|
|
95041acfd4 | ||
|
|
eb0409f1a2 | ||
|
|
fbab145f39 | ||
|
|
f59323f245 | ||
|
|
1c37d37c28 | ||
|
|
408ab4ce89 | ||
|
|
a8a64e601a | ||
|
|
d88b982830 | ||
|
|
d87c27183a | ||
|
|
b141ca1868 | ||
|
|
dfa7f8090c | ||
|
|
82068d2d83 | ||
|
|
216ae7a29a | ||
|
|
9813a01a19 | ||
|
|
0be321b64e | ||
|
|
acbf21842f | ||
|
|
65be2ef201 | ||
|
|
c244124f6f | ||
|
|
4db8db0f2d | ||
|
|
1fa4bc800b | ||
|
|
e3351654ea | ||
|
|
d1ca002939 | ||
|
|
38a86bb783 | ||
|
|
72f4a4afff | ||
|
|
eed5715f1f | ||
|
|
e486da0881 | ||
|
|
b275d9b330 | ||
|
|
bab134d697 | ||
|
|
df9bdfaf77 | ||
|
|
35d7f0b33f | ||
|
|
4f9fb4310f | ||
|
|
7b74628732 | ||
|
|
7536bdee43 | ||
|
|
ef8d915e3b | ||
|
|
3f078c91d2 | ||
|
|
8df7bc9baa | ||
|
|
52e587e70f | ||
|
|
3152b1b79e | ||
|
|
d20afb094c | ||
|
|
118f567e8d | ||
|
|
a447fefc7b | ||
|
|
9efc61d8eb | ||
|
|
aa65da59df | ||
|
|
bc91080eca | ||
|
|
9afe6fe0fa | ||
|
|
abc60528d5 | ||
|
|
413f88c7b8 | ||
|
|
b482f07788 | ||
|
|
3b191d274e | ||
|
|
be5ec7c545 | ||
|
|
c93815b9f9 | ||
|
|
1e527993e5 | ||
|
|
f4eae8da75 | ||
|
|
62505ca98c | ||
|
|
cc1bc0932f | ||
|
|
c08f5621ef | ||
|
|
b6d2aac7a3 | ||
|
|
51ac0c89da | ||
|
|
f4985b1d87 | ||
|
|
96affac979 | ||
|
|
93b321dc36 | ||
|
|
e313399a5a | ||
|
|
90744ebe47 | ||
|
|
33bb2ee196 | ||
|
|
eb97b2d23d | ||
|
|
5aaaffbda9 | ||
|
|
43029019f4 | ||
|
|
8c481f18c6 | ||
|
|
87ecb20f7a | ||
|
|
2324f3c89f | ||
|
|
c35c32bddd | ||
|
|
6eb36b44f3 | ||
|
|
a1fc0287fc | ||
|
|
02dd763e63 | ||
|
|
a4024394e3 | ||
|
|
c72096058a | ||
|
|
672fcd5bc4 | ||
|
|
25f34b3715 | ||
|
|
8a7557f0eb |
8
.changeset/README.md
Normal file
8
.changeset/README.md
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# 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)
|
||||||
11
.changeset/config.json
Normal file
11
.changeset/config.json
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"$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": []
|
||||||
|
}
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
require("@rushstack/eslint-patch/modern-module-resolution")
|
|
||||||
|
|
||||||
/** @type {import('eslint').Linter.Config} */
|
|
||||||
module.exports = {
|
|
||||||
extends: [require.resolve("@itsmapleleaf/configs/eslint")],
|
|
||||||
ignorePatterns: [
|
|
||||||
"**/node_modules/**",
|
|
||||||
"**/.cache/**",
|
|
||||||
"**/build/**",
|
|
||||||
"**/dist/**",
|
|
||||||
"**/coverage/**",
|
|
||||||
"**/public/**",
|
|
||||||
],
|
|
||||||
parserOptions: {
|
|
||||||
project: require.resolve("./tsconfig.base.json"),
|
|
||||||
},
|
|
||||||
overrides: [
|
|
||||||
{
|
|
||||||
files: ["packages/website/cypress/**"],
|
|
||||||
parserOptions: {
|
|
||||||
project: require.resolve("./packages/website/cypress/tsconfig.json"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
41
.github/workflows/main.yml
vendored
41
.github/workflows/main.yml
vendored
@@ -1,41 +0,0 @@
|
|||||||
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 }}
|
|
||||||
33
.github/workflows/release.yml
vendored
Normal file
33
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
# 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 }}
|
||||||
44
.github/workflows/tests.yml
vendored
Normal file
44
.github/workflows/tests.yml
vendored
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
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()
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -4,6 +4,8 @@ node_modules
|
|||||||
coverage
|
coverage
|
||||||
.env
|
.env
|
||||||
*.code-workspace
|
*.code-workspace
|
||||||
|
.pnpm-debug.log
|
||||||
build
|
build
|
||||||
.cache
|
.cache
|
||||||
|
.vercel
|
||||||
|
*.tsbuildinfo
|
||||||
|
|||||||
@@ -1,7 +1,3 @@
|
|||||||
node_modules
|
|
||||||
dist
|
|
||||||
coverage
|
|
||||||
pnpm-lock.yaml
|
pnpm-lock.yaml
|
||||||
build
|
/packages/website/public/api
|
||||||
.cache
|
.astro
|
||||||
packages/website/public/api
|
|
||||||
|
|||||||
15
Dockerfile
15
Dockerfile
@@ -1,15 +0,0 @@
|
|||||||
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" ]
|
|
||||||
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2022 itsMapleLeaf
|
Copyright (c) 2022 itsMapleLeaf
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
53
package.json
53
package.json
@@ -1,20 +1,47 @@
|
|||||||
{
|
{
|
||||||
|
"name": "reacord-monorepo",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "eslint --ext js,ts,tsx .",
|
"lint": "run-s --continue-on-error lint:*",
|
||||||
"lint-fix": "pnpm lint -- --fix",
|
"lint:eslint": "eslint . --fix --cache --cache-file=node_modules/.cache/.eslintcache --report-unused-disable-directives",
|
||||||
"format": "prettier --write ."
|
"lint:prettier": "prettier . --write --cache --list-different",
|
||||||
|
"lint:types": "tsc -b & pnpm -r --parallel run typecheck",
|
||||||
|
"astro-sync": "pnpm --filter website exec astro sync",
|
||||||
|
"format": "run-s --continue-on-error format:*",
|
||||||
|
"format:eslint": "eslint . --report-unused-disable-directives --fix",
|
||||||
|
"format:prettier": "prettier --cache --write . \"**/*.astro\"",
|
||||||
|
"test": "vitest",
|
||||||
|
"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": {
|
"devDependencies": {
|
||||||
"@itsmapleleaf/configs": "^1.1.3",
|
"@changesets/cli": "^2.26.2",
|
||||||
"@rushstack/eslint-patch": "^1.1.3",
|
"@itsmapleleaf/configs": "github:itsMapleLeaf/configs",
|
||||||
"@types/eslint": "^8.4.1",
|
"eslint": "^8.50.0",
|
||||||
"eslint": "^8.14.0",
|
"npm-run-all": "^4.1.5",
|
||||||
"prettier": "^2.6.2",
|
"prettier": "^3.0.3",
|
||||||
"typescript": "^4.6.3"
|
"react": "^18.2.0",
|
||||||
|
"tailwindcss": "^3.3.3",
|
||||||
|
"typescript": "^5.2.2",
|
||||||
|
"vitest": "^0.34.5"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"prettier": "@itsmapleleaf/configs/prettier",
|
||||||
"esbuild": "latest"
|
"eslintConfig": {
|
||||||
},
|
"extends": [
|
||||||
"prettier": "@itsmapleleaf/configs/prettier"
|
"./node_modules/@itsmapleleaf/configs/eslint.config.cjs",
|
||||||
|
"./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"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
42
packages/helpers/convert-object-property-case.test.ts
Normal file
42
packages/helpers/convert-object-property-case.test.ts
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
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)
|
||||||
|
})
|
||||||
35
packages/helpers/convert-object-property-case.ts
Normal file
35
packages/helpers/convert-object-property-case.ts
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
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)
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { raise } from "./raise.js"
|
import { raise } from "./raise.js"
|
||||||
|
|
||||||
export function getEnvironmentValue(name: string) {
|
export function getEnvironmentValue(name: string) {
|
||||||
return process.env[name] ?? raise(`Missing environment variable: ${name}`)
|
return process.env[name] ?? raise(`Missing environment variable: ${name}`)
|
||||||
}
|
}
|
||||||
7
packages/helpers/is-instance-of.ts
Normal file
7
packages/helpers/is-instance-of.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
/** 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
|
||||||
3
packages/helpers/is-object.ts
Normal file
3
packages/helpers/is-object.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export function isObject(value: unknown): value is object {
|
||||||
|
return typeof value === "object" && value !== null
|
||||||
|
}
|
||||||
7
packages/helpers/json.ts
Normal file
7
packages/helpers/json.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
export function safeJsonStringify(value: unknown): string {
|
||||||
|
try {
|
||||||
|
return JSON.stringify(value)
|
||||||
|
} catch {
|
||||||
|
return String(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
export function last<T>(array: T[]): T | undefined {
|
export function last<T>(array: T[]): T | undefined {
|
||||||
return array[array.length - 1]
|
return array[array.length - 1]
|
||||||
}
|
}
|
||||||
11
packages/helpers/log-pretty.ts
Normal file
11
packages/helpers/log-pretty.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { inspect } from "node:util"
|
||||||
|
|
||||||
|
export function logPretty(value: unknown) {
|
||||||
|
console.info(
|
||||||
|
inspect(value, {
|
||||||
|
// depth: Number.POSITIVE_INFINITY,
|
||||||
|
depth: 10,
|
||||||
|
colors: true,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
7
packages/helpers/omit.test.ts
Normal file
7
packages/helpers/omit.test.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
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 })
|
||||||
|
})
|
||||||
3
packages/helpers/omit.test.types.ts
Normal file
3
packages/helpers/omit.test.types.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
import { omit } from "./omit.ts"
|
||||||
|
|
||||||
|
omit({ a: 1, b: true }, ["a"]) satisfies { b: boolean }
|
||||||
10
packages/helpers/omit.ts
Normal file
10
packages/helpers/omit.ts
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
14
packages/helpers/package.json
Normal file
14
packages/helpers/package.json
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"name": "@reacord/helpers",
|
||||||
|
"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.3.2",
|
||||||
|
"vitest": "^0.34.5"
|
||||||
|
}
|
||||||
|
}
|
||||||
11
packages/helpers/pick.ts
Normal file
11
packages/helpers/pick.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
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>
|
||||||
|
}
|
||||||
34
packages/helpers/prune-nullish-values.test.ts
Normal file
34
packages/helpers/prune-nullish-values.test.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
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)
|
||||||
|
})
|
||||||
46
packages/helpers/prune-nullish-values.ts
Normal file
46
packages/helpers/prune-nullish-values.ts
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
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]
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { toError } from "./to-error.js"
|
import { toError } from "./to-error.js"
|
||||||
|
|
||||||
export function raise(error: unknown): never {
|
export function raise(error: unknown): never {
|
||||||
throw toError(error)
|
throw toError(error)
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
import { setTimeout } from "node:timers/promises"
|
|
||||||
import { toError } from "./to-error.js"
|
import { toError } from "./to-error.js"
|
||||||
|
import { setTimeout } from "node:timers/promises"
|
||||||
|
|
||||||
export async function rejectAfter(
|
export async function rejectAfter(
|
||||||
timeMs: number,
|
timeMs: number,
|
||||||
error: unknown = `rejected after ${timeMs}ms`,
|
error: unknown = `rejected after ${timeMs}ms`,
|
||||||
): Promise<never> {
|
): Promise<never> {
|
||||||
await setTimeout(timeMs)
|
await setTimeout(timeMs)
|
||||||
throw toError(error)
|
throw toError(error)
|
||||||
}
|
}
|
||||||
21
packages/helpers/retry-with-timeout.ts
Normal file
21
packages/helpers/retry-with-timeout.ts
Normal file
@@ -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, @typescript-eslint/no-unnecessary-condition
|
||||||
|
while (true) {
|
||||||
|
try {
|
||||||
|
return await callback()
|
||||||
|
} catch (error) {
|
||||||
|
if (Date.now() - startTime > maxTime) {
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
await setTimeout(waitPeriod)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
3
packages/helpers/to-error.ts
Normal file
3
packages/helpers/to-error.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export function toError(value: unknown) {
|
||||||
|
return value instanceof Error ? value : new Error(String(value))
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
/** A typesafe version of toUpperCase */
|
/** A typesafe version of toUpperCase */
|
||||||
export function toUpper<S extends string>(string: S) {
|
export function toUpper<S extends string>(string: S) {
|
||||||
return string.toUpperCase() as Uppercase<S>
|
return string.toUpperCase() as Uppercase<S>
|
||||||
}
|
}
|
||||||
3
packages/helpers/tsconfig.json
Normal file
3
packages/helpers/tsconfig.json
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"extends": "../../tsconfig.base.json"
|
||||||
|
}
|
||||||
4
packages/helpers/types.test.types.ts
Normal file
4
packages/helpers/types.test.types.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
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)
|
||||||
21
packages/helpers/types.ts
Normal file
21
packages/helpers/types.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
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")
|
||||||
23
packages/helpers/wait-for.ts
Normal file
23
packages/helpers/wait-for.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
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")
|
||||||
|
}
|
||||||
24
packages/helpers/with-logged-method-calls.ts
Normal file
24
packages/helpers/with-logged-method-calls.ts
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
32
packages/reacord/CHANGELOG.md
Normal file
32
packages/reacord/CHANGELOG.md
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# reacord
|
||||||
|
|
||||||
|
## 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
|
||||||
1
packages/reacord/env.d.ts
vendored
Normal file
1
packages/reacord/env.d.ts
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/// <reference types="@total-typescript/ts-reset" />
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
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)
|
|
||||||
})
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
/**
|
|
||||||
* for narrowing instance types with array.filter
|
|
||||||
*/
|
|
||||||
export const isInstanceOf =
|
|
||||||
<T>(Constructor: new (...args: any[]) => T) =>
|
|
||||||
(value: unknown): value is T =>
|
|
||||||
value instanceof Constructor
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -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,
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import type { LoosePick, UnknownRecord } from "./types"
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { expect, test } from "vitest"
|
|
||||||
import { PruneNullishValues, pruneNullishValues } from "./prune-nullish-values"
|
|
||||||
|
|
||||||
test("pruneNullishValues", () => {
|
|
||||||
type 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)
|
|
||||||
})
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
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] = pruneNullishValues(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
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]
|
|
||||||
@@ -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
|
|
||||||
while (true) {
|
|
||||||
try {
|
|
||||||
return await callback()
|
|
||||||
} catch (error) {
|
|
||||||
if (Date.now() - startTime > maxTime) {
|
|
||||||
throw error
|
|
||||||
}
|
|
||||||
await setTimeout(waitPeriod)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export function toError(value: unknown) {
|
|
||||||
return value instanceof Error ? value : new Error(String(value))
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
/* 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
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import { setTimeout } from "timers/promises"
|
|
||||||
|
|
||||||
const maxTime = 1000
|
|
||||||
|
|
||||||
export async function waitFor<Result>(
|
|
||||||
predicate: () => 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
throw lastError ?? new Error("Timeout")
|
|
||||||
}
|
|
||||||
@@ -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: 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
|
|
||||||
}
|
|
||||||
@@ -1,113 +1,102 @@
|
|||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import type { ReacordInstance } from "./instance"
|
import type { ReacordInstance } from "./instance"
|
||||||
|
|
||||||
/**
|
/** @category Component Event */
|
||||||
* @category Component Event
|
export interface ComponentEvent {
|
||||||
*/
|
/**
|
||||||
export type ComponentEvent = {
|
* The message associated with this event. For example: with a button click,
|
||||||
/**
|
* this is the message that the button is on.
|
||||||
* The message associated with this event.
|
*
|
||||||
* For example: with a button click,
|
* @see https://discord.com/developers/docs/resources/channel#message-object
|
||||||
* this is the message that the button is on.
|
*/
|
||||||
* @see https://discord.com/developers/docs/resources/channel#message-object
|
message: MessageInfo
|
||||||
*/
|
|
||||||
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: ChannelInfo
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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: UserInfo
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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?: GuildInfo
|
||||||
|
|
||||||
/**
|
/** Create a new reply to this event. */
|
||||||
* Create a new reply to this event.
|
reply(content?: ReactNode): ReacordInstance
|
||||||
*/
|
|
||||||
reply(content?: ReactNode): ReacordInstance
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create an ephemeral reply to this event,
|
* Create an ephemeral reply to this event, shown only to the user who
|
||||||
* shown only to the user who triggered it.
|
* triggered it.
|
||||||
*/
|
*/
|
||||||
ephemeralReply(content?: ReactNode): ReacordInstance
|
ephemeralReply(content?: ReactNode): ReacordInstance
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Component Event */
|
||||||
* @category Component Event
|
export interface ChannelInfo {
|
||||||
*/
|
id: string
|
||||||
export type ChannelInfo = {
|
name?: string
|
||||||
id: string
|
topic?: string
|
||||||
name?: string
|
nsfw?: boolean
|
||||||
topic?: string
|
lastMessageId?: string
|
||||||
nsfw?: boolean
|
ownerId?: string
|
||||||
lastMessageId?: string
|
parentId?: string
|
||||||
ownerId?: string
|
rateLimitPerUser?: number
|
||||||
parentId?: string
|
|
||||||
rateLimitPerUser?: number
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Component Event */
|
||||||
* @category Component Event
|
export interface MessageInfo {
|
||||||
*/
|
id: string
|
||||||
export type MessageInfo = {
|
channelId: string
|
||||||
id: string
|
authorId: string
|
||||||
channelId: string
|
member?: GuildMemberInfo
|
||||||
authorId: UserInfo
|
content: string
|
||||||
member?: GuildMemberInfo
|
timestamp: string
|
||||||
content: string
|
editedTimestamp?: string
|
||||||
timestamp: string
|
tts: boolean
|
||||||
editedTimestamp?: string
|
mentionEveryone: boolean
|
||||||
tts: boolean
|
/** The IDs of mentioned users */
|
||||||
mentionEveryone: boolean
|
mentions: string[]
|
||||||
/** The IDs of mentioned users */
|
|
||||||
mentions: string[]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Component Event */
|
||||||
* @category Component Event
|
export interface GuildInfo {
|
||||||
*/
|
id: string
|
||||||
export type GuildInfo = {
|
name: string
|
||||||
id: string
|
member: GuildMemberInfo
|
||||||
name: string
|
|
||||||
member: GuildMemberInfo
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Component Event */
|
||||||
* @category Component Event
|
export interface GuildMemberInfo {
|
||||||
*/
|
id: string
|
||||||
export type GuildMemberInfo = {
|
nick?: string
|
||||||
id: string
|
displayName: string
|
||||||
nick?: string
|
avatarUrl?: string
|
||||||
displayName: string
|
displayAvatarUrl: string
|
||||||
avatarUrl?: string
|
roles: string[]
|
||||||
displayAvatarUrl: string
|
color: number
|
||||||
roles: string[]
|
joinedAt?: string
|
||||||
color: number
|
premiumSince?: string
|
||||||
joinedAt?: string
|
pending?: boolean
|
||||||
premiumSince?: string
|
communicationDisabledUntil?: string
|
||||||
pending?: boolean
|
|
||||||
communicationDisabledUntil?: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Component Event */
|
||||||
* @category Component Event
|
export interface UserInfo {
|
||||||
*/
|
id: string
|
||||||
export type UserInfo = {
|
username: string
|
||||||
id: string
|
discriminator: string
|
||||||
username: string
|
tag: string
|
||||||
discriminator: string
|
avatarUrl: string | null
|
||||||
tag: string
|
accentColor?: number
|
||||||
avatarUrl: string
|
|
||||||
accentColor?: number
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,23 @@
|
|||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import React from "react"
|
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import type { MessageOptions } from "../../internal/message"
|
import type { MessageOptions } from "../../internal/message"
|
||||||
import { Node } from "../../internal/node.js"
|
import { Node } from "../../internal/node.js"
|
||||||
|
import type { ComponentInteraction } from "../../internal/interaction.js"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Props for an action row
|
* Props for an action row
|
||||||
|
*
|
||||||
* @category Action Row
|
* @category Action Row
|
||||||
*/
|
*/
|
||||||
export type ActionRowProps = {
|
export interface ActionRowProps {
|
||||||
children?: ReactNode
|
children?: ReactNode
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An action row is a top-level container for message components.
|
* 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.
|
* You don't need to use this; Reacord automatically creates action rows for
|
||||||
* But this can be useful if you want a specific layout.
|
* you. But this can be useful if you want a specific layout.
|
||||||
*
|
*
|
||||||
* ```tsx
|
* ```tsx
|
||||||
* // put buttons on two separate rows
|
* // put buttons on two separate rows
|
||||||
@@ -30,18 +31,26 @@ export type ActionRowProps = {
|
|||||||
* @see https://discord.com/developers/docs/interactions/message-components#action-rows
|
* @see https://discord.com/developers/docs/interactions/message-components#action-rows
|
||||||
*/
|
*/
|
||||||
export function ActionRow(props: ActionRowProps) {
|
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<{}> {
|
class ActionRowNode extends Node<ActionRowProps> {
|
||||||
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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,24 @@
|
|||||||
|
import type { ReactNode } from "react"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Common props between button-like components
|
* Common props between button-like components
|
||||||
|
*
|
||||||
* @category Button
|
* @category Button
|
||||||
*/
|
*/
|
||||||
export type ButtonSharedProps = {
|
export interface 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?: string
|
label?: ReactNode
|
||||||
|
|
||||||
/** 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.
|
* Renders an emoji to the left of the text. Has to be a literal emoji
|
||||||
* Has to be a literal emoji character (e.g. 🍍),
|
* character (e.g. 🍍), or an emoji code, like
|
||||||
* or an emoji code, like `<:plus_one:778531744860602388>`.
|
* `<:plus_one:778531744860602388>`.
|
||||||
*
|
*
|
||||||
* To get an emoji code, type your emoji in Discord chat
|
* To get an emoji code, type your emoji in Discord chat with a backslash `\`
|
||||||
* with a backslash `\` in front.
|
* in front. The bot has to be in the emoji's guild to use it.
|
||||||
* The bot has to be in the emoji's guild to use it.
|
*/
|
||||||
*/
|
emoji?: string
|
||||||
emoji?: string
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { nanoid } from "nanoid"
|
import { randomUUID } from "node:crypto"
|
||||||
import React from "react"
|
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import type { ComponentInteraction } from "../../internal/interaction"
|
import type { ComponentInteraction } from "../../internal/interaction"
|
||||||
import type { MessageOptions } from "../../internal/message"
|
import type { MessageOptions } from "../../internal/message"
|
||||||
@@ -8,58 +7,63 @@ import { Node } from "../../internal/node.js"
|
|||||||
import type { ComponentEvent } from "../component-event"
|
import type { ComponentEvent } from "../component-event"
|
||||||
import type { ButtonSharedProps } from "./button-shared-props"
|
import type { ButtonSharedProps } from "./button-shared-props"
|
||||||
|
|
||||||
/**
|
/** @category Button */
|
||||||
* @category Button
|
|
||||||
*/
|
|
||||||
export type ButtonProps = ButtonSharedProps & {
|
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. */
|
||||||
* Happens when a user clicks the button.
|
onClick: (event: ButtonClickEvent) => void
|
||||||
*/
|
|
||||||
onClick: (event: ButtonClickEvent) => void
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Button */
|
||||||
* @category Button
|
|
||||||
*/
|
|
||||||
export type ButtonClickEvent = ComponentEvent
|
export type ButtonClickEvent = ComponentEvent
|
||||||
|
|
||||||
/**
|
/** @category Button */
|
||||||
* @category Button
|
|
||||||
*/
|
|
||||||
export function Button(props: ButtonProps) {
|
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> {
|
class ButtonNode extends Node<ButtonProps> {
|
||||||
private customId = nanoid()
|
private customId = randomUUID()
|
||||||
|
|
||||||
override modifyMessageOptions(options: MessageOptions): void {
|
// this has text children, but buttons themselves shouldn't yield text
|
||||||
getNextActionRow(options).push({
|
// eslint-disable-next-line @typescript-eslint/class-literal-property-style
|
||||||
type: "button",
|
override get text() {
|
||||||
customId: this.customId,
|
return ""
|
||||||
style: this.props.style ?? "secondary",
|
}
|
||||||
disabled: this.props.disabled,
|
|
||||||
emoji: this.props.emoji,
|
|
||||||
label: this.props.label,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
override handleComponentInteraction(interaction: ComponentInteraction) {
|
override modifyMessageOptions(options: MessageOptions): void {
|
||||||
if (
|
getNextActionRow(options).push({
|
||||||
interaction.type === "button" &&
|
type: "button",
|
||||||
interaction.customId === this.customId
|
customId: this.customId,
|
||||||
) {
|
style: this.props.style ?? "secondary",
|
||||||
this.props.onClick(interaction.event)
|
disabled: this.props.disabled,
|
||||||
return true
|
emoji: this.props.emoji,
|
||||||
}
|
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>> {}
|
||||||
|
|||||||
@@ -1,36 +1,36 @@
|
|||||||
import React from "react"
|
import type { ReactNode } from "react"
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
|
import { Node } from "../../internal/node.js"
|
||||||
import { EmbedChildNode } from "./embed-child.js"
|
import { EmbedChildNode } from "./embed-child.js"
|
||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export interface EmbedAuthorProps {
|
||||||
*/
|
name?: ReactNode
|
||||||
export type EmbedAuthorProps = {
|
children?: ReactNode
|
||||||
name?: string
|
url?: string
|
||||||
children?: string
|
iconUrl?: string
|
||||||
url?: string
|
|
||||||
iconUrl?: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
|
||||||
*/
|
|
||||||
export function EmbedAuthor(props: EmbedAuthorProps) {
|
export function EmbedAuthor(props: EmbedAuthorProps) {
|
||||||
return (
|
return (
|
||||||
<ReacordElement
|
<ReacordElement props={props} createNode={() => new EmbedAuthorNode(props)}>
|
||||||
props={props}
|
<ReacordElement props={{}} createNode={() => new AuthorTextNode({})}>
|
||||||
createNode={() => new EmbedAuthorNode(props)}
|
{props.name ?? props.children}
|
||||||
/>
|
</ReacordElement>
|
||||||
)
|
</ReacordElement>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
|
class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
|
||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
options.author = {
|
options.author = {
|
||||||
name: this.props.name ?? this.props.children ?? "",
|
name: this.children.findType(AuthorTextNode)?.text ?? "",
|
||||||
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>> {}
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ import { Node } from "../../internal/node.js"
|
|||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
export abstract class EmbedChildNode<Props> extends Node<Props> {
|
export abstract class EmbedChildNode<Props> extends Node<Props> {
|
||||||
abstract modifyEmbedOptions(options: EmbedOptions): void
|
abstract modifyEmbedOptions(options: EmbedOptions): void
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,37 +1,41 @@
|
|||||||
import React from "react"
|
import type { ReactNode } from "react"
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
|
import { Node } from "../../internal/node.js"
|
||||||
import { EmbedChildNode } from "./embed-child.js"
|
import { EmbedChildNode } from "./embed-child.js"
|
||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export interface EmbedFieldProps {
|
||||||
*/
|
name: ReactNode
|
||||||
export type EmbedFieldProps = {
|
value?: ReactNode
|
||||||
name: string
|
inline?: boolean
|
||||||
value?: string
|
children?: ReactNode
|
||||||
inline?: boolean
|
|
||||||
children?: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
|
||||||
*/
|
|
||||||
export function EmbedField(props: EmbedFieldProps) {
|
export function EmbedField(props: EmbedFieldProps) {
|
||||||
return (
|
return (
|
||||||
<ReacordElement
|
<ReacordElement props={props} createNode={() => new EmbedFieldNode(props)}>
|
||||||
props={props}
|
<ReacordElement props={{}} createNode={() => new FieldNameNode({})}>
|
||||||
createNode={() => new EmbedFieldNode(props)}
|
{props.name}
|
||||||
/>
|
</ReacordElement>
|
||||||
)
|
<ReacordElement props={{}} createNode={() => new FieldValueNode({})}>
|
||||||
|
{props.value ?? props.children}
|
||||||
|
</ReacordElement>
|
||||||
|
</ReacordElement>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedFieldNode extends EmbedChildNode<EmbedFieldProps> {
|
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.props.name,
|
name: this.children.findType(FieldNameNode)?.text ?? "",
|
||||||
value: this.props.value ?? this.props.children ?? "",
|
value: this.children.findType(FieldValueNode)?.text ?? "",
|
||||||
inline: this.props.inline,
|
inline: this.props.inline,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class FieldNameNode extends Node<Record<string, never>> {}
|
||||||
|
class FieldValueNode extends Node<Record<string, never>> {}
|
||||||
|
|||||||
@@ -1,38 +1,40 @@
|
|||||||
import React from "react"
|
import type { ReactNode } from "react"
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
|
import { Node } from "../../internal/node.js"
|
||||||
import { EmbedChildNode } from "./embed-child.js"
|
import { EmbedChildNode } from "./embed-child.js"
|
||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export interface EmbedFooterProps {
|
||||||
*/
|
text?: ReactNode
|
||||||
export type EmbedFooterProps = {
|
children?: ReactNode
|
||||||
text?: string
|
iconUrl?: string
|
||||||
children?: string
|
timestamp?: string | number | Date
|
||||||
iconUrl?: string
|
|
||||||
timestamp?: string | number | Date
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export function EmbedFooter({ text, children, ...props }: EmbedFooterProps) {
|
||||||
*/
|
return (
|
||||||
export function EmbedFooter(props: EmbedFooterProps) {
|
<ReacordElement props={props} createNode={() => new EmbedFooterNode(props)}>
|
||||||
return (
|
<ReacordElement props={{}} createNode={() => new FooterTextNode({})}>
|
||||||
<ReacordElement
|
{text ?? children}
|
||||||
props={props}
|
</ReacordElement>
|
||||||
createNode={() => new EmbedFooterNode(props)}
|
</ReacordElement>
|
||||||
/>
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedFooterNode extends EmbedChildNode<EmbedFooterProps> {
|
class EmbedFooterNode extends EmbedChildNode<
|
||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
Omit<EmbedFooterProps, "text" | "children">
|
||||||
options.footer = {
|
> {
|
||||||
text: this.props.text ?? this.props.children ?? "",
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
icon_url: this.props.iconUrl,
|
options.footer = {
|
||||||
}
|
text: this.children.findType(FooterTextNode)?.text ?? "",
|
||||||
options.timestamp = this.props.timestamp
|
icon_url: this.props.iconUrl,
|
||||||
? new Date(this.props.timestamp).toISOString()
|
}
|
||||||
: undefined
|
options.timestamp = this.props.timestamp
|
||||||
}
|
? new Date(this.props.timestamp).toISOString()
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class FooterTextNode extends Node<Record<string, never>> {}
|
||||||
|
|||||||
@@ -1,29 +1,24 @@
|
|||||||
import React from "react"
|
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import { EmbedChildNode } from "./embed-child.js"
|
import { EmbedChildNode } from "./embed-child.js"
|
||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export interface EmbedImageProps {
|
||||||
*/
|
url: string
|
||||||
export type EmbedImageProps = {
|
|
||||||
url: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
|
||||||
*/
|
|
||||||
export function EmbedImage(props: EmbedImageProps) {
|
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> {
|
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 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import type { Except, SnakeCasedPropertiesDeep } from "type-fest"
|
|
||||||
import type { EmbedProps } from "./embed"
|
import type { EmbedProps } from "./embed"
|
||||||
|
import type { Except, SnakeCasedPropertiesDeep } from "type-fest"
|
||||||
|
|
||||||
export type EmbedOptions = SnakeCasedPropertiesDeep<
|
export type EmbedOptions = SnakeCasedPropertiesDeep<
|
||||||
Except<EmbedProps, "timestamp" | "children"> & {
|
Except<EmbedProps, "timestamp" | "children"> & {
|
||||||
timestamp?: string
|
timestamp?: string
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1,29 +1,24 @@
|
|||||||
import React from "react"
|
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import { EmbedChildNode } from "./embed-child.js"
|
import { EmbedChildNode } from "./embed-child.js"
|
||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export interface EmbedThumbnailProps {
|
||||||
*/
|
url: string
|
||||||
export type EmbedThumbnailProps = {
|
|
||||||
url: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
|
||||||
*/
|
|
||||||
export function EmbedThumbnail(props: EmbedThumbnailProps) {
|
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> {
|
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 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +1,31 @@
|
|||||||
import React from "react"
|
import type { ReactNode } from "react"
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
|
import { Node } from "../../internal/node.js"
|
||||||
import { EmbedChildNode } from "./embed-child.js"
|
import { EmbedChildNode } from "./embed-child.js"
|
||||||
import type { EmbedOptions } from "./embed-options"
|
import type { EmbedOptions } from "./embed-options"
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export interface EmbedTitleProps {
|
||||||
*/
|
children: ReactNode
|
||||||
export type EmbedTitleProps = {
|
url?: string
|
||||||
children: string
|
|
||||||
url?: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Embed */
|
||||||
* @category Embed
|
export function EmbedTitle({ children, ...props }: EmbedTitleProps) {
|
||||||
*/
|
return (
|
||||||
export function EmbedTitle(props: EmbedTitleProps) {
|
<ReacordElement props={props} createNode={() => new EmbedTitleNode(props)}>
|
||||||
return (
|
<ReacordElement props={{}} createNode={() => new TitleTextNode({})}>
|
||||||
<ReacordElement
|
{children}
|
||||||
props={props}
|
</ReacordElement>
|
||||||
createNode={() => new EmbedTitleNode(props)}
|
</ReacordElement>
|
||||||
/>
|
)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedTitleNode extends EmbedChildNode<EmbedTitleProps> {
|
class EmbedTitleNode extends EmbedChildNode<Omit<EmbedTitleProps, "children">> {
|
||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
options.title = this.props.children
|
options.title = this.children.findType(TitleTextNode)?.text ?? ""
|
||||||
options.url = this.props.url
|
options.url = this.props.url
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class TitleTextNode extends Node<Record<string, never>> {}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from "react"
|
import { snakeCaseDeep } from "@reacord/helpers/convert-object-property-case"
|
||||||
import { snakeCaseDeep } from "../../../helpers/convert-object-property-case"
|
import { omit } from "@reacord/helpers/omit"
|
||||||
import { omit } from "../../../helpers/omit"
|
import type React from "react"
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import type { MessageOptions } from "../../internal/message"
|
import type { MessageOptions } from "../../internal/message"
|
||||||
import { Node } from "../../internal/node.js"
|
import { Node } from "../../internal/node.js"
|
||||||
@@ -12,19 +12,19 @@ import type { EmbedOptions } from "./embed-options"
|
|||||||
* @category Embed
|
* @category Embed
|
||||||
* @see https://discord.com/developers/docs/resources/channel#embed-object
|
* @see https://discord.com/developers/docs/resources/channel#embed-object
|
||||||
*/
|
*/
|
||||||
export type EmbedProps = {
|
export interface 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 type EmbedProps = {
|
|||||||
* @see https://discord.com/developers/docs/resources/channel#embed-object
|
* @see https://discord.com/developers/docs/resources/channel#embed-object
|
||||||
*/
|
*/
|
||||||
export function Embed(props: EmbedProps) {
|
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> {
|
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +1,38 @@
|
|||||||
import React from "react"
|
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import type { MessageOptions } from "../../internal/message"
|
import type { MessageOptions } from "../../internal/message"
|
||||||
import { getNextActionRow } from "../../internal/message"
|
import { getNextActionRow } from "../../internal/message"
|
||||||
import { Node } from "../../internal/node.js"
|
import { Node } from "../../internal/node.js"
|
||||||
import type { ButtonSharedProps } from "./button-shared-props"
|
import type { ButtonSharedProps } from "./button-shared-props"
|
||||||
|
|
||||||
/**
|
/** @category Link */
|
||||||
* @category Link
|
|
||||||
*/
|
|
||||||
export type LinkProps = ButtonSharedProps & {
|
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 */
|
||||||
* @category Link
|
export function Link({ label, children, ...props }: LinkProps) {
|
||||||
*/
|
return (
|
||||||
export function Link(props: LinkProps) {
|
<ReacordElement props={props} createNode={() => new LinkNode(props)}>
|
||||||
return <ReacordElement props={props} createNode={() => new LinkNode(props)} />
|
<ReacordElement props={{}} createNode={() => new LinkTextNode({})}>
|
||||||
|
{label ?? children}
|
||||||
|
</ReacordElement>
|
||||||
|
</ReacordElement>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
class LinkNode extends Node<LinkProps> {
|
class LinkNode extends Node<Omit<LinkProps, "label" | "children">> {
|
||||||
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.props.label || this.props.children,
|
label: this.children.findType(LinkTextNode)?.text,
|
||||||
url: this.props.url,
|
url: this.props.url,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class LinkTextNode extends Node<Record<string, never>> {}
|
||||||
|
|||||||
@@ -2,13 +2,18 @@ import type { MessageSelectOptionOptions } from "../../internal/message"
|
|||||||
import { Node } from "../../internal/node"
|
import { Node } from "../../internal/node"
|
||||||
import type { OptionProps } from "./option"
|
import type { OptionProps } from "./option"
|
||||||
|
|
||||||
export class OptionNode extends Node<OptionProps> {
|
export class OptionNode extends Node<
|
||||||
get options(): MessageSelectOptionOptions {
|
Omit<OptionProps, "children" | "label" | "description">
|
||||||
return {
|
> {
|
||||||
label: this.props.children || this.props.label || this.props.value,
|
get options(): MessageSelectOptionOptions {
|
||||||
value: this.props.value,
|
return {
|
||||||
description: this.props.description,
|
label: this.children.findType(OptionLabelNode)?.text ?? this.props.value,
|
||||||
emoji: this.props.emoji,
|
value: this.props.value,
|
||||||
}
|
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>> {}
|
||||||
|
|||||||
@@ -1,38 +1,56 @@
|
|||||||
import React from "react"
|
import type { ReactNode } from "react"
|
||||||
import { ReacordElement } from "../../internal/element"
|
import { ReacordElement } from "../../internal/element"
|
||||||
import { OptionNode } from "./option-node"
|
import {
|
||||||
|
OptionDescriptionNode,
|
||||||
|
OptionLabelNode,
|
||||||
|
OptionNode,
|
||||||
|
} from "./option-node"
|
||||||
|
|
||||||
/**
|
/** @category Select */
|
||||||
* @category Select
|
export interface OptionProps {
|
||||||
*/
|
/** The internal value of this option */
|
||||||
export type OptionProps = {
|
value: string
|
||||||
/** The internal value of this option */
|
/** The text shown to the user. This takes priority over `children` */
|
||||||
value: string
|
label?: ReactNode
|
||||||
/** The text shown to the user. This takes priority over `children` */
|
/** The text shown to the user */
|
||||||
label?: string
|
children?: ReactNode
|
||||||
/** The text shown to the user */
|
/** Description for the option, shown to the user */
|
||||||
children?: string
|
description?: ReactNode
|
||||||
/** 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. 🍍),
|
* Has to be a literal emoji character (e.g. 🍍), or an emoji code, like
|
||||||
* or an emoji code, like `<:plus_one:778531744860602388>`.
|
* `<:plus_one:778531744860602388>`.
|
||||||
*
|
*
|
||||||
* To get an emoji code, type your emoji in Discord chat
|
* To get an emoji code, type your emoji in Discord chat with a backslash `\`
|
||||||
* with a backslash `\` in front.
|
* in front. The bot has to be in the emoji's guild to use it.
|
||||||
* The bot has to be in the emoji's guild to use it.
|
*/
|
||||||
*/
|
emoji?: string
|
||||||
emoji?: string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Select */
|
||||||
* @category Select
|
export function Option({
|
||||||
*/
|
label,
|
||||||
export function Option(props: OptionProps) {
|
children,
|
||||||
return (
|
description,
|
||||||
<ReacordElement props={props} createNode={() => new OptionNode(props)} />
|
...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>
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,153 +1,152 @@
|
|||||||
import { nanoid } from "nanoid"
|
import { isInstanceOf } from "@reacord/helpers/is-instance-of"
|
||||||
|
import { randomUUID } from "node:crypto"
|
||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import React from "react"
|
|
||||||
import { isInstanceOf } from "../../../helpers/is-instance-of"
|
|
||||||
import { ReacordElement } from "../../internal/element.js"
|
import { ReacordElement } from "../../internal/element.js"
|
||||||
import type { ComponentInteraction } from "../../internal/interaction"
|
import type { ComponentInteraction } from "../../internal/interaction"
|
||||||
import type {
|
import type {
|
||||||
ActionRow,
|
ActionRow,
|
||||||
ActionRowItem,
|
ActionRowItem,
|
||||||
MessageOptions,
|
MessageOptions,
|
||||||
} from "../../internal/message"
|
} from "../../internal/message"
|
||||||
import { Node } from "../../internal/node.js"
|
import { Node } from "../../internal/node.js"
|
||||||
import type { ComponentEvent } from "../component-event"
|
import type { ComponentEvent } from "../component-event"
|
||||||
import { OptionNode } from "./option-node"
|
import { OptionNode } from "./option-node"
|
||||||
|
import { omit } from "@reacord/helpers/omit.js"
|
||||||
|
|
||||||
/**
|
/** @category Select */
|
||||||
* @category Select
|
export interface SelectProps {
|
||||||
*/
|
children?: ReactNode
|
||||||
export type SelectProps = {
|
/** Sets the currently selected value */
|
||||||
children?: ReactNode
|
value?: string
|
||||||
/** 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.
|
* With `multiple`, the minimum number of values that can be selected. When
|
||||||
* When `multiple` is false or not defined, this is always 1.
|
* `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.
|
* With `multiple`, the maximum number of values that can be selected. When
|
||||||
* When `multiple` is false or not defined, this is always 1.
|
* `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. */
|
/**
|
||||||
disabled?: boolean
|
* When true, the select will be slightly faded, and cannot be interacted
|
||||||
|
* with.
|
||||||
|
*/
|
||||||
|
disabled?: boolean
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when the user inputs a selection.
|
* Called when the user inputs a selection. Receives the entire select change
|
||||||
* Receives the entire select change event,
|
* event, which can be used to create new replies, etc.
|
||||||
* 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 value.
|
* Convenience shorthand for `onChange`, which receives the first selected
|
||||||
*/
|
* value.
|
||||||
onChangeValue?: (value: string, event: SelectChangeEvent) => void
|
*/
|
||||||
|
onChangeValue?: (value: string, event: SelectChangeEvent) => void
|
||||||
|
|
||||||
/**
|
/** Convenience shorthand for `onChange`, which receives all selected values. */
|
||||||
* Convenience shorthand for `onChange`, which receives all selected values.
|
onChangeMultiple?: (values: string[], event: SelectChangeEvent) => void
|
||||||
*/
|
|
||||||
onChangeMultiple?: (values: string[], event: SelectChangeEvent) => void
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/** @category Select */
|
||||||
* @category Select
|
|
||||||
*/
|
|
||||||
export type SelectChangeEvent = ComponentEvent & {
|
export type SelectChangeEvent = ComponentEvent & {
|
||||||
values: string[]
|
values: string[]
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* See [the select menu guide](/guides/select-menu) for a usage example.
|
* See [the select menu guide](/guides/select-menu) for a usage example.
|
||||||
|
*
|
||||||
* @category Select
|
* @category Select
|
||||||
*/
|
*/
|
||||||
export function Select(props: SelectProps) {
|
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> {
|
class SelectNode extends Node<SelectProps> {
|
||||||
readonly customId = nanoid()
|
readonly customId = randomUUID()
|
||||||
|
|
||||||
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,
|
||||||
children,
|
...props
|
||||||
onChange,
|
} = omit(this.props, [
|
||||||
onChangeValue,
|
"children",
|
||||||
onChangeMultiple,
|
"onChange",
|
||||||
...props
|
"onChangeValue",
|
||||||
} = this.props
|
"onChangeMultiple",
|
||||||
|
])
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
import type { ReacordInstance } from "./instance.js"
|
||||||
|
import { raise } from "@reacord/helpers/raise.js"
|
||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
import { raise } from "../../helpers/raise"
|
|
||||||
import type { ReacordInstance } from "./instance"
|
|
||||||
|
|
||||||
const Context = React.createContext<ReacordInstance | undefined>(undefined)
|
const Context = React.createContext<ReacordInstance | undefined>(undefined)
|
||||||
|
|
||||||
@@ -13,8 +13,8 @@ export const InstanceProvider = Context.Provider
|
|||||||
* @see https://reacord.mapleleaf.dev/guides/use-instance
|
* @see https://reacord.mapleleaf.dev/guides/use-instance
|
||||||
*/
|
*/
|
||||||
export function useInstance(): ReacordInstance {
|
export function useInstance(): ReacordInstance {
|
||||||
return (
|
return (
|
||||||
React.useContext(Context) ??
|
React.useContext(Context) ??
|
||||||
raise("Could not find instance, was this component rendered via Reacord?")
|
raise("Could not find instance, was this component rendered via Reacord?")
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,18 +2,19 @@ import type { ReactNode } from "react"
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents an interactive message, which can later be replaced or deleted.
|
* Represents an interactive message, which can later be replaced or deleted.
|
||||||
|
*
|
||||||
* @category Core
|
* @category Core
|
||||||
*/
|
*/
|
||||||
export type ReacordInstance = {
|
export interface ReacordInstance {
|
||||||
/** Render some JSX to this instance (edits the message) */
|
/** Render some JSX to this instance (edits the message) */
|
||||||
render: (content: ReactNode) => void
|
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,24 @@
|
|||||||
/* eslint-disable class-methods-use-this */
|
import { safeJsonStringify } from "@reacord/helpers/json"
|
||||||
|
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 * as Discord from "discord.js"
|
||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import type { Except } from "type-fest"
|
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 { ComponentInteraction } from "../internal/interaction"
|
||||||
import type { Message, MessageOptions } from "../internal/message"
|
import type {
|
||||||
|
Message,
|
||||||
|
MessageButtonOptions,
|
||||||
|
MessageOptions,
|
||||||
|
} from "../internal/message"
|
||||||
import { ChannelMessageRenderer } from "../internal/renderers/channel-message-renderer"
|
import { ChannelMessageRenderer } from "../internal/renderers/channel-message-renderer"
|
||||||
import { InteractionReplyRenderer } from "../internal/renderers/interaction-reply-renderer"
|
import { InteractionReplyRenderer } from "../internal/renderers/interaction-reply-renderer"
|
||||||
import type {
|
import type {
|
||||||
ChannelInfo,
|
ChannelInfo,
|
||||||
GuildInfo,
|
GuildInfo,
|
||||||
GuildMemberInfo,
|
GuildMemberInfo,
|
||||||
MessageInfo,
|
MessageInfo,
|
||||||
UserInfo,
|
UserInfo,
|
||||||
} from "./component-event"
|
} from "./component-event"
|
||||||
import type { ReacordInstance } from "./instance"
|
import type { ReacordInstance } from "./instance"
|
||||||
import type { ReacordConfig } from "./reacord"
|
import type { ReacordConfig } from "./reacord"
|
||||||
@@ -23,344 +26,383 @@ import { Reacord } from "./reacord"
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The Reacord adapter for Discord.js.
|
* The Reacord adapter for Discord.js.
|
||||||
|
*
|
||||||
* @category Core
|
* @category Core
|
||||||
*/
|
*/
|
||||||
export class ReacordDiscordJs extends Reacord {
|
export class ReacordDiscordJs extends Reacord {
|
||||||
constructor(private client: Discord.Client, config: ReacordConfig = {}) {
|
constructor(
|
||||||
super(config)
|
private client: Discord.Client,
|
||||||
|
config: ReacordConfig = {},
|
||||||
|
) {
|
||||||
|
super(config)
|
||||||
|
|
||||||
client.on("interactionCreate", (interaction) => {
|
client.on("interactionCreate", (interaction) => {
|
||||||
if (interaction.isMessageComponent()) {
|
if (interaction.isButton() || interaction.isStringSelectMenu()) {
|
||||||
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.mapleleaf.dev/guides/sending-messages
|
*
|
||||||
*/
|
* @see https://reacord.mapleleaf.dev/guides/sending-messages
|
||||||
override send(
|
*/
|
||||||
channelId: string,
|
override send(
|
||||||
initialContent?: React.ReactNode,
|
channelId: string,
|
||||||
): ReacordInstance {
|
initialContent?: React.ReactNode,
|
||||||
return this.createInstance(
|
): ReacordInstance {
|
||||||
this.createChannelRenderer(channelId),
|
return this.createInstance(
|
||||||
initialContent,
|
this.createChannelRenderer(channelId),
|
||||||
)
|
initialContent,
|
||||||
}
|
)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sends a message as a reply to a command interaction.
|
* Sends a message as a reply to a command interaction.
|
||||||
* @see https://reacord.mapleleaf.dev/guides/sending-messages
|
*
|
||||||
*/
|
* @see https://reacord.mapleleaf.dev/guides/sending-messages
|
||||||
override reply(
|
*/
|
||||||
interaction: Discord.CommandInteraction,
|
override reply(
|
||||||
initialContent?: React.ReactNode,
|
interaction: Discord.CommandInteraction,
|
||||||
): ReacordInstance {
|
initialContent?: React.ReactNode,
|
||||||
return this.createInstance(
|
): ReacordInstance {
|
||||||
this.createInteractionReplyRenderer(interaction),
|
return this.createInstance(
|
||||||
initialContent,
|
this.createInteractionReplyRenderer(interaction),
|
||||||
)
|
initialContent,
|
||||||
}
|
)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sends an ephemeral message as a reply to a command interaction.
|
* Sends an ephemeral message as a reply to a command interaction.
|
||||||
* @see https://reacord.mapleleaf.dev/guides/sending-messages
|
*
|
||||||
*/
|
* @see https://reacord.mapleleaf.dev/guides/sending-messages
|
||||||
override ephemeralReply(
|
*/
|
||||||
interaction: Discord.CommandInteraction,
|
override ephemeralReply(
|
||||||
initialContent?: React.ReactNode,
|
interaction: Discord.CommandInteraction,
|
||||||
): ReacordInstance {
|
initialContent?: React.ReactNode,
|
||||||
return this.createInstance(
|
): ReacordInstance {
|
||||||
this.createEphemeralInteractionReplyRenderer(interaction),
|
return this.createInstance(
|
||||||
initialContent,
|
this.createEphemeralInteractionReplyRenderer(interaction),
|
||||||
)
|
initialContent,
|
||||||
}
|
)
|
||||||
|
}
|
||||||
|
|
||||||
private createChannelRenderer(channelId: string) {
|
private createChannelRenderer(channelId: string) {
|
||||||
return new ChannelMessageRenderer({
|
return new ChannelMessageRenderer({
|
||||||
send: async (options) => {
|
send: async (options) => {
|
||||||
const channel =
|
const channel =
|
||||||
this.client.channels.cache.get(channelId) ??
|
this.client.channels.cache.get(channelId) ??
|
||||||
(await this.client.channels.fetch(channelId)) ??
|
(await this.client.channels.fetch(channelId)) ??
|
||||||
raise(`Channel ${channelId} not found`)
|
raise(`Channel ${channelId} not found`)
|
||||||
|
|
||||||
if (!channel.isText()) {
|
if (!channel.isTextBased()) {
|
||||||
raise(`Channel ${channelId} is not a text channel`)
|
raise(`Channel ${channelId} is not a text channel`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const message = await channel.send(getDiscordMessageOptions(options))
|
const message = await channel.send(getDiscordMessageOptions(options))
|
||||||
return createReacordMessage(message)
|
return createReacordMessage(message)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private createInteractionReplyRenderer(
|
private createInteractionReplyRenderer(
|
||||||
interaction:
|
interaction:
|
||||||
| Discord.CommandInteraction
|
| Discord.CommandInteraction
|
||||||
| Discord.MessageComponentInteraction,
|
| Discord.MessageComponentInteraction,
|
||||||
) {
|
) {
|
||||||
return new InteractionReplyRenderer({
|
return new InteractionReplyRenderer({
|
||||||
type: "command",
|
type: "command",
|
||||||
id: interaction.id,
|
id: interaction.id,
|
||||||
reply: async (options) => {
|
reply: async (options) => {
|
||||||
const message = await interaction.reply({
|
const message = await interaction.reply({
|
||||||
...getDiscordMessageOptions(options),
|
...getDiscordMessageOptions(options),
|
||||||
fetchReply: true,
|
fetchReply: true,
|
||||||
})
|
})
|
||||||
return createReacordMessage(message as Discord.Message)
|
return createReacordMessage(message)
|
||||||
},
|
},
|
||||||
followUp: async (options) => {
|
followUp: async (options) => {
|
||||||
const message = await interaction.followUp({
|
const message = await interaction.followUp({
|
||||||
...getDiscordMessageOptions(options),
|
...getDiscordMessageOptions(options),
|
||||||
fetchReply: true,
|
fetchReply: true,
|
||||||
})
|
})
|
||||||
return createReacordMessage(message as Discord.Message)
|
return createReacordMessage(message)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private createEphemeralInteractionReplyRenderer(
|
private createEphemeralInteractionReplyRenderer(
|
||||||
interaction:
|
interaction:
|
||||||
| Discord.CommandInteraction
|
| Discord.CommandInteraction
|
||||||
| Discord.MessageComponentInteraction,
|
| Discord.MessageComponentInteraction,
|
||||||
) {
|
) {
|
||||||
return new InteractionReplyRenderer({
|
return new InteractionReplyRenderer({
|
||||||
type: "command",
|
type: "command",
|
||||||
id: interaction.id,
|
id: interaction.id,
|
||||||
reply: async (options) => {
|
reply: async (options) => {
|
||||||
await interaction.reply({
|
await interaction.reply({
|
||||||
...getDiscordMessageOptions(options),
|
...getDiscordMessageOptions(options),
|
||||||
ephemeral: true,
|
ephemeral: true,
|
||||||
})
|
})
|
||||||
return createEphemeralReacordMessage()
|
return createEphemeralReacordMessage()
|
||||||
},
|
},
|
||||||
followUp: async (options) => {
|
followUp: async (options) => {
|
||||||
await interaction.followUp({
|
await interaction.followUp({
|
||||||
...getDiscordMessageOptions(options),
|
...getDiscordMessageOptions(options),
|
||||||
ephemeral: true,
|
ephemeral: true,
|
||||||
})
|
})
|
||||||
return createEphemeralReacordMessage()
|
return createEphemeralReacordMessage()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private createReacordComponentInteraction(
|
private createReacordComponentInteraction(
|
||||||
interaction: Discord.MessageComponentInteraction,
|
interaction: Discord.MessageComponentInteraction,
|
||||||
): ComponentInteraction {
|
): ComponentInteraction {
|
||||||
// todo please dear god clean this up
|
// todo please dear god clean this up
|
||||||
const channel: ChannelInfo = interaction.channel
|
const channel: ChannelInfo = interaction.channel
|
||||||
? {
|
? {
|
||||||
...pruneNullishValues(
|
...pruneNullishValues(
|
||||||
pick(interaction.channel, [
|
pick(interaction.channel, [
|
||||||
"topic",
|
"topic",
|
||||||
"nsfw",
|
"nsfw",
|
||||||
"lastMessageId",
|
"lastMessageId",
|
||||||
"ownerId",
|
"ownerId",
|
||||||
"parentId",
|
"parentId",
|
||||||
"rateLimitPerUser",
|
"rateLimitPerUser",
|
||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
id: interaction.channelId,
|
id: interaction.channelId,
|
||||||
}
|
}
|
||||||
: raise("Non-channel interactions are not supported")
|
: raise("Non-channel interactions are not supported")
|
||||||
|
|
||||||
const message: MessageInfo =
|
const message: MessageInfo =
|
||||||
interaction.message instanceof Discord.Message
|
interaction.message instanceof Discord.Message
|
||||||
? {
|
? {
|
||||||
...pick(interaction.message, [
|
...pick(interaction.message, [
|
||||||
"id",
|
"id",
|
||||||
"channelId",
|
"channelId",
|
||||||
"authorId",
|
"authorId",
|
||||||
"content",
|
"content",
|
||||||
"tts",
|
"tts",
|
||||||
"mentionEveryone",
|
"mentionEveryone",
|
||||||
]),
|
]),
|
||||||
timestamp: new Date(
|
timestamp: new Date(
|
||||||
interaction.message.createdTimestamp,
|
interaction.message.createdTimestamp,
|
||||||
).toISOString(),
|
).toISOString(),
|
||||||
editedTimestamp: interaction.message.editedTimestamp
|
editedTimestamp: interaction.message.editedTimestamp
|
||||||
? new Date(interaction.message.editedTimestamp).toISOString()
|
? new Date(interaction.message.editedTimestamp).toISOString()
|
||||||
: undefined,
|
: undefined,
|
||||||
mentions: interaction.message.mentions.users.map((u) => u.id),
|
mentions: interaction.message.mentions.users.map((u) => u.id),
|
||||||
}
|
authorId: interaction.message.author.id,
|
||||||
: raise("Message not found")
|
mentionEveryone: interaction.message.mentions.everyone,
|
||||||
|
}
|
||||||
|
: raise("Message not found")
|
||||||
|
|
||||||
const member: GuildMemberInfo | undefined =
|
const member: GuildMemberInfo | undefined =
|
||||||
interaction.member instanceof Discord.GuildMember
|
interaction.member instanceof Discord.GuildMember
|
||||||
? {
|
? {
|
||||||
...pruneNullishValues(
|
...pruneNullishValues(
|
||||||
pick(interaction.member, [
|
pick(interaction.member, [
|
||||||
"id",
|
"id",
|
||||||
"nick",
|
"nick",
|
||||||
"displayName",
|
"displayName",
|
||||||
"avatarUrl",
|
"avatarUrl",
|
||||||
"displayAvatarUrl",
|
"displayAvatarUrl",
|
||||||
"color",
|
"color",
|
||||||
"pending",
|
"pending",
|
||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
displayName: interaction.member.displayName,
|
displayName: interaction.member.displayName,
|
||||||
roles: [...interaction.member.roles.cache.map((role) => role.id)],
|
roles: interaction.member.roles.cache.map((role) => role.id),
|
||||||
joinedAt: interaction.member.joinedAt?.toISOString(),
|
joinedAt: interaction.member.joinedAt?.toISOString(),
|
||||||
premiumSince: interaction.member.premiumSince?.toISOString(),
|
premiumSince: interaction.member.premiumSince?.toISOString(),
|
||||||
communicationDisabledUntil:
|
communicationDisabledUntil:
|
||||||
interaction.member.communicationDisabledUntil?.toISOString(),
|
interaction.member.communicationDisabledUntil?.toISOString(),
|
||||||
}
|
color: interaction.member.displayColor,
|
||||||
: undefined
|
displayAvatarUrl: interaction.member.displayAvatarURL(),
|
||||||
|
}
|
||||||
|
: undefined
|
||||||
|
|
||||||
const guild: GuildInfo | undefined = interaction.guild
|
const guild: GuildInfo | undefined = interaction.guild
|
||||||
? {
|
? {
|
||||||
...pruneNullishValues(pick(interaction.guild, ["id", "name"])),
|
...pruneNullishValues(pick(interaction.guild, ["id", "name"])),
|
||||||
member: member ?? raise("unexpected: member is undefined"),
|
member: member ?? raise("unexpected: member is undefined"),
|
||||||
}
|
}
|
||||||
: undefined
|
: undefined
|
||||||
|
|
||||||
const user: UserInfo = {
|
const user: UserInfo = {
|
||||||
...pruneNullishValues(
|
...pruneNullishValues(
|
||||||
pick(interaction.user, ["id", "username", "discriminator", "tag"]),
|
pick(interaction.user, ["id", "username", "discriminator", "tag"]),
|
||||||
),
|
),
|
||||||
avatarUrl: interaction.user.avatarURL()!,
|
avatarUrl: interaction.user.avatarURL(),
|
||||||
accentColor: interaction.user.accentColor ?? undefined,
|
accentColor: interaction.user.accentColor ?? undefined,
|
||||||
}
|
}
|
||||||
|
|
||||||
const baseProps: Except<ComponentInteraction, "type"> = {
|
const baseProps: Except<ComponentInteraction, "type"> = {
|
||||||
id: interaction.id,
|
id: interaction.id,
|
||||||
customId: interaction.customId,
|
customId: interaction.customId,
|
||||||
update: async (options: MessageOptions) => {
|
update: async (options: MessageOptions) => {
|
||||||
await interaction.update(getDiscordMessageOptions(options))
|
if (interaction.deferred || interaction.replied) {
|
||||||
},
|
await interaction.message.edit(getDiscordMessageOptions(options))
|
||||||
deferUpdate: async () => {
|
} else {
|
||||||
if (interaction.replied || interaction.deferred) return
|
await interaction.update(getDiscordMessageOptions(options))
|
||||||
await interaction.deferUpdate()
|
}
|
||||||
},
|
},
|
||||||
reply: async (options) => {
|
deferUpdate: async () => {
|
||||||
const message = await interaction.reply({
|
if (interaction.replied || interaction.deferred) return
|
||||||
...getDiscordMessageOptions(options),
|
await interaction.deferUpdate()
|
||||||
fetchReply: true,
|
},
|
||||||
})
|
reply: async (options) => {
|
||||||
return createReacordMessage(message as Discord.Message)
|
const message = await interaction.reply({
|
||||||
},
|
...getDiscordMessageOptions(options),
|
||||||
followUp: async (options) => {
|
fetchReply: true,
|
||||||
const message = await interaction.followUp({
|
})
|
||||||
...getDiscordMessageOptions(options),
|
return createReacordMessage(message)
|
||||||
fetchReply: true,
|
},
|
||||||
})
|
followUp: async (options) => {
|
||||||
return createReacordMessage(message as Discord.Message)
|
const message = await interaction.followUp({
|
||||||
},
|
...getDiscordMessageOptions(options),
|
||||||
event: {
|
fetchReply: true,
|
||||||
channel,
|
})
|
||||||
message,
|
return createReacordMessage(message)
|
||||||
user,
|
},
|
||||||
guild,
|
event: {
|
||||||
|
channel,
|
||||||
|
message,
|
||||||
|
user,
|
||||||
|
guild,
|
||||||
|
|
||||||
reply: (content?: ReactNode) =>
|
reply: (content?: ReactNode) =>
|
||||||
this.createInstance(
|
this.createInstance(
|
||||||
this.createInteractionReplyRenderer(interaction),
|
this.createInteractionReplyRenderer(interaction),
|
||||||
content,
|
content,
|
||||||
),
|
),
|
||||||
|
|
||||||
ephemeralReply: (content: ReactNode) =>
|
ephemeralReply: (content: ReactNode) =>
|
||||||
this.createInstance(
|
this.createInstance(
|
||||||
this.createEphemeralInteractionReplyRenderer(interaction),
|
this.createEphemeralInteractionReplyRenderer(interaction),
|
||||||
content,
|
content,
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interaction.isButton()) {
|
if (interaction.isButton()) {
|
||||||
return {
|
return {
|
||||||
...baseProps,
|
...baseProps,
|
||||||
type: "button",
|
type: "button",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interaction.isSelectMenu()) {
|
if (interaction.isStringSelectMenu()) {
|
||||||
return {
|
return {
|
||||||
...baseProps,
|
...baseProps,
|
||||||
type: "select",
|
type: "select",
|
||||||
event: {
|
event: {
|
||||||
...baseProps.event,
|
...baseProps.event,
|
||||||
values: interaction.values,
|
values: interaction.values,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
raise(`Unsupported component interaction type: ${interaction.type}`)
|
raise(`Unsupported component interaction type: ${interaction.type}`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function createReacordMessage(message: Discord.Message): Message {
|
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 () => {
|
delete: async () => {
|
||||||
await message.delete()
|
await message.delete()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function createEphemeralReacordMessage(): Message {
|
function createEphemeralReacordMessage(): Message {
|
||||||
return {
|
return {
|
||||||
edit: () => {
|
edit: () => {
|
||||||
console.warn("Ephemeral messages can't be edited")
|
console.warn("Ephemeral messages can't be edited")
|
||||||
return Promise.resolve()
|
return Promise.resolve()
|
||||||
},
|
},
|
||||||
delete: () => {
|
delete: () => {
|
||||||
console.warn("Ephemeral messages can't be deleted")
|
console.warn("Ephemeral messages can't be deleted")
|
||||||
return Promise.resolve()
|
return Promise.resolve()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function convertButtonStyleToEnum(style: MessageButtonOptions["style"]) {
|
||||||
|
const styleMap = {
|
||||||
|
primary: Discord.ButtonStyle.Primary,
|
||||||
|
secondary: Discord.ButtonStyle.Secondary,
|
||||||
|
success: Discord.ButtonStyle.Success,
|
||||||
|
danger: Discord.ButtonStyle.Danger,
|
||||||
|
} as const
|
||||||
|
|
||||||
|
return styleMap[style ?? "secondary"]
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: this could be a part of the core library,
|
// TODO: this could be a part of the core library,
|
||||||
// and also handle some edge cases, e.g. empty messages
|
// and also handle some edge cases, e.g. empty messages
|
||||||
function getDiscordMessageOptions(
|
function getDiscordMessageOptions(reacordOptions: MessageOptions) {
|
||||||
reacordOptions: MessageOptions,
|
const options = {
|
||||||
): Discord.MessageOptions {
|
content: reacordOptions.content || undefined,
|
||||||
const options: Discord.MessageOptions = {
|
embeds: reacordOptions.embeds,
|
||||||
// eslint-disable-next-line unicorn/no-null
|
components: reacordOptions.actionRows.map((row) => ({
|
||||||
content: reacordOptions.content || null,
|
type: Discord.ComponentType.ActionRow,
|
||||||
embeds: reacordOptions.embeds,
|
components: row.map(
|
||||||
components: reacordOptions.actionRows.map((row) => ({
|
(component): Discord.MessageActionRowComponentData => {
|
||||||
type: "ACTION_ROW",
|
if (component.type === "button") {
|
||||||
components: row.map(
|
return {
|
||||||
(component): Discord.MessageActionRowComponentOptions => {
|
type: Discord.ComponentType.Button,
|
||||||
if (component.type === "button") {
|
customId: component.customId,
|
||||||
return {
|
label: component.label ?? "",
|
||||||
type: "BUTTON",
|
style: convertButtonStyleToEnum(component.style),
|
||||||
customId: component.customId,
|
disabled: component.disabled,
|
||||||
label: component.label ?? "",
|
emoji: component.emoji,
|
||||||
style: toUpper(component.style ?? "secondary"),
|
}
|
||||||
disabled: component.disabled,
|
}
|
||||||
emoji: component.emoji,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (component.type === "select") {
|
if (component.type === "link") {
|
||||||
return {
|
return {
|
||||||
...component,
|
type: Discord.ComponentType.Button,
|
||||||
type: "SELECT_MENU",
|
url: component.url,
|
||||||
options: component.options.map((option) => ({
|
label: component.label ?? "",
|
||||||
...option,
|
style: Discord.ButtonStyle.Link,
|
||||||
default: component.values?.includes(option.value),
|
disabled: component.disabled,
|
||||||
})),
|
emoji: component.emoji,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
raise(`Unsupported component type: ${component.type}`)
|
// future proofing
|
||||||
},
|
// 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),
|
||||||
|
})),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!options.content && !options.embeds?.length) {
|
component satisfies never
|
||||||
options.content = "_ _"
|
throw new Error(
|
||||||
}
|
`Invalid component type ${safeJsonStringify(component)}}`,
|
||||||
|
)
|
||||||
|
},
|
||||||
|
),
|
||||||
|
})),
|
||||||
|
}
|
||||||
|
|
||||||
return options
|
if (!options.content && !options.embeds.length) {
|
||||||
|
options.content = "_ _"
|
||||||
|
}
|
||||||
|
|
||||||
|
return options
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,79 +1,85 @@
|
|||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import React from "react"
|
import type { ComponentInteraction } from "../internal/interaction.js"
|
||||||
import type { ComponentInteraction } from "../internal/interaction"
|
|
||||||
import { reconciler } from "../internal/reconciler.js"
|
import { reconciler } from "../internal/reconciler.js"
|
||||||
import type { Renderer } from "../internal/renderers/renderer"
|
import type { Renderer } from "../internal/renderers/renderer.js"
|
||||||
import type { ReacordInstance } from "./instance"
|
import { InstanceProvider } from "./instance-context.js"
|
||||||
import { InstanceProvider } from "./instance-context"
|
import type { ReacordInstance } from "./instance.js"
|
||||||
|
|
||||||
/**
|
/** @category Core */
|
||||||
* @category Core
|
export interface ReacordConfig {
|
||||||
*/
|
/**
|
||||||
export type ReacordConfig = {
|
* The max number of active instances. When this limit is exceeded, the oldest
|
||||||
/**
|
* instances will be disabled.
|
||||||
* The max number of active instances.
|
*/
|
||||||
* When this limit is exceeded, the oldest instances will be disabled.
|
maxInstances?: number
|
||||||
*/
|
|
||||||
maxInstances?: number
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The main Reacord class that other Reacord adapters should extend.
|
* The main Reacord class that other Reacord adapters should extend. Only use
|
||||||
* Only use this directly if you're making [a custom adapter](/guides/custom-adapters).
|
* this directly if you're making [a custom adapter](/guides/custom-adapters).
|
||||||
*/
|
*/
|
||||||
export abstract class Reacord {
|
export abstract class Reacord {
|
||||||
private renderers: Renderer[] = []
|
private renderers: Renderer[] = []
|
||||||
|
|
||||||
constructor(private readonly config: ReacordConfig = {}) {}
|
constructor(private readonly config: ReacordConfig = {}) {}
|
||||||
|
|
||||||
abstract send(...args: unknown[]): ReacordInstance
|
abstract send(...args: unknown[]): ReacordInstance
|
||||||
abstract reply(...args: unknown[]): ReacordInstance
|
abstract reply(...args: unknown[]): ReacordInstance
|
||||||
abstract ephemeralReply(...args: unknown[]): ReacordInstance
|
abstract ephemeralReply(...args: unknown[]): ReacordInstance
|
||||||
|
|
||||||
protected handleComponentInteraction(interaction: ComponentInteraction) {
|
protected handleComponentInteraction(interaction: ComponentInteraction) {
|
||||||
for (const renderer of this.renderers) {
|
for (const renderer of this.renderers) {
|
||||||
if (renderer.handleComponentInteraction(interaction)) return
|
if (renderer.handleComponentInteraction(interaction)) return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private get maxInstances() {
|
private get maxInstances() {
|
||||||
return this.config.maxInstances ?? 50
|
return this.config.maxInstances ?? 50
|
||||||
}
|
}
|
||||||
|
|
||||||
protected createInstance(renderer: Renderer, initialContent?: ReactNode) {
|
protected createInstance(renderer: Renderer, initialContent?: ReactNode) {
|
||||||
if (this.renderers.length > this.maxInstances) {
|
if (this.renderers.length > this.maxInstances && this.renderers[0]) {
|
||||||
this.deactivate(this.renderers[0]!)
|
this.deactivate(this.renderers[0])
|
||||||
}
|
}
|
||||||
|
|
||||||
this.renderers.push(renderer)
|
this.renderers.push(renderer)
|
||||||
|
|
||||||
const container = reconciler.createContainer(renderer, 0, false, {})
|
const container: unknown = reconciler.createContainer(
|
||||||
|
renderer,
|
||||||
|
0,
|
||||||
|
null,
|
||||||
|
false,
|
||||||
|
null,
|
||||||
|
"reacord",
|
||||||
|
() => {},
|
||||||
|
null,
|
||||||
|
)
|
||||||
|
|
||||||
const instance: ReacordInstance = {
|
const instance: ReacordInstance = {
|
||||||
render: (content: ReactNode) => {
|
render: (content: ReactNode) => {
|
||||||
reconciler.updateContainer(
|
reconciler.updateContainer(
|
||||||
<InstanceProvider value={instance}>{content}</InstanceProvider>,
|
<InstanceProvider value={instance}>{content}</InstanceProvider>,
|
||||||
container,
|
container,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
deactivate: () => {
|
deactivate: () => {
|
||||||
this.deactivate(renderer)
|
this.deactivate(renderer)
|
||||||
},
|
},
|
||||||
destroy: () => {
|
destroy: () => {
|
||||||
this.renderers = this.renderers.filter((it) => it !== renderer)
|
this.renderers = this.renderers.filter((it) => it !== renderer)
|
||||||
renderer.destroy()
|
renderer.destroy()
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if (initialContent !== undefined) {
|
if (initialContent !== undefined) {
|
||||||
instance.render(initialContent)
|
instance.render(initialContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
|
|
||||||
private deactivate(renderer: Renderer) {
|
private deactivate(renderer: Renderer) {
|
||||||
this.renderers = this.renderers.filter((it) => it !== renderer)
|
this.renderers = this.renderers.filter((it) => it !== renderer)
|
||||||
renderer.deactivate()
|
renderer.deactivate()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import type { Message, MessageOptions } from "./message"
|
import type { Message, MessageOptions } from "./message"
|
||||||
|
|
||||||
export type Channel = {
|
export interface Channel {
|
||||||
send(message: MessageOptions): Promise<Message>
|
send(message: MessageOptions): Promise<Message>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,27 +1,39 @@
|
|||||||
export class Container<T> {
|
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 = []
|
||||||
}
|
}
|
||||||
|
|
||||||
[Symbol.iterator]() {
|
find(predicate: (item: T) => boolean): T | undefined {
|
||||||
return this.items[Symbol.iterator]()
|
return this.items.find(predicate)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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]()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
|
import type { Node } from "./node"
|
||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import React from "react"
|
import React from "react"
|
||||||
import type { Node } from "./node"
|
|
||||||
|
|
||||||
export function ReacordElement<Props>(props: {
|
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)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,28 +8,28 @@ export type ComponentInteraction = ButtonInteraction | SelectInteraction
|
|||||||
export type CommandInteraction = BaseInteraction<"command">
|
export type CommandInteraction = BaseInteraction<"command">
|
||||||
|
|
||||||
export type ButtonInteraction = BaseComponentInteraction<
|
export type ButtonInteraction = BaseComponentInteraction<
|
||||||
"button",
|
"button",
|
||||||
ButtonClickEvent
|
ButtonClickEvent
|
||||||
>
|
>
|
||||||
|
|
||||||
export type SelectInteraction = BaseComponentInteraction<
|
export type SelectInteraction = BaseComponentInteraction<
|
||||||
"select",
|
"select",
|
||||||
SelectChangeEvent
|
SelectChangeEvent
|
||||||
>
|
>
|
||||||
|
|
||||||
export type BaseInteraction<Type extends string> = {
|
export interface 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<
|
export type BaseComponentInteraction<
|
||||||
Type extends string,
|
Type extends string,
|
||||||
Event extends ComponentEvent,
|
Event extends ComponentEvent,
|
||||||
> = BaseInteraction<Type> & {
|
> = 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>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,24 +1,24 @@
|
|||||||
export class LimitedCollection<T> {
|
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]()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,65 +1,65 @@
|
|||||||
import type { Except } from "type-fest"
|
|
||||||
import { last } from "../../helpers/last"
|
|
||||||
import type { EmbedOptions } from "../core/components/embed-options"
|
import type { EmbedOptions } from "../core/components/embed-options"
|
||||||
import type { SelectProps } from "../core/components/select"
|
import type { SelectProps } from "../core/components/select"
|
||||||
|
import { last } from "@reacord/helpers/last"
|
||||||
|
import type { Except } from "type-fest"
|
||||||
|
|
||||||
export type MessageOptions = {
|
export interface MessageOptions {
|
||||||
content: string
|
content: string
|
||||||
embeds: EmbedOptions[]
|
embeds: EmbedOptions[]
|
||||||
actionRows: ActionRow[]
|
actionRows: ActionRow[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export type ActionRow = ActionRowItem[]
|
export type ActionRow = ActionRowItem[]
|
||||||
|
|
||||||
export type ActionRowItem =
|
export type ActionRowItem =
|
||||||
| MessageButtonOptions
|
| MessageButtonOptions
|
||||||
| MessageLinkOptions
|
| MessageLinkOptions
|
||||||
| MessageSelectOptions
|
| MessageSelectOptions
|
||||||
|
|
||||||
export type MessageButtonOptions = {
|
export interface 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 type MessageLinkOptions = {
|
export interface 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"> & {
|
export type MessageSelectOptions = Except<SelectProps, "children" | "value"> & {
|
||||||
type: "select"
|
type: "select"
|
||||||
customId: string
|
customId: string
|
||||||
options: MessageSelectOptionOptions[]
|
options: MessageSelectOptionOptions[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export type MessageSelectOptionOptions = {
|
export interface MessageSelectOptionOptions {
|
||||||
label: string
|
label: string
|
||||||
value: string
|
value: string
|
||||||
description?: string
|
description?: string
|
||||||
emoji?: string
|
emoji?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export type Message = {
|
export interface Message {
|
||||||
edit(options: MessageOptions): Promise<void>
|
edit(options: MessageOptions): Promise<void>
|
||||||
delete(): Promise<void>
|
delete(): Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getNextActionRow(options: MessageOptions): ActionRow {
|
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,21 @@
|
|||||||
/* eslint-disable class-methods-use-this */
|
|
||||||
import { Container } from "./container.js"
|
import { Container } from "./container.js"
|
||||||
import type { ComponentInteraction } from "./interaction"
|
import type { ComponentInteraction } from "./interaction"
|
||||||
import type { MessageOptions } from "./message"
|
import type { MessageOptions } from "./message"
|
||||||
|
|
||||||
export abstract class Node<Props> {
|
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("")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,104 +1,107 @@
|
|||||||
|
import { raise } from "@reacord/helpers/raise.js"
|
||||||
import type { HostConfig } from "react-reconciler"
|
import type { HostConfig } from "react-reconciler"
|
||||||
import ReactReconciler from "react-reconciler"
|
import ReactReconciler from "react-reconciler"
|
||||||
import { raise } from "../../helpers/raise.js"
|
import { DefaultEventPriority } from "react-reconciler/constants.js"
|
||||||
import { Node } from "./node.js"
|
import { Node } from "./node.js"
|
||||||
import type { Renderer } from "./renderers/renderer"
|
import type { Renderer } from "./renderers/renderer"
|
||||||
import { TextNode } from "./text-node.js"
|
import { TextNode } from "./text-node.js"
|
||||||
|
|
||||||
const config: HostConfig<
|
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,
|
||||||
> = {
|
> = {
|
||||||
// config
|
supportsMutation: true,
|
||||||
now: Date.now,
|
supportsPersistence: false,
|
||||||
supportsMutation: true,
|
supportsHydration: false,
|
||||||
supportsPersistence: false,
|
isPrimaryRenderer: true,
|
||||||
supportsHydration: false,
|
scheduleTimeout: global.setTimeout,
|
||||||
isPrimaryRenderer: true,
|
cancelTimeout: global.clearTimeout,
|
||||||
scheduleTimeout: global.setTimeout,
|
noTimeout: -1,
|
||||||
cancelTimeout: global.clearTimeout,
|
|
||||||
noTimeout: -1,
|
|
||||||
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
getRootHostContext: () => null,
|
||||||
getRootHostContext: () => null,
|
getChildHostContext: (parentContext) => parentContext,
|
||||||
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 = props.createNode(props.props)
|
const node: unknown = 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,
|
||||||
// @ts-expect-error
|
detachDeletedInstance: (_instance) => {},
|
||||||
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
|
||||||
},
|
},
|
||||||
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
prepareForCommit: () => null,
|
||||||
prepareForCommit: () => null,
|
resetAfterCommit: (renderer) => {
|
||||||
resetAfterCommit: (renderer) => {
|
renderer.render()
|
||||||
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)
|
export const reconciler = ReactReconciler(config)
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ import type { Message, MessageOptions } from "../message"
|
|||||||
import { Renderer } from "./renderer"
|
import { Renderer } from "./renderer"
|
||||||
|
|
||||||
export class ChannelMessageRenderer extends 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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,16 +7,16 @@ import { Renderer } from "./renderer"
|
|||||||
const repliedInteractionIds = new Set<string>()
|
const repliedInteractionIds = new Set<string>()
|
||||||
|
|
||||||
export class InteractionReplyRenderer extends Renderer {
|
export class InteractionReplyRenderer extends Renderer {
|
||||||
constructor(private interaction: Interaction) {
|
constructor(private interaction: Interaction) {
|
||||||
super()
|
super()
|
||||||
}
|
}
|
||||||
|
|
||||||
protected createMessage(options: MessageOptions): Promise<Message> {
|
protected createMessage(options: MessageOptions): Promise<Message> {
|
||||||
if (repliedInteractionIds.has(this.interaction.id)) {
|
if (repliedInteractionIds.has(this.interaction.id)) {
|
||||||
return this.interaction.followUp(options)
|
return this.interaction.followUp(options)
|
||||||
}
|
}
|
||||||
|
|
||||||
repliedInteractionIds.add(this.interaction.id)
|
repliedInteractionIds.add(this.interaction.id)
|
||||||
return this.interaction.reply(options)
|
return this.interaction.reply(options)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,119 +1,117 @@
|
|||||||
import { Subject } from "rxjs"
|
|
||||||
import { concatMap } from "rxjs/operators"
|
|
||||||
import { Container } from "../container.js"
|
import { Container } from "../container.js"
|
||||||
import type { ComponentInteraction } from "../interaction"
|
import type { ComponentInteraction } from "../interaction"
|
||||||
import type { Message, MessageOptions } from "../message"
|
import type { Message, MessageOptions } from "../message"
|
||||||
import type { Node } from "../node.js"
|
import type { Node } from "../node.js"
|
||||||
|
import { Subject } from "rxjs"
|
||||||
|
import { concatMap } from "rxjs/operators"
|
||||||
|
|
||||||
type UpdatePayload =
|
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 {
|
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) {
|
||||||
this.componentInteraction = interaction
|
for (const node of this.nodes) {
|
||||||
|
if (node.handleComponentInteraction(interaction)) {
|
||||||
|
this.componentInteraction = interaction
|
||||||
|
setTimeout(() => {
|
||||||
|
this.updates.next({ action: "deferUpdate", interaction })
|
||||||
|
}, 500)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
setTimeout(() => {
|
protected abstract createMessage(options: MessageOptions): Promise<Message>
|
||||||
this.updates.next({ action: "deferUpdate", interaction })
|
|
||||||
}, 500)
|
|
||||||
|
|
||||||
for (const node of this.nodes) {
|
private getMessageOptions(): MessageOptions {
|
||||||
if (node.handleComponentInteraction(interaction)) {
|
const options: MessageOptions = {
|
||||||
return true
|
content: "",
|
||||||
}
|
embeds: [],
|
||||||
}
|
actionRows: [],
|
||||||
}
|
}
|
||||||
|
for (const node of this.nodes) {
|
||||||
|
node.modifyMessageOptions(options)
|
||||||
|
}
|
||||||
|
return options
|
||||||
|
}
|
||||||
|
|
||||||
protected abstract createMessage(options: MessageOptions): Promise<Message>
|
private async updateMessage(payload: UpdatePayload) {
|
||||||
|
if (payload.action === "destroy") {
|
||||||
|
this.updateSubscription.unsubscribe()
|
||||||
|
await this.message?.delete()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
private getMessageOptions(): MessageOptions {
|
if (payload.action === "deactivate") {
|
||||||
const options: MessageOptions = {
|
this.updateSubscription.unsubscribe()
|
||||||
content: "",
|
|
||||||
embeds: [],
|
|
||||||
actionRows: [],
|
|
||||||
}
|
|
||||||
for (const node of this.nodes) {
|
|
||||||
node.modifyMessageOptions(options)
|
|
||||||
}
|
|
||||||
return options
|
|
||||||
}
|
|
||||||
|
|
||||||
private async updateMessage(payload: UpdatePayload) {
|
await this.message?.edit({
|
||||||
if (payload.action === "destroy") {
|
...payload.options,
|
||||||
this.updateSubscription.unsubscribe()
|
actionRows: payload.options.actionRows.map((row) =>
|
||||||
await this.message?.delete()
|
row.map((component) => ({
|
||||||
return
|
...component,
|
||||||
}
|
disabled: true,
|
||||||
|
})),
|
||||||
|
),
|
||||||
|
})
|
||||||
|
|
||||||
if (payload.action === "deactivate") {
|
return
|
||||||
this.updateSubscription.unsubscribe()
|
}
|
||||||
|
|
||||||
await this.message?.edit({
|
if (payload.action === "deferUpdate") {
|
||||||
...payload.options,
|
await payload.interaction.deferUpdate()
|
||||||
actionRows: payload.options.actionRows.map((row) =>
|
return
|
||||||
row.map((component) => ({
|
}
|
||||||
...component,
|
|
||||||
disabled: true,
|
|
||||||
})),
|
|
||||||
),
|
|
||||||
})
|
|
||||||
|
|
||||||
return
|
if (this.componentInteraction) {
|
||||||
}
|
const promise = this.componentInteraction.update(payload.options)
|
||||||
|
this.componentInteraction = undefined
|
||||||
|
await promise
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if (payload.action === "deferUpdate") {
|
if (this.message) {
|
||||||
await payload.interaction.deferUpdate()
|
await this.message.edit(payload.options)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.componentInteraction) {
|
this.message = await this.createMessage(payload.options)
|
||||||
const promise = this.componentInteraction.update(payload.options)
|
}
|
||||||
this.componentInteraction = undefined
|
|
||||||
await promise
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.message) {
|
|
||||||
await this.message.edit(payload.options)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.message = await this.createMessage(payload.options)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,11 @@ import type { MessageOptions } from "./message"
|
|||||||
import { Node } from "./node.js"
|
import { Node } from "./node.js"
|
||||||
|
|
||||||
export class TextNode extends Node<string> {
|
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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
export class Timeout {
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "reacord",
|
"name": "reacord",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"description": "Create interactive Discord messages using React.",
|
"description": "Create interactive Discord messages using React.",
|
||||||
"version": "0.3.5",
|
"version": "0.5.3",
|
||||||
"types": "./dist/main.d.ts",
|
"types": "./dist/main.d.ts",
|
||||||
"homepage": "https://reacord.mapleleaf.dev",
|
"homepage": "https://reacord.mapleleaf.dev",
|
||||||
"repository": "https://github.com/itsMapleLeaf/reacord.git",
|
"repository": "https://github.com/itsMapleLeaf/reacord.git",
|
||||||
@@ -20,6 +20,7 @@
|
|||||||
"reacord"
|
"reacord"
|
||||||
],
|
],
|
||||||
"files": [
|
"files": [
|
||||||
|
"library",
|
||||||
"dist",
|
"dist",
|
||||||
"README.md",
|
"README.md",
|
||||||
"LICENSE"
|
"LICENSE"
|
||||||
@@ -27,7 +28,8 @@
|
|||||||
"exports": {
|
"exports": {
|
||||||
".": {
|
".": {
|
||||||
"import": "./dist/main.js",
|
"import": "./dist/main.js",
|
||||||
"require": "./dist/main.cjs"
|
"require": "./dist/main.cjs",
|
||||||
|
"types": "./library/main.ts"
|
||||||
},
|
},
|
||||||
"./package.json": {
|
"./package.json": {
|
||||||
"import": "./package.json",
|
"import": "./package.json",
|
||||||
@@ -35,24 +37,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "tsup-node library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
|
"build": "cpy ../../README.md ../../LICENSE . && tsup library/main.ts --target node16 --format cjs,esm --sourcemap",
|
||||||
"build-watch": "pnpm build -- --watch",
|
"build-watch": "pnpm build -- --watch",
|
||||||
"test": "vitest --coverage --no-watch",
|
"test": "vitest --coverage --no-watch",
|
||||||
"test-dev": "vitest",
|
"test-dev": "vitest",
|
||||||
"typecheck": "tsc --noEmit",
|
"test-manual": "nodemon --exec tsx --ext ts,tsx ./scripts/discordjs-manual-test.tsx",
|
||||||
"playground": "nodemon --exec esmo --ext ts,tsx --inspect=5858 --enable-source-maps ./playground/main.tsx",
|
"typecheck": "tsc -b"
|
||||||
"release": "bash scripts/release.sh"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/node": "*",
|
"@types/node": "^20.7.0",
|
||||||
"@types/react": "*",
|
"@types/react": "^18.2.23",
|
||||||
"@types/react-reconciler": "^0.26.6",
|
"@types/react-reconciler": "^0.28.5",
|
||||||
"nanoid": "^3.3.3",
|
"react-reconciler": "^0.29.0",
|
||||||
"react-reconciler": "^0.27.0",
|
"rxjs": "^7.8.1"
|
||||||
"rxjs": "^7.5.5"
|
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"discord.js": "^13.3",
|
"discord.js": "^14",
|
||||||
"react": ">=17"
|
"react": ">=17"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
@@ -61,27 +61,20 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/lodash-es": "^4.17.6",
|
"@reacord/helpers": "workspace:*",
|
||||||
"c8": "^7.11.2",
|
"@types/lodash-es": "^4.17.9",
|
||||||
"discord.js": "^13.6.0",
|
"c8": "^8.0.1",
|
||||||
"dotenv": "^16.0.0",
|
"cpy-cli": "^5.0.0",
|
||||||
"esbuild": "latest",
|
"discord.js": "^14.13.0",
|
||||||
"esbuild-jest": "^0.5.0",
|
"dotenv": "^16.3.1",
|
||||||
"esmo": "^0.14.1",
|
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"nodemon": "^2.0.15",
|
"nodemon": "^3.0.1",
|
||||||
"prettier": "^2.6.2",
|
"prettier": "^3.0.3",
|
||||||
"pretty-ms": "^7.0.1",
|
"pretty-ms": "^8.0.0",
|
||||||
"react": "^18.0.0",
|
"react": "^18.2.0",
|
||||||
"release-it": "^14.14.2",
|
"tsup": "^7.2.0",
|
||||||
"tsup": "^5.12.6",
|
"tsx": "^3.13.0",
|
||||||
"type-fest": "^2.12.2",
|
"type-fest": "^4.3.2"
|
||||||
"typescript": "^4.6.3",
|
|
||||||
"vite": "^2.9.5",
|
|
||||||
"vitest": "^0.9.4"
|
|
||||||
},
|
|
||||||
"resolutions": {
|
|
||||||
"esbuild": "latest"
|
|
||||||
},
|
},
|
||||||
"release-it": {
|
"release-it": {
|
||||||
"git": {
|
"git": {
|
||||||
@@ -91,5 +84,8 @@
|
|||||||
"release": true,
|
"release": true,
|
||||||
"web": true
|
"web": true
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"publishConfig": {
|
||||||
|
"access": "public"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
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} />
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
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)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
import { Client } from "discord.js"
|
|
||||||
import "dotenv/config"
|
|
||||||
import React from "react"
|
|
||||||
import { Button, ReacordDiscordJs, useInstance } from "../library/main"
|
|
||||||
import { createCommandHandler } from "./command-handler"
|
|
||||||
import { Counter } from "./counter"
|
|
||||||
import { FruitSelect } from "./fruit-select"
|
|
||||||
|
|
||||||
const client = new Client({
|
|
||||||
intents: ["GUILDS"],
|
|
||||||
})
|
|
||||||
|
|
||||||
const reacord = new ReacordDiscordJs(client)
|
|
||||||
|
|
||||||
client.on("ready", () => {
|
|
||||||
console.info("ready 💖")
|
|
||||||
|
|
||||||
// const now = new Date()
|
|
||||||
|
|
||||||
// function UptimeCounter() {
|
|
||||||
// const [uptime, setUptime] = React.useState(0)
|
|
||||||
|
|
||||||
// React.useEffect(() => {
|
|
||||||
// const interval = setInterval(() => {
|
|
||||||
// setUptime(Date.now() - now.getTime())
|
|
||||||
// }, 5000)
|
|
||||||
// return () => clearInterval(interval)
|
|
||||||
// }, [])
|
|
||||||
|
|
||||||
// return (
|
|
||||||
// <Embed>this bot has been running for {prettyMilliseconds(uptime)}</Embed>
|
|
||||||
// )
|
|
||||||
// }
|
|
||||||
|
|
||||||
// reacord.send("671787605624487941", <UptimeCounter />)
|
|
||||||
})
|
|
||||||
|
|
||||||
createCommandHandler(client, [
|
|
||||||
{
|
|
||||||
name: "button",
|
|
||||||
description: "it's a button",
|
|
||||||
run: (interaction) => {
|
|
||||||
reacord.reply(
|
|
||||||
interaction,
|
|
||||||
<Button label="clic" onClick={() => console.info("was clic")} />,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "counter",
|
|
||||||
description: "shows a counter button",
|
|
||||||
run: (interaction) => {
|
|
||||||
const reply = reacord.reply(interaction)
|
|
||||||
reply.render(<Counter onDeactivate={() => reply.destroy()} />)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "select",
|
|
||||||
description: "shows a select",
|
|
||||||
run: (interaction) => {
|
|
||||||
const instance = reacord.reply(
|
|
||||||
interaction,
|
|
||||||
<FruitSelect
|
|
||||||
onConfirm={(value) => {
|
|
||||||
instance.render(`you chose ${value}`)
|
|
||||||
instance.deactivate()
|
|
||||||
}}
|
|
||||||
/>,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "ephemeral-button",
|
|
||||||
description: "button which shows ephemeral messages",
|
|
||||||
run: (interaction) => {
|
|
||||||
reacord.reply(
|
|
||||||
interaction,
|
|
||||||
<>
|
|
||||||
<Button
|
|
||||||
label="public clic"
|
|
||||||
onClick={(event) =>
|
|
||||||
reacord.reply(
|
|
||||||
interaction,
|
|
||||||
`${event.guild?.member.displayName} clic`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
label="clic"
|
|
||||||
onClick={(event) => event.ephemeralReply("you clic")}
|
|
||||||
/>
|
|
||||||
</>,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "delete-this",
|
|
||||||
description: "delete this",
|
|
||||||
run: (interaction) => {
|
|
||||||
function DeleteThis() {
|
|
||||||
const instance = useInstance()
|
|
||||||
return <Button label="delete this" onClick={() => instance.destroy()} />
|
|
||||||
}
|
|
||||||
reacord.reply(interaction, <DeleteThis />)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
])
|
|
||||||
|
|
||||||
await client.login(process.env.TEST_BOT_TOKEN)
|
|
||||||
144
packages/reacord/scripts/discordjs-manual-test.tsx
Normal file
144
packages/reacord/scripts/discordjs-manual-test.tsx
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
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.send(channel.id, "Hello, world!")
|
||||||
|
})
|
||||||
|
|
||||||
|
await createTest("counter", (channel) => {
|
||||||
|
const Counter = () => {
|
||||||
|
const [count, setCount] = React.useState(0)
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
count: {count}
|
||||||
|
<Button
|
||||||
|
style="primary"
|
||||||
|
emoji="➕"
|
||||||
|
onClick={() => setCount(count + 1)}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
style="primary"
|
||||||
|
emoji="➖"
|
||||||
|
onClick={() => setCount(count - 1)}
|
||||||
|
/>
|
||||||
|
<Button label="reset" onClick={() => setCount(0)} />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
reacord.send(channel.id, <Counter />)
|
||||||
|
})
|
||||||
|
|
||||||
|
await createTest("select", (channel) => {
|
||||||
|
function FruitSelect({ onConfirm }: { onConfirm: (choice: string) => void }) {
|
||||||
|
const [value, setValue] = useState<string>()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Select
|
||||||
|
placeholder="choose a fruit"
|
||||||
|
value={value}
|
||||||
|
onChangeValue={setValue}
|
||||||
|
>
|
||||||
|
<Option value="🍎" emoji="🍎" label="apple" description="it red" />
|
||||||
|
<Option value="🍌" emoji="🍌" label="banana" description="bnanbna" />
|
||||||
|
<Option value="🍒" emoji="🍒" label="cherry" description="heh" />
|
||||||
|
</Select>
|
||||||
|
<Button
|
||||||
|
label="confirm"
|
||||||
|
disabled={value == undefined}
|
||||||
|
onClick={() => {
|
||||||
|
if (value) onConfirm(value)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const instance = reacord.send(
|
||||||
|
channel.id,
|
||||||
|
<FruitSelect
|
||||||
|
onConfirm={(value) => {
|
||||||
|
instance.render(`you chose ${value}`)
|
||||||
|
instance.deactivate()
|
||||||
|
}}
|
||||||
|
/>,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
await createTest("ephemeral button", (channel) => {
|
||||||
|
reacord.send(
|
||||||
|
channel.id,
|
||||||
|
<>
|
||||||
|
<Button
|
||||||
|
label="public clic"
|
||||||
|
onClick={(event) =>
|
||||||
|
event.reply(`${event.guild?.member.displayName} clic`)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
label="clic"
|
||||||
|
onClick={(event) => event.ephemeralReply("you clic")}
|
||||||
|
/>
|
||||||
|
</>,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
await createTest("delete this", (channel) => {
|
||||||
|
function DeleteThis() {
|
||||||
|
const instance = useInstance()
|
||||||
|
return <Button label="delete this" onClick={() => instance.destroy()} />
|
||||||
|
}
|
||||||
|
reacord.send(channel.id, <DeleteThis />)
|
||||||
|
})
|
||||||
|
|
||||||
|
await createTest("link", (channel) => {
|
||||||
|
reacord.send(channel.id, <Link label="hi" url="https://mapleleaf.dev" />)
|
||||||
|
})
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
pnpm build
|
|
||||||
cp ../../README.md .
|
|
||||||
cp ../../LICENSE .
|
|
||||||
pnpx release-it
|
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from "react"
|
|
||||||
import { test } from "vitest"
|
import { test } from "vitest"
|
||||||
import { ActionRow, Button, Select } from "../library/main"
|
import { ActionRow, Button, Select } from "../library/main"
|
||||||
import { ReacordTester } from "./test-adapter"
|
import { ReacordTester } from "./test-adapter"
|
||||||
@@ -6,36 +5,36 @@ import { ReacordTester } from "./test-adapter"
|
|||||||
const testing = new ReacordTester()
|
const testing = new ReacordTester()
|
||||||
|
|
||||||
test("action row", async () => {
|
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" },
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
12
packages/reacord/test/commonjs-require.test.ts
Normal file
12
packages/reacord/test/commonjs-require.test.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import { spawnSync } from "node:child_process"
|
||||||
|
import { createRequire } from "node:module"
|
||||||
|
import { beforeAll, expect, test } from "vitest"
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
spawnSync("pnpm", ["run", "build"])
|
||||||
|
})
|
||||||
|
|
||||||
|
test("can require commonjs", () => {
|
||||||
|
const require = createRequire(import.meta.url)
|
||||||
|
expect(() => require("../dist/main.cjs") as unknown).not.toThrow()
|
||||||
|
})
|
||||||
@@ -1,275 +1,274 @@
|
|||||||
import React from "react"
|
|
||||||
import { test } from "vitest"
|
import { test } from "vitest"
|
||||||
import {
|
import {
|
||||||
Embed,
|
Embed,
|
||||||
EmbedAuthor,
|
EmbedAuthor,
|
||||||
EmbedField,
|
EmbedField,
|
||||||
EmbedFooter,
|
EmbedFooter,
|
||||||
EmbedImage,
|
EmbedImage,
|
||||||
EmbedThumbnail,
|
EmbedThumbnail,
|
||||||
EmbedTitle,
|
EmbedTitle,
|
||||||
} from "../library/main"
|
} from "../library/main"
|
||||||
import { ReacordTester } from "./test-adapter"
|
import { ReacordTester } from "./test-adapter"
|
||||||
|
|
||||||
const testing = new ReacordTester()
|
const testing = new ReacordTester()
|
||||||
|
|
||||||
test("kitchen sink", async () => {
|
test("kitchen sink", async () => {
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
|
|
||||||
await testing.assertRender(
|
await testing.assertRender(
|
||||||
<>
|
<>
|
||||||
<Embed color={0xfe_ee_ef}>
|
<Embed color={0xfe_ee_ef}>
|
||||||
<EmbedAuthor name="author" iconUrl="https://example.com/author.png" />
|
<EmbedAuthor name="author" iconUrl="https://example.com/author.png" />
|
||||||
<EmbedTitle>title text</EmbedTitle>
|
<EmbedTitle>title text</EmbedTitle>
|
||||||
description text
|
description text
|
||||||
<EmbedThumbnail url="https://example.com/thumbnail.png" />
|
<EmbedThumbnail url="https://example.com/thumbnail.png" />
|
||||||
<EmbedImage url="https://example.com/image.png" />
|
<EmbedImage url="https://example.com/image.png" />
|
||||||
<EmbedField name="field name" value="field value" inline />
|
<EmbedField name="field name" value="field value" inline />
|
||||||
<EmbedField name="block field" value="block field value" />
|
<EmbedField name="block field" value="block field value" />
|
||||||
<EmbedFooter
|
<EmbedFooter
|
||||||
text="footer text"
|
text="footer text"
|
||||||
iconUrl="https://example.com/footer.png"
|
iconUrl="https://example.com/footer.png"
|
||||||
timestamp={now}
|
timestamp={now}
|
||||||
/>
|
/>
|
||||||
</Embed>
|
</Embed>
|
||||||
</>,
|
</>,
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
actionRows: [],
|
actionRows: [],
|
||||||
content: "",
|
content: "",
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
description: "description text",
|
description: "description text",
|
||||||
author: {
|
author: {
|
||||||
icon_url: "https://example.com/author.png",
|
icon_url: "https://example.com/author.png",
|
||||||
name: "author",
|
name: "author",
|
||||||
},
|
},
|
||||||
color: 0xfe_ee_ef,
|
color: 0xfe_ee_ef,
|
||||||
fields: [
|
fields: [
|
||||||
{
|
{
|
||||||
inline: true,
|
inline: true,
|
||||||
name: "field name",
|
name: "field name",
|
||||||
value: "field value",
|
value: "field value",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "block field",
|
name: "block field",
|
||||||
value: "block field value",
|
value: "block field value",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
footer: {
|
footer: {
|
||||||
icon_url: "https://example.com/footer.png",
|
icon_url: "https://example.com/footer.png",
|
||||||
text: "footer text",
|
text: "footer text",
|
||||||
},
|
},
|
||||||
image: {
|
image: {
|
||||||
url: "https://example.com/image.png",
|
url: "https://example.com/image.png",
|
||||||
},
|
},
|
||||||
thumbnail: {
|
thumbnail: {
|
||||||
url: "https://example.com/thumbnail.png",
|
url: "https://example.com/thumbnail.png",
|
||||||
},
|
},
|
||||||
timestamp: now.toISOString(),
|
timestamp: now.toISOString(),
|
||||||
title: "title text",
|
title: "title text",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("author variants", async () => {
|
test("author variants", async () => {
|
||||||
await testing.assertRender(
|
await testing.assertRender(
|
||||||
<>
|
<>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedAuthor iconUrl="https://example.com/author.png">
|
<EmbedAuthor iconUrl="https://example.com/author.png">
|
||||||
author name
|
author name
|
||||||
</EmbedAuthor>
|
</EmbedAuthor>
|
||||||
</Embed>
|
</Embed>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedAuthor iconUrl="https://example.com/author.png" />
|
<EmbedAuthor iconUrl="https://example.com/author.png" />
|
||||||
</Embed>
|
</Embed>
|
||||||
</>,
|
</>,
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
actionRows: [],
|
actionRows: [],
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
author: {
|
author: {
|
||||||
icon_url: "https://example.com/author.png",
|
icon_url: "https://example.com/author.png",
|
||||||
name: "author name",
|
name: "author name",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
author: {
|
author: {
|
||||||
icon_url: "https://example.com/author.png",
|
icon_url: "https://example.com/author.png",
|
||||||
name: "",
|
name: "",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("field variants", async () => {
|
test("field variants", async () => {
|
||||||
await testing.assertRender(
|
await testing.assertRender(
|
||||||
<>
|
<>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedField name="field name" value="field value" />
|
<EmbedField name="field name" value="field value" />
|
||||||
<EmbedField name="field name" value="field value" inline />
|
<EmbedField name="field name" value="field value" inline />
|
||||||
<EmbedField name="field name" inline>
|
<EmbedField name="field name" inline>
|
||||||
field value
|
field value
|
||||||
</EmbedField>
|
</EmbedField>
|
||||||
<EmbedField name="field name" />
|
<EmbedField name="field name" />
|
||||||
</Embed>
|
</Embed>
|
||||||
</>,
|
</>,
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
actionRows: [],
|
actionRows: [],
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
fields: [
|
fields: [
|
||||||
{
|
{
|
||||||
name: "field name",
|
name: "field name",
|
||||||
value: "field value",
|
value: "field value",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
inline: true,
|
inline: true,
|
||||||
name: "field name",
|
name: "field name",
|
||||||
value: "field value",
|
value: "field value",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
inline: true,
|
inline: true,
|
||||||
name: "field name",
|
name: "field name",
|
||||||
value: "field value",
|
value: "field value",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "field name",
|
name: "field name",
|
||||||
value: "",
|
value: "",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("footer variants", async () => {
|
test("footer variants", async () => {
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
|
|
||||||
await testing.assertRender(
|
await testing.assertRender(
|
||||||
<>
|
<>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedFooter text="footer text" />
|
<EmbedFooter text="footer text" />
|
||||||
</Embed>
|
</Embed>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedFooter
|
<EmbedFooter
|
||||||
text="footer text"
|
text="footer text"
|
||||||
iconUrl="https://example.com/footer.png"
|
iconUrl="https://example.com/footer.png"
|
||||||
/>
|
/>
|
||||||
</Embed>
|
</Embed>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedFooter timestamp={now}>footer text</EmbedFooter>
|
<EmbedFooter timestamp={now}>footer text</EmbedFooter>
|
||||||
</Embed>
|
</Embed>
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedFooter iconUrl="https://example.com/footer.png" timestamp={now} />
|
<EmbedFooter iconUrl="https://example.com/footer.png" timestamp={now} />
|
||||||
</Embed>
|
</Embed>
|
||||||
</>,
|
</>,
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
actionRows: [],
|
actionRows: [],
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
footer: {
|
footer: {
|
||||||
text: "footer text",
|
text: "footer text",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
footer: {
|
footer: {
|
||||||
icon_url: "https://example.com/footer.png",
|
icon_url: "https://example.com/footer.png",
|
||||||
text: "footer text",
|
text: "footer text",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
footer: {
|
footer: {
|
||||||
text: "footer text",
|
text: "footer text",
|
||||||
},
|
},
|
||||||
timestamp: now.toISOString(),
|
timestamp: now.toISOString(),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
footer: {
|
footer: {
|
||||||
icon_url: "https://example.com/footer.png",
|
icon_url: "https://example.com/footer.png",
|
||||||
text: "",
|
text: "",
|
||||||
},
|
},
|
||||||
timestamp: now.toISOString(),
|
timestamp: now.toISOString(),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("embed props", async () => {
|
test("embed props", async () => {
|
||||||
const now = new Date()
|
const now = new Date()
|
||||||
|
|
||||||
await testing.assertRender(
|
await testing.assertRender(
|
||||||
<Embed
|
<Embed
|
||||||
title="title text"
|
title="title text"
|
||||||
description="description text"
|
description="description text"
|
||||||
url="https://example.com/"
|
url="https://example.com/"
|
||||||
color={0xfe_ee_ef}
|
color={0xfe_ee_ef}
|
||||||
timestamp={now}
|
timestamp={now}
|
||||||
author={{
|
author={{
|
||||||
name: "author name",
|
name: "author name",
|
||||||
url: "https://example.com/author",
|
url: "https://example.com/author",
|
||||||
iconUrl: "https://example.com/author.png",
|
iconUrl: "https://example.com/author.png",
|
||||||
}}
|
}}
|
||||||
thumbnail={{
|
thumbnail={{
|
||||||
url: "https://example.com/thumbnail.png",
|
url: "https://example.com/thumbnail.png",
|
||||||
}}
|
}}
|
||||||
image={{
|
image={{
|
||||||
url: "https://example.com/image.png",
|
url: "https://example.com/image.png",
|
||||||
}}
|
}}
|
||||||
footer={{
|
footer={{
|
||||||
text: "footer text",
|
text: "footer text",
|
||||||
iconUrl: "https://example.com/footer.png",
|
iconUrl: "https://example.com/footer.png",
|
||||||
}}
|
}}
|
||||||
fields={[
|
fields={[
|
||||||
{ name: "field name", value: "field value", inline: true },
|
{ name: "field name", value: "field value", inline: true },
|
||||||
{ name: "block field", value: "block field value" },
|
{ name: "block field", value: "block field value" },
|
||||||
]}
|
]}
|
||||||
/>,
|
/>,
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
actionRows: [],
|
actionRows: [],
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
title: "title text",
|
title: "title text",
|
||||||
description: "description text",
|
description: "description text",
|
||||||
url: "https://example.com/",
|
url: "https://example.com/",
|
||||||
color: 0xfe_ee_ef,
|
color: 0xfe_ee_ef,
|
||||||
timestamp: now.toISOString(),
|
timestamp: now.toISOString(),
|
||||||
author: {
|
author: {
|
||||||
name: "author name",
|
name: "author name",
|
||||||
url: "https://example.com/author",
|
url: "https://example.com/author",
|
||||||
icon_url: "https://example.com/author.png",
|
icon_url: "https://example.com/author.png",
|
||||||
},
|
},
|
||||||
thumbnail: { url: "https://example.com/thumbnail.png" },
|
thumbnail: { url: "https://example.com/thumbnail.png" },
|
||||||
image: { url: "https://example.com/image.png" },
|
image: { url: "https://example.com/image.png" },
|
||||||
footer: {
|
footer: {
|
||||||
text: "footer text",
|
text: "footer text",
|
||||||
icon_url: "https://example.com/footer.png",
|
icon_url: "https://example.com/footer.png",
|
||||||
},
|
},
|
||||||
fields: [
|
fields: [
|
||||||
{ name: "field name", value: "field value", inline: true },
|
{ name: "field name", value: "field value", inline: true },
|
||||||
{ name: "block field", value: "block field value" },
|
{ name: "block field", value: "block field value" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
import { test } from "vitest"
|
import { test } from "vitest"
|
||||||
|
|
||||||
test.todo("ephemeral reply")
|
test.todo("ephemeral reply")
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from "react"
|
|
||||||
import { test } from "vitest"
|
import { test } from "vitest"
|
||||||
import { Link } from "../library/main"
|
import { Link } from "../library/main"
|
||||||
import { ReacordTester } from "./test-adapter"
|
import { ReacordTester } from "./test-adapter"
|
||||||
@@ -6,37 +5,37 @@ import { ReacordTester } from "./test-adapter"
|
|||||||
const tester = new ReacordTester()
|
const tester = new ReacordTester()
|
||||||
|
|
||||||
test("link", async () => {
|
test("link", async () => {
|
||||||
await tester.assertRender(
|
await tester.assertRender(
|
||||||
<>
|
<>
|
||||||
<Link url="https://example.com/">link text</Link>
|
<Link url="https://example.com/">link text</Link>
|
||||||
<Link label="link text" url="https://example.com/" />
|
<Link label="link text" url="https://example.com/" />
|
||||||
<Link label="link text" url="https://example.com/" disabled />
|
<Link label="link text" url="https://example.com/" disabled />
|
||||||
</>,
|
</>,
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "link",
|
type: "link",
|
||||||
url: "https://example.com/",
|
url: "https://example.com/",
|
||||||
label: "link text",
|
label: "link text",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "link",
|
type: "link",
|
||||||
url: "https://example.com/",
|
url: "https://example.com/",
|
||||||
label: "link text",
|
label: "link text",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "link",
|
type: "link",
|
||||||
url: "https://example.com/",
|
url: "https://example.com/",
|
||||||
label: "link text",
|
label: "link text",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,270 +1,270 @@
|
|||||||
import * as React from "react"
|
|
||||||
import { test } from "vitest"
|
|
||||||
import { Button, Embed, EmbedField, EmbedTitle } from "../library/main"
|
import { Button, Embed, EmbedField, EmbedTitle } from "../library/main"
|
||||||
import { ReacordTester } from "./test-adapter"
|
import { ReacordTester } from "./test-adapter"
|
||||||
|
import * as React from "react"
|
||||||
|
import { test } from "vitest"
|
||||||
|
|
||||||
test("rendering behavior", async () => {
|
test("rendering behavior", async () => {
|
||||||
const tester = new ReacordTester()
|
const tester = new ReacordTester()
|
||||||
|
|
||||||
const reply = tester.reply()
|
const reply = tester.reply()
|
||||||
reply.render(<KitchenSinkCounter onDeactivate={() => reply.deactivate()} />)
|
reply.render(<KitchenSinkCounter onDeactivate={() => reply.deactivate()} />)
|
||||||
|
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 0",
|
content: "count: 0",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "show embed",
|
label: "show embed",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("show embed").click()
|
await tester.findButtonByLabel("show embed").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 0",
|
content: "count: 0",
|
||||||
embeds: [{ title: "the counter" }],
|
embeds: [{ title: "the counter" }],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "hide embed",
|
label: "hide embed",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("clicc").click()
|
await tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 1",
|
content: "count: 1",
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
title: "the counter",
|
title: "the counter",
|
||||||
fields: [{ name: "is it even?", value: "no" }],
|
fields: [{ name: "is it even?", value: "no" }],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "hide embed",
|
label: "hide embed",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("clicc").click()
|
await tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 2",
|
content: "count: 2",
|
||||||
embeds: [
|
embeds: [
|
||||||
{
|
{
|
||||||
title: "the counter",
|
title: "the counter",
|
||||||
fields: [{ name: "is it even?", value: "yes" }],
|
fields: [{ name: "is it even?", value: "yes" }],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "hide embed",
|
label: "hide embed",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("hide embed").click()
|
await tester.findButtonByLabel("hide embed").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 2",
|
content: "count: 2",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "show embed",
|
label: "show embed",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("clicc").click()
|
await tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 3",
|
content: "count: 3",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "show embed",
|
label: "show embed",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("deactivate").click()
|
await tester.findButtonByLabel("deactivate").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 3",
|
content: "count: 3",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "show embed",
|
label: "show embed",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
tester.findButtonByLabel("clicc").click()
|
await tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 3",
|
content: "count: 3",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "primary",
|
style: "primary",
|
||||||
label: "clicc",
|
label: "clicc",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "secondary",
|
style: "secondary",
|
||||||
label: "show embed",
|
label: "show embed",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "button",
|
type: "button",
|
||||||
style: "danger",
|
style: "danger",
|
||||||
label: "deactivate",
|
label: "deactivate",
|
||||||
disabled: true,
|
disabled: true,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
})
|
})
|
||||||
|
|
||||||
test("delete", async () => {
|
test("delete", async () => {
|
||||||
const tester = new ReacordTester()
|
const tester = new ReacordTester()
|
||||||
|
|
||||||
const reply = tester.reply()
|
const reply = tester.reply()
|
||||||
reply.render(
|
reply.render(
|
||||||
<>
|
<>
|
||||||
some text
|
some text
|
||||||
<Embed>some embed</Embed>
|
<Embed>some embed</Embed>
|
||||||
<Button label="some button" onClick={() => {}} />
|
<Button label="some button" onClick={() => {}} />
|
||||||
</>,
|
</>,
|
||||||
)
|
)
|
||||||
|
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "some text",
|
content: "some text",
|
||||||
embeds: [{ description: "some embed" }],
|
embeds: [{ description: "some embed" }],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[{ type: "button", style: "secondary", label: "some button" }],
|
[{ type: "button", style: "secondary", label: "some button" }],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
reply.destroy()
|
reply.destroy()
|
||||||
await tester.assertMessages([])
|
await tester.assertMessages([])
|
||||||
})
|
})
|
||||||
|
|
||||||
// test multiple instances that can be updated independently,
|
// test multiple instances that can be updated independently,
|
||||||
@@ -272,34 +272,34 @@ test("delete", async () => {
|
|||||||
test.todo("multiple instances")
|
test.todo("multiple instances")
|
||||||
|
|
||||||
function KitchenSinkCounter(props: { onDeactivate: () => void }) {
|
function KitchenSinkCounter(props: { onDeactivate: () => void }) {
|
||||||
const [count, setCount] = React.useState(0)
|
const [count, setCount] = React.useState(0)
|
||||||
const [embedVisible, setEmbedVisible] = React.useState(false)
|
const [embedVisible, setEmbedVisible] = React.useState(false)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
count: {count}
|
count: {count}
|
||||||
{embedVisible && (
|
{embedVisible && (
|
||||||
<Embed>
|
<Embed>
|
||||||
<EmbedTitle>the counter</EmbedTitle>
|
<EmbedTitle>the counter</EmbedTitle>
|
||||||
{count > 0 && (
|
{count > 0 && (
|
||||||
<EmbedField name="is it even?">
|
<EmbedField name="is it even?">
|
||||||
{count % 2 === 0 ? "yes" : "no"}
|
{count % 2 === 0 ? "yes" : "no"}
|
||||||
</EmbedField>
|
</EmbedField>
|
||||||
)}
|
)}
|
||||||
</Embed>
|
</Embed>
|
||||||
)}
|
)}
|
||||||
{embedVisible && (
|
{embedVisible && (
|
||||||
<Button label="hide embed" onClick={() => setEmbedVisible(false)} />
|
<Button label="hide embed" onClick={() => setEmbedVisible(false)} />
|
||||||
)}
|
)}
|
||||||
<Button
|
<Button
|
||||||
style="primary"
|
style="primary"
|
||||||
label="clicc"
|
label="clicc"
|
||||||
onClick={() => setCount(count + 1)}
|
onClick={() => setCount(count + 1)}
|
||||||
/>
|
/>
|
||||||
{!embedVisible && (
|
{!embedVisible && (
|
||||||
<Button label="show embed" onClick={() => setEmbedVisible(true)} />
|
<Button label="show embed" onClick={() => setEmbedVisible(true)} />
|
||||||
)}
|
)}
|
||||||
<Button style="danger" label="deactivate" onClick={props.onDeactivate} />
|
<Button style="danger" label="deactivate" onClick={props.onDeactivate} />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,160 +1,164 @@
|
|||||||
import React, { useState } from "react"
|
import { useState } from "react"
|
||||||
import { expect, test, vi } from "vitest"
|
import { expect, test, vi } from "vitest"
|
||||||
import { Button, Option, Select } from "../library/main"
|
import { Button, Option, Select } from "../library/main"
|
||||||
import { ReacordTester } from "./test-adapter"
|
import { ReacordTester } from "./test-adapter"
|
||||||
|
|
||||||
test("single select", async () => {
|
test("single select", async () => {
|
||||||
const tester = new ReacordTester()
|
const tester = new ReacordTester()
|
||||||
const onSelect = vi.fn()
|
const onSelect = vi.fn()
|
||||||
|
|
||||||
function TestSelect() {
|
function TestSelect() {
|
||||||
const [value, setValue] = useState<string>()
|
const [value, setValue] = useState<string>()
|
||||||
const [disabled, setDisabled] = useState(false)
|
const [disabled, setDisabled] = useState(false)
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Select
|
<Select
|
||||||
placeholder="choose one"
|
placeholder="choose one"
|
||||||
value={value}
|
value={value}
|
||||||
onChange={onSelect}
|
onChange={onSelect}
|
||||||
onChangeValue={setValue}
|
onChangeValue={setValue}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
>
|
>
|
||||||
<Option value="1" />
|
<Option value="1" />
|
||||||
<Option value="2" label="two" />
|
<Option value="2" label="two" />
|
||||||
<Option value="3">three</Option>
|
<Option value="3">three</Option>
|
||||||
</Select>
|
</Select>
|
||||||
<Button label="disable" onClick={() => setDisabled(true)} />
|
<Button label="disable" onClick={() => setDisabled(true)} />
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function assertSelect(values: string[], disabled = false) {
|
async function assertSelect(values: string[], disabled = false) {
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "select",
|
type: "select",
|
||||||
placeholder: "choose one",
|
placeholder: "choose one",
|
||||||
values,
|
values,
|
||||||
disabled,
|
disabled,
|
||||||
options: [
|
options: [
|
||||||
{ label: "1", value: "1" },
|
{ label: "1", value: "1" },
|
||||||
{ label: "two", value: "2" },
|
{ label: "two", value: "2" },
|
||||||
{ label: "three", value: "3" },
|
{ label: "three", value: "3" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
[{ type: "button", style: "secondary", label: "disable" }],
|
[{ type: "button", style: "secondary", label: "disable" }],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
const reply = tester.reply()
|
const reply = tester.reply()
|
||||||
|
|
||||||
reply.render(<TestSelect />)
|
reply.render(<TestSelect />)
|
||||||
await assertSelect([])
|
await assertSelect([])
|
||||||
expect(onSelect).toHaveBeenCalledTimes(0)
|
expect(onSelect).toHaveBeenCalledTimes(0)
|
||||||
|
|
||||||
tester.findSelectByPlaceholder("choose one").select("2")
|
await tester.findSelectByPlaceholder("choose one").select("2")
|
||||||
await assertSelect(["2"])
|
await assertSelect(["2"])
|
||||||
expect(onSelect).toHaveBeenCalledWith(
|
expect(onSelect).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ values: ["2"] }),
|
expect.objectContaining({ values: ["2"] }),
|
||||||
)
|
)
|
||||||
|
|
||||||
tester.findButtonByLabel("disable").click()
|
await tester.findButtonByLabel("disable").click()
|
||||||
await assertSelect(["2"], true)
|
await assertSelect(["2"], true)
|
||||||
|
|
||||||
tester.findSelectByPlaceholder("choose one").select("1")
|
await tester.findSelectByPlaceholder("choose one").select("1")
|
||||||
await assertSelect(["2"], true)
|
await assertSelect(["2"], true)
|
||||||
expect(onSelect).toHaveBeenCalledTimes(1)
|
expect(onSelect).toHaveBeenCalledTimes(1)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("multiple select", async () => {
|
test("multiple select", async () => {
|
||||||
const tester = new ReacordTester()
|
const tester = new ReacordTester()
|
||||||
const onSelect = vi.fn()
|
const onSelect = vi.fn()
|
||||||
|
|
||||||
function TestSelect() {
|
function TestSelect() {
|
||||||
const [values, setValues] = useState<string[]>([])
|
const [values, setValues] = useState<string[]>([])
|
||||||
return (
|
return (
|
||||||
<Select
|
<Select
|
||||||
placeholder="select"
|
placeholder="select"
|
||||||
multiple
|
multiple
|
||||||
values={values}
|
values={values}
|
||||||
onChange={onSelect}
|
onChange={onSelect}
|
||||||
onChangeMultiple={setValues}
|
onChangeMultiple={setValues}
|
||||||
>
|
>
|
||||||
<Option value="1">one</Option>
|
<Option value="1">one</Option>
|
||||||
<Option value="2">two</Option>
|
<Option value="2">two</Option>
|
||||||
<Option value="3">three</Option>
|
<Option value="3">three</Option>
|
||||||
</Select>
|
</Select>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function assertSelect(values: string[]) {
|
async function assertSelect(values: string[]) {
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
type: "select",
|
type: "select",
|
||||||
placeholder: "select",
|
placeholder: "select",
|
||||||
values,
|
values,
|
||||||
minValues: 0,
|
minValues: 0,
|
||||||
maxValues: 25,
|
maxValues: 25,
|
||||||
options: [
|
options: [
|
||||||
{ label: "one", value: "1" },
|
{ label: "one", value: "1" },
|
||||||
{ label: "two", value: "2" },
|
{ label: "two", value: "2" },
|
||||||
{ label: "three", value: "3" },
|
{ label: "three", value: "3" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
const reply = tester.reply()
|
const reply = tester.reply()
|
||||||
|
|
||||||
reply.render(<TestSelect />)
|
reply.render(<TestSelect />)
|
||||||
await assertSelect([])
|
await assertSelect([])
|
||||||
expect(onSelect).toHaveBeenCalledTimes(0)
|
expect(onSelect).toHaveBeenCalledTimes(0)
|
||||||
|
|
||||||
tester.findSelectByPlaceholder("select").select("1", "3")
|
await tester.findSelectByPlaceholder("select").select("1", "3")
|
||||||
await assertSelect(expect.arrayContaining(["1", "3"]) as unknown as string[])
|
await assertSelect(expect.arrayContaining(["1", "3"]) as unknown as string[])
|
||||||
expect(onSelect).toHaveBeenCalledWith(
|
expect(onSelect).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ values: expect.arrayContaining(["1", "3"]) }),
|
expect.objectContaining({
|
||||||
)
|
values: expect.arrayContaining(["1", "3"]) as unknown,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
tester.findSelectByPlaceholder("select").select("2")
|
await tester.findSelectByPlaceholder("select").select("2")
|
||||||
await assertSelect(expect.arrayContaining(["2"]) as unknown as string[])
|
await assertSelect(expect.arrayContaining(["2"]) as unknown as string[])
|
||||||
expect(onSelect).toHaveBeenCalledWith(
|
expect(onSelect).toHaveBeenCalledWith(
|
||||||
expect.objectContaining({ values: expect.arrayContaining(["2"]) }),
|
expect.objectContaining({
|
||||||
)
|
values: expect.arrayContaining(["2"]) as unknown,
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
tester.findSelectByPlaceholder("select").select()
|
await tester.findSelectByPlaceholder("select").select()
|
||||||
await assertSelect([])
|
await assertSelect([])
|
||||||
expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ values: [] }))
|
expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ values: [] }))
|
||||||
})
|
})
|
||||||
|
|
||||||
test("optional onSelect + unknown value", async () => {
|
test("optional onSelect + unknown value", async () => {
|
||||||
const tester = new ReacordTester()
|
const tester = new ReacordTester()
|
||||||
tester.reply().render(<Select placeholder="select" />)
|
tester.reply().render(<Select placeholder="select" />)
|
||||||
tester.findSelectByPlaceholder("select").select("something")
|
await tester.findSelectByPlaceholder("select").select("something")
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
embeds: [],
|
embeds: [],
|
||||||
actionRows: [
|
actionRows: [
|
||||||
[{ type: "select", placeholder: "select", options: [], values: [] }],
|
[{ type: "select", placeholder: "select", options: [], values: [] }],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
})
|
})
|
||||||
|
|
||||||
test.todo("select minValues and maxValues")
|
test.todo("select minValues and maxValues")
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user