Compare commits
2 Commits
astro
...
new-api-pa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6e2f083bc | ||
|
|
723d663d3c |
@@ -1,8 +0,0 @@
|
|||||||
# Changesets
|
|
||||||
|
|
||||||
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
|
|
||||||
with multi-package repos, or single-package repos to help you version and publish your code. You can
|
|
||||||
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
|
|
||||||
|
|
||||||
We have a quick list of common questions to get you started engaging with this project in
|
|
||||||
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://unpkg.com/@changesets/config@2.1.0/schema.json",
|
|
||||||
"changelog": "@changesets/cli/changelog",
|
|
||||||
"commit": false,
|
|
||||||
"fixed": [],
|
|
||||||
"linked": [],
|
|
||||||
"access": "public",
|
|
||||||
"baseBranch": "main",
|
|
||||||
"updateInternalDependencies": "patch",
|
|
||||||
"ignore": []
|
|
||||||
}
|
|
||||||
@@ -1,38 +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"),
|
|
||||||
extraFileExtensions: [".astro"],
|
|
||||||
},
|
|
||||||
overrides: [
|
|
||||||
{
|
|
||||||
files: ["packages/website/cypress/**"],
|
|
||||||
parserOptions: {
|
|
||||||
project: require.resolve("./packages/website/cypress/tsconfig.json"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
files: ["*.astro"],
|
|
||||||
parser: "astro-eslint-parser",
|
|
||||||
parserOptions: {
|
|
||||||
parser: "@typescript-eslint/parser",
|
|
||||||
},
|
|
||||||
rules: {
|
|
||||||
"react/no-unknown-property": "off",
|
|
||||||
"react/jsx-key": "off",
|
|
||||||
"react/jsx-no-undef": "off",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
26
.eslintrc.json
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"extends": ["./node_modules/@itsmapleleaf/configs/eslint"],
|
||||||
|
"ignorePatterns": [
|
||||||
|
"**/node_modules/**",
|
||||||
|
"**/.cache/**",
|
||||||
|
"**/build/**",
|
||||||
|
"**/dist/**",
|
||||||
|
"**/coverage/**",
|
||||||
|
"**/public/**"
|
||||||
|
],
|
||||||
|
"parserOptions": {
|
||||||
|
"project": "./tsconfig.base.json"
|
||||||
|
},
|
||||||
|
"rules": {
|
||||||
|
"import/no-unused-modules": "off",
|
||||||
|
"unicorn/prevent-abbreviations": "off"
|
||||||
|
},
|
||||||
|
"overrides": [
|
||||||
|
{
|
||||||
|
"files": ["packages/website/cypress/**"],
|
||||||
|
"parserOptions": {
|
||||||
|
"project": "./packages/website/cypress/tsconfig.json"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
17
.github/workflows/deploy-website.yml
vendored
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
name: deploy website
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
paths:
|
||||||
|
- "packages/website/**"
|
||||||
|
- "reacord/library/**/*.{ts,tsx}"
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- uses: superfly/flyctl-actions@master
|
||||||
|
env:
|
||||||
|
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
|
||||||
|
with:
|
||||||
|
args: "deploy"
|
||||||
34
.github/workflows/main.yml
vendored
@@ -10,10 +10,6 @@ env:
|
|||||||
TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
|
TEST_CHANNEL_ID: ${{ secrets.TEST_CHANNEL_ID }}
|
||||||
TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
|
TEST_GUILD_ID: ${{ secrets.TEST_GUILD_ID }}
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
run-commands:
|
run-commands:
|
||||||
strategy:
|
strategy:
|
||||||
@@ -23,31 +19,23 @@ jobs:
|
|||||||
# if these run in the same process, it dies,
|
# if these run in the same process, it dies,
|
||||||
# so we test them separate
|
# so we test them separate
|
||||||
- name: test reacord
|
- name: test reacord
|
||||||
run: pnpm -C packages/reacord test
|
run: pnpm test -C packages/reacord
|
||||||
# - name: test website
|
- name: test website
|
||||||
# run: pnpm -C packages/website test
|
run: pnpm test -C packages/website
|
||||||
- name: build
|
- name: build
|
||||||
run: pnpm --recursive run build
|
run: pnpm build --recursive
|
||||||
- name: lint
|
- name: lint
|
||||||
run: pnpm run lint
|
run: pnpm lint
|
||||||
- name: typecheck
|
- name: typecheck
|
||||||
run: pnpm --recursive run typecheck
|
run: pnpm typecheck --parallel
|
||||||
name: ${{ matrix.command.name }}
|
name: ${{ matrix.command.name }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: checkout
|
- uses: actions/checkout@v2
|
||||||
uses: actions/checkout@v3
|
- uses: actions/setup-node@v2
|
||||||
|
|
||||||
- name: setup pnpm
|
|
||||||
uses: pnpm/action-setup@v2
|
|
||||||
with:
|
with:
|
||||||
version: 7.13.4
|
# https://github.com/actions/setup-node#supported-version-syntax
|
||||||
|
node-version: "16"
|
||||||
- name: setup node
|
- run: npm i -g pnpm
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
cache: pnpm
|
|
||||||
|
|
||||||
- run: pnpm install --frozen-lockfile
|
- run: pnpm install --frozen-lockfile
|
||||||
- run: ${{ matrix.command.run }}
|
- run: ${{ matrix.command.run }}
|
||||||
|
|||||||
40
.github/workflows/release.yml
vendored
@@ -1,40 +0,0 @@
|
|||||||
# https://pnpm.io/using-changesets
|
|
||||||
name: release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
concurrency: ${{ github.workflow }}-${{ github.ref }}
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
name: release
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: setup pnpm
|
|
||||||
uses: pnpm/action-setup@v2
|
|
||||||
with:
|
|
||||||
version: 7.13.4
|
|
||||||
|
|
||||||
- name: setup node
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
cache: pnpm
|
|
||||||
|
|
||||||
- name: install deps
|
|
||||||
run: pnpm install --frozen-lockfile
|
|
||||||
|
|
||||||
- name: changesets release
|
|
||||||
id: changesets
|
|
||||||
uses: changesets/action@v1
|
|
||||||
with:
|
|
||||||
publish: pnpm run release
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
|
||||||
6
.gitignore
vendored
@@ -3,10 +3,4 @@ node_modules
|
|||||||
.vscode
|
.vscode
|
||||||
coverage
|
coverage
|
||||||
.env
|
.env
|
||||||
*.code-workspace
|
|
||||||
.pnpm-debug.log
|
|
||||||
|
|
||||||
build
|
|
||||||
.cache
|
|
||||||
|
|
||||||
.vercel
|
|
||||||
|
|||||||
@@ -4,4 +4,3 @@ coverage
|
|||||||
pnpm-lock.yaml
|
pnpm-lock.yaml
|
||||||
build
|
build
|
||||||
.cache
|
.cache
|
||||||
packages/website/public/api
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
const base = require("@itsmapleleaf/configs/prettier")
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
...base,
|
|
||||||
plugins: [require.resolve("prettier-plugin-astro")],
|
|
||||||
overrides: [
|
|
||||||
{
|
|
||||||
files: "*.astro",
|
|
||||||
options: {
|
|
||||||
parser: "astro",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
15
Dockerfile
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
FROM node:lts-slim
|
||||||
|
|
||||||
|
ENV CYPRESS_INSTALL_BINARY=0
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY / ./
|
||||||
|
RUN ls -R
|
||||||
|
|
||||||
|
RUN npm install -g pnpm
|
||||||
|
RUN pnpm install --unsafe-perm --frozen-lockfile
|
||||||
|
RUN pnpm run build -C packages/website
|
||||||
|
|
||||||
|
ENV NODE_ENV=production
|
||||||
|
CMD [ "pnpm", "-C", "packages/website", "start" ]
|
||||||
@@ -18,7 +18,7 @@ pnpm add reacord react discord.js
|
|||||||
|
|
||||||
## Get Started
|
## Get Started
|
||||||
|
|
||||||
[Visit the docs to get started.](https://reacord.mapleleaf.dev/guides/getting-started)
|
[Visit the docs to get started.](https://reacord.fly.dev/guides/getting-started)
|
||||||
|
|
||||||
## Example
|
## Example
|
||||||
|
|
||||||
|
|||||||
40
fly.toml
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
# fly.toml file generated for reacord on 2021-12-29T14:06:41-06:00
|
||||||
|
|
||||||
|
app = "reacord"
|
||||||
|
|
||||||
|
kill_signal = "SIGINT"
|
||||||
|
kill_timeout = 5
|
||||||
|
processes = []
|
||||||
|
|
||||||
|
[env]
|
||||||
|
PORT = 8080
|
||||||
|
|
||||||
|
[experimental]
|
||||||
|
allowed_public_ports = []
|
||||||
|
auto_rollback = true
|
||||||
|
|
||||||
|
[[services]]
|
||||||
|
http_checks = []
|
||||||
|
internal_port = 8080
|
||||||
|
processes = ["app"]
|
||||||
|
protocol = "tcp"
|
||||||
|
script_checks = []
|
||||||
|
|
||||||
|
[services.concurrency]
|
||||||
|
hard_limit = 25
|
||||||
|
soft_limit = 20
|
||||||
|
type = "connections"
|
||||||
|
|
||||||
|
[[services.ports]]
|
||||||
|
handlers = ["http"]
|
||||||
|
port = 80
|
||||||
|
|
||||||
|
[[services.ports]]
|
||||||
|
handlers = ["tls", "http"]
|
||||||
|
port = 443
|
||||||
|
|
||||||
|
[[services.tcp_checks]]
|
||||||
|
grace_period = "1s"
|
||||||
|
interval = "15s"
|
||||||
|
restart_limit = 0
|
||||||
|
timeout = "2s"
|
||||||
33
package.json
@@ -1,26 +1,29 @@
|
|||||||
{
|
{
|
||||||
"name": "reacord-monorepo",
|
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "eslint --ext js,ts,tsx .",
|
"lint": "eslint --ext js,ts,tsx .",
|
||||||
"lint-fix": "pnpm lint -- --fix",
|
"lint-fix": "pnpm lint -- --fix",
|
||||||
"format": "prettier --write .",
|
"format": "prettier --write ."
|
||||||
"build": "pnpm -r run build",
|
},
|
||||||
"start": "pnpm -C packages/website run start",
|
"dependencies": {
|
||||||
"release": "pnpm -r run build && changeset publish"
|
"@itsmapleleaf/configs": "^1.1.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@changesets/cli": "^2.25.0",
|
"@typescript-eslint/eslint-plugin": "^5.9.1",
|
||||||
"@itsmapleleaf/configs": "^1.1.7",
|
"@typescript-eslint/parser": "^5.9.1",
|
||||||
"@rushstack/eslint-patch": "^1.2.0",
|
"eslint": "^8.6.0",
|
||||||
"@types/eslint": "^8.4.6",
|
"eslint-config-prettier": "^8.3.0",
|
||||||
"astro-eslint-parser": "^0.12.0",
|
"eslint-import-resolver-typescript": "^2.5.0",
|
||||||
"eslint": "^8.36.0",
|
"eslint-plugin-import": "^2.25.4",
|
||||||
"prettier": "^2.7.1",
|
"eslint-plugin-jsx-a11y": "^6.5.1",
|
||||||
"prettier-plugin-astro": "^0.8.0",
|
"eslint-plugin-react": "^7.28.0",
|
||||||
"typescript": "^4.8.4"
|
"eslint-plugin-react-hooks": "^4.3.0",
|
||||||
|
"eslint-plugin-unicorn": "^40.0.0",
|
||||||
|
"prettier": "^2.5.1",
|
||||||
|
"typescript": "^4.5.4"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"esbuild": "latest"
|
"esbuild": "latest"
|
||||||
}
|
},
|
||||||
|
"prettier": "@itsmapleleaf/configs/prettier"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "@reacord/helpers",
|
|
||||||
"version": "0.0.0",
|
|
||||||
"private": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@types/lodash-es": "^4.17.6",
|
|
||||||
"lodash-es": "^4.17.21",
|
|
||||||
"type-fest": "^2.17.0",
|
|
||||||
"vitest": "^0.18.1"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
import { expect, test } from "vitest"
|
|
||||||
import type { PruneNullishValues } from "./prune-nullish-values"
|
|
||||||
import { 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",
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
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 as any)) {
|
|
||||||
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 = 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,23 +0,0 @@
|
|||||||
# reacord
|
|
||||||
|
|
||||||
## 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,5 +1,6 @@
|
|||||||
import { inspect } from "node:util"
|
import { inspect } from "node:util"
|
||||||
|
|
||||||
|
// eslint-disable-next-line import/no-unused-modules
|
||||||
export function logPretty(value: unknown) {
|
export function logPretty(value: unknown) {
|
||||||
console.info(
|
console.info(
|
||||||
inspect(value, {
|
inspect(value, {
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// eslint-disable-next-line import/no-unused-modules
|
||||||
export function omit<Subject extends object, Key extends PropertyKey>(
|
export function omit<Subject extends object, Key extends PropertyKey>(
|
||||||
subject: Subject,
|
subject: Subject,
|
||||||
keys: Key[],
|
keys: Key[],
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import type { LoosePick, UnknownRecord } from "./types"
|
import type { LoosePick, UnknownRecord } from "./types"
|
||||||
|
|
||||||
|
// eslint-disable-next-line import/no-unused-modules
|
||||||
export function pick<T, K extends keyof T | PropertyKey>(
|
export function pick<T, K extends keyof T | PropertyKey>(
|
||||||
object: T,
|
object: T,
|
||||||
keys: K[],
|
keys: K[],
|
||||||
27
packages/reacord/helpers/prune-nullish-values.ts
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import { isObject } from "./is-object"
|
||||||
|
|
||||||
|
export function pruneNullishValues<T>(input: T): PruneNullishValues<T> {
|
||||||
|
if (Array.isArray(input)) {
|
||||||
|
return input.filter(Boolean).map((item) => pruneNullishValues(item)) as any
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isObject(input)) {
|
||||||
|
return input as any
|
||||||
|
}
|
||||||
|
|
||||||
|
const result: any = {}
|
||||||
|
for (const [key, value] of Object.entries(input)) {
|
||||||
|
if (value != undefined) {
|
||||||
|
result[key] = pruneNullishValues(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
type PruneNullishValues<Input> = Input extends ReadonlyArray<infer Value>
|
||||||
|
? ReadonlyArray<NonNullable<Value>>
|
||||||
|
: Input extends object
|
||||||
|
? {
|
||||||
|
[Key in keyof Input]: NonNullable<Input[Key]>
|
||||||
|
}
|
||||||
|
: Input
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
/* eslint-disable import/no-unused-modules */
|
||||||
export type MaybePromise<T> = T | Promise<T>
|
export type MaybePromise<T> = T | Promise<T>
|
||||||
|
|
||||||
export type ValueOf<Type> = Type extends ReadonlyArray<infer Value>
|
export type ValueOf<Type> = Type extends ReadonlyArray<infer Value>
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { inspect } from "node:util"
|
import { inspect } from "node:util"
|
||||||
|
|
||||||
|
// eslint-disable-next-line import/no-unused-modules
|
||||||
export function withLoggedMethodCalls<T extends object>(value: T) {
|
export function withLoggedMethodCalls<T extends object>(value: T) {
|
||||||
return new Proxy(value as Record<string | symbol, unknown>, {
|
return new Proxy(value as Record<string | symbol, unknown>, {
|
||||||
get(target, property) {
|
get(target, property) {
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
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 type ButtonSharedProps = {
|
||||||
/** The text on the button. Rich formatting (markdown) is not supported here. */
|
/** The text on the button. Rich formatting (markdown) is not supported here. */
|
||||||
label?: ReactNode
|
label?: string
|
||||||
|
|
||||||
/** When true, the button will be slightly faded, and cannot be clicked. */
|
/** When true, the button will be slightly faded, and cannot be clicked. */
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { randomUUID } from "node:crypto"
|
import { nanoid } from "nanoid"
|
||||||
import React from "react"
|
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"
|
||||||
@@ -34,22 +34,12 @@ export type ButtonClickEvent = ComponentEvent
|
|||||||
*/
|
*/
|
||||||
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 = randomUUID()
|
private customId = nanoid()
|
||||||
|
|
||||||
// this has text children, but buttons themselves shouldn't yield text
|
|
||||||
// eslint-disable-next-line class-methods-use-this
|
|
||||||
override get text() {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
override modifyMessageOptions(options: MessageOptions): void {
|
override modifyMessageOptions(options: MessageOptions): void {
|
||||||
getNextActionRow(options).push({
|
getNextActionRow(options).push({
|
||||||
@@ -58,7 +48,7 @@ class ButtonNode extends Node<ButtonProps> {
|
|||||||
style: this.props.style ?? "secondary",
|
style: this.props.style ?? "secondary",
|
||||||
disabled: this.props.disabled,
|
disabled: this.props.disabled,
|
||||||
emoji: this.props.emoji,
|
emoji: this.props.emoji,
|
||||||
label: this.children.findType(ButtonLabelNode)?.text,
|
label: this.props.label,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,5 +63,3 @@ class ButtonNode extends Node<ButtonProps> {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ButtonLabelNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import type { ReactNode } from "react"
|
|
||||||
import React from "react"
|
import React 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"
|
||||||
|
|
||||||
@@ -9,8 +7,8 @@ import type { EmbedOptions } from "./embed-options"
|
|||||||
* @category Embed
|
* @category Embed
|
||||||
*/
|
*/
|
||||||
export type EmbedAuthorProps = {
|
export type EmbedAuthorProps = {
|
||||||
name?: ReactNode
|
name?: string
|
||||||
children?: ReactNode
|
children?: string
|
||||||
url?: string
|
url?: string
|
||||||
iconUrl?: string
|
iconUrl?: string
|
||||||
}
|
}
|
||||||
@@ -20,22 +18,19 @@ export type EmbedAuthorProps = {
|
|||||||
*/
|
*/
|
||||||
export function EmbedAuthor(props: EmbedAuthorProps) {
|
export function EmbedAuthor(props: EmbedAuthorProps) {
|
||||||
return (
|
return (
|
||||||
<ReacordElement props={props} createNode={() => new EmbedAuthorNode(props)}>
|
<ReacordElement
|
||||||
<ReacordElement props={{}} createNode={() => new AuthorTextNode({})}>
|
props={props}
|
||||||
{props.name ?? props.children}
|
createNode={() => new EmbedAuthorNode(props)}
|
||||||
</ReacordElement>
|
/>
|
||||||
</ReacordElement>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
|
class EmbedAuthorNode extends EmbedChildNode<EmbedAuthorProps> {
|
||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
options.author = {
|
options.author = {
|
||||||
name: this.children.findType(AuthorTextNode)?.text ?? "",
|
name: this.props.name ?? this.props.children ?? "",
|
||||||
url: this.props.url,
|
url: this.props.url,
|
||||||
icon_url: this.props.iconUrl,
|
icon_url: this.props.iconUrl,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class AuthorTextNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import type { ReactNode } from "react"
|
|
||||||
import React from "react"
|
import React 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"
|
||||||
|
|
||||||
@@ -9,10 +7,10 @@ import type { EmbedOptions } from "./embed-options"
|
|||||||
* @category Embed
|
* @category Embed
|
||||||
*/
|
*/
|
||||||
export type EmbedFieldProps = {
|
export type EmbedFieldProps = {
|
||||||
name: ReactNode
|
name: string
|
||||||
value?: ReactNode
|
value?: string
|
||||||
inline?: boolean
|
inline?: boolean
|
||||||
children?: ReactNode
|
children?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,14 +18,10 @@ export type EmbedFieldProps = {
|
|||||||
*/
|
*/
|
||||||
export function EmbedField(props: EmbedFieldProps) {
|
export function EmbedField(props: EmbedFieldProps) {
|
||||||
return (
|
return (
|
||||||
<ReacordElement props={props} createNode={() => new EmbedFieldNode(props)}>
|
<ReacordElement
|
||||||
<ReacordElement props={{}} createNode={() => new FieldNameNode({})}>
|
props={props}
|
||||||
{props.name}
|
createNode={() => new EmbedFieldNode(props)}
|
||||||
</ReacordElement>
|
/>
|
||||||
<ReacordElement props={{}} createNode={() => new FieldValueNode({})}>
|
|
||||||
{props.value || props.children}
|
|
||||||
</ReacordElement>
|
|
||||||
</ReacordElement>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,12 +29,9 @@ class EmbedFieldNode extends EmbedChildNode<EmbedFieldProps> {
|
|||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
options.fields ??= []
|
options.fields ??= []
|
||||||
options.fields.push({
|
options.fields.push({
|
||||||
name: this.children.findType(FieldNameNode)?.text ?? "",
|
name: this.props.name,
|
||||||
value: this.children.findType(FieldValueNode)?.text ?? "",
|
value: this.props.value ?? this.props.children ?? "",
|
||||||
inline: this.props.inline,
|
inline: this.props.inline,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class FieldNameNode extends Node<{}> {}
|
|
||||||
class FieldValueNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import type { ReactNode } from "react"
|
|
||||||
import React from "react"
|
import React 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"
|
||||||
|
|
||||||
@@ -9,8 +7,8 @@ import type { EmbedOptions } from "./embed-options"
|
|||||||
* @category Embed
|
* @category Embed
|
||||||
*/
|
*/
|
||||||
export type EmbedFooterProps = {
|
export type EmbedFooterProps = {
|
||||||
text?: ReactNode
|
text?: string
|
||||||
children?: ReactNode
|
children?: string
|
||||||
iconUrl?: string
|
iconUrl?: string
|
||||||
timestamp?: string | number | Date
|
timestamp?: string | number | Date
|
||||||
}
|
}
|
||||||
@@ -18,22 +16,19 @@ export type EmbedFooterProps = {
|
|||||||
/**
|
/**
|
||||||
* @category Embed
|
* @category Embed
|
||||||
*/
|
*/
|
||||||
export function EmbedFooter({ text, children, ...props }: EmbedFooterProps) {
|
export function EmbedFooter(props: EmbedFooterProps) {
|
||||||
return (
|
return (
|
||||||
<ReacordElement props={props} createNode={() => new EmbedFooterNode(props)}>
|
<ReacordElement
|
||||||
<ReacordElement props={{}} createNode={() => new FooterTextNode({})}>
|
props={props}
|
||||||
{text ?? children}
|
createNode={() => new EmbedFooterNode(props)}
|
||||||
</ReacordElement>
|
/>
|
||||||
</ReacordElement>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedFooterNode extends EmbedChildNode<
|
class EmbedFooterNode extends EmbedChildNode<EmbedFooterProps> {
|
||||||
Omit<EmbedFooterProps, "text" | "children">
|
|
||||||
> {
|
|
||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
options.footer = {
|
options.footer = {
|
||||||
text: this.children.findType(FooterTextNode)?.text ?? "",
|
text: this.props.text ?? this.props.children ?? "",
|
||||||
icon_url: this.props.iconUrl,
|
icon_url: this.props.iconUrl,
|
||||||
}
|
}
|
||||||
options.timestamp = this.props.timestamp
|
options.timestamp = this.props.timestamp
|
||||||
@@ -41,5 +36,3 @@ class EmbedFooterNode extends EmbedChildNode<
|
|||||||
: undefined
|
: undefined
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class FooterTextNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import type { ReactNode } from "react"
|
|
||||||
import React from "react"
|
import React 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"
|
||||||
|
|
||||||
@@ -9,28 +7,25 @@ import type { EmbedOptions } from "./embed-options"
|
|||||||
* @category Embed
|
* @category Embed
|
||||||
*/
|
*/
|
||||||
export type EmbedTitleProps = {
|
export type EmbedTitleProps = {
|
||||||
children: ReactNode
|
children: string
|
||||||
url?: string
|
url?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @category Embed
|
* @category Embed
|
||||||
*/
|
*/
|
||||||
export function EmbedTitle({ children, ...props }: EmbedTitleProps) {
|
export function EmbedTitle(props: EmbedTitleProps) {
|
||||||
return (
|
return (
|
||||||
<ReacordElement props={props} createNode={() => new EmbedTitleNode(props)}>
|
<ReacordElement
|
||||||
<ReacordElement props={{}} createNode={() => new TitleTextNode({})}>
|
props={props}
|
||||||
{children}
|
createNode={() => new EmbedTitleNode(props)}
|
||||||
</ReacordElement>
|
/>
|
||||||
</ReacordElement>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
class EmbedTitleNode extends EmbedChildNode<Omit<EmbedTitleProps, "children">> {
|
class EmbedTitleNode extends EmbedChildNode<EmbedTitleProps> {
|
||||||
override modifyEmbedOptions(options: EmbedOptions): void {
|
override modifyEmbedOptions(options: EmbedOptions): void {
|
||||||
options.title = this.children.findType(TitleTextNode)?.text ?? ""
|
options.title = this.props.children
|
||||||
options.url = this.props.url
|
options.url = this.props.url
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class TitleTextNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { snakeCaseDeep } from "@reacord/helpers/convert-object-property-case"
|
|
||||||
import { omit } from "@reacord/helpers/omit"
|
|
||||||
import React from "react"
|
import React from "react"
|
||||||
|
import { snakeCaseDeep } from "../../../helpers/convert-object-property-case"
|
||||||
|
import { omit } from "../../../helpers/omit"
|
||||||
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"
|
||||||
|
|||||||
@@ -18,26 +18,18 @@ export type LinkProps = ButtonSharedProps & {
|
|||||||
/**
|
/**
|
||||||
* @category Link
|
* @category Link
|
||||||
*/
|
*/
|
||||||
export function Link({ label, children, ...props }: LinkProps) {
|
export function Link(props: LinkProps) {
|
||||||
return (
|
return <ReacordElement props={props} createNode={() => new LinkNode(props)} />
|
||||||
<ReacordElement props={props} createNode={() => new LinkNode(props)}>
|
|
||||||
<ReacordElement props={{}} createNode={() => new LinkTextNode({})}>
|
|
||||||
{label || children}
|
|
||||||
</ReacordElement>
|
|
||||||
</ReacordElement>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class LinkNode extends Node<Omit<LinkProps, "label" | "children">> {
|
class LinkNode extends Node<LinkProps> {
|
||||||
override modifyMessageOptions(options: MessageOptions): void {
|
override modifyMessageOptions(options: MessageOptions): void {
|
||||||
getNextActionRow(options).push({
|
getNextActionRow(options).push({
|
||||||
type: "link",
|
type: "link",
|
||||||
disabled: this.props.disabled,
|
disabled: this.props.disabled,
|
||||||
emoji: this.props.emoji,
|
emoji: this.props.emoji,
|
||||||
label: this.children.findType(LinkTextNode)?.text,
|
label: this.props.label || this.props.children,
|
||||||
url: this.props.url,
|
url: this.props.url,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class LinkTextNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -2,18 +2,13 @@ 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<
|
export class OptionNode extends Node<OptionProps> {
|
||||||
Omit<OptionProps, "children" | "label" | "description">
|
|
||||||
> {
|
|
||||||
get options(): MessageSelectOptionOptions {
|
get options(): MessageSelectOptionOptions {
|
||||||
return {
|
return {
|
||||||
label: this.children.findType(OptionLabelNode)?.text ?? this.props.value,
|
label: this.props.children || this.props.label || this.props.value,
|
||||||
value: this.props.value,
|
value: this.props.value,
|
||||||
description: this.children.findType(OptionDescriptionNode)?.text,
|
description: this.props.description,
|
||||||
emoji: this.props.emoji,
|
emoji: this.props.emoji,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class OptionLabelNode extends Node<{}> {}
|
|
||||||
export class OptionDescriptionNode extends Node<{}> {}
|
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
import type { ReactNode } from "react"
|
|
||||||
import React from "react"
|
import React from "react"
|
||||||
import { ReacordElement } from "../../internal/element"
|
import { ReacordElement } from "../../internal/element"
|
||||||
import {
|
import { OptionNode } from "./option-node"
|
||||||
OptionDescriptionNode,
|
|
||||||
OptionLabelNode,
|
|
||||||
OptionNode,
|
|
||||||
} from "./option-node"
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @category Select
|
* @category Select
|
||||||
@@ -14,11 +9,11 @@ export type OptionProps = {
|
|||||||
/** The internal value of this option */
|
/** The internal value of this option */
|
||||||
value: string
|
value: string
|
||||||
/** The text shown to the user. This takes priority over `children` */
|
/** The text shown to the user. This takes priority over `children` */
|
||||||
label?: ReactNode
|
label?: string
|
||||||
/** The text shown to the user */
|
/** The text shown to the user */
|
||||||
children?: ReactNode
|
children?: string
|
||||||
/** Description for the option, shown to the user */
|
/** Description for the option, shown to the user */
|
||||||
description?: ReactNode
|
description?: string
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders an emoji to the left of the text.
|
* Renders an emoji to the left of the text.
|
||||||
@@ -36,27 +31,8 @@ export type OptionProps = {
|
|||||||
/**
|
/**
|
||||||
* @category Select
|
* @category Select
|
||||||
*/
|
*/
|
||||||
export function Option({
|
export function Option(props: OptionProps) {
|
||||||
label,
|
|
||||||
children,
|
|
||||||
description,
|
|
||||||
...props
|
|
||||||
}: OptionProps) {
|
|
||||||
return (
|
return (
|
||||||
<ReacordElement props={props} createNode={() => new OptionNode(props)}>
|
<ReacordElement props={props} createNode={() => new OptionNode(props)} />
|
||||||
{(label !== undefined || children !== undefined) && (
|
|
||||||
<ReacordElement props={{}} createNode={() => new OptionLabelNode({})}>
|
|
||||||
{label || children}
|
|
||||||
</ReacordElement>
|
|
||||||
)}
|
|
||||||
{description !== undefined && (
|
|
||||||
<ReacordElement
|
|
||||||
props={{}}
|
|
||||||
createNode={() => new OptionDescriptionNode({})}
|
|
||||||
>
|
|
||||||
{description}
|
|
||||||
</ReacordElement>
|
|
||||||
)}
|
|
||||||
</ReacordElement>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { isInstanceOf } from "@reacord/helpers/is-instance-of"
|
import { nanoid } from "nanoid"
|
||||||
import { randomUUID } from "node:crypto"
|
|
||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import React 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 {
|
||||||
@@ -89,7 +89,7 @@ export function Select(props: SelectProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class SelectNode extends Node<SelectProps> {
|
class SelectNode extends Node<SelectProps> {
|
||||||
readonly customId = randomUUID()
|
readonly customId = nanoid()
|
||||||
|
|
||||||
override modifyMessageOptions(message: MessageOptions): void {
|
override modifyMessageOptions(message: MessageOptions): void {
|
||||||
const actionRow: ActionRow = []
|
const actionRow: ActionRow = []
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { raise } from "@reacord/helpers/raise"
|
|
||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
|
import { raise } from "../../helpers/raise"
|
||||||
import type { ReacordInstance } from "./instance"
|
import type { ReacordInstance } from "./instance"
|
||||||
|
|
||||||
const Context = React.createContext<ReacordInstance | undefined>(undefined)
|
const Context = React.createContext<ReacordInstance | undefined>(undefined)
|
||||||
@@ -10,7 +10,7 @@ export const InstanceProvider = Context.Provider
|
|||||||
* Get the associated instance for the current component.
|
* Get the associated instance for the current component.
|
||||||
*
|
*
|
||||||
* @category Core
|
* @category Core
|
||||||
* @see https://reacord.mapleleaf.dev/guides/use-instance
|
* @see https://reacord.fly.dev/guides/use-instance
|
||||||
*/
|
*/
|
||||||
export function useInstance(): ReacordInstance {
|
export function useInstance(): ReacordInstance {
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -1,16 +1,13 @@
|
|||||||
/* eslint-disable class-methods-use-this */
|
/* eslint-disable class-methods-use-this */
|
||||||
import { pick } from "@reacord/helpers/pick"
|
|
||||||
import { pruneNullishValues } from "@reacord/helpers/prune-nullish-values"
|
|
||||||
import { raise } from "@reacord/helpers/raise"
|
|
||||||
import * as Discord from "discord.js"
|
import * 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 {
|
import type { Message, MessageOptions } from "../internal/message"
|
||||||
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 {
|
||||||
@@ -33,7 +30,7 @@ export class ReacordDiscordJs extends Reacord {
|
|||||||
super(config)
|
super(config)
|
||||||
|
|
||||||
client.on("interactionCreate", (interaction) => {
|
client.on("interactionCreate", (interaction) => {
|
||||||
if (interaction.isButton() || interaction.isSelectMenu()) {
|
if (interaction.isMessageComponent()) {
|
||||||
this.handleComponentInteraction(
|
this.handleComponentInteraction(
|
||||||
this.createReacordComponentInteraction(interaction),
|
this.createReacordComponentInteraction(interaction),
|
||||||
)
|
)
|
||||||
@@ -43,7 +40,7 @@ export class ReacordDiscordJs extends Reacord {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Sends a message to a channel.
|
* Sends a message to a channel.
|
||||||
* @see https://reacord.mapleleaf.dev/guides/sending-messages
|
* @see https://reacord.fly.dev/guides/sending-messages
|
||||||
*/
|
*/
|
||||||
override send(
|
override send(
|
||||||
channelId: string,
|
channelId: string,
|
||||||
@@ -57,7 +54,7 @@ export class ReacordDiscordJs extends Reacord {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.fly.dev/guides/sending-messages
|
||||||
*/
|
*/
|
||||||
override reply(
|
override reply(
|
||||||
interaction: Discord.CommandInteraction,
|
interaction: Discord.CommandInteraction,
|
||||||
@@ -71,7 +68,7 @@ export class ReacordDiscordJs extends Reacord {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.fly.dev/guides/sending-messages
|
||||||
*/
|
*/
|
||||||
override ephemeralReply(
|
override ephemeralReply(
|
||||||
interaction: Discord.CommandInteraction,
|
interaction: Discord.CommandInteraction,
|
||||||
@@ -91,7 +88,7 @@ export class ReacordDiscordJs extends Reacord {
|
|||||||
(await this.client.channels.fetch(channelId)) ??
|
(await this.client.channels.fetch(channelId)) ??
|
||||||
raise(`Channel ${channelId} not found`)
|
raise(`Channel ${channelId} not found`)
|
||||||
|
|
||||||
if (!channel.isTextBased()) {
|
if (!channel.isText()) {
|
||||||
raise(`Channel ${channelId} is not a text channel`)
|
raise(`Channel ${channelId} is not a text channel`)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,7 +204,7 @@ export class ReacordDiscordJs extends Reacord {
|
|||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
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:
|
||||||
@@ -301,6 +298,17 @@ function createReacordMessage(message: Discord.Message): Message {
|
|||||||
edit: async (options) => {
|
edit: async (options) => {
|
||||||
await message.edit(getDiscordMessageOptions(options))
|
await message.edit(getDiscordMessageOptions(options))
|
||||||
},
|
},
|
||||||
|
disableComponents: async () => {
|
||||||
|
for (const actionRow of message.components) {
|
||||||
|
for (const component of actionRow.components) {
|
||||||
|
component.setDisabled(true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await message.edit({
|
||||||
|
components: message.components,
|
||||||
|
})
|
||||||
|
},
|
||||||
delete: async () => {
|
delete: async () => {
|
||||||
await message.delete()
|
await message.delete()
|
||||||
},
|
},
|
||||||
@@ -313,6 +321,10 @@ function createEphemeralReacordMessage(): Message {
|
|||||||
console.warn("Ephemeral messages can't be edited")
|
console.warn("Ephemeral messages can't be edited")
|
||||||
return Promise.resolve()
|
return Promise.resolve()
|
||||||
},
|
},
|
||||||
|
disableComponents: () => {
|
||||||
|
console.warn("Ephemeral messages can't be edited")
|
||||||
|
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()
|
||||||
@@ -320,45 +332,25 @@ function createEphemeralReacordMessage(): Message {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function convertButtonStyleToEnum(style: MessageButtonOptions["style"]) {
|
|
||||||
const styleMap = {
|
|
||||||
primary: Discord.ButtonStyle.Primary,
|
|
||||||
secondary: Discord.ButtonStyle.Secondary,
|
|
||||||
success: Discord.ButtonStyle.Success,
|
|
||||||
danger: Discord.ButtonStyle.Danger,
|
|
||||||
} as const
|
|
||||||
|
|
||||||
return styleMap[style ?? "secondary"]
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: this could be a part of the core library,
|
// 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(reacordOptions: MessageOptions) {
|
function getDiscordMessageOptions(
|
||||||
const options = {
|
reacordOptions: MessageOptions,
|
||||||
|
): Discord.MessageOptions {
|
||||||
|
const options: Discord.MessageOptions = {
|
||||||
// eslint-disable-next-line unicorn/no-null
|
// eslint-disable-next-line unicorn/no-null
|
||||||
content: reacordOptions.content || null,
|
content: reacordOptions.content || null,
|
||||||
embeds: reacordOptions.embeds,
|
embeds: reacordOptions.embeds,
|
||||||
components: reacordOptions.actionRows.map((row) => ({
|
components: reacordOptions.actionRows.map((row) => ({
|
||||||
type: Discord.ComponentType.ActionRow,
|
type: "ACTION_ROW",
|
||||||
components: row.map(
|
components: row.map(
|
||||||
(component): Discord.MessageActionRowComponentData => {
|
(component): Discord.MessageActionRowComponentOptions => {
|
||||||
if (component.type === "button") {
|
if (component.type === "button") {
|
||||||
return {
|
return {
|
||||||
type: Discord.ComponentType.Button,
|
type: "BUTTON",
|
||||||
customId: component.customId,
|
customId: component.customId,
|
||||||
label: component.label ?? "",
|
label: component.label ?? "",
|
||||||
style: convertButtonStyleToEnum(component.style),
|
style: toUpper(component.style ?? "secondary"),
|
||||||
disabled: component.disabled,
|
|
||||||
emoji: component.emoji,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (component.type === "link") {
|
|
||||||
return {
|
|
||||||
type: Discord.ComponentType.Button,
|
|
||||||
url: component.url,
|
|
||||||
label: component.label ?? "",
|
|
||||||
style: Discord.ButtonStyle.Link,
|
|
||||||
disabled: component.disabled,
|
disabled: component.disabled,
|
||||||
emoji: component.emoji,
|
emoji: component.emoji,
|
||||||
}
|
}
|
||||||
@@ -367,7 +359,7 @@ function getDiscordMessageOptions(reacordOptions: MessageOptions) {
|
|||||||
if (component.type === "select") {
|
if (component.type === "select") {
|
||||||
return {
|
return {
|
||||||
...component,
|
...component,
|
||||||
type: Discord.ComponentType.SelectMenu,
|
type: "SELECT_MENU",
|
||||||
options: component.options.map((option) => ({
|
options: component.options.map((option) => ({
|
||||||
...option,
|
...option,
|
||||||
default: component.values?.includes(option.value),
|
default: component.values?.includes(option.value),
|
||||||
@@ -375,7 +367,7 @@ function getDiscordMessageOptions(reacordOptions: MessageOptions) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
raise(`Unsupported component type: ${(component as any).type}`)
|
raise(`Unsupported component type: ${component.type}`)
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
})),
|
})),
|
||||||
|
|||||||
@@ -47,19 +47,7 @@ export abstract class Reacord {
|
|||||||
|
|
||||||
this.renderers.push(renderer)
|
this.renderers.push(renderer)
|
||||||
|
|
||||||
const container = reconciler.createContainer(
|
const container = reconciler.createContainer(renderer, 0, false, {})
|
||||||
renderer,
|
|
||||||
0,
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
null,
|
|
||||||
false,
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
null,
|
|
||||||
"reacord",
|
|
||||||
() => {},
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
null,
|
|
||||||
)
|
|
||||||
|
|
||||||
const instance: ReacordInstance = {
|
const instance: ReacordInstance = {
|
||||||
render: (content: ReactNode) => {
|
render: (content: ReactNode) => {
|
||||||
|
|||||||
@@ -21,16 +21,6 @@ export class Container<T> {
|
|||||||
this.items = []
|
this.items = []
|
||||||
}
|
}
|
||||||
|
|
||||||
find(predicate: (item: T) => boolean): T | undefined {
|
|
||||||
return this.items.find(predicate)
|
|
||||||
}
|
|
||||||
|
|
||||||
findType<U extends T>(type: new (...args: any[]) => U): U | undefined {
|
|
||||||
for (const item of this.items) {
|
|
||||||
if (item instanceof type) return item
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[Symbol.iterator]() {
|
[Symbol.iterator]() {
|
||||||
return this.items[Symbol.iterator]()
|
return this.items[Symbol.iterator]()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { last } from "@reacord/helpers/last"
|
|
||||||
import type { Except } from "type-fest"
|
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"
|
||||||
|
|
||||||
@@ -49,6 +49,7 @@ export type MessageSelectOptionOptions = {
|
|||||||
export type Message = {
|
export type Message = {
|
||||||
edit(options: MessageOptions): Promise<void>
|
edit(options: MessageOptions): Promise<void>
|
||||||
delete(): Promise<void>
|
delete(): Promise<void>
|
||||||
|
disableComponents(): Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getNextActionRow(options: MessageOptions): ActionRow {
|
export function getNextActionRow(options: MessageOptions): ActionRow {
|
||||||
|
|||||||
@@ -13,8 +13,4 @@ export abstract class Node<Props> {
|
|||||||
handleComponentInteraction(interaction: ComponentInteraction): boolean {
|
handleComponentInteraction(interaction: ComponentInteraction): boolean {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
get text(): string {
|
|
||||||
return [...this.children].map((child) => child.text).join("")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
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 { DefaultEventPriority } from "react-reconciler/constants.js"
|
import { raise } from "../../helpers/raise.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"
|
||||||
@@ -21,6 +20,8 @@ const config: HostConfig<
|
|||||||
number, // TimeoutHandle,
|
number, // TimeoutHandle,
|
||||||
number // NoTimeout,
|
number // NoTimeout,
|
||||||
> = {
|
> = {
|
||||||
|
// config
|
||||||
|
now: Date.now,
|
||||||
supportsMutation: true,
|
supportsMutation: true,
|
||||||
supportsPersistence: false,
|
supportsPersistence: false,
|
||||||
supportsHydration: false,
|
supportsHydration: false,
|
||||||
@@ -51,13 +52,6 @@ const config: HostConfig<
|
|||||||
},
|
},
|
||||||
createTextInstance: (text) => new TextNode(text),
|
createTextInstance: (text) => new TextNode(text),
|
||||||
shouldSetTextContent: () => false,
|
shouldSetTextContent: () => false,
|
||||||
detachDeletedInstance: (instance) => {},
|
|
||||||
beforeActiveInstanceBlur: () => {},
|
|
||||||
afterActiveInstanceBlur: () => {},
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
getInstanceFromNode: (node: any) => null,
|
|
||||||
// eslint-disable-next-line unicorn/no-null
|
|
||||||
getInstanceFromScope: (scopeInstance: any) => null,
|
|
||||||
|
|
||||||
clearContainer: (renderer) => {
|
clearContainer: (renderer) => {
|
||||||
renderer.nodes.clear()
|
renderer.nodes.clear()
|
||||||
@@ -98,14 +92,11 @@ const config: HostConfig<
|
|||||||
resetAfterCommit: (renderer) => {
|
resetAfterCommit: (renderer) => {
|
||||||
renderer.render()
|
renderer.render()
|
||||||
},
|
},
|
||||||
prepareScopeUpdate: (scopeInstance: any, instance: any) => {},
|
|
||||||
|
|
||||||
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)
|
||||||
|
|||||||
@@ -83,17 +83,7 @@ export abstract class Renderer {
|
|||||||
|
|
||||||
if (payload.action === "deactivate") {
|
if (payload.action === "deactivate") {
|
||||||
this.updateSubscription.unsubscribe()
|
this.updateSubscription.unsubscribe()
|
||||||
|
await this.message?.disableComponents()
|
||||||
await this.message?.edit({
|
|
||||||
...payload.options,
|
|
||||||
actionRows: payload.options.actionRows.map((row) =>
|
|
||||||
row.map((component) => ({
|
|
||||||
...component,
|
|
||||||
disabled: true,
|
|
||||||
})),
|
|
||||||
),
|
|
||||||
})
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,4 @@ 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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
"name": "reacord",
|
"name": "reacord",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"description": "Create interactive Discord messages using React.",
|
"description": "Create interactive Discord messages using React.",
|
||||||
"version": "0.5.2",
|
"version": "0.3.4",
|
||||||
"types": "./dist/main.d.ts",
|
"types": "./dist/main.d.ts",
|
||||||
"homepage": "https://reacord.mapleleaf.dev",
|
"homepage": "https://reacord.fly.dev",
|
||||||
"repository": "https://github.com/itsMapleLeaf/reacord.git",
|
"repository": "https://github.com/itsMapleLeaf/reacord.git",
|
||||||
"changelog": "https://github.com/itsMapleLeaf/reacord/releases",
|
"changelog": "https://github.com/itsMapleLeaf/reacord/releases",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -27,8 +27,7 @@
|
|||||||
"exports": {
|
"exports": {
|
||||||
".": {
|
".": {
|
||||||
"import": "./dist/main.js",
|
"import": "./dist/main.js",
|
||||||
"require": "./dist/main.cjs",
|
"require": "./dist/main.cjs"
|
||||||
"types": "./dist/main.d.ts"
|
|
||||||
},
|
},
|
||||||
"./package.json": {
|
"./package.json": {
|
||||||
"import": "./package.json",
|
"import": "./package.json",
|
||||||
@@ -36,22 +35,24 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "cp ../../README.md . && cp ../../LICENSE . && tsup library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
|
"build": "tsup-node library/main.ts --target node16 --format cjs,esm --dts --sourcemap",
|
||||||
"build-watch": "pnpm build -- --watch",
|
"build-watch": "pnpm build -- --watch",
|
||||||
"test": "vitest --coverage --no-watch",
|
"test": "vitest --coverage --no-watch",
|
||||||
"test-dev": "vitest",
|
"test-dev": "vitest",
|
||||||
"test-manual": "nodemon --exec tsx --ext ts,tsx ./scripts/discordjs-manual-test.tsx",
|
"typecheck": "tsc --noEmit",
|
||||||
"typecheck": "tsc --noEmit"
|
"playground": "nodemon --exec esmo --ext ts,tsx --inspect=5858 --enable-source-maps ./playground/main.tsx",
|
||||||
|
"release": "bash scripts/release.sh"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/node": "*",
|
"@types/node": "*",
|
||||||
"@types/react": "*",
|
"@types/react": "*",
|
||||||
"@types/react-reconciler": "^0.28.0",
|
"@types/react-reconciler": "^0.26.4",
|
||||||
"react-reconciler": "^0.29.0",
|
"nanoid": "^3.1.31",
|
||||||
"rxjs": "^7.5.6"
|
"react-reconciler": "^0.26.2",
|
||||||
|
"rxjs": "^7.5.2"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"discord.js": "^14",
|
"discord.js": "^13.3",
|
||||||
"react": ">=17"
|
"react": ">=17"
|
||||||
},
|
},
|
||||||
"peerDependenciesMeta": {
|
"peerDependenciesMeta": {
|
||||||
@@ -60,21 +61,24 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@reacord/helpers": "workspace:*",
|
"@types/lodash-es": "^4.17.5",
|
||||||
"@types/lodash-es": "^4.17.6",
|
"c8": "^7.11.0",
|
||||||
"c8": "^7.12.0",
|
"discord.js": "^13.5.1",
|
||||||
"discord.js": "^14.0.3",
|
"dotenv": "^11.0.0",
|
||||||
"dotenv": "^16.0.1",
|
"esbuild": "latest",
|
||||||
|
"esbuild-jest": "^0.5.0",
|
||||||
|
"esmo": "^0.13.0",
|
||||||
"lodash-es": "^4.17.21",
|
"lodash-es": "^4.17.21",
|
||||||
"nodemon": "^2.0.19",
|
"nodemon": "^2.0.15",
|
||||||
"prettier": "^2.7.1",
|
"prettier": "^2.5.1",
|
||||||
"pretty-ms": "^8.0.0",
|
"pretty-ms": "^7.0.1",
|
||||||
"react": "^18.2.0",
|
"react": "^17.0.2",
|
||||||
"tsup": "^6.1.3",
|
"release-it": "^14.12.1",
|
||||||
"tsx": "^3.8.0",
|
"tsup": "^5.11.11",
|
||||||
"type-fest": "^2.17.0",
|
"type-fest": "^2.9.0",
|
||||||
"typescript": "^4.7.4",
|
"typescript": "^4.5.4",
|
||||||
"vitest": "^0.18.1"
|
"vite": "^2.7.10",
|
||||||
|
"vitest": "^0.0.141"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"esbuild": "latest"
|
"esbuild": "latest"
|
||||||
@@ -87,8 +91,5 @@
|
|||||||
"release": true,
|
"release": true,
|
||||||
"web": true
|
"web": true
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"publishConfig": {
|
|
||||||
"access": "public"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
38
packages/reacord/playground/command-handler.ts
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
import type { Client, CommandInteraction } from "discord.js"
|
||||||
|
|
||||||
|
type Command = {
|
||||||
|
name: string
|
||||||
|
description: string
|
||||||
|
run: (interaction: CommandInteraction) => unknown
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createCommandHandler(client: Client, commands: Command[]) {
|
||||||
|
client.on("ready", async () => {
|
||||||
|
for (const command of commands) {
|
||||||
|
for (const guild of client.guilds.cache.values()) {
|
||||||
|
await client.application?.commands.create(
|
||||||
|
{
|
||||||
|
name: command.name,
|
||||||
|
description: command.description,
|
||||||
|
},
|
||||||
|
guild.id,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
client.on("interactionCreate", async (interaction) => {
|
||||||
|
if (!interaction.isCommand()) return
|
||||||
|
|
||||||
|
const command = commands.find(
|
||||||
|
(command) => command.name === interaction.commandName,
|
||||||
|
)
|
||||||
|
if (command) {
|
||||||
|
try {
|
||||||
|
await command.run(interaction)
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
36
packages/reacord/playground/counter.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import * as React from "react"
|
||||||
|
import { Button, Embed, EmbedField, EmbedTitle } from "../library/main"
|
||||||
|
|
||||||
|
export function Counter(props: { onDeactivate: () => void }) {
|
||||||
|
const [count, setCount] = React.useState(0)
|
||||||
|
const [embedVisible, setEmbedVisible] = React.useState(false)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
this button was clicked {count} times
|
||||||
|
{embedVisible && (
|
||||||
|
<Embed>
|
||||||
|
<EmbedTitle>the counter</EmbedTitle>
|
||||||
|
{count > 0 && (
|
||||||
|
<EmbedField name="is it even?">
|
||||||
|
{count % 2 === 0 ? "yes" : "no"}
|
||||||
|
</EmbedField>
|
||||||
|
)}
|
||||||
|
</Embed>
|
||||||
|
)}
|
||||||
|
{embedVisible && (
|
||||||
|
<Button label="hide embed" onClick={() => setEmbedVisible(false)} />
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
style="primary"
|
||||||
|
emoji="<:plus_one:778531744860602388>"
|
||||||
|
label="clicc"
|
||||||
|
onClick={() => setCount(count + 1)}
|
||||||
|
/>
|
||||||
|
{!embedVisible && (
|
||||||
|
<Button label="show embed" onClick={() => setEmbedVisible(true)} />
|
||||||
|
)}
|
||||||
|
<Button style="danger" label="deactivate" onClick={props.onDeactivate} />
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
31
packages/reacord/playground/fruit-select.tsx
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import React, { useState } from "react"
|
||||||
|
import { Button, Option, Select } from "../library/main"
|
||||||
|
|
||||||
|
export function FruitSelect({
|
||||||
|
onConfirm,
|
||||||
|
}: {
|
||||||
|
onConfirm: (choice: string) => void
|
||||||
|
}) {
|
||||||
|
const [value, setValue] = useState<string>()
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Select
|
||||||
|
placeholder="choose a fruit"
|
||||||
|
value={value}
|
||||||
|
onChangeValue={setValue}
|
||||||
|
>
|
||||||
|
<Option value="🍎" />
|
||||||
|
<Option value="🍌" />
|
||||||
|
<Option value="🍒" />
|
||||||
|
</Select>
|
||||||
|
<Button
|
||||||
|
label="confirm"
|
||||||
|
disabled={value == undefined}
|
||||||
|
onClick={() => {
|
||||||
|
if (value) onConfirm(value)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
109
packages/reacord/playground/main.tsx
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
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)
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
import type { TextChannel } from "discord.js"
|
|
||||||
import { ChannelType, Client, IntentsBitField } from "discord.js"
|
|
||||||
import "dotenv/config"
|
|
||||||
import { kebabCase } from "lodash-es"
|
|
||||||
import * as React from "react"
|
|
||||||
import { useState } from "react"
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
Link,
|
|
||||||
Option,
|
|
||||||
ReacordDiscordJs,
|
|
||||||
Select,
|
|
||||||
useInstance,
|
|
||||||
} from "../library/main"
|
|
||||||
|
|
||||||
const client = new Client({ intents: IntentsBitField.Flags.Guilds })
|
|
||||||
const reacord = new ReacordDiscordJs(client)
|
|
||||||
|
|
||||||
await client.login(process.env.TEST_BOT_TOKEN)
|
|
||||||
|
|
||||||
const guild = await client.guilds.fetch(process.env.TEST_GUILD_ID!)
|
|
||||||
|
|
||||||
const category = await guild.channels.fetch(process.env.TEST_CATEGORY_ID!)
|
|
||||||
if (category?.type !== ChannelType.GuildCategory) {
|
|
||||||
throw new Error(
|
|
||||||
`channel ${process.env.TEST_CATEGORY_ID} is not a guild category. received ${category?.type}`,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const [, channel] of category.children.cache) {
|
|
||||||
await channel.delete()
|
|
||||||
}
|
|
||||||
|
|
||||||
let prefix = 0
|
|
||||||
const createTest = async (
|
|
||||||
name: string,
|
|
||||||
block: (channel: TextChannel) => void | Promise<unknown>,
|
|
||||||
) => {
|
|
||||||
prefix += 1
|
|
||||||
const channel = await category.children.create({
|
|
||||||
type: ChannelType.GuildText,
|
|
||||||
name: `${String(prefix).padStart(3, "0")}-${kebabCase(name)}`,
|
|
||||||
})
|
|
||||||
await block(channel)
|
|
||||||
}
|
|
||||||
|
|
||||||
await createTest("basic", (channel) => {
|
|
||||||
reacord.send(channel.id, "Hello, world!")
|
|
||||||
})
|
|
||||||
|
|
||||||
await createTest("counter", (channel) => {
|
|
||||||
const Counter = () => {
|
|
||||||
const [count, setCount] = React.useState(0)
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
count: {count}
|
|
||||||
<Button
|
|
||||||
style="primary"
|
|
||||||
emoji="➕"
|
|
||||||
onClick={() => setCount(count + 1)}
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
style="primary"
|
|
||||||
emoji="➖"
|
|
||||||
onClick={() => setCount(count - 1)}
|
|
||||||
/>
|
|
||||||
<Button label="reset" onClick={() => setCount(0)} />
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
reacord.send(channel.id, <Counter />)
|
|
||||||
})
|
|
||||||
|
|
||||||
await createTest("select", (channel) => {
|
|
||||||
function FruitSelect({ onConfirm }: { onConfirm: (choice: string) => void }) {
|
|
||||||
const [value, setValue] = useState<string>()
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Select
|
|
||||||
placeholder="choose a fruit"
|
|
||||||
value={value}
|
|
||||||
onChangeValue={setValue}
|
|
||||||
>
|
|
||||||
<Option value="🍎" emoji="🍎" label="apple" description="it red" />
|
|
||||||
<Option value="🍌" emoji="🍌" label="banana" description="bnanbna" />
|
|
||||||
<Option value="🍒" emoji="🍒" label="cherry" description="heh" />
|
|
||||||
</Select>
|
|
||||||
<Button
|
|
||||||
label="confirm"
|
|
||||||
disabled={value == undefined}
|
|
||||||
onClick={() => {
|
|
||||||
if (value) onConfirm(value)
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const instance = reacord.send(
|
|
||||||
channel.id,
|
|
||||||
<FruitSelect
|
|
||||||
onConfirm={(value) => {
|
|
||||||
instance.render(`you chose ${value}`)
|
|
||||||
instance.deactivate()
|
|
||||||
}}
|
|
||||||
/>,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
await createTest("ephemeral button", (channel) => {
|
|
||||||
reacord.send(
|
|
||||||
channel.id,
|
|
||||||
<>
|
|
||||||
<Button
|
|
||||||
label="public clic"
|
|
||||||
onClick={(event) =>
|
|
||||||
event.reply(`${event.guild?.member.displayName} clic`)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<Button
|
|
||||||
label="clic"
|
|
||||||
onClick={(event) => event.ephemeralReply("you clic")}
|
|
||||||
/>
|
|
||||||
</>,
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
await createTest("delete this", (channel) => {
|
|
||||||
function DeleteThis() {
|
|
||||||
const instance = useInstance()
|
|
||||||
return <Button label="delete this" onClick={() => instance.destroy()} />
|
|
||||||
}
|
|
||||||
reacord.send(channel.id, <DeleteThis />)
|
|
||||||
})
|
|
||||||
|
|
||||||
await createTest("link", (channel) => {
|
|
||||||
reacord.send(channel.id, <Link label="hi" url="https://mapleleaf.dev" />)
|
|
||||||
})
|
|
||||||
4
packages/reacord/scripts/release.sh
Executable file
@@ -0,0 +1,4 @@
|
|||||||
|
pnpm build
|
||||||
|
cp ../../README.md .
|
||||||
|
cp ../../LICENSE .
|
||||||
|
pnpx release-it
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
import { spawnSync } from "node:child_process"
|
|
||||||
import { createRequire } from "node:module"
|
|
||||||
import { beforeAll, expect, test } from "vitest"
|
|
||||||
|
|
||||||
beforeAll(() => {
|
|
||||||
spawnSync("pnpm", ["run", "build"])
|
|
||||||
})
|
|
||||||
|
|
||||||
test("can require commonjs", () => {
|
|
||||||
const require = createRequire(import.meta.url)
|
|
||||||
expect(() => require("../dist/main.cjs")).not.toThrow()
|
|
||||||
})
|
|
||||||
@@ -35,7 +35,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("show embed").click()
|
tester.findButtonByLabel("show embed").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 0",
|
content: "count: 0",
|
||||||
@@ -62,7 +62,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("clicc").click()
|
tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 1",
|
content: "count: 1",
|
||||||
@@ -94,7 +94,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("clicc").click()
|
tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 2",
|
content: "count: 2",
|
||||||
@@ -126,7 +126,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("hide embed").click()
|
tester.findButtonByLabel("hide embed").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 2",
|
content: "count: 2",
|
||||||
@@ -153,7 +153,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("clicc").click()
|
tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 3",
|
content: "count: 3",
|
||||||
@@ -180,7 +180,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("deactivate").click()
|
tester.findButtonByLabel("deactivate").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 3",
|
content: "count: 3",
|
||||||
@@ -210,7 +210,7 @@ test("rendering behavior", async () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
await tester.findButtonByLabel("clicc").click()
|
tester.findButtonByLabel("clicc").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "count: 3",
|
content: "count: 3",
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import React, { useState } from "react"
|
import React, { useState } from "react"
|
||||||
import { expect, test, vi } from "vitest"
|
import { expect, fn, test } 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 = fn()
|
||||||
|
|
||||||
function TestSelect() {
|
function TestSelect() {
|
||||||
const [value, setValue] = useState<string>()
|
const [value, setValue] = useState<string>()
|
||||||
@@ -59,23 +59,23 @@ test("single select", async () => {
|
|||||||
await assertSelect([])
|
await assertSelect([])
|
||||||
expect(onSelect).toHaveBeenCalledTimes(0)
|
expect(onSelect).toHaveBeenCalledTimes(0)
|
||||||
|
|
||||||
await tester.findSelectByPlaceholder("choose one").select("2")
|
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"] }),
|
||||||
)
|
)
|
||||||
|
|
||||||
await tester.findButtonByLabel("disable").click()
|
tester.findButtonByLabel("disable").click()
|
||||||
await assertSelect(["2"], true)
|
await assertSelect(["2"], true)
|
||||||
|
|
||||||
await tester.findSelectByPlaceholder("choose one").select("1")
|
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 = fn()
|
||||||
|
|
||||||
function TestSelect() {
|
function TestSelect() {
|
||||||
const [values, setValues] = useState<string[]>([])
|
const [values, setValues] = useState<string[]>([])
|
||||||
@@ -125,19 +125,19 @@ test("multiple select", async () => {
|
|||||||
await assertSelect([])
|
await assertSelect([])
|
||||||
expect(onSelect).toHaveBeenCalledTimes(0)
|
expect(onSelect).toHaveBeenCalledTimes(0)
|
||||||
|
|
||||||
await tester.findSelectByPlaceholder("select").select("1", "3")
|
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"]) }),
|
||||||
)
|
)
|
||||||
|
|
||||||
await tester.findSelectByPlaceholder("select").select("2")
|
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"]) }),
|
||||||
)
|
)
|
||||||
|
|
||||||
await tester.findSelectByPlaceholder("select").select()
|
tester.findSelectByPlaceholder("select").select()
|
||||||
await assertSelect([])
|
await assertSelect([])
|
||||||
expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ values: [] }))
|
expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ values: [] }))
|
||||||
})
|
})
|
||||||
@@ -145,7 +145,7 @@ test("multiple select", async () => {
|
|||||||
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" />)
|
||||||
await tester.findSelectByPlaceholder("select").select("something")
|
tester.findSelectByPlaceholder("select").select("something")
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
{
|
{
|
||||||
content: "",
|
content: "",
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
/* eslint-disable class-methods-use-this */
|
/* eslint-disable class-methods-use-this */
|
||||||
/* eslint-disable require-await */
|
/* eslint-disable require-await */
|
||||||
import { logPretty } from "@reacord/helpers/log-pretty"
|
import { nanoid } from "nanoid"
|
||||||
import { omit } from "@reacord/helpers/omit"
|
import { nextTick } from "node:process"
|
||||||
import { pruneNullishValues } from "@reacord/helpers/prune-nullish-values"
|
import { promisify } from "node:util"
|
||||||
import { raise } from "@reacord/helpers/raise"
|
|
||||||
import { waitFor } from "@reacord/helpers/wait-for"
|
|
||||||
import { randomUUID } from "node:crypto"
|
|
||||||
import { setTimeout } from "node:timers/promises"
|
|
||||||
import type { ReactNode } from "react"
|
import type { ReactNode } from "react"
|
||||||
import { expect } from "vitest"
|
import { expect } from "vitest"
|
||||||
|
import { logPretty } from "../helpers/log-pretty"
|
||||||
|
import { omit } from "../helpers/omit"
|
||||||
|
import { pruneNullishValues } from "../helpers/prune-nullish-values"
|
||||||
|
import { raise } from "../helpers/raise"
|
||||||
import type {
|
import type {
|
||||||
ChannelInfo,
|
ChannelInfo,
|
||||||
GuildInfo,
|
GuildInfo,
|
||||||
@@ -26,10 +26,17 @@ import type {
|
|||||||
CommandInteraction,
|
CommandInteraction,
|
||||||
SelectInteraction,
|
SelectInteraction,
|
||||||
} from "../library/internal/interaction"
|
} from "../library/internal/interaction"
|
||||||
import type { Message, MessageOptions } from "../library/internal/message"
|
import type {
|
||||||
|
Message,
|
||||||
|
MessageButtonOptions,
|
||||||
|
MessageOptions,
|
||||||
|
MessageSelectOptions,
|
||||||
|
} from "../library/internal/message"
|
||||||
import { ChannelMessageRenderer } from "../library/internal/renderers/channel-message-renderer"
|
import { ChannelMessageRenderer } from "../library/internal/renderers/channel-message-renderer"
|
||||||
import { InteractionReplyRenderer } from "../library/internal/renderers/interaction-reply-renderer"
|
import { InteractionReplyRenderer } from "../library/internal/renderers/interaction-reply-renderer"
|
||||||
|
|
||||||
|
const nextTickPromise = promisify(nextTick)
|
||||||
|
|
||||||
export type MessageSample = ReturnType<ReacordTester["sampleMessages"]>[0]
|
export type MessageSample = ReturnType<ReacordTester["sampleMessages"]>[0]
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -66,10 +73,9 @@ export class ReacordTester extends Reacord {
|
|||||||
return this.reply(initialContent)
|
return this.reply(initialContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
assertMessages(expected: MessageSample[]) {
|
async assertMessages(expected: MessageSample[]) {
|
||||||
return waitFor(() => {
|
await nextTickPromise()
|
||||||
expect(this.sampleMessages()).toEqual(expected)
|
expect(this.sampleMessages()).toEqual(expected)
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async assertRender(content: ReactNode, expected: MessageSample[]) {
|
async assertRender(content: ReactNode, expected: MessageSample[]) {
|
||||||
@@ -102,59 +108,58 @@ export class ReacordTester extends Reacord {
|
|||||||
}
|
}
|
||||||
|
|
||||||
findButtonByLabel(label: string) {
|
findButtonByLabel(label: string) {
|
||||||
return {
|
for (const message of this.messageContainer) {
|
||||||
click: () => {
|
for (const component of message.options.actionRows.flat()) {
|
||||||
return waitFor(() => {
|
|
||||||
for (const [component, message] of this.eachComponent()) {
|
|
||||||
if (component.type === "button" && component.label === label) {
|
if (component.type === "button" && component.label === label) {
|
||||||
this.handleComponentInteraction(
|
return this.createButtonActions(component, message)
|
||||||
new TestButtonInteraction(component.customId, message, this),
|
}
|
||||||
)
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
raise(`Couldn't find button with label "${label}"`)
|
raise(`Couldn't find button with label "${label}"`)
|
||||||
})
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
findSelectByPlaceholder(placeholder: string) {
|
findSelectByPlaceholder(placeholder: string) {
|
||||||
return {
|
for (const message of this.messageContainer) {
|
||||||
select: (...values: string[]) => {
|
for (const component of message.options.actionRows.flat()) {
|
||||||
return waitFor(() => {
|
|
||||||
for (const [component, message] of this.eachComponent()) {
|
|
||||||
if (
|
if (
|
||||||
component.type === "select" &&
|
component.type === "select" &&
|
||||||
component.placeholder === placeholder
|
component.placeholder === placeholder
|
||||||
) {
|
) {
|
||||||
this.handleComponentInteraction(
|
return this.createSelectActions(component, message)
|
||||||
new TestSelectInteraction(
|
}
|
||||||
component.customId,
|
|
||||||
message,
|
|
||||||
values,
|
|
||||||
this,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
raise(`Couldn't find select with placeholder "${placeholder}"`)
|
raise(`Couldn't find select with placeholder "${placeholder}"`)
|
||||||
})
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
createMessage(options: MessageOptions) {
|
createMessage(options: MessageOptions) {
|
||||||
return new TestMessage(options, this.messageContainer)
|
return new TestMessage(options, this.messageContainer)
|
||||||
}
|
}
|
||||||
|
|
||||||
private *eachComponent() {
|
private createButtonActions(
|
||||||
for (const message of this.messageContainer) {
|
button: MessageButtonOptions,
|
||||||
for (const component of message.options.actionRows.flat()) {
|
message: TestMessage,
|
||||||
yield [component, message] as const
|
) {
|
||||||
|
return {
|
||||||
|
click: () => {
|
||||||
|
this.handleComponentInteraction(
|
||||||
|
new TestButtonInteraction(button.customId, message, this),
|
||||||
|
)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private createSelectActions(
|
||||||
|
component: MessageSelectOptions,
|
||||||
|
message: TestMessage,
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
select: (...values: string[]) => {
|
||||||
|
this.handleComponentInteraction(
|
||||||
|
new TestSelectInteraction(component.customId, message, values, this),
|
||||||
|
)
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,6 +175,16 @@ class TestMessage implements Message {
|
|||||||
this.options = options
|
this.options = options
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async disableComponents(): Promise<void> {
|
||||||
|
for (const row of this.options.actionRows) {
|
||||||
|
for (const action of row) {
|
||||||
|
if (action.type === "button") {
|
||||||
|
action.disabled = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async delete(): Promise<void> {
|
async delete(): Promise<void> {
|
||||||
this.container.remove(this)
|
this.container.remove(this)
|
||||||
}
|
}
|
||||||
@@ -182,19 +197,21 @@ class TestCommandInteraction implements CommandInteraction {
|
|||||||
|
|
||||||
constructor(private messageContainer: Container<TestMessage>) {}
|
constructor(private messageContainer: Container<TestMessage>) {}
|
||||||
|
|
||||||
async reply(messageOptions: MessageOptions): Promise<Message> {
|
reply(messageOptions: MessageOptions): Promise<Message> {
|
||||||
await setTimeout()
|
return Promise.resolve(
|
||||||
return new TestMessage(messageOptions, this.messageContainer)
|
new TestMessage(messageOptions, this.messageContainer),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
async followUp(messageOptions: MessageOptions): Promise<Message> {
|
followUp(messageOptions: MessageOptions): Promise<Message> {
|
||||||
await setTimeout()
|
return Promise.resolve(
|
||||||
return new TestMessage(messageOptions, this.messageContainer)
|
new TestMessage(messageOptions, this.messageContainer),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class TestInteraction {
|
class TestInteraction {
|
||||||
readonly id = randomUUID()
|
readonly id = nanoid()
|
||||||
readonly channelId = "test-channel-id"
|
readonly channelId = "test-channel-id"
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
import * as React from "react"
|
|
||||||
import { test } from "vitest"
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
Embed,
|
|
||||||
EmbedAuthor,
|
|
||||||
EmbedField,
|
|
||||||
EmbedFooter,
|
|
||||||
EmbedTitle,
|
|
||||||
Link,
|
|
||||||
Option,
|
|
||||||
Select,
|
|
||||||
} from "../library/main"
|
|
||||||
import { ReacordTester } from "./test-adapter"
|
|
||||||
|
|
||||||
test("text children in other components", async () => {
|
|
||||||
const tester = new ReacordTester()
|
|
||||||
|
|
||||||
const SomeText = () => <>some text</>
|
|
||||||
|
|
||||||
await tester.assertRender(
|
|
||||||
<>
|
|
||||||
<Embed>
|
|
||||||
<EmbedTitle>
|
|
||||||
<SomeText />
|
|
||||||
</EmbedTitle>
|
|
||||||
<EmbedAuthor>
|
|
||||||
<SomeText />
|
|
||||||
</EmbedAuthor>
|
|
||||||
<EmbedField name={<SomeText />}>
|
|
||||||
<SomeText /> <Button label="ignore this" onClick={() => {}} />
|
|
||||||
nailed it
|
|
||||||
</EmbedField>
|
|
||||||
<EmbedFooter>
|
|
||||||
<SomeText />
|
|
||||||
</EmbedFooter>
|
|
||||||
</Embed>
|
|
||||||
<Button label={<SomeText />} onClick={() => {}} />
|
|
||||||
<Link url="https://discord.com" label={<SomeText />} />
|
|
||||||
<Select>
|
|
||||||
<Option value="1">
|
|
||||||
<SomeText />
|
|
||||||
</Option>
|
|
||||||
<Option value="2" label={<SomeText />} description={<SomeText />} />
|
|
||||||
</Select>
|
|
||||||
</>,
|
|
||||||
[
|
|
||||||
{
|
|
||||||
content: "",
|
|
||||||
embeds: [
|
|
||||||
{
|
|
||||||
title: "some text",
|
|
||||||
author: {
|
|
||||||
name: "some text",
|
|
||||||
},
|
|
||||||
fields: [{ name: "some text", value: "some text nailed it" }],
|
|
||||||
footer: {
|
|
||||||
text: "some text",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
actionRows: [
|
|
||||||
[
|
|
||||||
{
|
|
||||||
type: "button",
|
|
||||||
label: "some text",
|
|
||||||
style: "secondary",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: "link",
|
|
||||||
url: "https://discord.com",
|
|
||||||
label: "some text",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
[
|
|
||||||
{
|
|
||||||
type: "select",
|
|
||||||
values: [],
|
|
||||||
options: [
|
|
||||||
{ value: "1", label: "some text" },
|
|
||||||
{ value: "2", label: "some text", description: "some text" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
)
|
|
||||||
})
|
|
||||||
@@ -55,7 +55,7 @@ describe("useInstance", () => {
|
|||||||
await tester.assertMessages([messageOutput("parent")])
|
await tester.assertMessages([messageOutput("parent")])
|
||||||
expect(instanceFromHook).toBe(instance)
|
expect(instanceFromHook).toBe(instance)
|
||||||
|
|
||||||
await tester.findButtonByLabel("create parent").click()
|
tester.findButtonByLabel("create parent").click()
|
||||||
await tester.assertMessages([
|
await tester.assertMessages([
|
||||||
messageOutput("parent"),
|
messageOutput("parent"),
|
||||||
messageOutput("child"),
|
messageOutput("child"),
|
||||||
@@ -63,10 +63,10 @@ describe("useInstance", () => {
|
|||||||
|
|
||||||
// this test ensures that the only the child instance is destroyed,
|
// this test ensures that the only the child instance is destroyed,
|
||||||
// and not the parent instance
|
// and not the parent instance
|
||||||
await tester.findButtonByLabel("destroy child").click()
|
tester.findButtonByLabel("destroy child").click()
|
||||||
await tester.assertMessages([messageOutput("parent")])
|
await tester.assertMessages([messageOutput("parent")])
|
||||||
|
|
||||||
await tester.findButtonByLabel("destroy parent").click()
|
tester.findButtonByLabel("destroy parent").click()
|
||||||
await tester.assertMessages([])
|
await tester.assertMessages([])
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
{
|
{
|
||||||
"extends": "../../tsconfig.base.json",
|
"extends": "../../tsconfig.base.json"
|
||||||
"include": ["**/*.ts", "**/*.tsx", "**/*.cjs", "**/*.mjs"]
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/// <reference types="vitest" />
|
/// <reference types="vitest" />
|
||||||
import { defineConfig } from "vitest/config"
|
import { defineConfig } from "vite"
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
build: {
|
build: {
|
||||||
|
|||||||
8
packages/website/.gitignore
vendored
@@ -1,11 +1,13 @@
|
|||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
/.cache
|
/.cache
|
||||||
/build
|
/build
|
||||||
/public/build
|
/public/build
|
||||||
.env
|
.env
|
||||||
/public/api
|
|
||||||
cypress/videos
|
cypress/videos
|
||||||
cypress/screenshots
|
cypress/screenshots
|
||||||
*.out.css
|
*.out.css
|
||||||
/api
|
|
||||||
.astro
|
# typedoc output
|
||||||
|
/public/api
|
||||||
|
/app/assets/api.json
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
# website
|
|
||||||
|
|
||||||
## 0.4.3
|
|
||||||
|
|
||||||
### Patch Changes
|
|
||||||
|
|
||||||
- Updated dependencies [9813a01]
|
|
||||||
- reacord@0.5.2
|
|
||||||
|
|
||||||
## 0.4.2
|
|
||||||
|
|
||||||
### Patch Changes
|
|
||||||
|
|
||||||
- Updated dependencies [72f4a4a]
|
|
||||||
- Updated dependencies [7536bde]
|
|
||||||
- Updated dependencies [e335165]
|
|
||||||
- reacord@0.5.1
|
|
||||||
|
|
||||||
## 0.4.1
|
|
||||||
|
|
||||||
### Patch Changes
|
|
||||||
|
|
||||||
- Updated dependencies [aa65da5]
|
|
||||||
- reacord@0.5.0
|
|
||||||
|
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 146 B After Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 658 B After Width: | Height: | Size: 658 B |
4
packages/website/app/entry.client.tsx
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
import { hydrate } from "react-dom";
|
||||||
|
import { RemixBrowser } from "remix";
|
||||||
|
|
||||||
|
hydrate(<RemixBrowser />, document);
|
||||||
21
packages/website/app/entry.server.tsx
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { renderToString } from "react-dom/server";
|
||||||
|
import { RemixServer } from "remix";
|
||||||
|
import type { EntryContext } from "remix";
|
||||||
|
|
||||||
|
export default function handleRequest(
|
||||||
|
request: Request,
|
||||||
|
responseStatusCode: number,
|
||||||
|
responseHeaders: Headers,
|
||||||
|
remixContext: EntryContext
|
||||||
|
) {
|
||||||
|
const markup = renderToString(
|
||||||
|
<RemixServer context={remixContext} url={request.url} />
|
||||||
|
);
|
||||||
|
|
||||||
|
responseHeaders.set("Content-Type", "text/html");
|
||||||
|
|
||||||
|
return new Response("<!DOCTYPE html>" + markup, {
|
||||||
|
status: responseStatusCode,
|
||||||
|
headers: responseHeaders
|
||||||
|
});
|
||||||
|
}
|
||||||
8
packages/website/app/modules/api/api-data.server.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import type { JSONOutput } from "typedoc"
|
||||||
|
import apiData from "~/assets/api.json"
|
||||||
|
|
||||||
|
export type ApiData = JSONOutput.ContainerReflection
|
||||||
|
|
||||||
|
export function getApiData(): ApiData {
|
||||||
|
return apiData as ApiData
|
||||||
|
}
|
||||||
27
packages/website/app/modules/app/app-footer.tsx
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import { HeartIcon } from "@heroicons/react/solid"
|
||||||
|
import clsx from "clsx"
|
||||||
|
import { ExternalLink } from "~/modules/dom/external-link"
|
||||||
|
import { linkClass, maxWidthContainer } from "~/modules/ui/components"
|
||||||
|
|
||||||
|
export function AppFooter() {
|
||||||
|
return (
|
||||||
|
<footer className={clsx(maxWidthContainer, "text-xs opacity-75")}>
|
||||||
|
<address className="not-italic">
|
||||||
|
© {new Date().getFullYear()} itsMapleLeaf
|
||||||
|
</address>
|
||||||
|
<p>
|
||||||
|
Coded with <HeartIcon className="inline w-4 align-sub" /> using{" "}
|
||||||
|
<ExternalLink className={linkClass()} href="https://remix.run">
|
||||||
|
Remix
|
||||||
|
</ExternalLink>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Uses{" "}
|
||||||
|
<ExternalLink className={linkClass()} href="https://umami.is/">
|
||||||
|
umami
|
||||||
|
</ExternalLink>{" "}
|
||||||
|
for simple, non-identifying analytics.
|
||||||
|
</p>
|
||||||
|
</footer>
|
||||||
|
)
|
||||||
|
}
|
||||||
20
packages/website/app/modules/app/app-logo.tsx
Normal file
12
packages/website/app/modules/dom/external-link.tsx
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import type { ComponentPropsWithoutRef } from "react"
|
||||||
|
|
||||||
|
export function ExternalLink({
|
||||||
|
children,
|
||||||
|
...props
|
||||||
|
}: ComponentPropsWithoutRef<"a">) {
|
||||||
|
return (
|
||||||
|
<a target="_blank" rel="noopener noreferrer" {...props}>
|
||||||
|
{children}
|
||||||
|
</a>
|
||||||
|
)
|
||||||
|
}
|
||||||
20
packages/website/app/modules/dom/portal.tsx
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
import type { ReactNode } from "react"
|
||||||
|
import { useEffect, useRef } from "react"
|
||||||
|
import { createPortal } from "react-dom"
|
||||||
|
|
||||||
|
export function Portal({ children }: { children: ReactNode }) {
|
||||||
|
const containerRef = useRef<Element>()
|
||||||
|
|
||||||
|
if (!containerRef.current && typeof document !== "undefined") {
|
||||||
|
containerRef.current = document.createElement("react-portal")
|
||||||
|
document.body.append(containerRef.current)
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => () => containerRef.current!.remove(), [])
|
||||||
|
|
||||||
|
return containerRef.current ? (
|
||||||
|
createPortal(children, containerRef.current)
|
||||||
|
) : (
|
||||||
|
<>{children}</>
|
||||||
|
)
|
||||||
|
}
|
||||||
13
packages/website/app/modules/helpers/promise-all-object.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
export async function promiseAllObject<Input extends object>(
|
||||||
|
input: Input,
|
||||||
|
): Promise<{
|
||||||
|
[K in keyof Input]: Awaited<Input[K]>
|
||||||
|
}> {
|
||||||
|
const result: any = {}
|
||||||
|
await Promise.all(
|
||||||
|
Object.entries(input).map(async ([key, promise]) => {
|
||||||
|
result[key] = await promise
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
return result
|
||||||
|
}
|
||||||
3
packages/website/app/modules/helpers/raise.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export function raise(error: unknown): never {
|
||||||
|
throw error instanceof Error ? error : new Error(String(error))
|
||||||
|
}
|
||||||
@@ -186,7 +186,7 @@ export function LandingAnimation() {
|
|||||||
<img
|
<img
|
||||||
src={cursorUrl}
|
src={cursorUrl}
|
||||||
alt=""
|
alt=""
|
||||||
className="transition-all duration-500 absolute scale-75 bg-transparent"
|
className="transition-all duration-500 absolute scale-75"
|
||||||
style={{ left: state.cursorLeft, bottom: state.cursorBottom }}
|
style={{ left: state.cursorLeft, bottom: state.cursorBottom }}
|
||||||
ref={cursorRef}
|
ref={cursorRef}
|
||||||
/>
|
/>
|
||||||
26
packages/website/app/modules/landing/landing-code.mdx
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{/* prettier-ignore */}
|
||||||
|
```tsx
|
||||||
|
import * as React from "react"
|
||||||
|
import { Button, useInstance } from "reacord"
|
||||||
|
|
||||||
|
function Counter() {
|
||||||
|
const [count, setCount] = React.useState(0)
|
||||||
|
const instance = useInstance()
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
this button was clicked {count} times
|
||||||
|
<Button
|
||||||
|
label="+1"
|
||||||
|
style="success"
|
||||||
|
onClick={() => setCount(count + 1)}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
label="delete"
|
||||||
|
emoji="🗑"
|
||||||
|
style="danger"
|
||||||
|
onClick={() => instance.destroy()}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
```
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
export async function renderMarkdown(
|
||||||
|
markdown: string,
|
||||||
|
): Promise<{ __html: string }> {
|
||||||
|
const rehypePrism = import("rehype-prism-plus").then(
|
||||||
|
(module) => module.default,
|
||||||
|
)
|
||||||
|
const rehypeStringify = import("rehype-stringify").then(
|
||||||
|
(module) => module.default,
|
||||||
|
)
|
||||||
|
const remarkParse = import("remark-parse").then((module) => module.default)
|
||||||
|
const remarkRehype = import("remark-rehype").then((module) => module.default)
|
||||||
|
const { unified } = await import("unified")
|
||||||
|
|
||||||
|
const processor = unified()
|
||||||
|
.use(await remarkParse)
|
||||||
|
.use(await remarkRehype)
|
||||||
|
.use(await rehypeStringify)
|
||||||
|
.use(await rehypePrism)
|
||||||
|
|
||||||
|
const result = await processor.process(markdown)
|
||||||
|
|
||||||
|
return { __html: result.toString() }
|
||||||
|
}
|
||||||
14
packages/website/app/modules/navigation/active-link.tsx
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import type { ReactNode } from "react"
|
||||||
|
import type { PathPattern } from "react-router"
|
||||||
|
import { useMatch } from "react-router"
|
||||||
|
|
||||||
|
export function ActiveLink({
|
||||||
|
to,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
to: string | PathPattern
|
||||||
|
children: (props: { active: boolean }) => ReactNode
|
||||||
|
}) {
|
||||||
|
const match = useMatch(to)
|
||||||
|
return <>{children({ active: match != undefined })}</>
|
||||||
|
}
|
||||||
32
packages/website/app/modules/navigation/app-link.tsx
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
import type { ComponentPropsWithoutRef } from "react"
|
||||||
|
import { Link } from "remix"
|
||||||
|
import { ExternalLink } from "~/modules/dom/external-link"
|
||||||
|
|
||||||
|
export type AppLinkProps = ComponentPropsWithoutRef<"a"> & {
|
||||||
|
type: "internal" | "external" | "router"
|
||||||
|
to: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AppLink({ type, to, children, ...props }: AppLinkProps) {
|
||||||
|
if (type === "internal") {
|
||||||
|
return (
|
||||||
|
<a href={to} {...props}>
|
||||||
|
{children}
|
||||||
|
</a>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type === "external") {
|
||||||
|
return (
|
||||||
|
<ExternalLink href={to} {...props}>
|
||||||
|
{children}
|
||||||
|
</ExternalLink>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Link to={to} {...props}>
|
||||||
|
{children}
|
||||||
|
</Link>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { createContext, useContext } from "react"
|
||||||
|
import type { GuideLink } from "~/modules/navigation/load-guide-links.server"
|
||||||
|
|
||||||
|
const Context = createContext<GuideLink[]>([])
|
||||||
|
|
||||||
|
export const GuideLinksProvider = Context.Provider
|
||||||
|
|
||||||
|
export function useGuideLinksContext() {
|
||||||
|
return useContext(Context)
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import glob from "fast-glob"
|
||||||
|
import grayMatter from "gray-matter"
|
||||||
|
import { readFile } from "node:fs/promises"
|
||||||
|
import { join, parse } from "node:path"
|
||||||
|
import type { AppLinkProps } from "~/modules/navigation/app-link"
|
||||||
|
|
||||||
|
const guidesFolder = "app/routes/guides"
|
||||||
|
|
||||||
|
export type GuideLink = {
|
||||||
|
title: string
|
||||||
|
order: number
|
||||||
|
link: AppLinkProps
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function loadGuideLinks(): Promise<GuideLink[]> {
|
||||||
|
const guideFiles = await glob(`**/*.md`, { cwd: guidesFolder })
|
||||||
|
|
||||||
|
const links: GuideLink[] = await Promise.all(
|
||||||
|
guideFiles.map(async (file) => {
|
||||||
|
const { data } = grayMatter(await readFile(join(guidesFolder, file)))
|
||||||
|
|
||||||
|
let order = data.order
|
||||||
|
if (!Number.isFinite(order)) {
|
||||||
|
order = Number.POSITIVE_INFINITY
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
title: data.meta?.title,
|
||||||
|
order,
|
||||||
|
link: {
|
||||||
|
type: "router",
|
||||||
|
to: `/guides/${parse(file).name}`,
|
||||||
|
children: data.meta?.title,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
|
||||||
|
return links.sort((a, b) => a.order - b.order)
|
||||||
|
}
|
||||||
37
packages/website/app/modules/navigation/main-links.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import {
|
||||||
|
CodeIcon,
|
||||||
|
DocumentTextIcon,
|
||||||
|
ExternalLinkIcon,
|
||||||
|
} from "@heroicons/react/solid"
|
||||||
|
import type { AppLinkProps } from "~/modules/navigation/app-link"
|
||||||
|
import { inlineIconClass } from "../ui/components"
|
||||||
|
|
||||||
|
export const mainLinks: AppLinkProps[] = [
|
||||||
|
{
|
||||||
|
type: "internal",
|
||||||
|
to: "/guides/getting-started",
|
||||||
|
children: (
|
||||||
|
<>
|
||||||
|
<DocumentTextIcon className={inlineIconClass} /> Guides
|
||||||
|
</>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "internal",
|
||||||
|
to: "/api/",
|
||||||
|
children: (
|
||||||
|
<>
|
||||||
|
<CodeIcon className={inlineIconClass} /> API Reference
|
||||||
|
</>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "external",
|
||||||
|
to: "https://github.com/itsMapleLeaf/reacord",
|
||||||
|
children: (
|
||||||
|
<>
|
||||||
|
<ExternalLinkIcon className={inlineIconClass} /> GitHub
|
||||||
|
</>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
]
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
import { Menu, Transition } from "@headlessui/react"
|
||||||
|
import { MenuAlt4Icon } from "@heroicons/react/outline"
|
||||||
|
import clsx from "clsx"
|
||||||
|
import { ActiveLink } from "~/modules/navigation/active-link"
|
||||||
|
import { useGuideLinksContext } from "~/modules/navigation/guide-links-context"
|
||||||
|
import { Popper } from "~/modules/ui/popper"
|
||||||
|
import { AppLink } from "./app-link"
|
||||||
|
import { mainLinks } from "./main-links"
|
||||||
|
|
||||||
|
export function MainNavigationMenu() {
|
||||||
|
const guideLinks = useGuideLinksContext()
|
||||||
|
return (
|
||||||
|
<Menu>
|
||||||
|
<Popper
|
||||||
|
renderReference={(reference) => (
|
||||||
|
<Menu.Button {...reference}>
|
||||||
|
<MenuAlt4Icon className="w-6" />
|
||||||
|
<span className="sr-only">Menu</span>
|
||||||
|
</Menu.Button>
|
||||||
|
)}
|
||||||
|
renderPopover={() => (
|
||||||
|
<Transition
|
||||||
|
enter="transition"
|
||||||
|
enterFrom="translate-y-4 opacity-0"
|
||||||
|
enterTo="translate-y-0 opacity-100"
|
||||||
|
leave="transition"
|
||||||
|
leaveFrom="translate-y-0 opacity-100"
|
||||||
|
leaveTo="translate-y-4 opacity-0"
|
||||||
|
>
|
||||||
|
<Menu.Items className="w-48 max-h-[calc(100vh-5rem)] bg-slate-800 shadow rounded-lg overflow-hidden overflow-y-auto focus:outline-none">
|
||||||
|
{mainLinks.map((link) => (
|
||||||
|
<Menu.Item key={link.to}>
|
||||||
|
{({ active }) => (
|
||||||
|
<AppLink {...link} className={menuItemClass({ active })} />
|
||||||
|
)}
|
||||||
|
</Menu.Item>
|
||||||
|
))}
|
||||||
|
<Menu.Item disabled>
|
||||||
|
<hr className="border-0 h-[2px] bg-black/50" />
|
||||||
|
</Menu.Item>
|
||||||
|
{guideLinks.map(({ link }) => (
|
||||||
|
<Menu.Item key={link.to}>
|
||||||
|
{(menuItem) => (
|
||||||
|
<ActiveLink to={link.to}>
|
||||||
|
{(activeLink) => (
|
||||||
|
<AppLink
|
||||||
|
{...link}
|
||||||
|
className={menuItemClass({
|
||||||
|
active: activeLink.active || menuItem.active,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</ActiveLink>
|
||||||
|
)}
|
||||||
|
</Menu.Item>
|
||||||
|
))}
|
||||||
|
</Menu.Items>
|
||||||
|
</Transition>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</Menu>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const menuItemClass = ({ active = false }) =>
|
||||||
|
clsx(
|
||||||
|
clsx`px-3 py-2 transition text-left font-medium block opacity-50`,
|
||||||
|
active && clsx`opacity-100 bg-black/75 text-emerald-400`,
|
||||||
|
)
|
||||||
23
packages/website/app/modules/navigation/main-navigation.tsx
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { AppLogo } from "~/modules/app/app-logo"
|
||||||
|
import { linkClass } from "../ui/components"
|
||||||
|
import { AppLink } from "./app-link"
|
||||||
|
import { mainLinks } from "./main-links"
|
||||||
|
import { MainNavigationMenu } from "./main-navigation-menu"
|
||||||
|
|
||||||
|
export function MainNavigation() {
|
||||||
|
return (
|
||||||
|
<nav className="flex justify-between items-center h-16">
|
||||||
|
<a href="/">
|
||||||
|
<AppLogo className="w-32" />
|
||||||
|
</a>
|
||||||
|
<div className="hidden md:flex gap-4">
|
||||||
|
{mainLinks.map((link) => (
|
||||||
|
<AppLink {...link} key={link.to} className={linkClass()} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="md:hidden">
|
||||||
|
<MainNavigationMenu />
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
)
|
||||||
|
}
|
||||||
44
packages/website/app/modules/ui/components.ts
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import clsx from "clsx"
|
||||||
|
|
||||||
|
export const maxWidthContainer = clsx`mx-auto w-full max-w-screen-lg px-4`
|
||||||
|
|
||||||
|
export const inlineIconClass = clsx`inline w-5 align-sub`
|
||||||
|
|
||||||
|
export const linkClass = ({ active = false } = {}) =>
|
||||||
|
clsx(
|
||||||
|
clsx`font-medium inline-block relative`,
|
||||||
|
clsx`opacity-60 hover:opacity-100 transition-opacity`,
|
||||||
|
clsx`after:absolute after:block after:w-full after:h-px after:bg-white/50 after:translate-y-[3px] after:opacity-0 after:transition`,
|
||||||
|
clsx`hover:after:translate-y-[-1px] hover:after:opacity-100`,
|
||||||
|
active
|
||||||
|
? clsx`text-emerald-500 after:bg-emerald-500`
|
||||||
|
: clsx`after:bg-white/50`,
|
||||||
|
)
|
||||||
|
|
||||||
|
export const docsProseClass = clsx`
|
||||||
|
prose prose-invert
|
||||||
|
prose-h1:font-light prose-h1:mb-4 prose-h1:text-3xl lg:prose-h1:text-4xl
|
||||||
|
prose-h2:font-light
|
||||||
|
prose-h3:font-light
|
||||||
|
prose-p:my-3
|
||||||
|
prose-a:font-medium prose-a:text-emerald-400 hover:prose-a:no-underline
|
||||||
|
prose-strong:font-medium prose-strong:text-emerald-400
|
||||||
|
prose-pre:font-monospace prose-pre:overflow-x-auto
|
||||||
|
prose-code:before:hidden prose-code:after:hidden prose-code:text-slate-400
|
||||||
|
prose-li:mb-5
|
||||||
|
max-w-none
|
||||||
|
`
|
||||||
|
|
||||||
|
export const buttonClass = ({
|
||||||
|
variant,
|
||||||
|
}: {
|
||||||
|
variant: "solid" | "semiblack"
|
||||||
|
}) => {
|
||||||
|
return clsx(
|
||||||
|
clsx`inline-block mt-4 px-4 py-2.5 text-xl transition rounded-lg`,
|
||||||
|
clsx`hover:translate-y-[-2px] hover:shadow`,
|
||||||
|
clsx`active:translate-y-[0px] active:transition-none`, // using translate-y-[0px] instead of just -0 so it takes priority
|
||||||
|
variant === "solid" && clsx`bg-emerald-700 hover:bg-emerald-800`,
|
||||||
|
variant === "semiblack" && clsx`bg-black/25 hover:bg-black/40`,
|
||||||
|
)
|
||||||
|
}
|
||||||