diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dbda93fe..33632a3f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,12 +13,12 @@ name: "CodeQL" on: push: - branches: [ main ] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [main] schedule: - - cron: '40 21 * * 6' + - cron: "40 21 * * 6" jobs: analyze: @@ -32,40 +32,40 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript' ] + language: ["javascript"] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8d4d4e1a..1cfa2cdc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,22 +8,14 @@ jobs: docs: runs-on: ubuntu-latest steps: - - name: Checkout repository and submodules + - name: Checkout repository uses: actions/checkout@v3 + - name: Setup Deno 2.x + uses: denoland/setup-deno@v2 with: - submodules: recursive - - uses: pnpm/action-setup@v4.0.0 - - name: Use Node.js LTS - uses: actions/setup-node@v3 - with: - node-version: 22 - cache: "pnpm" - - name: Install packages - run: pnpm install - + deno-version: 2.x - name: Build - run: pnpm run docs - + run: deno task docs - name: Deploy uses: JamesIves/github-pages-deploy-action@4.1.5 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2fa1595b..5253ade5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,22 +10,15 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout repository and submodules + - name: Checkout repository uses: actions/checkout@v3 + - name: Setup Deno 2.x + uses: denoland/setup-deno@v2 with: - submodules: recursive - - uses: pnpm/action-setup@v4.0.0 - - name: Use Node.js LTS - uses: actions/setup-node@v3 - with: - node-version: 22 - cache: "pnpm" - - name: Install packages - run: pnpm install - + deno-version: 2.x - name: Typecheck - run: pnpm typecheck + run: deno check src/ - name: Code Formatting - run: pnpm fmt:check + run: deno fmt --check - name: Lint - run: pnpm lint + run: deno lint diff --git a/.github/workflows/npmPublish.ts b/.github/workflows/npmPublish.ts new file mode 100644 index 00000000..b02b0d41 --- /dev/null +++ b/.github/workflows/npmPublish.ts @@ -0,0 +1,64 @@ +import { build, emptyDir } from "jsr:@deno/dnt"; +import pkg from "../../deno.json" with { type: "json" }; +import tsc from "../../tsconfig.json" with { type: "json" }; + +await emptyDir("npm"); + +await build({ + entryPoints: ["src/index.ts"], + esModule: true, + outDir: "npm", + scriptModule: false, + shims: {}, + skipNpmInstall: true, + skipSourceOutput: true, + test: false, + package: { + name: "revolt.js", + version: pkg.version, + type: "module", + module: "lib/index.js", + types: "lib/index.d.ts", + repository: { + type: "git", + url: "git+https://github.com/revoltchat/revolt.js.git", + }, + author: "Paul Makles ", + license: "MIT", + description: "Library for interacting with the Revolt API.", + dependencies: Object.fromEntries( + Object.values(pkg.imports).map((dep) => { + dep = dep.replace("npm:", ""); + + const lastAtIndex = dep.lastIndexOf("@"); + return [dep.slice(0, lastAtIndex), dep.slice(lastAtIndex + 1)]; + }), + ), + engines: { + node: ">=22.0.0", + }, + }, + compilerOptions: { + ...tsc.compilerOptions, + lib: ["ES2022", "DOM"], + target: "ES2022", + }, + postBuild() { + Deno.renameSync("npm/esm", "npm/lib"); + Deno.removeSync("npm/.npmignore"); + Deno.copyFileSync("README.md", "npm/README.md"); + Deno.copyFileSync("LICENSE", "npm/LICENSE"); + + const messageEmbedCode = Deno.readTextFileSync( + "npm/lib/classes/MessageEmbed.js", + ).replace( + 'import * as dntShim from "../_dnt.shims.js";\n', + "", + ).replace("dntShim.dntGlobalThis", "globalThis"); + + Deno.writeTextFileSync("npm/lib/classes/MessageEmbed.js", messageEmbedCode); + + Deno.removeSync("npm/lib/_dnt.shims.js"); + Deno.removeSync("npm/lib/_dnt.shims.d.ts"); + }, +}); diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 00000000..43e93a46 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,31 @@ +# publish to jsr and npm on release +name: Publish + +on: + release: + types: [published] + +jobs: + publish: + runs-on: ubuntu-latest + permissions: + contents: read + id-token: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Setup Deno 2.x + uses: denoland/setup-deno@v2 + with: + deno-version: 2.x + - name: Setup Node 22.x + uses: actions/setup-node@v2 + with: + node-version: 22.x + - name: Publish to jsr + run: deno publish + - name: Build for npm + run: deno task npm + - name: Publish to npm + run: npm publish diff --git a/.gitignore b/.gitignore index 0f5ad0f5..41f0a0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,4 @@ -# build -node_modules -.env -docs -todo -/lib - -# yarn -.pnp.* -.yarn/* -!.yarn/patches -!.yarn/plugins -!.yarn/releases -!.yarn/sdks -!.yarn/versions +/node_modules +/.env +/docs +/npm diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index e9cf7027..00000000 --- a/.prettierrc +++ /dev/null @@ -1,13 +0,0 @@ -{ - "tabWidth": 2, - "useTabs": false, - "plugins": ["@trivago/prettier-plugin-sort-imports"], - "importOrder": [ - "^solid", - "", - "^\\.\\.", - "^[./]" - ], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true -} diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d7df89c9..74baffcc 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"] + "recommendations": ["denoland.vscode-deno"] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 9bf4d12b..3e5dc4c1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,7 @@ { - "editor.defaultFormatter": "esbenp.prettier-vscode", - "editor.formatOnSave": true + "editor.defaultFormatter": "denoland.vscode-deno", + "editor.formatOnSave": true, + "[github-actions-workflow]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } } diff --git a/README.md b/README.md index e4629e44..70edb204 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # revolt.js -![revolt.js](https://img.shields.io/npm/v/revolt.js) ![revolt-api](https://img.shields.io/npm/v/revolt-api?label=Revolt%20API) +![revolt.js](https://img.shields.io/npm/v/revolt.js) +![revolt-api](https://img.shields.io/npm/v/revolt-api?label=Revolt%20API) -**revolt.js** is a JavaScript library for interacting with the entire Revolt API. +**revolt.js** is a JavaScript library for interacting with the entire Revolt +API. ## Example Usage @@ -11,8 +13,9 @@ import { Client } from "revolt.js"; let client = new Client(); -client.on("ready", async () => - console.info(`Logged in as ${client.user.username}!`), +client.on( + "ready", + async () => console.info(`Logged in as ${client.user.username}!`), ); client.on("messageCreate", async (message) => { @@ -23,32 +26,3 @@ client.on("messageCreate", async (message) => { client.loginBot(".."); ``` - -## Reactivity with Signals & Solid.js Primitives - -All objects have reactivity built-in and can be dropped straight into any Solid.js project. - -```tsx -const client = new Client(); -// initialise the client - -function MyApp() { - return ( -

Your username is: {client.user?.username ?? "[logging in...]"}

- ); -} -``` - -## Revolt API Types - -> [!WARNING] -> It is advised you do not use this unless necessary. If you find somewhere that isn't covered by the library, please open an issue as this library aims to transform all objects. - -All `revolt-api` types are re-exported from this library under `API`. - -```typescript -import { API } from "revolt.js"; - -// API.Channel; -// API.[..]; -``` diff --git a/deno.json b/deno.json new file mode 100644 index 00000000..d7296531 --- /dev/null +++ b/deno.json @@ -0,0 +1,28 @@ +{ + "name": "@revolt/revoltjs", + "version": "7.1.0-rc.2", + "exports": "./src/index.ts", + "imports": { + "@vladfrangu/async_event_emitter": "npm:@vladfrangu/async_event_emitter@^2.4.6", + "revolt-api": "npm:revolt-api@0.8.3", + "ulid": "npm:ulid@^2.3.0" + }, + "tasks": { + "docs": "deno run -A npm:typedoc --name revolt.js --readme README.md src/", + "npm": "deno run -A .github/workflows/npmPublish.ts" + }, + "fmt": { + "indentWidth": 2, + "useTabs": false + }, + "lint": { + "rules": { + "tags": ["recommended", "jsr"] + } + }, + "publish": { + "exclude": [".github", ".vscode"] + }, + "nodeModulesDir": "auto", + "lock": false +} diff --git a/eslint.config.js b/eslint.config.js deleted file mode 100644 index de573f89..00000000 --- a/eslint.config.js +++ /dev/null @@ -1,23 +0,0 @@ -import eslint from "@eslint/js"; -import prettier from "eslint-plugin-prettier/recommended"; -import solid from "eslint-plugin-solid/configs/typescript"; -import { defineConfig } from "eslint/config"; -import tseslint from "typescript-eslint"; - -export default defineConfig([ - eslint.configs.recommended, - tseslint.configs.recommended, - solid, - { - rules: { - "@typescript-eslint/no-unused-vars": [ - "warn", - { - caughtErrors: "all", - varsIgnorePattern: "^_", - }, - ], - }, - }, - prettier, -]); diff --git a/package.json b/package.json deleted file mode 100644 index 63ce4ce0..00000000 --- a/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "revolt.js", - "version": "7.1.0-rc.2", - "type": "module", - "module": "lib/index.js", - "types": "lib/index.d.ts", - "repository": "https://github.com/revoltchat/revolt.js", - "author": "Paul Makles ", - "license": "MIT", - "scripts": { - "build": "tsc", - "build:watch": "tsc-watch --onSuccess \"node .\"", - "lint": "eslint --ext .ts,.tsx src/", - "lint:fix": "eslint --fix --ext .ts,.tsx src/", - "typecheck": "tsc --noEmit", - "docs": "typedoc --plugin @mxssfd/typedoc-theme --theme my-theme --readme README.md src/", - "fmt": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'", - "fmt:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx}'" - }, - "files": [ - "README.md", - "lib" - ], - "description": "Library for interacting with the Revolt API.", - "packageManager": "pnpm@9.4.0", - "dependencies": { - "@solid-primitives/map": "^0.6.0", - "@solid-primitives/set": "^0.6.0", - "@vladfrangu/async_event_emitter": "^2.4.6", - "revolt-api": "0.8.3", - "solid-js": "^1.9.5", - "ulid": "^2.3.0" - }, - "devDependencies": { - "@mxssfd/typedoc-theme": "^1.1.7", - "@trivago/prettier-plugin-sort-imports": "^5.2.2", - "@types/node": "^22.13.10", - "eslint": "^9.22.0", - "eslint-plugin-prettier": "^5.2.3", - "eslint-plugin-solid": "^0.14.5", - "prettier": "^3.5.3", - "typedoc": "^0.27.9", - "typescript": "^5.8.2", - "typescript-eslint": "^8.26.1" - } -} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml deleted file mode 100644 index b56ebcad..00000000 --- a/pnpm-lock.yaml +++ /dev/null @@ -1,1581 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: - dependencies: - '@solid-primitives/map': - specifier: ^0.6.0 - version: 0.6.0(solid-js@1.9.5) - '@solid-primitives/set': - specifier: ^0.6.0 - version: 0.6.0(solid-js@1.9.5) - '@vladfrangu/async_event_emitter': - specifier: ^2.4.6 - version: 2.4.6 - revolt-api: - specifier: 0.8.3 - version: 0.8.3 - solid-js: - specifier: ^1.9.5 - version: 1.9.5 - ulid: - specifier: ^2.3.0 - version: 2.3.0 - devDependencies: - '@mxssfd/typedoc-theme': - specifier: ^1.1.7 - version: 1.1.7(typedoc@0.27.9(typescript@5.8.2)) - '@trivago/prettier-plugin-sort-imports': - specifier: ^5.2.2 - version: 5.2.2(prettier@3.5.3) - '@types/node': - specifier: ^22.13.10 - version: 22.13.10 - eslint: - specifier: ^9.22.0 - version: 9.22.0 - eslint-plugin-prettier: - specifier: ^5.2.3 - version: 5.2.3(eslint-config-prettier@8.10.0(eslint@9.22.0))(eslint@9.22.0)(prettier@3.5.3) - eslint-plugin-solid: - specifier: ^0.14.5 - version: 0.14.5(eslint@9.22.0)(typescript@5.8.2) - prettier: - specifier: ^3.5.3 - version: 3.5.3 - typedoc: - specifier: ^0.27.9 - version: 0.27.9(typescript@5.8.2) - typescript: - specifier: ^5.8.2 - version: 5.8.2 - typescript-eslint: - specifier: ^8.26.1 - version: 8.26.1(eslint@9.22.0)(typescript@5.8.2) - -packages: - - '@babel/code-frame@7.26.2': - resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} - engines: {node: '>=6.9.0'} - - '@babel/generator@7.26.10': - resolution: {integrity: sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==} - engines: {node: '>=6.9.0'} - - '@babel/helper-string-parser@7.25.9': - resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-identifier@7.25.9': - resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.26.10': - resolution: {integrity: sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==} - engines: {node: '>=6.0.0'} - hasBin: true - - '@babel/template@7.26.9': - resolution: {integrity: sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==} - engines: {node: '>=6.9.0'} - - '@babel/traverse@7.26.10': - resolution: {integrity: sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==} - engines: {node: '>=6.9.0'} - - '@babel/types@7.26.10': - resolution: {integrity: sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==} - engines: {node: '>=6.9.0'} - - '@eslint-community/eslint-utils@4.5.1': - resolution: {integrity: sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - - '@eslint-community/regexpp@4.12.1': - resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - - '@eslint/config-array@0.19.2': - resolution: {integrity: sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/config-helpers@0.1.0': - resolution: {integrity: sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/core@0.12.0': - resolution: {integrity: sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/eslintrc@3.3.0': - resolution: {integrity: sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/js@9.22.0': - resolution: {integrity: sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/object-schema@2.1.6': - resolution: {integrity: sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@eslint/plugin-kit@0.2.7': - resolution: {integrity: sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@gerrit0/mini-shiki@1.27.2': - resolution: {integrity: sha512-GeWyHz8ao2gBiUW4OJnQDxXQnFgZQwwQk05t/CVVgNBN7/rK8XZ7xY6YhLVv9tH3VppWWmr9DCl3MwemB/i+Og==} - - '@humanfs/core@0.19.1': - resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==} - engines: {node: '>=18.18.0'} - - '@humanfs/node@0.16.6': - resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==} - engines: {node: '>=18.18.0'} - - '@humanwhocodes/module-importer@1.0.1': - resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} - engines: {node: '>=12.22'} - - '@humanwhocodes/retry@0.3.1': - resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} - engines: {node: '>=18.18'} - - '@humanwhocodes/retry@0.4.2': - resolution: {integrity: sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==} - engines: {node: '>=18.18'} - - '@jridgewell/gen-mapping@0.3.8': - resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} - engines: {node: '>=6.0.0'} - - '@jridgewell/resolve-uri@3.1.2': - resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} - engines: {node: '>=6.0.0'} - - '@jridgewell/set-array@1.2.1': - resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} - engines: {node: '>=6.0.0'} - - '@jridgewell/sourcemap-codec@1.5.0': - resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - - '@jridgewell/trace-mapping@0.3.25': - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - - '@mxssfd/typedoc-theme@1.1.7': - resolution: {integrity: sha512-dj4p0TjIoudD8j1u+Kf+KzcEc+je3IB/B1oohWcVJmMRfbw5uZYX6qOGHzfUzAPiU1pYe2u5Vo1IPqgLo58taA==} - engines: {node: '>= 14'} - peerDependencies: - typedoc: ^0.26.7 - - '@nodelib/fs.scandir@2.1.5': - resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} - engines: {node: '>= 8'} - - '@nodelib/fs.stat@2.0.5': - resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} - engines: {node: '>= 8'} - - '@nodelib/fs.walk@1.2.8': - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} - - '@pkgr/core@0.1.1': - resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} - engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - - '@shikijs/engine-oniguruma@1.29.2': - resolution: {integrity: sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==} - - '@shikijs/types@1.29.2': - resolution: {integrity: sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==} - - '@shikijs/vscode-textmate@10.0.2': - resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} - - '@solid-primitives/map@0.6.0': - resolution: {integrity: sha512-h8uCJNxUTvzNK/aTW9vJCd/PQeBkUL8i7AyLPvTFqMgcMnJ1I5GzAi5JODzxpxQwffxoqJyQtOE1vBqFzDv0Vw==} - peerDependencies: - solid-js: ^1.6.12 - - '@solid-primitives/set@0.6.0': - resolution: {integrity: sha512-P1Tp001m8ib5XCi/LEJHh2QsoS2uPO86HewtbrSxr2axt5te9EGc0UOwNKTPxNvNSLNHteUw5IrzDsEklW4m3g==} - peerDependencies: - solid-js: ^1.6.12 - - '@solid-primitives/trigger@1.2.0': - resolution: {integrity: sha512-sW4/3cDXSjYQampn8CIFZ11BlxgNf2li8r2fXnb3b3YWE6RdZZCl8PhvpPF38Gzl0CnryrbTPJWM7OIkseCDgQ==} - peerDependencies: - solid-js: ^1.6.12 - - '@solid-primitives/utils@6.3.0': - resolution: {integrity: sha512-e7hTlJ1Ywh2+g/Qug+n4L1mpfxsikoIS4/sHE2EK9WatQt8UJqop/vE6bsLnXlU1xuhb/jo94Ah5Y27rd4wP7A==} - peerDependencies: - solid-js: ^1.6.12 - - '@trivago/prettier-plugin-sort-imports@5.2.2': - resolution: {integrity: sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==} - engines: {node: '>18.12'} - peerDependencies: - '@vue/compiler-sfc': 3.x - prettier: 2.x - 3.x - prettier-plugin-svelte: 3.x - svelte: 4.x || 5.x - peerDependenciesMeta: - '@vue/compiler-sfc': - optional: true - prettier-plugin-svelte: - optional: true - svelte: - optional: true - - '@types/estree@1.0.6': - resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} - - '@types/hast@3.0.4': - resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==} - - '@types/json-schema@7.0.15': - resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - - '@types/node@22.13.10': - resolution: {integrity: sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==} - - '@types/unist@3.0.3': - resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} - - '@typescript-eslint/eslint-plugin@8.26.1': - resolution: {integrity: sha512-2X3mwqsj9Bd3Ciz508ZUtoQQYpOhU/kWoUqIf49H8Z0+Vbh6UF/y0OEYp0Q0axOGzaBGs7QxRwq0knSQ8khQNA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 - eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.9.0' - - '@typescript-eslint/parser@8.26.1': - resolution: {integrity: sha512-w6HZUV4NWxqd8BdeFf81t07d7/YV9s7TCWrQQbG5uhuvGUAW+fq1usZ1Hmz9UPNLniFnD8GLSsDpjP0hm1S4lQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.9.0' - - '@typescript-eslint/scope-manager@8.26.1': - resolution: {integrity: sha512-6EIvbE5cNER8sqBu6V7+KeMZIC1664d2Yjt+B9EWUXrsyWpxx4lEZrmvxgSKRC6gX+efDL/UY9OpPZ267io3mg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@typescript-eslint/type-utils@8.26.1': - resolution: {integrity: sha512-Kcj/TagJLwoY/5w9JGEFV0dclQdyqw9+VMndxOJKtoFSjfZhLXhYjzsQEeyza03rwHx2vFEGvrJWJBXKleRvZg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.9.0' - - '@typescript-eslint/types@8.26.1': - resolution: {integrity: sha512-n4THUQW27VmQMx+3P+B0Yptl7ydfceUj4ON/AQILAASwgYdZ/2dhfymRMh5egRUrvK5lSmaOm77Ry+lmXPOgBQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@typescript-eslint/typescript-estree@8.26.1': - resolution: {integrity: sha512-yUwPpUHDgdrv1QJ7YQal3cMVBGWfnuCdKbXw1yyjArax3353rEJP1ZA+4F8nOlQ3RfS2hUN/wze3nlY+ZOhvoA==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - typescript: '>=4.8.4 <5.9.0' - - '@typescript-eslint/utils@8.26.1': - resolution: {integrity: sha512-V4Urxa/XtSUroUrnI7q6yUTD3hDtfJ2jzVfeT3VK0ciizfK2q/zGC0iDh1lFMUZR8cImRrep6/q0xd/1ZGPQpg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.9.0' - - '@typescript-eslint/visitor-keys@8.26.1': - resolution: {integrity: sha512-AjOC3zfnxd6S4Eiy3jwktJPclqhFHNyd8L6Gycf9WUPoKZpgM5PjkxY1X7uSy61xVpiJDhhk7XT2NVsN3ALTWg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - '@vladfrangu/async_event_emitter@2.4.6': - resolution: {integrity: sha512-RaI5qZo6D2CVS6sTHFKg1v5Ohq/+Bo2LZ5gzUEwZ/WkHhwtGTCB/sVLw8ijOkAUxasZ+WshN/Rzj4ywsABJ5ZA==} - engines: {node: '>=v14.0.0', npm: '>=7.0.0'} - - acorn-jsx@5.3.2: - resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} - peerDependencies: - acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - - acorn@8.14.1: - resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} - engines: {node: '>=0.4.0'} - hasBin: true - - ajv@6.12.6: - resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} - - ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} - - argparse@2.0.1: - resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - - axios@0.26.1: - resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} - - balanced-match@1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - - brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - - brace-expansion@2.0.1: - resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} - - braces@3.0.3: - resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} - engines: {node: '>=8'} - - callsites@3.1.0: - resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} - engines: {node: '>=6'} - - chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - - color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} - - color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - - concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - - cross-spawn@7.0.6: - resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} - engines: {node: '>= 8'} - - csstype@3.1.3: - resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - - debug@4.4.0: - resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - - deep-is@0.1.4: - resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - - entities@4.5.0: - resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} - engines: {node: '>=0.12'} - - escape-string-regexp@4.0.0: - resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} - engines: {node: '>=10'} - - eslint-config-prettier@8.10.0: - resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} - hasBin: true - peerDependencies: - eslint: '>=7.0.0' - - eslint-plugin-prettier@5.2.3: - resolution: {integrity: sha512-qJ+y0FfCp/mQYQ/vWQ3s7eUlFEL4PyKfAJxsnYTJ4YT73nsJBWqmEpFryxV9OeUiqmsTsYJ5Y+KDNaeP31wrRw==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - '@types/eslint': '>=8.0.0' - eslint: '>=8.0.0' - eslint-config-prettier: '*' - prettier: '>=3.0.0' - peerDependenciesMeta: - '@types/eslint': - optional: true - eslint-config-prettier: - optional: true - - eslint-plugin-solid@0.14.5: - resolution: {integrity: sha512-nfuYK09ah5aJG/oEN6P1qziy1zLgW4PDWe75VNPi4CEFYk1x2AEqwFeQfEPR7gNn0F2jOeqKhx2E+5oNCOBYWQ==} - engines: {node: '>=18.0.0'} - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 - typescript: '>=4.8.4' - - eslint-scope@8.3.0: - resolution: {integrity: sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - eslint-visitor-keys@3.4.3: - resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - - eslint-visitor-keys@4.2.0: - resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - eslint@9.22.0: - resolution: {integrity: sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - hasBin: true - peerDependencies: - jiti: '*' - peerDependenciesMeta: - jiti: - optional: true - - espree@10.3.0: - resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - - esquery@1.6.0: - resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==} - engines: {node: '>=0.10'} - - esrecurse@4.3.0: - resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} - engines: {node: '>=4.0'} - - estraverse@5.3.0: - resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} - engines: {node: '>=4.0'} - - esutils@2.0.3: - resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} - engines: {node: '>=0.10.0'} - - fast-deep-equal@3.1.3: - resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - - fast-diff@1.3.0: - resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} - - fast-glob@3.3.3: - resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} - engines: {node: '>=8.6.0'} - - fast-json-stable-stringify@2.1.0: - resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - - fast-levenshtein@2.0.6: - resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - - fastq@1.19.1: - resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==} - - file-entry-cache@8.0.0: - resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} - engines: {node: '>=16.0.0'} - - fill-range@7.1.1: - resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} - engines: {node: '>=8'} - - find-up@5.0.0: - resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} - engines: {node: '>=10'} - - flat-cache@4.0.1: - resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} - engines: {node: '>=16'} - - flatted@3.3.3: - resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==} - - follow-redirects@1.15.9: - resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - - glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - - glob-parent@6.0.2: - resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} - engines: {node: '>=10.13.0'} - - globals@11.12.0: - resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} - engines: {node: '>=4'} - - globals@14.0.0: - resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} - engines: {node: '>=18'} - - graphemer@1.4.0: - resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - - has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - - html-tags@3.3.1: - resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==} - engines: {node: '>=8'} - - ignore@5.3.2: - resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} - engines: {node: '>= 4'} - - import-fresh@3.3.1: - resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==} - engines: {node: '>=6'} - - imurmurhash@0.1.4: - resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} - engines: {node: '>=0.8.19'} - - inline-style-parser@0.2.4: - resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==} - - is-extglob@2.1.1: - resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} - engines: {node: '>=0.10.0'} - - is-glob@4.0.3: - resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} - engines: {node: '>=0.10.0'} - - is-html@2.0.0: - resolution: {integrity: sha512-S+OpgB5i7wzIue/YSE5hg0e5ZYfG3hhpNh9KGl6ayJ38p7ED6wxQLd1TV91xHpcTvw90KMJ9EwN3F/iNflHBVg==} - engines: {node: '>=8'} - - is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - - isexe@2.0.0: - resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - - javascript-natural-sort@0.7.1: - resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} - - js-tokens@4.0.0: - resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - - js-yaml@4.1.0: - resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} - hasBin: true - - jsesc@3.1.0: - resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} - engines: {node: '>=6'} - hasBin: true - - json-buffer@3.0.1: - resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} - - json-schema-traverse@0.4.1: - resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - - json-stable-stringify-without-jsonify@1.0.1: - resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - - kebab-case@1.0.2: - resolution: {integrity: sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==} - - keyv@4.5.4: - resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} - - known-css-properties@0.30.0: - resolution: {integrity: sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==} - - levn@0.4.1: - resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} - engines: {node: '>= 0.8.0'} - - linkify-it@5.0.0: - resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} - - locate-path@6.0.0: - resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} - engines: {node: '>=10'} - - lodash.defaultsdeep@4.6.1: - resolution: {integrity: sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==} - - lodash.merge@4.6.2: - resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - - lodash@4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - - lunr@2.3.9: - resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} - - markdown-it@14.1.0: - resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} - hasBin: true - - mdurl@2.0.0: - resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} - - merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - - micromatch@4.0.8: - resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} - engines: {node: '>=8.6'} - - minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - - minimatch@9.0.5: - resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} - engines: {node: '>=16 || 14 >=14.17'} - - ms@2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - - natural-compare@1.4.0: - resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - - optionator@0.9.4: - resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==} - engines: {node: '>= 0.8.0'} - - p-limit@3.1.0: - resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} - engines: {node: '>=10'} - - p-locate@5.0.0: - resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} - engines: {node: '>=10'} - - parent-module@1.0.1: - resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} - engines: {node: '>=6'} - - path-exists@4.0.0: - resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} - engines: {node: '>=8'} - - path-key@3.1.1: - resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} - engines: {node: '>=8'} - - picocolors@1.1.1: - resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} - - picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} - engines: {node: '>=8.6'} - - prelude-ls@1.2.1: - resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} - engines: {node: '>= 0.8.0'} - - prettier-linter-helpers@1.0.0: - resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} - engines: {node: '>=6.0.0'} - - prettier@3.5.3: - resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==} - engines: {node: '>=14'} - hasBin: true - - punycode.js@2.3.1: - resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} - engines: {node: '>=6'} - - punycode@2.3.1: - resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} - engines: {node: '>=6'} - - queue-microtask@1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - - resolve-from@4.0.0: - resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} - engines: {node: '>=4'} - - reusify@1.1.0: - resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==} - engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - - revolt-api@0.8.3: - resolution: {integrity: sha512-4dOe6sbiWFGF5PlAuYtH9vWHXdFOge/L6/EKr6oLgslN+QBn2DKfSOIhl6Ni2n0B0cBurhA1KuBy0mWfE68fIQ==} - - run-parallel@1.2.0: - resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - - semver@7.7.1: - resolution: {integrity: sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==} - engines: {node: '>=10'} - hasBin: true - - seroval-plugins@1.2.1: - resolution: {integrity: sha512-H5vs53+39+x4Udwp4J5rNZfgFuA+Lt+uU+09w1gYBVWomtAl98B+E9w7yC05Xc81/HgLvJdlyqJbU0fJCKCmdw==} - engines: {node: '>=10'} - peerDependencies: - seroval: ^1.0 - - seroval@1.2.1: - resolution: {integrity: sha512-yBxFFs3zmkvKNmR0pFSU//rIsYjuX418TnlDmc2weaq5XFDqDIV/NOMPBoLrbxjLH42p4UzRuXHryXh9dYcKcw==} - engines: {node: '>=10'} - - shebang-command@2.0.0: - resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} - engines: {node: '>=8'} - - shebang-regex@3.0.0: - resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} - engines: {node: '>=8'} - - solid-js@1.9.5: - resolution: {integrity: sha512-ogI3DaFcyn6UhYhrgcyRAMbu/buBJitYQASZz5WzfQVPP10RD2AbCoRZ517psnezrasyCbWzIxZ6kVqet768xw==} - - strip-json-comments@3.1.1: - resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} - engines: {node: '>=8'} - - style-to-object@1.0.8: - resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==} - - supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - - synckit@0.9.2: - resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==} - engines: {node: ^14.18.0 || >=16.0.0} - - to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - - ts-api-utils@2.0.1: - resolution: {integrity: sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==} - engines: {node: '>=18.12'} - peerDependencies: - typescript: '>=4.8.4' - - tslib@2.8.1: - resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - - type-check@0.4.0: - resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} - engines: {node: '>= 0.8.0'} - - typedoc@0.27.9: - resolution: {integrity: sha512-/z585740YHURLl9DN2jCWe6OW7zKYm6VoQ93H0sxZ1cwHQEQrUn5BJrEnkWhfzUdyO+BLGjnKUZ9iz9hKloFDw==} - engines: {node: '>= 18'} - hasBin: true - peerDependencies: - typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x - - typescript-eslint@8.26.1: - resolution: {integrity: sha512-t/oIs9mYyrwZGRpDv3g+3K6nZ5uhKEMt2oNmAPwaY4/ye0+EH4nXIPYNtkYFS6QHm+1DFg34DbglYBz5P9Xysg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: '>=4.8.4 <5.9.0' - - typescript@5.8.2: - resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==} - engines: {node: '>=14.17'} - hasBin: true - - uc.micro@2.1.0: - resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} - - ulid@2.3.0: - resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==} - hasBin: true - - undici-types@6.20.0: - resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} - - uri-js@4.4.1: - resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - - which@2.0.2: - resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} - engines: {node: '>= 8'} - hasBin: true - - word-wrap@1.2.5: - resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} - engines: {node: '>=0.10.0'} - - yaml@2.7.0: - resolution: {integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==} - engines: {node: '>= 14'} - hasBin: true - - yocto-queue@0.1.0: - resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} - engines: {node: '>=10'} - -snapshots: - - '@babel/code-frame@7.26.2': - dependencies: - '@babel/helper-validator-identifier': 7.25.9 - js-tokens: 4.0.0 - picocolors: 1.1.1 - - '@babel/generator@7.26.10': - dependencies: - '@babel/parser': 7.26.10 - '@babel/types': 7.26.10 - '@jridgewell/gen-mapping': 0.3.8 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 3.1.0 - - '@babel/helper-string-parser@7.25.9': {} - - '@babel/helper-validator-identifier@7.25.9': {} - - '@babel/parser@7.26.10': - dependencies: - '@babel/types': 7.26.10 - - '@babel/template@7.26.9': - dependencies: - '@babel/code-frame': 7.26.2 - '@babel/parser': 7.26.10 - '@babel/types': 7.26.10 - - '@babel/traverse@7.26.10': - dependencies: - '@babel/code-frame': 7.26.2 - '@babel/generator': 7.26.10 - '@babel/parser': 7.26.10 - '@babel/template': 7.26.9 - '@babel/types': 7.26.10 - debug: 4.4.0 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - - '@babel/types@7.26.10': - dependencies: - '@babel/helper-string-parser': 7.25.9 - '@babel/helper-validator-identifier': 7.25.9 - - '@eslint-community/eslint-utils@4.5.1(eslint@9.22.0)': - dependencies: - eslint: 9.22.0 - eslint-visitor-keys: 3.4.3 - - '@eslint-community/regexpp@4.12.1': {} - - '@eslint/config-array@0.19.2': - dependencies: - '@eslint/object-schema': 2.1.6 - debug: 4.4.0 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color - - '@eslint/config-helpers@0.1.0': {} - - '@eslint/core@0.12.0': - dependencies: - '@types/json-schema': 7.0.15 - - '@eslint/eslintrc@3.3.0': - dependencies: - ajv: 6.12.6 - debug: 4.4.0 - espree: 10.3.0 - globals: 14.0.0 - ignore: 5.3.2 - import-fresh: 3.3.1 - js-yaml: 4.1.0 - minimatch: 3.1.2 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - supports-color - - '@eslint/js@9.22.0': {} - - '@eslint/object-schema@2.1.6': {} - - '@eslint/plugin-kit@0.2.7': - dependencies: - '@eslint/core': 0.12.0 - levn: 0.4.1 - - '@gerrit0/mini-shiki@1.27.2': - dependencies: - '@shikijs/engine-oniguruma': 1.29.2 - '@shikijs/types': 1.29.2 - '@shikijs/vscode-textmate': 10.0.2 - - '@humanfs/core@0.19.1': {} - - '@humanfs/node@0.16.6': - dependencies: - '@humanfs/core': 0.19.1 - '@humanwhocodes/retry': 0.3.1 - - '@humanwhocodes/module-importer@1.0.1': {} - - '@humanwhocodes/retry@0.3.1': {} - - '@humanwhocodes/retry@0.4.2': {} - - '@jridgewell/gen-mapping@0.3.8': - dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.25 - - '@jridgewell/resolve-uri@3.1.2': {} - - '@jridgewell/set-array@1.2.1': {} - - '@jridgewell/sourcemap-codec@1.5.0': {} - - '@jridgewell/trace-mapping@0.3.25': - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.0 - - '@mxssfd/typedoc-theme@1.1.7(typedoc@0.27.9(typescript@5.8.2))': - dependencies: - typedoc: 0.27.9(typescript@5.8.2) - - '@nodelib/fs.scandir@2.1.5': - dependencies: - '@nodelib/fs.stat': 2.0.5 - run-parallel: 1.2.0 - - '@nodelib/fs.stat@2.0.5': {} - - '@nodelib/fs.walk@1.2.8': - dependencies: - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.19.1 - - '@pkgr/core@0.1.1': {} - - '@shikijs/engine-oniguruma@1.29.2': - dependencies: - '@shikijs/types': 1.29.2 - '@shikijs/vscode-textmate': 10.0.2 - - '@shikijs/types@1.29.2': - dependencies: - '@shikijs/vscode-textmate': 10.0.2 - '@types/hast': 3.0.4 - - '@shikijs/vscode-textmate@10.0.2': {} - - '@solid-primitives/map@0.6.0(solid-js@1.9.5)': - dependencies: - '@solid-primitives/trigger': 1.2.0(solid-js@1.9.5) - solid-js: 1.9.5 - - '@solid-primitives/set@0.6.0(solid-js@1.9.5)': - dependencies: - '@solid-primitives/trigger': 1.2.0(solid-js@1.9.5) - solid-js: 1.9.5 - - '@solid-primitives/trigger@1.2.0(solid-js@1.9.5)': - dependencies: - '@solid-primitives/utils': 6.3.0(solid-js@1.9.5) - solid-js: 1.9.5 - - '@solid-primitives/utils@6.3.0(solid-js@1.9.5)': - dependencies: - solid-js: 1.9.5 - - '@trivago/prettier-plugin-sort-imports@5.2.2(prettier@3.5.3)': - dependencies: - '@babel/generator': 7.26.10 - '@babel/parser': 7.26.10 - '@babel/traverse': 7.26.10 - '@babel/types': 7.26.10 - javascript-natural-sort: 0.7.1 - lodash: 4.17.21 - prettier: 3.5.3 - transitivePeerDependencies: - - supports-color - - '@types/estree@1.0.6': {} - - '@types/hast@3.0.4': - dependencies: - '@types/unist': 3.0.3 - - '@types/json-schema@7.0.15': {} - - '@types/node@22.13.10': - dependencies: - undici-types: 6.20.0 - - '@types/unist@3.0.3': {} - - '@typescript-eslint/eslint-plugin@8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2)': - dependencies: - '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - '@typescript-eslint/scope-manager': 8.26.1 - '@typescript-eslint/type-utils': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - '@typescript-eslint/utils': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - '@typescript-eslint/visitor-keys': 8.26.1 - eslint: 9.22.0 - graphemer: 1.4.0 - ignore: 5.3.2 - natural-compare: 1.4.0 - ts-api-utils: 2.0.1(typescript@5.8.2) - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/parser@8.26.1(eslint@9.22.0)(typescript@5.8.2)': - dependencies: - '@typescript-eslint/scope-manager': 8.26.1 - '@typescript-eslint/types': 8.26.1 - '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.8.2) - '@typescript-eslint/visitor-keys': 8.26.1 - debug: 4.4.0 - eslint: 9.22.0 - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/scope-manager@8.26.1': - dependencies: - '@typescript-eslint/types': 8.26.1 - '@typescript-eslint/visitor-keys': 8.26.1 - - '@typescript-eslint/type-utils@8.26.1(eslint@9.22.0)(typescript@5.8.2)': - dependencies: - '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.8.2) - '@typescript-eslint/utils': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - debug: 4.4.0 - eslint: 9.22.0 - ts-api-utils: 2.0.1(typescript@5.8.2) - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/types@8.26.1': {} - - '@typescript-eslint/typescript-estree@8.26.1(typescript@5.8.2)': - dependencies: - '@typescript-eslint/types': 8.26.1 - '@typescript-eslint/visitor-keys': 8.26.1 - debug: 4.4.0 - fast-glob: 3.3.3 - is-glob: 4.0.3 - minimatch: 9.0.5 - semver: 7.7.1 - ts-api-utils: 2.0.1(typescript@5.8.2) - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/utils@8.26.1(eslint@9.22.0)(typescript@5.8.2)': - dependencies: - '@eslint-community/eslint-utils': 4.5.1(eslint@9.22.0) - '@typescript-eslint/scope-manager': 8.26.1 - '@typescript-eslint/types': 8.26.1 - '@typescript-eslint/typescript-estree': 8.26.1(typescript@5.8.2) - eslint: 9.22.0 - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/visitor-keys@8.26.1': - dependencies: - '@typescript-eslint/types': 8.26.1 - eslint-visitor-keys: 4.2.0 - - '@vladfrangu/async_event_emitter@2.4.6': {} - - acorn-jsx@5.3.2(acorn@8.14.1): - dependencies: - acorn: 8.14.1 - - acorn@8.14.1: {} - - ajv@6.12.6: - dependencies: - fast-deep-equal: 3.1.3 - fast-json-stable-stringify: 2.1.0 - json-schema-traverse: 0.4.1 - uri-js: 4.4.1 - - ansi-styles@4.3.0: - dependencies: - color-convert: 2.0.1 - - argparse@2.0.1: {} - - axios@0.26.1: - dependencies: - follow-redirects: 1.15.9 - transitivePeerDependencies: - - debug - - balanced-match@1.0.2: {} - - brace-expansion@1.1.11: - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - - brace-expansion@2.0.1: - dependencies: - balanced-match: 1.0.2 - - braces@3.0.3: - dependencies: - fill-range: 7.1.1 - - callsites@3.1.0: {} - - chalk@4.1.2: - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - - color-convert@2.0.1: - dependencies: - color-name: 1.1.4 - - color-name@1.1.4: {} - - concat-map@0.0.1: {} - - cross-spawn@7.0.6: - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - - csstype@3.1.3: {} - - debug@4.4.0: - dependencies: - ms: 2.1.3 - - deep-is@0.1.4: {} - - entities@4.5.0: {} - - escape-string-regexp@4.0.0: {} - - eslint-config-prettier@8.10.0(eslint@9.22.0): - dependencies: - eslint: 9.22.0 - optional: true - - eslint-plugin-prettier@5.2.3(eslint-config-prettier@8.10.0(eslint@9.22.0))(eslint@9.22.0)(prettier@3.5.3): - dependencies: - eslint: 9.22.0 - prettier: 3.5.3 - prettier-linter-helpers: 1.0.0 - synckit: 0.9.2 - optionalDependencies: - eslint-config-prettier: 8.10.0(eslint@9.22.0) - - eslint-plugin-solid@0.14.5(eslint@9.22.0)(typescript@5.8.2): - dependencies: - '@typescript-eslint/utils': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - eslint: 9.22.0 - estraverse: 5.3.0 - is-html: 2.0.0 - kebab-case: 1.0.2 - known-css-properties: 0.30.0 - style-to-object: 1.0.8 - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - eslint-scope@8.3.0: - dependencies: - esrecurse: 4.3.0 - estraverse: 5.3.0 - - eslint-visitor-keys@3.4.3: {} - - eslint-visitor-keys@4.2.0: {} - - eslint@9.22.0: - dependencies: - '@eslint-community/eslint-utils': 4.5.1(eslint@9.22.0) - '@eslint-community/regexpp': 4.12.1 - '@eslint/config-array': 0.19.2 - '@eslint/config-helpers': 0.1.0 - '@eslint/core': 0.12.0 - '@eslint/eslintrc': 3.3.0 - '@eslint/js': 9.22.0 - '@eslint/plugin-kit': 0.2.7 - '@humanfs/node': 0.16.6 - '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.4.2 - '@types/estree': 1.0.6 - '@types/json-schema': 7.0.15 - ajv: 6.12.6 - chalk: 4.1.2 - cross-spawn: 7.0.6 - debug: 4.4.0 - escape-string-regexp: 4.0.0 - eslint-scope: 8.3.0 - eslint-visitor-keys: 4.2.0 - espree: 10.3.0 - esquery: 1.6.0 - esutils: 2.0.3 - fast-deep-equal: 3.1.3 - file-entry-cache: 8.0.0 - find-up: 5.0.0 - glob-parent: 6.0.2 - ignore: 5.3.2 - imurmurhash: 0.1.4 - is-glob: 4.0.3 - json-stable-stringify-without-jsonify: 1.0.1 - lodash.merge: 4.6.2 - minimatch: 3.1.2 - natural-compare: 1.4.0 - optionator: 0.9.4 - transitivePeerDependencies: - - supports-color - - espree@10.3.0: - dependencies: - acorn: 8.14.1 - acorn-jsx: 5.3.2(acorn@8.14.1) - eslint-visitor-keys: 4.2.0 - - esquery@1.6.0: - dependencies: - estraverse: 5.3.0 - - esrecurse@4.3.0: - dependencies: - estraverse: 5.3.0 - - estraverse@5.3.0: {} - - esutils@2.0.3: {} - - fast-deep-equal@3.1.3: {} - - fast-diff@1.3.0: {} - - fast-glob@3.3.3: - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.8 - - fast-json-stable-stringify@2.1.0: {} - - fast-levenshtein@2.0.6: {} - - fastq@1.19.1: - dependencies: - reusify: 1.1.0 - - file-entry-cache@8.0.0: - dependencies: - flat-cache: 4.0.1 - - fill-range@7.1.1: - dependencies: - to-regex-range: 5.0.1 - - find-up@5.0.0: - dependencies: - locate-path: 6.0.0 - path-exists: 4.0.0 - - flat-cache@4.0.1: - dependencies: - flatted: 3.3.3 - keyv: 4.5.4 - - flatted@3.3.3: {} - - follow-redirects@1.15.9: {} - - glob-parent@5.1.2: - dependencies: - is-glob: 4.0.3 - - glob-parent@6.0.2: - dependencies: - is-glob: 4.0.3 - - globals@11.12.0: {} - - globals@14.0.0: {} - - graphemer@1.4.0: {} - - has-flag@4.0.0: {} - - html-tags@3.3.1: {} - - ignore@5.3.2: {} - - import-fresh@3.3.1: - dependencies: - parent-module: 1.0.1 - resolve-from: 4.0.0 - - imurmurhash@0.1.4: {} - - inline-style-parser@0.2.4: {} - - is-extglob@2.1.1: {} - - is-glob@4.0.3: - dependencies: - is-extglob: 2.1.1 - - is-html@2.0.0: - dependencies: - html-tags: 3.3.1 - - is-number@7.0.0: {} - - isexe@2.0.0: {} - - javascript-natural-sort@0.7.1: {} - - js-tokens@4.0.0: {} - - js-yaml@4.1.0: - dependencies: - argparse: 2.0.1 - - jsesc@3.1.0: {} - - json-buffer@3.0.1: {} - - json-schema-traverse@0.4.1: {} - - json-stable-stringify-without-jsonify@1.0.1: {} - - kebab-case@1.0.2: {} - - keyv@4.5.4: - dependencies: - json-buffer: 3.0.1 - - known-css-properties@0.30.0: {} - - levn@0.4.1: - dependencies: - prelude-ls: 1.2.1 - type-check: 0.4.0 - - linkify-it@5.0.0: - dependencies: - uc.micro: 2.1.0 - - locate-path@6.0.0: - dependencies: - p-locate: 5.0.0 - - lodash.defaultsdeep@4.6.1: {} - - lodash.merge@4.6.2: {} - - lodash@4.17.21: {} - - lunr@2.3.9: {} - - markdown-it@14.1.0: - dependencies: - argparse: 2.0.1 - entities: 4.5.0 - linkify-it: 5.0.0 - mdurl: 2.0.0 - punycode.js: 2.3.1 - uc.micro: 2.1.0 - - mdurl@2.0.0: {} - - merge2@1.4.1: {} - - micromatch@4.0.8: - dependencies: - braces: 3.0.3 - picomatch: 2.3.1 - - minimatch@3.1.2: - dependencies: - brace-expansion: 1.1.11 - - minimatch@9.0.5: - dependencies: - brace-expansion: 2.0.1 - - ms@2.1.3: {} - - natural-compare@1.4.0: {} - - optionator@0.9.4: - dependencies: - deep-is: 0.1.4 - fast-levenshtein: 2.0.6 - levn: 0.4.1 - prelude-ls: 1.2.1 - type-check: 0.4.0 - word-wrap: 1.2.5 - - p-limit@3.1.0: - dependencies: - yocto-queue: 0.1.0 - - p-locate@5.0.0: - dependencies: - p-limit: 3.1.0 - - parent-module@1.0.1: - dependencies: - callsites: 3.1.0 - - path-exists@4.0.0: {} - - path-key@3.1.1: {} - - picocolors@1.1.1: {} - - picomatch@2.3.1: {} - - prelude-ls@1.2.1: {} - - prettier-linter-helpers@1.0.0: - dependencies: - fast-diff: 1.3.0 - - prettier@3.5.3: {} - - punycode.js@2.3.1: {} - - punycode@2.3.1: {} - - queue-microtask@1.2.3: {} - - resolve-from@4.0.0: {} - - reusify@1.1.0: {} - - revolt-api@0.8.3: - dependencies: - axios: 0.26.1 - lodash.defaultsdeep: 4.6.1 - transitivePeerDependencies: - - debug - - run-parallel@1.2.0: - dependencies: - queue-microtask: 1.2.3 - - semver@7.7.1: {} - - seroval-plugins@1.2.1(seroval@1.2.1): - dependencies: - seroval: 1.2.1 - - seroval@1.2.1: {} - - shebang-command@2.0.0: - dependencies: - shebang-regex: 3.0.0 - - shebang-regex@3.0.0: {} - - solid-js@1.9.5: - dependencies: - csstype: 3.1.3 - seroval: 1.2.1 - seroval-plugins: 1.2.1(seroval@1.2.1) - - strip-json-comments@3.1.1: {} - - style-to-object@1.0.8: - dependencies: - inline-style-parser: 0.2.4 - - supports-color@7.2.0: - dependencies: - has-flag: 4.0.0 - - synckit@0.9.2: - dependencies: - '@pkgr/core': 0.1.1 - tslib: 2.8.1 - - to-regex-range@5.0.1: - dependencies: - is-number: 7.0.0 - - ts-api-utils@2.0.1(typescript@5.8.2): - dependencies: - typescript: 5.8.2 - - tslib@2.8.1: {} - - type-check@0.4.0: - dependencies: - prelude-ls: 1.2.1 - - typedoc@0.27.9(typescript@5.8.2): - dependencies: - '@gerrit0/mini-shiki': 1.27.2 - lunr: 2.3.9 - markdown-it: 14.1.0 - minimatch: 9.0.5 - typescript: 5.8.2 - yaml: 2.7.0 - - typescript-eslint@8.26.1(eslint@9.22.0)(typescript@5.8.2): - dependencies: - '@typescript-eslint/eslint-plugin': 8.26.1(@typescript-eslint/parser@8.26.1(eslint@9.22.0)(typescript@5.8.2))(eslint@9.22.0)(typescript@5.8.2) - '@typescript-eslint/parser': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - '@typescript-eslint/utils': 8.26.1(eslint@9.22.0)(typescript@5.8.2) - eslint: 9.22.0 - typescript: 5.8.2 - transitivePeerDependencies: - - supports-color - - typescript@5.8.2: {} - - uc.micro@2.1.0: {} - - ulid@2.3.0: {} - - undici-types@6.20.0: {} - - uri-js@4.4.1: - dependencies: - punycode: 2.3.1 - - which@2.0.2: - dependencies: - isexe: 2.0.0 - - word-wrap@1.2.5: {} - - yaml@2.7.0: {} - - yocto-queue@0.1.0: {} diff --git a/src/Client.ts b/src/Client.ts index 77f9240c..a91d5c9c 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -1,40 +1,37 @@ -import type { Accessor, Setter } from "solid-js"; -import { batch, createSignal } from "solid-js"; - import { AsyncEventEmitter } from "@vladfrangu/async_event_emitter"; -import { API } from "revolt-api"; -import type { DataLogin, RevoltConfig, Role } from "revolt-api"; - -import type { Channel } from "./classes/Channel.js"; -import type { Emoji } from "./classes/Emoji.js"; -import type { Message } from "./classes/Message.js"; -import type { Server } from "./classes/Server.js"; -import type { ServerMember } from "./classes/ServerMember.js"; -import type { User } from "./classes/User.js"; -import { AccountCollection } from "./collections/AccountCollection.js"; -import { BotCollection } from "./collections/BotCollection.js"; -import { ChannelCollection } from "./collections/ChannelCollection.js"; -import { ChannelUnreadCollection } from "./collections/ChannelUnreadCollection.js"; -import { ChannelWebhookCollection } from "./collections/ChannelWebhookCollection.js"; -import { EmojiCollection } from "./collections/EmojiCollection.js"; -import { MessageCollection } from "./collections/MessageCollection.js"; -import { ServerCollection } from "./collections/ServerCollection.js"; -import { ServerMemberCollection } from "./collections/ServerMemberCollection.js"; -import { SessionCollection } from "./collections/SessionCollection.js"; -import { UserCollection } from "./collections/UserCollection.js"; +import type { DataLogin, RevoltConfig } from "revolt-api"; +import { API, type Role } from "revolt-api"; + +import type { Channel } from "./classes/Channel.ts"; +import type { Emoji } from "./classes/Emoji.ts"; +import type { Message } from "./classes/Message.ts"; +import type { Server } from "./classes/Server.ts"; +import type { ServerMember } from "./classes/ServerMember.ts"; +import type { User } from "./classes/User.ts"; +import { AccountCollection } from "./collections/AccountCollection.ts"; +import { BotCollection } from "./collections/BotCollection.ts"; +import { ChannelCollection } from "./collections/ChannelCollection.ts"; +import { ChannelUnreadCollection } from "./collections/ChannelUnreadCollection.ts"; +import { ChannelWebhookCollection } from "./collections/ChannelWebhookCollection.ts"; +import { EmojiCollection } from "./collections/EmojiCollection.ts"; +import { MessageCollection } from "./collections/MessageCollection.ts"; +import { ServerCollection } from "./collections/ServerCollection.ts"; +import { ServerMemberCollection } from "./collections/ServerMemberCollection.ts"; +import { SessionCollection } from "./collections/SessionCollection.ts"; +import { UserCollection } from "./collections/UserCollection.ts"; import { ConnectionState, EventClient, type EventClientOptions, -} from "./events/EventClient.js"; -import { handleEvent } from "./events/v1.js"; -import type { HydratedChannel } from "./hydration/channel.js"; -import type { HydratedEmoji } from "./hydration/emoji.js"; -import type { HydratedMessage } from "./hydration/message.js"; -import type { HydratedServer } from "./hydration/server.js"; -import type { HydratedServerMember } from "./hydration/serverMember.js"; -import type { HydratedUser } from "./hydration/user.js"; -import { RE_CHANNELS, RE_MENTIONS, RE_SPOILER } from "./lib/regex.js"; +} from "./events/EventClient.ts"; +import { handleEvent } from "./events/v1.ts"; +import type { HydratedChannel } from "./hydration/channel.ts"; +import type { HydratedEmoji } from "./hydration/emoji.ts"; +import type { HydratedMessage } from "./hydration/message.ts"; +import type { HydratedServer } from "./hydration/server.ts"; +import type { HydratedServerMember } from "./hydration/serverMember.ts"; +import type { HydratedUser } from "./hydration/user.ts"; +import { RE_CHANNELS, RE_MENTIONS, RE_SPOILER } from "./lib/regex.ts"; export type Session = { _id: string; token: string; user_id: string } | string; @@ -42,8 +39,8 @@ export type Session = { _id: string; token: string; user_id: string } | string; * Events provided by the client */ export type Events = { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - error: [error: any]; + // deno-lint-ignore no-explicit-any + error: [any]; connected: []; connecting: []; @@ -152,31 +149,33 @@ export type ClientOptions = Partial & { * Revolt.js Clients */ export class Client extends AsyncEventEmitter { - readonly account; - readonly bots; - readonly channels; - readonly channelUnreads; - readonly channelWebhooks; - readonly emojis; - readonly messages; - readonly servers; - readonly serverMembers; - readonly sessions; - readonly users; + readonly account: AccountCollection = new AccountCollection(this); + readonly bots: BotCollection = new BotCollection(this); + readonly channels: ChannelCollection = new ChannelCollection(this); + readonly channelUnreads: ChannelUnreadCollection = + new ChannelUnreadCollection(this); + readonly channelWebhooks: ChannelWebhookCollection = + new ChannelWebhookCollection(this); + readonly emojis: EmojiCollection = new EmojiCollection(this); + readonly messages: MessageCollection = new MessageCollection(this); + readonly servers: ServerCollection = new ServerCollection(this); + readonly serverMembers: ServerMemberCollection = new ServerMemberCollection( + this, + ); + readonly sessions: SessionCollection = new SessionCollection(this); + readonly users: UserCollection = new UserCollection(this); readonly api: API; readonly options: ClientOptions; readonly events: EventClient<1>; - configuration: RevoltConfig | undefined; + public configuration: RevoltConfig | undefined; #session: Session | undefined; user: User | undefined; - readonly ready: Accessor; - #setReady: Setter; + ready = false; + connectionFailureCount = 0; - readonly connectionFailureCount: Accessor; - #setConnectionFailureCount: Setter; #reconnectTimeout: number | undefined; /** @@ -217,36 +216,14 @@ export class Client extends AsyncEventEmitter { baseURL: this.options.baseURL, }); - const [ready, setReady] = createSignal(false); - this.ready = ready; - this.#setReady = setReady; - - const [connectionFailureCount, setConnectionFailureCount] = createSignal(0); - this.connectionFailureCount = connectionFailureCount; - this.#setConnectionFailureCount = setConnectionFailureCount; - - this.account = new AccountCollection(this); - this.bots = new BotCollection(this); - this.channels = new ChannelCollection(this); - this.channelUnreads = new ChannelUnreadCollection(this); - this.channelWebhooks = new ChannelWebhookCollection(this); - this.emojis = new EmojiCollection(this); - this.messages = new MessageCollection(this); - this.servers = new ServerCollection(this); - this.serverMembers = new ServerMemberCollection(this); - this.sessions = new SessionCollection(this); - this.users = new UserCollection(this); - this.events = new EventClient(1, "json", this.options); this.events.on("error", (error) => this.emit("error", error)); this.events.on("state", (state) => { switch (state) { case ConnectionState.Connected: - batch(() => { - this.servers.forEach((server) => server.resetSyncStatus()); - this.#setConnectionFailureCount(0); - this.emit("connected"); - }); + this.servers.forEach((server) => server.resetSyncStatus()); + this.connectionFailureCount = 0; + this.emit("connected"); break; case ConnectionState.Connecting: this.emit("connecting"); @@ -256,19 +233,24 @@ export class Client extends AsyncEventEmitter { if (this.options.autoReconnect) { this.#reconnectTimeout = setTimeout( () => this.connect(), - this.options.retryDelayFunction(this.connectionFailureCount()) * + this.options.retryDelayFunction(this.connectionFailureCount) * 1e3, ) as never; - this.#setConnectionFailureCount((count) => count + 1); + this.connectionFailureCount += 1; } break; } }); this.events.on("event", (event) => - handleEvent(this, event, this.#setReady), - ); + handleEvent( + this, + event, + ((value: boolean) => { + this.ready = value; + }).bind(this), + )); } /** @@ -293,7 +275,7 @@ export class Client extends AsyncEventEmitter { connect(): void { clearTimeout(this.#reconnectTimeout); this.events.disconnect(); - this.#setReady(false); + this.ready = false; this.events.connect( this.configuration?.ws ?? "wss://ws.revolt.chat", typeof this.#session === "string" ? this.#session : this.#session!.token, @@ -391,9 +373,11 @@ export class Client extends AsyncEventEmitter { */ proxyFile(url: string): string | undefined { if (this.configuration?.features.january.enabled) { - return `${this.configuration.features.january.url}/proxy?url=${encodeURIComponent( - url, - )}`; + return `${this.configuration.features.january.url}/proxy?url=${ + encodeURIComponent( + url, + ) + }`; } else { return url; } diff --git a/src/classes/BannedUser.ts b/src/classes/BannedUser.ts index 4283cc71..f13defbc 100644 --- a/src/classes/BannedUser.ts +++ b/src/classes/BannedUser.ts @@ -1,8 +1,8 @@ import type { BannedUser as APIBannedUser } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import { File } from "./File.js"; +import { File } from "./File.ts"; /** * Banned User diff --git a/src/classes/Bot.ts b/src/classes/Bot.ts index d28140e4..fbe94894 100644 --- a/src/classes/Bot.ts +++ b/src/classes/Bot.ts @@ -1,10 +1,10 @@ import type { DataEditBot } from "revolt-api"; import { decodeTime } from "ulid"; -import type { BotCollection } from "../collections/BotCollection.js"; -import type { BotFlags } from "../hydration/bot.js"; +import type { BotCollection } from "../collections/BotCollection.ts"; +import type { BotFlags } from "../hydration/bot.ts"; -import type { User } from "./User.js"; +import type { User } from "./User.ts"; /** * Bot Class diff --git a/src/classes/Channel.ts b/src/classes/Channel.ts index bbfc0c46..c0ca2618 100644 --- a/src/classes/Channel.ts +++ b/src/classes/Channel.ts @@ -1,34 +1,30 @@ -import { batch } from "solid-js"; - -import type { ReactiveSet } from "@solid-primitives/set"; import type { Channel as APIChannel, - Member as APIMember, - Message as APIMessage, - User as APIUser, DataEditChannel, DataMessageSearch, DataMessageSend, - Invite, + Member as APIMember, + Message as APIMessage, Override, + User as APIUser, } from "revolt-api"; import type { APIRoutes } from "revolt-api/dist/routes"; import { decodeTime, ulid } from "ulid"; -import { ChannelCollection } from "../collections/index.js"; -import { hydrate } from "../hydration/index.js"; +import type { ChannelCollection } from "../collections/ChannelCollection.ts"; +import { hydrate } from "../hydration/index.ts"; import { bitwiseAndEq, calculatePermission, -} from "../permissions/calculator.js"; -import { Permission } from "../permissions/definitions.js"; +} from "../permissions/calculator.ts"; +import { Permission } from "../permissions/definitions.ts"; -import type { ChannelWebhook } from "./ChannelWebhook.js"; -import type { File } from "./File.js"; -import type { Message } from "./Message.js"; -import type { Server } from "./Server.js"; -import type { ServerMember } from "./ServerMember.js"; -import type { User } from "./User.js"; +import type { ChannelWebhook } from "./ChannelWebhook.ts"; +import type { File } from "./File.ts"; +import type { Message } from "./Message.ts"; +import type { Server } from "./Server.ts"; +import type { ServerMember } from "./ServerMember.ts"; +import type { User } from "./User.ts"; /** * Channel Class @@ -108,8 +104,8 @@ export class Channel { return this.type === "SavedMessages" ? this.user?.username : this.type === "DirectMessage" - ? this.recipient?.username - : this.name; + ? this.recipient?.username + : this.name; } /** @@ -136,7 +132,7 @@ export class Channel { /** * User ids of people currently typing in channel */ - get typingIds(): ReactiveSet { + get typingIds(): Set { return this.#collection.getUnderlyingObject(this.id).typingIds; } @@ -152,7 +148,7 @@ export class Channel { /** * User ids of recipients of the group */ - get recipientIds(): ReactiveSet { + get recipientIds(): Set { return this.#collection.getUnderlyingObject(this.id).recipientIds; } @@ -171,8 +167,8 @@ export class Channel { get recipient(): User | undefined { return this.type === "DirectMessage" ? this.recipients?.find( - (user) => user?.id !== this.#collection.client.user!.id, - ) + (user) => user?.id !== this.#collection.client.user!.id, + ) : undefined; } @@ -291,13 +287,14 @@ export class Channel { this.type === "SavedMessages" || this.type === "VoiceChannel" || this.#collection.client.options.channelIsMuted(this) - ) + ) { return false; + } return ( ( this.#collection.client.channelUnreads.get(this.id)?.lastMessageId ?? - "0" + "0" ).localeCompare(this.lastMessageId) === -1 ); } @@ -305,9 +302,10 @@ export class Channel { /** * Get mentions in this channel for user. */ - get mentions(): ReactiveSet | undefined { - if (this.type === "SavedMessages" || this.type === "VoiceChannel") + get mentions(): Set | undefined { + if (this.type === "SavedMessages" || this.type === "VoiceChannel") { return undefined; + } return this.#collection.client.channelUnreads.get(this.id) ?.messageMentionIds; @@ -376,7 +374,7 @@ export class Channel { orPermission(...permission: (keyof typeof Permission)[]): boolean { return ( permission.findIndex((x) => - bitwiseAndEq(this.permission, Permission[x]), + bitwiseAndEq(this.permission, Permission[x]) ) !== -1 ); } @@ -391,10 +389,8 @@ export class Channel { `/channels/${this.id as ""}/members`, ); - return batch(() => - members.map((user) => - this.#collection.client.users.getOrCreate(user._id, user), - ), + return members.map((user) => + this.#collection.client.users.getOrCreate(user._id, user) ); } @@ -408,13 +404,8 @@ export class Channel { `/channels/${this.id as ""}/webhooks`, ); - return batch(() => - webhooks.map((webhook) => - this.#collection.client.channelWebhooks.getOrCreate( - webhook.id, - webhook, - ), - ), + return webhooks.map((webhook) => + this.#collection.client.channelWebhooks.getOrCreate(webhook.id, webhook) ); } @@ -428,7 +419,7 @@ export class Channel { data, ); - this.#collection.updateUnderlyingObject( + this.#collection.setUnderlyingObject( this.id, hydrate("channel", channel, this.#collection.client, false), ); @@ -445,7 +436,7 @@ export class Channel { }); if (this.type === "DirectMessage") { - this.#collection.updateUnderlyingObject(this.id, "active", false); + this.#collection.setUnderlyingKey(this.id, "active", false); return; } @@ -484,8 +475,9 @@ export class Channel { data: string | DataMessageSend, idempotencyKey: string = ulid(), ): Promise { - const msg: DataMessageSend = - typeof data === "string" ? { content: data } : data; + const msg: DataMessageSend = typeof data === "string" + ? { content: data } + : data; // Mark as silent message if (msg.content?.startsWith("@silent ")) { @@ -546,7 +538,7 @@ export class Channel { )) as APIMessage[]; return messages.map((message) => - this.#collection.client.messages.getOrCreate(message._id, message), + this.#collection.client.messages.getOrCreate(message._id, message) ); } @@ -574,17 +566,17 @@ export class Channel { { ...params, include_users: true }, )) as { messages: APIMessage[]; users: APIUser[]; members?: APIMember[] }; - return batch(() => ({ + return { messages: data.messages.map((message) => - this.#collection.client.messages.getOrCreate(message._id, message), + this.#collection.client.messages.getOrCreate(message._id, message) ), users: data.users.map((user) => - this.#collection.client.users.getOrCreate(user._id, user), + this.#collection.client.users.getOrCreate(user._id, user) ), members: data.members?.map((member) => - this.#collection.client.serverMembers.getOrCreate(member._id, member), + this.#collection.client.serverMembers.getOrCreate(member._id, member) ), - })); + }; } /** @@ -601,10 +593,8 @@ export class Channel { params, )) as APIMessage[]; - return batch(() => - messages.map((message) => - this.#collection.client.messages.getOrCreate(message._id, message), - ), + return messages.map((message) => + this.#collection.client.messages.getOrCreate(message._id, message) ); } @@ -629,17 +619,17 @@ export class Channel { }, )) as { messages: APIMessage[]; users: APIUser[]; members?: APIMember[] }; - return batch(() => ({ + return { messages: data.messages.map((message) => - this.#collection.client.messages.getOrCreate(message._id, message), + this.#collection.client.messages.getOrCreate(message._id, message) ), users: data.users.map((user) => - this.#collection.client.users.getOrCreate(user._id, user), + this.#collection.client.users.getOrCreate(user._id, user) ), members: data.members?.map((member) => - this.#collection.client.serverMembers.getOrCreate(member._id, member), + this.#collection.client.serverMembers.getOrCreate(member._id, member) ), - })); + }; } /** @@ -661,7 +651,16 @@ export class Channel { * @requires `TextChannel`, `VoiceChannel` * @returns Newly created invite code */ - async createInvite(): Promise { + async createInvite(): Promise< + | { + type: "Server"; + _id: string; + server: string; + creator: string; + channel: string; + } + | { type: "Group"; _id: string; creator: string; channel: string } + > { return await this.#collection.client.api.post( `/channels/${this.id as ""}/invites`, ); @@ -679,31 +678,33 @@ export class Channel { * @param skipNextMarking For internal usage only * @requires `SavedMessages`, `DirectMessage`, `Group`, `TextChannel` */ - async ack( + ack( message?: Message | string, skipRateLimiter?: boolean, skipRequest?: boolean, skipNextMarking?: boolean, - ): Promise { + ): void { if (!message && this.#manuallyMarked) { this.#manuallyMarked = false; return; - } - // Skip the next unread marking + } // Skip the next unread marking else if (skipNextMarking) { this.#manuallyMarked = true; } const lastMessageId = (typeof message === "string" ? message : message?.id) ?? - this.lastMessageId ?? - ulid(); + this.lastMessageId ?? + ulid(); const unreads = this.#collection.client.channelUnreads; const channelUnread = unreads.get(this.id); if (channelUnread) { - unreads.updateUnderlyingObject(this.id, { + unreads.setUnderlyingObject(this.id, { + ...unreads.getUnderlyingObject(this.id), lastMessageId, + messageMentionIds: unreads.getUnderlyingObject(this.id) + .messageMentionIds, }); if (channelUnread.messageMentionIds.size) { diff --git a/src/classes/ChannelUnread.ts b/src/classes/ChannelUnread.ts index 4b31911c..59ca9917 100644 --- a/src/classes/ChannelUnread.ts +++ b/src/classes/ChannelUnread.ts @@ -1,6 +1,4 @@ -import type { ReactiveSet } from "@solid-primitives/set"; - -import type { ChannelUnreadCollection } from "../collections/ChannelUnreadCollection.js"; +import type { ChannelUnreadCollection } from "../collections/ChannelUnreadCollection.ts"; /** * Channel Unread Class @@ -36,7 +34,7 @@ export class ChannelUnread { /** * List of message IDs that we were mentioned in */ - get messageMentionIds(): ReactiveSet { + get messageMentionIds(): Set { return this.#collection.getUnderlyingObject(this.id).messageMentionIds; } } diff --git a/src/classes/ChannelWebhook.ts b/src/classes/ChannelWebhook.ts index 87a197c5..3d3fa67d 100644 --- a/src/classes/ChannelWebhook.ts +++ b/src/classes/ChannelWebhook.ts @@ -1,10 +1,8 @@ -import * as APITmp from "revolt-api"; +import type { ChannelWebhookCollection } from "../collections/ChannelWebhookCollection.ts"; +import { hydrate } from "../hydration/index.ts"; -import type { ChannelWebhookCollection } from "../collections/ChannelWebhookCollection.js"; -import { hydrate } from "../hydration/index.js"; - -import type { Channel } from "./Channel.js"; -import type { File } from "./File.js"; +import type { Channel } from "./Channel.ts"; +import type { File } from "./File.ts"; /** * Channel Webhook Class @@ -88,17 +86,13 @@ export class ChannelWebhook { remove: ["Icon"]; }>, ): Promise { - // @ts-expect-error this should error once edit webhook is stable - // eslint-disable-next-line - type TodoUseThisDefinitionOnceItExists = APITmp.DataEditWebhook; - const webhook = await this.#collection.client.api.patch( // @ts-expect-error not in prod `/webhooks/${this.id as ""}/${this.token as ""}`, data, ); - this.#collection.updateUnderlyingObject( + this.#collection.setUnderlyingObject( this.id, // @ts-expect-error not in prod hydrate("channelWebhook", webhook, this.#collection.client), diff --git a/src/classes/Emoji.ts b/src/classes/Emoji.ts index 7b157fee..68619b2c 100644 --- a/src/classes/Emoji.ts +++ b/src/classes/Emoji.ts @@ -1,9 +1,9 @@ import type { EmojiParent } from "revolt-api"; import { decodeTime } from "ulid"; -import type { EmojiCollection } from "../collections/EmojiCollection.js"; +import type { EmojiCollection } from "../collections/EmojiCollection.ts"; -import type { User } from "./User.js"; +import type { User } from "./User.ts"; /** * Emoji Class diff --git a/src/classes/File.ts b/src/classes/File.ts index 21767c02..989f9aca 100644 --- a/src/classes/File.ts +++ b/src/classes/File.ts @@ -1,6 +1,6 @@ import type { File as APIFile, Metadata } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; /** * Uploaded File @@ -60,18 +60,14 @@ export class File { * Direct URL to the file */ get url(): string { - return `${this.#client.configuration?.features.autumn.url}/${this.tag}/${ - this.id - }/${this.filename}`; + return `${this.#client.configuration?.features.autumn.url}/${this.tag}/${this.id}/${this.filename}`; } /** * Download URL for the file */ get downloadURL(): string { - return `${this.#client.configuration?.features.autumn.url}/${ - this.tag - }/download/${this.id}/${this.filename}`; + return `${this.#client.configuration?.features.autumn.url}/${this.tag}/download/${this.id}/${this.filename}`; } /** diff --git a/src/classes/Invite.ts b/src/classes/Invite.ts index df197bc1..23bc7353 100644 --- a/src/classes/Invite.ts +++ b/src/classes/Invite.ts @@ -1,10 +1,10 @@ import type { Invite } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import type { Channel } from "./Channel.js"; -import type { Server } from "./Server.js"; -import type { User } from "./User.js"; +import type { Channel } from "./Channel.ts"; +import type { Server } from "./Server.ts"; +import type { User } from "./User.ts"; /** * Channel Invite diff --git a/src/classes/MFA.ts b/src/classes/MFA.ts index 72255332..6eaccf61 100644 --- a/src/classes/MFA.ts +++ b/src/classes/MFA.ts @@ -1,21 +1,18 @@ -import type { SetStoreFunction } from "solid-js/store"; -import { createStore } from "solid-js/store"; - import type { MFAMethod, MFAResponse, - MultiFactorStatus, MFATicket as TicketType, + MultiFactorStatus, } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; /** * Multi-Factor Authentication */ export class MFA { #client: Client; - #store: [MultiFactorStatus, SetStoreFunction]; + #store: MultiFactorStatus; /** * Construct MFA helper @@ -24,21 +21,30 @@ export class MFA { */ constructor(client: Client, state: MultiFactorStatus) { this.#client = client; - this.#store = createStore(state); + this.#store = state; + } + + /** + * Set MFA status + * @param key key to set + * @param value boolean + */ + #setStore(key: keyof MultiFactorStatus, value: boolean): void { + this.#store[key] = value; } /** * Whether authenticator app is enabled */ get authenticatorEnabled(): boolean { - return this.#store[0].totp_mfa; + return this.#store.totp_mfa; } /** * Whether recovery codes are enabled */ get recoveryEnabled(): boolean { - return this.#store[0].recovery_active; + return this.#store.recovery_active; } /** @@ -46,9 +52,7 @@ export class MFA { */ get availableMethods(): MFAMethod[] { return this.authenticatorEnabled - ? this.recoveryEnabled - ? ["Totp", "Recovery"] - : ["Totp"] + ? this.recoveryEnabled ? ["Totp", "Recovery"] : ["Totp"] : ["Password"]; } @@ -61,7 +65,7 @@ export class MFA { return new MFATicket( this.#client, await this.#client.api.put("/auth/mfa/ticket", params), - this.#store[1] + this.#setStore.bind(this), ); } @@ -71,7 +75,7 @@ export class MFA { */ async enableAuthenticator(token: string): Promise { await this.#client.api.put("/auth/mfa/totp", { totp_code: token }); - this.#store[1]("totp_mfa", true); + this.#setStore("totp_mfa", true); } } @@ -81,7 +85,7 @@ export class MFA { export class MFATicket { #client: Client; #ticket: TicketType; - #mutate: SetStoreFunction; + #mutate: (key: keyof MultiFactorStatus, value: boolean) => void; #used = false; /** @@ -93,7 +97,7 @@ export class MFATicket { constructor( client: Client, ticket: TicketType, - mutate: SetStoreFunction, + mutate: (key: keyof MultiFactorStatus, value: boolean) => void, ) { this.#client = client; this.#ticket = ticket; diff --git a/src/classes/Message.ts b/src/classes/Message.ts index c07aa71d..b38b2cd6 100644 --- a/src/classes/Message.ts +++ b/src/classes/Message.ts @@ -1,24 +1,22 @@ -import type { ReactiveMap } from "@solid-primitives/map"; -import type { ReactiveSet } from "@solid-primitives/set"; import type { - Message as APIMessage, - MessageWebhook as APIMessageWebhook, DataEditMessage, DataMessageSend, Masquerade, + Message as APIMessage, + MessageWebhook as APIMessageWebhook, } from "revolt-api"; import { decodeTime } from "ulid"; -import type { Client } from "../Client.js"; -import type { MessageCollection } from "../collections/MessageCollection.js"; +import type { Client } from "../Client.ts"; +import type { MessageCollection } from "../collections/MessageCollection.ts"; -import type { Channel } from "./Channel.js"; -import { File } from "./File.js"; -import type { MessageEmbed } from "./MessageEmbed.js"; -import type { Server } from "./Server.js"; -import type { ServerMember } from "./ServerMember.js"; -import type { SystemMessage } from "./SystemMessage.js"; -import type { User } from "./User.js"; +import type { Channel } from "./Channel.ts"; +import { File } from "./File.ts"; +import type { MessageEmbed } from "./MessageEmbed.ts"; +import type { Server } from "./Server.ts"; +import type { ServerMember } from "./ServerMember.ts"; +import type { SystemMessage } from "./SystemMessage.ts"; +import type { User } from "./User.ts"; /** * Message Class @@ -61,7 +59,7 @@ export class Message { /** * URL to this message */ - get url(): string | undefined { + get url(): string { return this.#collection.client.configuration?.app + this.path; } @@ -75,7 +73,7 @@ export class Message { /** * Id of channel this message was sent in */ - get channelId(): string | undefined { + get channelId(): string { return this.#collection.getUnderlyingObject(this.id).channelId; } @@ -187,7 +185,7 @@ export class Message { /** * Reactions */ - get reactions(): ReactiveMap> { + get reactions(): Map> { return this.#collection.getUnderlyingObject(this.id).reactions; } @@ -220,9 +218,9 @@ export class Message { return ( this.masquerade?.name ?? - (webhook - ? webhook.name - : (this.member?.nickname ?? this.author?.username)) + (webhook + ? webhook.name + : (this.member?.nickname ?? this.author?.username)) ); } @@ -241,9 +239,9 @@ export class Message { return ( this.masqueradeAvatarURL ?? - (webhook - ? webhook.avatarURL - : (this.member?.avatarURL ?? this.author?.avatarURL)) + (webhook + ? webhook.avatarURL + : (this.member?.avatarURL ?? this.author?.avatarURL)) ); } @@ -255,9 +253,9 @@ export class Message { return ( this.masqueradeAvatarURL ?? - (webhook - ? webhook.avatarURL - : this.member + (webhook + ? webhook.avatarURL + : this.member ? this.member?.animatedAvatarURL : this.author?.animatedAvatarURL) ); @@ -312,8 +310,8 @@ export class Message { data: | string | (Omit & { - nonce?: string; - }), + nonce?: string; + }), mention = true, ): Promise | undefined { const obj = typeof data === "string" ? { content: data } : data; @@ -338,9 +336,8 @@ export class Message { */ async react(emoji: string): Promise { return await this.#collection.client.api.put( - `/channels/${this.channelId as ""}/messages/${this.id as ""}/reactions/${ - emoji as "" - }`, + `/channels/${this.channelId as ""}/messages/${this + .id as ""}/reactions/${emoji as ""}`, ); } @@ -350,9 +347,8 @@ export class Message { */ async unreact(emoji: string): Promise { return await this.#collection.client.api.delete( - `/channels/${this.channelId as ""}/messages/${this.id as ""}/reactions/${ - emoji as "" - }`, + `/channels/${this.channelId as ""}/messages/${this + .id as ""}/reactions/${emoji as ""}`, ); } } @@ -378,14 +374,14 @@ export class MessageWebhook { this.name = webhook.name; this.avatar = webhook.avatar ? new File(client, { - _id: webhook.avatar, - tag: "avatars", - metadata: { - type: "Image", - width: 256, - height: 256, - }, - }) + _id: webhook.avatar, + tag: "avatars", + metadata: { + type: "Image", + width: 256, + height: 256, + }, + }) : undefined; } @@ -395,7 +391,7 @@ export class MessageWebhook { get avatarURL(): string { return ( this.avatar?.createFileURL() ?? - `${this.#client.options.baseURL}/users/${this.id}/default_avatar` + `${this.#client.options.baseURL}/users/${this.id}/default_avatar` ); } } diff --git a/src/classes/MessageEmbed.ts b/src/classes/MessageEmbed.ts index 5b6b77c9..18ed00d7 100644 --- a/src/classes/MessageEmbed.ts +++ b/src/classes/MessageEmbed.ts @@ -1,8 +1,8 @@ import type { Embed, ImageSize, Special } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import { File } from "./File.js"; +import { File } from "./File.ts"; /** * Message Embed @@ -168,25 +168,27 @@ export class WebsiteEmbed extends MessageEmbed { return `https://www.youtube-nocookie.com/embed/${this.specialContent.id}?modestbranding=1${timestamp}`; } case "Twitch": - return `https://player.twitch.tv/?${this.specialContent.content_type.toLowerCase()}=${ - this.specialContent.id - }&parent=${(window ?? {})?.location?.hostname}&autoplay=false`; + return `https://player.twitch.tv/?${this.specialContent.content_type.toLowerCase()}=${this.specialContent.id}&parent=${ + (globalThis ?? {})?.location?.hostname + }&autoplay=false`; case "Lightspeed": return `https://new.lightspeed.tv/embed/${this.specialContent.id}/stream`; case "Spotify": return `https://open.spotify.com/embed/${this.specialContent.content_type}/${this.specialContent.id}`; case "Soundcloud": - return `https://w.soundcloud.com/player/?url=${encodeURIComponent( - this.url!, - )}&color=%23FF7F50&auto_play=false&hide_related=false&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true`; + return `https://w.soundcloud.com/player/?url=${ + encodeURIComponent( + this.url!, + ) + }&color=%23FF7F50&auto_play=false&hide_related=false&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true`; case "Bandcamp": { - return `https://bandcamp.com/EmbeddedPlayer/${this.specialContent.content_type.toLowerCase()}=${ - this.specialContent.id - }/size=large/bgcol=181a1b/linkcol=056cc4/tracklist=false/transparent=true/`; + return `https://bandcamp.com/EmbeddedPlayer/${this.specialContent.content_type.toLowerCase()}=${this.specialContent.id}/size=large/bgcol=181a1b/linkcol=056cc4/tracklist=false/transparent=true/`; } case "Streamable": { return `https://streamable.com/e/${this.specialContent.id}?loop=0`; } + default: + return undefined; } } } diff --git a/src/classes/PublicBot.ts b/src/classes/PublicBot.ts index 3653d3f9..2a27b23a 100644 --- a/src/classes/PublicBot.ts +++ b/src/classes/PublicBot.ts @@ -1,10 +1,10 @@ import type { File as APIFile, PublicBot as APIPublicBot } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import { Channel } from "./Channel.js"; -import { File } from "./File.js"; -import { Server } from "./Server.js"; +import { Channel } from "./Channel.ts"; +import { File } from "./File.ts"; +import { Server } from "./Server.ts"; /** * Public Bot Class @@ -28,9 +28,9 @@ export class PublicBot { this.username = data.username; this.avatar = data.avatar ? new File(client, { - _id: data.avatar, - tag: "avatars", - } as APIFile) + _id: data.avatar, + tag: "avatars", + } as APIFile) : undefined; this.description = data.description!; } diff --git a/src/classes/PublicInvite.ts b/src/classes/PublicInvite.ts index e6ecf9f0..6c579135 100644 --- a/src/classes/PublicInvite.ts +++ b/src/classes/PublicInvite.ts @@ -1,12 +1,10 @@ -import { batch } from "solid-js"; - import type { Invite, InviteResponse } from "revolt-api"; -import type { Client } from "../Client.js"; -import type { ServerFlags } from "../hydration/server.js"; +import type { Client } from "../Client.ts"; +import type { ServerFlags } from "../hydration/server.ts"; -import { File } from "./File.js"; -import type { Server } from "./Server.js"; +import { File } from "./File.ts"; +import type { Server } from "./Server.ts"; /** * Public Channel Invite @@ -105,17 +103,15 @@ export class ServerPublicInvite extends PublicChannelInvite { const invite = await this.client!.api.post(`/invites/${this.code as ""}`); if (invite.type === "Server") { - return batch(() => { - for (const channel of invite.channels) { - this.client!.channels.getOrCreate(channel._id, channel); - } - - return this.client!.servers.getOrCreate( - invite.server._id, - invite.server, - true, - ); - }); + for (const channel of invite.channels) { + this.client!.channels.getOrCreate(channel._id, channel); + } + + return this.client!.servers.getOrCreate( + invite.server._id, + invite.server, + true, + ); } else { throw "unreachable"; } diff --git a/src/classes/Server.ts b/src/classes/Server.ts index 298c028b..6992f897 100644 --- a/src/classes/Server.ts +++ b/src/classes/Server.ts @@ -1,9 +1,4 @@ -import { batch } from "solid-js"; - -import type { ReactiveMap } from "@solid-primitives/map"; -import type { ReactiveSet } from "@solid-primitives/set"; import type { - Server as APIServer, AllMemberResponse, BannedUser, Category, @@ -13,27 +8,27 @@ import type { DataEditRole, DataEditServer, Override, - OverrideField, Role, + Server as APIServer, } from "revolt-api"; import { decodeTime } from "ulid"; -import type { ServerCollection } from "../collections/ServerCollection.js"; -import { hydrate } from "../hydration/index.js"; -import type { ServerFlags } from "../hydration/server.js"; +import type { ServerCollection } from "../collections/ServerCollection.ts"; +import { hydrate } from "../hydration/index.ts"; +import type { ServerFlags } from "../hydration/server.ts"; import { bitwiseAndEq, calculatePermission, -} from "../permissions/calculator.js"; -import { Permission } from "../permissions/definitions.js"; +} from "../permissions/calculator.ts"; +import { Permission } from "../permissions/definitions.ts"; -import type { Channel } from "./Channel.js"; -import type { Emoji } from "./Emoji.js"; -import type { File } from "./File.js"; -import { ChannelInvite } from "./Invite.js"; -import { ServerBan } from "./ServerBan.js"; -import { ServerMember } from "./ServerMember.js"; -import { User } from "./User.js"; +import type { Channel } from "./Channel.ts"; +import type { Emoji } from "./Emoji.ts"; +import type { File } from "./File.ts"; +import { ChannelInvite } from "./Invite.ts"; +import { ServerBan } from "./ServerBan.ts"; +import { ServerMember } from "./ServerMember.ts"; +import { User } from "./User.ts"; /** * Server Class @@ -51,6 +46,7 @@ export class Server { this.#collection = collection; this.id = id; } + /** * Convert to string * @returns String @@ -120,7 +116,7 @@ export class Server { /** * Channel IDs */ - get channelIds(): ReactiveSet { + get channelIds(): Set { return this.#collection.getUnderlyingObject(this.id).channelIds; } @@ -128,9 +124,9 @@ export class Server { * Channels */ get channels(): Channel[] { - return [ - ...this.#collection.getUnderlyingObject(this.id).channelIds.values(), - ] + return Array.from( + this.#collection.getUnderlyingObject(this.id).channelIds.values(), + ) .map((id) => this.#collection.client.channels.get(id)!) .filter((x) => x); } @@ -152,16 +148,7 @@ export class Server { /** * Roles */ - get roles(): ReactiveMap< - string, - { - name: string; - permissions: OverrideField; - colour?: string | null; - hoist?: boolean; - rank?: number; - } - > { + get roles(): Map { return this.#collection.getUnderlyingObject(this.id).roles; } @@ -269,19 +256,12 @@ export class Server { * ranking roles. This is dictated by the "rank" property * which is smaller for higher priority roles. */ - get orderedRoles(): { - name: string; - permissions: OverrideField; - colour?: string | null; - hoist?: boolean; - rank?: number; - id: string; - }[] { + get orderedRoles(): Role[] { const roles = this.roles; return roles ? [...roles.entries()] - .map(([id, role]) => ({ id, ...role })) - .sort((a, b) => (a.rank || 0) - (b.rank || 0)) + .map(([id, role]) => ({ id, ...role })) + .sort((a, b) => (a.rank || 0) - (b.rank || 0)) : []; } @@ -289,8 +269,8 @@ export class Server { * Check whether the server is currently unread * @returns Whether the server is unread */ - get unread(): boolean { - return !!this.channels.find((channel) => channel.unread); + get unread(): Channel | undefined { + return this.channels.find((channel) => channel.unread); } /** @@ -299,7 +279,7 @@ export class Server { */ get mentions(): string[] { const arr = this.channels.map((channel) => - Array.from(channel.mentions?.values() ?? []), + Array.from(channel.mentions?.values() ?? []) ); return ([] as string[]).concat(...arr); @@ -363,7 +343,7 @@ export class Server { orPermission(...permission: (keyof typeof Permission)[]): boolean { return ( permission.findIndex((x) => - bitwiseAndEq(this.permission, Permission[x]), + bitwiseAndEq(this.permission, Permission[x]) ) !== -1 ); } @@ -399,7 +379,7 @@ export class Server { * @param data Changes */ async edit(data: DataEditServer): Promise { - this.#collection.updateUnderlyingObject( + this.#collection.setUnderlyingObject( this.id, hydrate( "server", @@ -418,26 +398,22 @@ export class Server { * @param leaveEvent Whether we are leaving */ $delete(leaveEvent?: boolean): void { - batch(() => { - const server = this.#collection.client.servers.getUnderlyingObject( - this.id, - ); + const server = this.#collection.client.servers.getUnderlyingObject(this.id); - // Avoid race conditions - if (server.id) { - this.#collection.client.emit( - leaveEvent ? "serverLeave" : "serverDelete", - server, - ); - - for (const channel of this.channelIds) { - this.#collection.client.channels.delete(channel); - } + // Avoid race conditions + if (server.id) { + this.#collection.client.emit( + leaveEvent ? "serverLeave" : "serverDelete", + server, + ); - this.#collection.delete(this.id); + for (const channel of this.channelIds) { + this.#collection.client.channels.delete(channel); } - // TODO: delete members, emoji, etc - }); + + this.#collection.delete(this.id); + } + // TODO: delete members, emoji, etc } /** @@ -456,11 +432,9 @@ export class Server { * Mark a server as read */ async ack(): Promise { - batch(() => { - for (const channel of this.channels) { - channel.ack(undefined, false, true); - } - }); + for (const channel of this.channels) { + channel.ack(undefined, false, true); + } await this.#collection.client.api.put(`/servers/${this.id}/ack`); } @@ -474,12 +448,11 @@ export class Server { user: string | User | ServerMember, options: DataBanCreate = {}, ): Promise { - const userId = - user instanceof User - ? user.id - : user instanceof ServerMember - ? user.id.user - : user; + const userId = user instanceof User + ? user.id + : user instanceof ServerMember + ? user.id.user + : user; const ban = await this.#collection.client.api.put( `/servers/${this.id as ""}/bans/${userId as ""}`, @@ -499,8 +472,8 @@ export class Server { typeof user === "string" ? user : user instanceof User - ? user.id - : user.id.user + ? user.id + : user.id.user }`, ); } @@ -526,7 +499,7 @@ export class Server { ); return invites.map((invite) => - ChannelInvite.from(this.#collection.client, invite), + ChannelInvite.from(this.#collection.client, invite) ); } @@ -613,7 +586,7 @@ export class Server { }); if (existing) return existing; - return this.#collection.client.serverMembers.fetch(this.id, userId); + return await this.#collection.client.serverMembers.fetch(this.id, userId); } #synced: undefined | "partial" | "full"; @@ -630,31 +603,29 @@ export class Server { { exclude_offline: excludeOffline }, ); - batch(() => { - if (excludeOffline) { - for (let i = 0; i < data.users.length; i++) { - const user = data.users[i]; - if (user.online) { - this.#collection.client.users.getOrCreate(user._id, user); - this.#collection.client.serverMembers.getOrCreate( - data.members[i]._id, - data.members[i], - ); - } - } - } else { - for (let i = 0; i < data.users.length; i++) { - this.#collection.client.users.getOrCreate( - data.users[i]._id, - data.users[i], - ); + if (excludeOffline) { + for (let i = 0; i < data.users.length; i++) { + const user = data.users[i]; + if (user.online) { + this.#collection.client.users.getOrCreate(user._id, user); this.#collection.client.serverMembers.getOrCreate( data.members[i]._id, data.members[i], ); } } - }); + } else { + for (let i = 0; i < data.users.length; i++) { + this.#collection.client.users.getOrCreate( + data.users[i]._id, + data.users[i], + ); + this.#collection.client.serverMembers.getOrCreate( + data.members[i]._id, + data.members[i], + ); + } + } } /** @@ -674,14 +645,14 @@ export class Server { `/servers/${this.id as ""}/members`, )) as AllMemberResponse; - return batch(() => ({ + return { members: data.members.map((member) => - this.#collection.client.serverMembers.getOrCreate(member._id, member), + this.#collection.client.serverMembers.getOrCreate(member._id, member) ), users: data.users.map((user) => - this.#collection.client.users.getOrCreate(user._id, user), + this.#collection.client.users.getOrCreate(user._id, user) ), - })); + }; } /** @@ -693,21 +664,22 @@ export class Server { query: string, ): Promise<{ members: ServerMember[]; users: User[] }> { const data = (await this.#collection.client.api.get( - `/servers/${ - this.id as "" - }/members_experimental_query?experimental_api=true&query=${encodeURIComponent( - query, - )}` as never, + `/servers/${this + .id as ""}/members_experimental_query?experimental_api=true&query=${ + encodeURIComponent( + query, + ) + }` as never, )) as AllMemberResponse; - return batch(() => ({ + return { members: data.members.map((member) => - this.#collection.client.serverMembers.getOrCreate(member._id, member), + this.#collection.client.serverMembers.getOrCreate(member._id, member) ), users: data.users.map((user) => - this.#collection.client.users.getOrCreate(user._id, user), + this.#collection.client.users.getOrCreate(user._id, user) ), - })); + }; } /** @@ -742,10 +714,8 @@ export class Server { `/servers/${this.id as ""}/emojis`, ); - return batch(() => - emojis.map((emoji) => - this.#collection.client.emojis.getOrCreate(emoji._id, emoji), - ), + return emojis.map((emoji) => + this.#collection.client.emojis.getOrCreate(emoji._id, emoji) ); } @@ -754,6 +724,8 @@ export class Server { * @param emojiId Emoji ID */ async deleteEmoji(emojiId: string): Promise { - await this.#collection.client.api.delete(`/custom/emoji/${emojiId}`); + return (await this.#collection.client.api.delete( + `/custom/emoji/${emojiId}`, + )) as void; } } diff --git a/src/classes/ServerBan.ts b/src/classes/ServerBan.ts index 807f15a5..298787e6 100644 --- a/src/classes/ServerBan.ts +++ b/src/classes/ServerBan.ts @@ -1,13 +1,13 @@ import type { BannedUser as APIBannedUser, - ServerBan as APIServerBan, MemberCompositeKey, + ServerBan as APIServerBan, } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import { BannedUser } from "./BannedUser.js"; -import type { Server } from "./Server.js"; +import { BannedUser } from "./BannedUser.ts"; +import type { Server } from "./Server.ts"; /** * Server Ban diff --git a/src/classes/ServerMember.ts b/src/classes/ServerMember.ts index ec4d2559..8c65fd76 100644 --- a/src/classes/ServerMember.ts +++ b/src/classes/ServerMember.ts @@ -5,17 +5,17 @@ import type { Role, } from "revolt-api"; -import type { ServerMemberCollection } from "../collections/ServerMemberCollection.js"; +import type { ServerMemberCollection } from "../collections/ServerMemberCollection.ts"; import { bitwiseAndEq, calculatePermission, -} from "../permissions/calculator.js"; -import { Permission } from "../permissions/definitions.js"; +} from "../permissions/calculator.ts"; +import { Permission } from "../permissions/definitions.ts"; -import type { Channel } from "./Channel.js"; -import type { File } from "./File.js"; -import type { Server } from "./Server.js"; -import type { User } from "./User.js"; +import type { Channel } from "./Channel.ts"; +import type { File } from "./File.ts"; +import type { Server } from "./Server.ts"; +import type { User } from "./User.ts"; /** * Deterministic conversion of member composite key to string ID @@ -236,13 +236,13 @@ export class ServerMember { * @param options Ban options */ async ban(options: DataBanCreate): Promise { - this.server?.banUser(this, options); + await this.server?.banUser(this, options); } /** * Kick this member from the server */ async kick(): Promise { - this.server?.kickUser(this); + await this.server?.kickUser(this); } } diff --git a/src/classes/Session.ts b/src/classes/Session.ts index bbf244ec..86edcdf0 100644 --- a/src/classes/Session.ts +++ b/src/classes/Session.ts @@ -1,6 +1,6 @@ import { decodeTime } from "ulid"; -import type { SessionCollection } from "../collections/SessionCollection.js"; +import type { SessionCollection } from "../collections/SessionCollection.ts"; /** * Session Class @@ -64,7 +64,7 @@ export class Session { friendly_name: name, }); - this.#collection.updateUnderlyingObject(this.id, "name", name); + this.#collection.setUnderlyingKey(this.id, "name", name); } /** diff --git a/src/classes/SystemMessage.ts b/src/classes/SystemMessage.ts index 3dcfbc5e..2b84937f 100644 --- a/src/classes/SystemMessage.ts +++ b/src/classes/SystemMessage.ts @@ -1,8 +1,8 @@ import type { SystemMessage as APISystemMessage } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import type { User } from "./User.js"; +import type { User } from "./User.ts"; /** * System Message diff --git a/src/classes/User.ts b/src/classes/User.ts index 2ce6cee9..2daadedb 100644 --- a/src/classes/User.ts +++ b/src/classes/User.ts @@ -1,12 +1,18 @@ -import type { User as APIUser, DataEditUser, Presence } from "revolt-api"; +import type { + DataEditUser, + Presence, + RelationshipStatus, + User as APIUser, +} from "revolt-api"; import { decodeTime } from "ulid"; -import type { UserCollection } from "../collections/UserCollection.js"; -import { U32_MAX, UserPermission } from "../permissions/definitions.js"; +import type { UserCollection } from "../collections/UserCollection.ts"; +import type { UserBadges, UserFlags } from "../hydration/user.ts"; +import { U32_MAX, UserPermission } from "../permissions/definitions.ts"; -import type { Channel } from "./Channel.js"; -import type { File } from "./File.js"; -import { UserProfile } from "./UserProfile.js"; +import type { Channel } from "./Channel.ts"; +import type { File } from "./File.ts"; +import { UserProfile } from "./UserProfile.ts"; /** * User Class @@ -67,7 +73,7 @@ export class User { get displayName(): string { return ( this.#collection.getUnderlyingObject(this.id).displayName ?? - this.#collection.getUnderlyingObject(this.id).username + this.#collection.getUnderlyingObject(this.id).username ); } @@ -81,7 +87,7 @@ export class User { /** * Badges */ - get badges(): number { + get badges(): UserBadges { return this.#collection.getUnderlyingObject(this.id).badges; } @@ -92,15 +98,16 @@ export class User { | { text?: string | null; presence?: Presence | null } | undefined { // TODO: issue with API, upstream fix required #319 - if (!this.online) + if (!this.online) { return { text: undefined, presence: "Invisible" as const }; + } return this.#collection.getUnderlyingObject(this.id).status; } /** * Relationship with user */ - get relationship(): string { + get relationship(): RelationshipStatus { return this.#collection.getUnderlyingObject(this.id).relationship; } @@ -121,7 +128,7 @@ export class User { /** * Flags */ - get flags(): number { + get flags(): UserFlags { return this.#collection.getUnderlyingObject(this.id).flags; } @@ -143,9 +150,7 @@ export class User { * URL to the user's default avatar */ get defaultAvatarURL(): string { - return `${this.#collection.client.options.baseURL}/users/${ - this.id - }/default_avatar`; + return `${this.#collection.client.options.baseURL}/users/${this.id}/default_avatar`; } /** @@ -179,7 +184,7 @@ export class User { ): string | undefined { return this.online ? (this.status?.text ?? - (this.presence === "Focus" ? translate("Focus") : undefined)) + (this.presence === "Focus" ? translate("Focus") : undefined)) : undefined; } @@ -256,7 +261,7 @@ export class User { if (dm) { if (!dm.active) { - this.#collection.client.channels.updateUnderlyingObject( + this.#collection.client.channels.setUnderlyingKey( dm.id, "active", true, diff --git a/src/classes/UserProfile.ts b/src/classes/UserProfile.ts index a2a2b7b1..592f4c62 100644 --- a/src/classes/UserProfile.ts +++ b/src/classes/UserProfile.ts @@ -1,8 +1,8 @@ import type { UserProfile as APIUserProfile } from "revolt-api"; -import type { Client } from "../Client.js"; +import type { Client } from "../Client.ts"; -import { File } from "./File.js"; +import { File } from "./File.ts"; /** * User Profile Class diff --git a/src/classes/index.ts b/src/classes/index.ts index c34f5cd1..c2c215ea 100644 --- a/src/classes/index.ts +++ b/src/classes/index.ts @@ -1,20 +1,20 @@ -export * from "./BannedUser.js"; -export * from "./Bot.js"; -export * from "./Channel.js"; -export * from "./ChannelUnread.js"; -export * from "./ChannelWebhook.js"; -export * from "./Emoji.js"; -export * from "./File.js"; -export * from "./Invite.js"; -export * from "./Message.js"; -export * from "./MessageEmbed.js"; -export * from "./PublicBot.js"; -export * from "./PublicInvite.js"; -export * from "./Server.js"; -export * from "./ServerBan.js"; -export * from "./ServerMember.js"; -export * from "./Session.js"; -export * from "./SystemMessage.js"; -export * from "./User.js"; -export * from "./MFA.js"; -export * from "./UserProfile.js"; +export * from "./BannedUser.ts"; +export * from "./Bot.ts"; +export * from "./Channel.ts"; +export * from "./ChannelUnread.ts"; +export * from "./ChannelWebhook.ts"; +export * from "./Emoji.ts"; +export * from "./File.ts"; +export * from "./Invite.ts"; +export * from "./Message.ts"; +export * from "./MessageEmbed.ts"; +export * from "./PublicBot.ts"; +export * from "./PublicInvite.ts"; +export * from "./Server.ts"; +export * from "./ServerBan.ts"; +export * from "./ServerMember.ts"; +export * from "./Session.ts"; +export * from "./SystemMessage.ts"; +export * from "./User.ts"; +export * from "./MFA.ts"; +export * from "./UserProfile.ts"; diff --git a/src/collections/AccountCollection.ts b/src/collections/AccountCollection.ts index 1f49675e..c9c4b707 100644 --- a/src/collections/AccountCollection.ts +++ b/src/collections/AccountCollection.ts @@ -1,7 +1,7 @@ import type { DataCreateAccount, WebPushSubscription } from "revolt-api"; -import type { Client } from "../Client.js"; -import { MFA } from "../classes/MFA.js"; +import type { Client } from "../Client.ts"; +import { MFA } from "../classes/MFA.ts"; /** * Utility functions for working with accounts @@ -36,8 +36,8 @@ export class AccountCollection { * Create a new account * @param data Account details */ - create(data: DataCreateAccount): Promise { - return this.client.api.post("/auth/account/create", data); + async create(data: DataCreateAccount): Promise { + return await this.client.api.post("/auth/account/create", data); } /** @@ -45,8 +45,11 @@ export class AccountCollection { * @param email Email * @param captcha Captcha if enabled */ - reverify(email: string, captcha?: string): Promise { - return this.client.api.post("/auth/account/reverify", { email, captcha }); + async reverify(email: string, captcha?: string): Promise { + return await this.client.api.post("/auth/account/reverify", { + email, + captcha, + }); } /** @@ -54,8 +57,8 @@ export class AccountCollection { * @param email Email * @param captcha Captcha if enabled */ - resetPassword(email: string, captcha?: string): Promise { - return this.client.api.post("/auth/account/reset_password", { + async resetPassword(email: string, captcha?: string): Promise { + return await this.client.api.post("/auth/account/reset_password", { email, captcha, }); @@ -65,16 +68,16 @@ export class AccountCollection { * Verify an account given the code * @param code Verification code */ - verify(code: string): Promise { - return this.client.api.post(`/auth/account/verify/${code}`); + async verify(code: string): Promise { + return await this.client.api.post(`/auth/account/verify/${code}`); } /** * Confirm account deletion * @param token Deletion token */ - confirmDelete(token: string): Promise { - return this.client.api.put("/auth/account/delete", { token }); + async confirmDelete(token: string): Promise { + return await this.client.api.put("/auth/account/delete", { token }); } /** @@ -83,12 +86,12 @@ export class AccountCollection { * @param newPassword New password * @param removeSessions Whether to remove existing sessions */ - confirmPasswordReset( + async confirmPasswordReset( token: string, newPassword: string, removeSessions: boolean, ): Promise { - return this.client.api.patch("/auth/account/reset_password", { + return await this.client.api.patch("/auth/account/reset_password", { token, password: newPassword, remove_sessions: removeSessions, @@ -100,8 +103,11 @@ export class AccountCollection { * @param newPassword New password * @param currentPassword Current password */ - changePassword(newPassword: string, currentPassword: string): Promise { - return this.client.api.patch("/auth/account/change/password", { + async changePassword( + newPassword: string, + currentPassword: string, + ): Promise { + return await this.client.api.patch("/auth/account/change/password", { password: newPassword, current_password: currentPassword, }); @@ -112,8 +118,8 @@ export class AccountCollection { * @param newEmail New email * @param currentPassword Current password */ - changeEmail(newEmail: string, currentPassword: string): Promise { - return this.client.api.patch("/auth/account/change/email", { + async changeEmail(newEmail: string, currentPassword: string): Promise { + return await this.client.api.patch("/auth/account/change/email", { email: newEmail, current_password: currentPassword, }); @@ -124,41 +130,40 @@ export class AccountCollection { * @param keys Keys * @returns Settings */ - fetchSettings(keys: string[]): Promise> { - return this.client.api.post("/sync/settings/fetch", { keys }) as Promise< - Record - >; + async fetchSettings( + keys: string[], + ): Promise> { + return await this.client.api.post("/sync/settings/fetch", { keys }); } - /* eslint-disable @typescript-eslint/no-explicit-any */ /** * Set settings * @param settings Settings * @param timestamp Timestamp */ - setSettings( + async setSettings( + // deno-lint-ignore no-explicit-any settings: Record, - timestamp = +new Date(), + timestamp: number = new Date().getTime(), ): Promise { - return this.client.api.post("/sync/settings/set", { + return await this.client.api.post("/sync/settings/set", { ...settings, timestamp, }); } - /* eslint-enable @typescript-eslint/no-explicit-any */ /** * Create a new Web Push subscription * @param subscription Subscription */ - webPushSubscribe(subscription: WebPushSubscription): Promise { - return this.client.api.post("/push/subscribe", subscription); + async webPushSubscribe(subscription: WebPushSubscription): Promise { + return await this.client.api.post("/push/subscribe", subscription); } /** * Remove existing Web Push subscription */ - webPushUnsubscribe(): Promise { - return this.client.api.post("/push/unsubscribe"); + async webPushUnsubscribe(): Promise { + return await this.client.api.post("/push/unsubscribe"); } } diff --git a/src/collections/BotCollection.ts b/src/collections/BotCollection.ts index 2b0e2ff5..e3223927 100644 --- a/src/collections/BotCollection.ts +++ b/src/collections/BotCollection.ts @@ -1,17 +1,15 @@ -import { batch } from "solid-js"; - import type { Bot as APIBot, OwnedBotsResponse } from "revolt-api"; -import { Bot } from "../classes/Bot.js"; -import { PublicBot } from "../classes/PublicBot.js"; -import type { HydratedBot } from "../hydration/bot.js"; +import { Bot } from "../classes/Bot.ts"; +import { PublicBot } from "../classes/PublicBot.ts"; +import type { HydratedBot } from "../hydration/bot.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Bots */ -export class BotCollection extends ClassCollection { +export class BotCollection extends Collection { /** * Fetch bot by ID * @param id Id @@ -31,12 +29,8 @@ export class BotCollection extends ClassCollection { */ async fetchOwned(): Promise { const data = (await this.client.api.get("/bots/@me")) as OwnedBotsResponse; - return batch(() => { - data.users.forEach((user) => - this.client.users.getOrCreate(user._id, user), - ); - return data.bots.map((bot) => this.getOrCreate(bot._id, bot)); - }); + data.users.forEach((user) => this.client.users.getOrCreate(user._id, user)); + return data.bots.map((bot) => this.getOrCreate(bot._id, bot)); } /** diff --git a/src/collections/ChannelCollection.ts b/src/collections/ChannelCollection.ts index 407f5359..39ba551c 100644 --- a/src/collections/ChannelCollection.ts +++ b/src/collections/ChannelCollection.ts @@ -1,18 +1,15 @@ import type { Channel as APIChannel } from "revolt-api"; -import { Channel } from "../classes/Channel.js"; -import { User } from "../classes/User.js"; -import type { HydratedChannel } from "../hydration/channel.js"; +import { Channel } from "../classes/Channel.ts"; +import { User } from "../classes/User.ts"; +import type { HydratedChannel } from "../hydration/channel.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Channels */ -export class ChannelCollection extends ClassCollection< - Channel, - HydratedChannel -> { +export class ChannelCollection extends Collection { /** * Delete an object * @param id Id diff --git a/src/collections/ChannelUnreadCollection.ts b/src/collections/ChannelUnreadCollection.ts index d71e10c8..ce1b7571 100644 --- a/src/collections/ChannelUnreadCollection.ts +++ b/src/collections/ChannelUnreadCollection.ts @@ -1,16 +1,14 @@ -import { batch } from "solid-js"; - import type { ChannelUnread as APIChannelUnread } from "revolt-api"; -import { ChannelUnread } from "../classes/ChannelUnread.js"; -import type { HydratedChannelUnread } from "../hydration/channelUnread.js"; +import { ChannelUnread } from "../classes/ChannelUnread.ts"; +import type { HydratedChannelUnread } from "../hydration/channelUnread.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Channel Unreads */ -export class ChannelUnreadCollection extends ClassCollection< +export class ChannelUnreadCollection extends Collection< ChannelUnread, HydratedChannelUnread > { @@ -19,19 +17,19 @@ export class ChannelUnreadCollection extends ClassCollection< */ async sync(): Promise { const unreads = await this.client.api.get("/sync/unreads"); - batch(() => { - this.reset(); - for (const unread of unreads) { - this.getOrCreate(unread._id.channel, unread); - } - }); + this.reset(); + for (const unread of unreads) { + this.getOrCreate(unread._id.channel, unread); + } } /** * Clear all unread data */ reset(): void { - this.updateUnderlyingObject({}); + for (const key of this.keys()) { + this.setUnderlyingObject(key, {} as never); + } } /** diff --git a/src/collections/ChannelWebhookCollection.ts b/src/collections/ChannelWebhookCollection.ts index a8cad39c..38dd93c7 100644 --- a/src/collections/ChannelWebhookCollection.ts +++ b/src/collections/ChannelWebhookCollection.ts @@ -1,14 +1,14 @@ import type { Webhook } from "revolt-api"; -import { ChannelWebhook } from "../classes/ChannelWebhook.js"; -import type { HydratedChannelWebhook } from "../hydration/channelWebhook.js"; +import { ChannelWebhook } from "../classes/ChannelWebhook.ts"; +import type { HydratedChannelWebhook } from "../hydration/channelWebhook.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Channel Webhooks */ -export class ChannelWebhookCollection extends ClassCollection< +export class ChannelWebhookCollection extends Collection< ChannelWebhook, HydratedChannelWebhook > { diff --git a/src/collections/Collection.ts b/src/collections/Collection.ts index 153daeee..993da8da 100644 --- a/src/collections/Collection.ts +++ b/src/collections/Collection.ts @@ -1,150 +1,66 @@ -import type { SetStoreFunction } from "solid-js/store"; - -import { ReactiveMap } from "@solid-primitives/map"; - -import type { Client } from "../Client.js"; -import type { Hydrators } from "../hydration/index.js"; -import { ObjectStorage } from "../storage/ObjectStorage.js"; +import type { Client } from "../Client.ts"; +import { hydrate, type Hydrators } from "../hydration/index.ts"; /** - * Abstract Collection type + * Collection backed by a store */ -export abstract class Collection { - /** - * Get an existing object - * @param id Id - * @returns Object - */ - abstract get(id: string): T | undefined; +export class Collection { + #storage = new Map(); + #objects = new Map(); /** - * Check whether an id exists in the Collection - * @param id Id - * @returns Whether it exists + * Construct store backed collection */ - abstract has(id: string): boolean; + constructor(public readonly client: Client) {} /** - * Delete an object + * Get an existing object * @param id Id */ - abstract delete(id: string): void; - - /** - * Number of stored objects - * @returns Size - */ - abstract size(): number; - - /** - * Iterable of keys in the map - * @returns Iterable - */ - abstract keys(): IterableIterator; - - /** - * Iterable of values in the map - * @returns Iterable - */ - abstract values(): IterableIterator; - - /** - * Iterable of key, value pairs in the map - * @returns Iterable - */ - abstract entries(): IterableIterator<[string, T]>; - - /** - * Execute a provided function over each key, value pair in the map - * @param cb Callback for each pair - */ - abstract forEach( - cb: (value: T, key: string, map: Map) => void, - ): void; - - /** - * List of values in the map - * @returns List - */ - toList(): T[] { - return [...this.values()]; + get(id: string): T | undefined { + return this.#objects.get(id); } /** - * Filter the collection by a given predicate - * @param predicate Predicate to satisfy + * Get an underlying object */ - filter(predicate: (value: T, key: string) => boolean): T[] { - const list: T[] = []; - for (const [key, value] of this.entries()) { - if (predicate(value, key)) { - list.push(value); - } - } - - return list; + getUnderlyingObject(id: string): V { + return this.#storage.get(id) ?? ({} as V); } /** - * Map the collection using a given callback - * @param cb Callback + * Set a key of an underlying object */ - map(cb: (value: T, key: string) => O): O[] { - const list: O[] = []; - for (const [key, value] of this.entries()) { - list.push(cb(value, key)); - } - - return list; + setUnderlyingKey(id: string, key: K, value: V[K]): void { + this.#storage.set(id, { + [key]: value, + ...((this.#storage.get(id) ?? {}) as V), + }); } /** - * Find some value based on a predicate - * @param predicate Predicate to satisfy + * Set an underlying object */ - find(predicate: (value: T, key: string) => boolean): T | undefined { - for (const [key, value] of this.entries()) { - if (predicate(value, key)) { - return value; - } - } - } -} - -/** - * Collection backed by a Solid.js Store - */ -export abstract class StoreCollection extends Collection { - #storage = new ObjectStorage(); - #objects = new ReactiveMap(); - readonly getUnderlyingObject: (id: string) => V; - readonly updateUnderlyingObject: SetStoreFunction>; - - /** - * Construct store backed collection - */ - constructor() { - super(); - this.getUnderlyingObject = (key) => this.#storage.get(key) ?? ({} as V); - this.updateUnderlyingObject = this.#storage.set; + setUnderlyingObject(id: string, value: V): void { + this.#storage.set(id, value); } /** - * Get an existing object + * Check whether an id exists in the Collection * @param id Id - * @returns Object + * @returns Whether it exists */ - get(id: string): T | undefined { - return this.#objects.get(id); + has(id: string): boolean { + return this.#objects.has(id); } /** - * Check whether an id exists in the Collection + * Check whether the underlying id exists * @param id Id * @returns Whether it exists */ - has(id: string): boolean { - return this.#objects.has(id); + hasUnderlying(id: string): boolean { + return !!((this.#storage.get(id) as { id: string }) ?? { id: false }).id; } /** @@ -153,7 +69,7 @@ export abstract class StoreCollection extends Collection { */ delete(id: string): void { this.#objects.delete(id); - this.updateUnderlyingObject(id, undefined as never); + this.#storage.delete(id); } /** @@ -171,7 +87,12 @@ export abstract class StoreCollection extends Collection { context: unknown, data?: unknown, ): void { - this.#storage.hydrate(id, type, context, data); + if (data) { + this.#storage.set( + id, + hydrate(type, { partial: false, ...data } as never, context, true) as V, + ); + } this.#objects.set(id, instance); } @@ -181,7 +102,9 @@ export abstract class StoreCollection extends Collection { * @returns Whether it is a partial */ isPartial(id: string): boolean { - return !!(this.getUnderlyingObject(id) as { partial: boolean }).partial; + return !!( + (this.#storage.get(id) ?? { partial: true }) as { partial: boolean } + ).partial; } /** @@ -219,25 +142,57 @@ export abstract class StoreCollection extends Collection { /** * Execute a provided function over each key, value pair in the map * @param cb Callback for each pair - * @returns Iterable */ forEach(cb: (value: T, key: string, map: Map) => void): void { return this.#objects.forEach(cb); } -} -/** - * Generic class collection backed by store - */ -export class ClassCollection extends StoreCollection { - readonly client: Client; + /** + * List of values in the map + * @returns List + */ + toList(): T[] { + return [...this.values()]; + } + + /** + * Filter the collection by a given predicate + * @param predicate Predicate to satisfy + */ + filter(predicate: (value: T, key: string) => boolean): T[] { + const list: T[] = []; + for (const [key, value] of this.entries()) { + if (predicate(value, key)) { + list.push(value); + } + } + + return list; + } /** - * Create generic class collection - * @param client Client + * Map the collection using a given callback + * @param cb Callback */ - constructor(client: Client) { - super(); - this.client = client; + map(cb: (value: T, key: string) => O): O[] { + const list: O[] = []; + for (const [key, value] of this.entries()) { + list.push(cb(value, key)); + } + + return list; + } + + /** + * Find some value based on a predicate + * @param predicate Predicate to satisfy + */ + find(predicate: (value: T, key: string) => boolean): T | undefined { + for (const [key, value] of this.entries()) { + if (predicate(value, key)) { + return value; + } + } + return undefined; } } diff --git a/src/collections/EmojiCollection.ts b/src/collections/EmojiCollection.ts index eb700f54..d6ec598f 100644 --- a/src/collections/EmojiCollection.ts +++ b/src/collections/EmojiCollection.ts @@ -1,14 +1,14 @@ import type { Emoji as APIEmoji } from "revolt-api"; -import { Emoji } from "../classes/Emoji.js"; -import type { HydratedEmoji } from "../hydration/emoji.js"; +import { Emoji } from "../classes/Emoji.ts"; +import type { HydratedEmoji } from "../hydration/emoji.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Emoji */ -export class EmojiCollection extends ClassCollection { +export class EmojiCollection extends Collection { /** * Fetch emoji by ID * @param id Id diff --git a/src/collections/MessageCollection.ts b/src/collections/MessageCollection.ts index efd351de..bd658750 100644 --- a/src/collections/MessageCollection.ts +++ b/src/collections/MessageCollection.ts @@ -1,17 +1,14 @@ import type { Message as APIMessage } from "revolt-api"; -import { Message } from "../classes/Message.js"; -import type { HydratedMessage } from "../hydration/message.js"; +import { Message } from "../classes/Message.ts"; +import type { HydratedMessage } from "../hydration/message.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Messages */ -export class MessageCollection extends ClassCollection< - Message, - HydratedMessage -> { +export class MessageCollection extends Collection { /** * Fetch message by Id * @param channelId Channel Id diff --git a/src/collections/ServerCollection.ts b/src/collections/ServerCollection.ts index e7c30c0e..6f90460f 100644 --- a/src/collections/ServerCollection.ts +++ b/src/collections/ServerCollection.ts @@ -1,20 +1,18 @@ -import { batch } from "solid-js"; - import type { - Server as APIServer, Channel, DataCreateServer, + Server as APIServer, } from "revolt-api"; -import { Server } from "../classes/Server.js"; -import type { HydratedServer } from "../hydration/server.js"; +import { Server } from "../classes/Server.ts"; +import type { HydratedServer } from "../hydration/server.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Servers */ -export class ServerCollection extends ClassCollection { +export class ServerCollection extends Collection { /** * Fetch server by ID * @@ -29,15 +27,13 @@ export class ServerCollection extends ClassCollection { include_channels: true, }); - return batch(() => { - for (const channel of data.channels as unknown as Channel[]) { - if (typeof channel !== "string") { - this.client.channels.getOrCreate(channel._id, channel); - } + for (const channel of data.channels as unknown as Channel[]) { + if (typeof channel !== "string") { + this.client.channels.getOrCreate(channel._id, channel); } + } - return this.getOrCreate(data._id, data); - }); + return this.getOrCreate(data._id, data); } /** @@ -85,12 +81,10 @@ export class ServerCollection extends ClassCollection { data, ); - return batch(() => { - for (const channel of channels) { - this.client.channels.getOrCreate(channel._id, channel); - } + for (const channel of channels) { + this.client.channels.getOrCreate(channel._id, channel); + } - return this.getOrCreate(server._id, server, true); - }); + return this.getOrCreate(server._id, server, true); } } diff --git a/src/collections/ServerMemberCollection.ts b/src/collections/ServerMemberCollection.ts index d421c2b8..c472bc77 100644 --- a/src/collections/ServerMemberCollection.ts +++ b/src/collections/ServerMemberCollection.ts @@ -1,14 +1,14 @@ import type { Member, MemberCompositeKey } from "revolt-api"; -import { ServerMember } from "../classes/ServerMember.js"; -import type { HydratedServerMember } from "../hydration/serverMember.js"; +import { ServerMember } from "../classes/ServerMember.ts"; +import type { HydratedServerMember } from "../hydration/serverMember.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Server Members */ -export class ServerMemberCollection extends ClassCollection< +export class ServerMemberCollection extends Collection< ServerMember, HydratedServerMember > { diff --git a/src/collections/SessionCollection.ts b/src/collections/SessionCollection.ts index 59274b98..e2c8d5a3 100644 --- a/src/collections/SessionCollection.ts +++ b/src/collections/SessionCollection.ts @@ -1,28 +1,21 @@ -import { batch } from "solid-js"; - import type { SessionInfo } from "revolt-api"; -import { Session } from "../classes/Session.js"; -import type { HydratedSession } from "../hydration/session.js"; +import { Session } from "../classes/Session.ts"; +import type { HydratedSession } from "../hydration/session.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Sessions */ -export class SessionCollection extends ClassCollection< - Session, - HydratedSession -> { +export class SessionCollection extends Collection { /** * Fetch active sessions * @returns List of sessions */ async fetch(): Promise { const data = await this.client.api.get("/auth/session/all"); - return batch(() => - data.map((session) => this.getOrCreate(session._id, session)), - ); + return data.map((session) => this.getOrCreate(session._id, session)); } /** diff --git a/src/collections/UserCollection.ts b/src/collections/UserCollection.ts index 4ae2c23e..4c036108 100644 --- a/src/collections/UserCollection.ts +++ b/src/collections/UserCollection.ts @@ -1,15 +1,15 @@ import type { User as APIUser } from "revolt-api"; -import type { Client } from "../Client.js"; -import { User } from "../classes/User.js"; -import type { HydratedUser } from "../hydration/user.js"; +import type { Client } from "../Client.ts"; +import { User } from "../classes/User.ts"; +import type { HydratedUser } from "../hydration/user.ts"; -import { ClassCollection } from "./Collection.js"; +import { Collection } from "./Collection.ts"; /** * Collection of Users */ -export class UserCollection extends ClassCollection { +export class UserCollection extends Collection { /** * Construct User collection */ diff --git a/src/collections/index.ts b/src/collections/index.ts index d192286a..4c4be57a 100644 --- a/src/collections/index.ts +++ b/src/collections/index.ts @@ -1,12 +1,11 @@ -export * from "./Collection.js"; - -export { BotCollection } from "./BotCollection.js"; -export { ChannelCollection } from "./ChannelCollection.js"; -export { ChannelUnreadCollection } from "./ChannelUnreadCollection.js"; -export { ChannelWebhookCollection } from "./ChannelWebhookCollection.js"; -export { EmojiCollection } from "./EmojiCollection.js"; -export { MessageCollection } from "./MessageCollection.js"; -export { ServerCollection } from "./ServerCollection.js"; -export { ServerMemberCollection } from "./ServerMemberCollection.js"; -export { SessionCollection } from "./SessionCollection.js"; -export { UserCollection } from "./UserCollection.js"; +export { BotCollection } from "./BotCollection.ts"; +export { ChannelCollection } from "./ChannelCollection.ts"; +export { ChannelUnreadCollection } from "./ChannelUnreadCollection.ts"; +export { ChannelWebhookCollection } from "./ChannelWebhookCollection.ts"; +export { Collection } from "./Collection.ts"; +export { EmojiCollection } from "./EmojiCollection.ts"; +export { MessageCollection } from "./MessageCollection.ts"; +export { ServerCollection } from "./ServerCollection.ts"; +export { ServerMemberCollection } from "./ServerMemberCollection.ts"; +export { SessionCollection } from "./SessionCollection.ts"; +export { UserCollection } from "./UserCollection.ts"; diff --git a/src/events/EventClient.ts b/src/events/EventClient.ts index f9b9fced..b17c038a 100644 --- a/src/events/EventClient.ts +++ b/src/events/EventClient.ts @@ -1,10 +1,7 @@ -import type { Accessor, Setter } from "solid-js"; -import { createSignal } from "solid-js"; - import { AsyncEventEmitter } from "@vladfrangu/async_event_emitter"; import type { Error } from "revolt-api"; -import type { ProtocolV1 } from "./v1.js"; +import type { ProtocolV1 } from "./v1.ts"; /** * Available protocols to connect with @@ -82,19 +79,16 @@ export class EventClient< #protocolVersion: T; #transportFormat: "json" | "msgpack"; - readonly ping: Accessor; - #setPing: Setter; - - readonly state: Accessor; - #setStateSetter: Setter; + ping = -1; + state = ConnectionState.Idle; #socket: WebSocket | undefined; #heartbeatIntervalReference: number | undefined; #pongTimeoutReference: number | undefined; #connectTimeoutReference: number | undefined; - #lastError: // eslint-disable-next-line @typescript-eslint/no-explicit-any - { type: "socket"; data: any } | { type: "revolt"; data: Error } | undefined; + // deno-lint-ignore no-explicit-any + #lastError?: { type: "socket"; data: any } | { type: "revolt"; data: Error }; /** * Create a new event client. @@ -120,14 +114,6 @@ export class EventClient< ...options, }; - const [state, setState] = createSignal(ConnectionState.Idle); - this.state = state; - this.#setStateSetter = setState; - - const [ping, setPing] = createSignal(-1); - this.ping = ping; - this.#setPing = setPing; - this.disconnect = this.disconnect.bind(this); } @@ -136,7 +122,7 @@ export class EventClient< * @param state state */ private setState(state: ConnectionState): void { - this.#setStateSetter(state); + this.state = state; this.emit("state", state); } @@ -232,8 +218,8 @@ export class EventClient< return; case "Pong": clearTimeout(this.#pongTimeoutReference); - this.#setPing(+new Date() - event.data); - if (this.options.debug) console.debug(`[ping] ${this.ping()}ms`); + this.ping = +new Date() - event.data; + if (this.options.debug) console.debug(`[ping] ${this.ping}ms`); return; case "Error": this.#lastError = { @@ -245,7 +231,7 @@ export class EventClient< return; } - switch (this.state()) { + switch (this.state) { case ConnectionState.Connecting: if (event.type === "Authenticated") { // no-op @@ -264,7 +250,7 @@ export class EventClient< } break; default: - throw `Unreachable code. Received ${event.type} in state ${this.state()}.`; + throw `Unreachable code. Received ${event.type} in state ${this.state}.`; } } @@ -272,15 +258,8 @@ export class EventClient< * Last error encountered by events client */ get lastError(): - | { - type: "socket"; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - data: any; - } - | { - type: "revolt"; - data: Error; - } + | { type: "socket"; data: unknown } + | { type: "revolt"; data: Error } | undefined { return this.#lastError; } diff --git a/src/events/v1.ts b/src/events/v1.ts index 0834c4b8..0b7953fb 100644 --- a/src/events/v1.ts +++ b/src/events/v1.ts @@ -1,7 +1,3 @@ -import type { Setter } from "solid-js"; -import { batch } from "solid-js"; - -import { ReactiveSet } from "@solid-primitives/set"; import type { Channel, Emoji, @@ -19,9 +15,9 @@ import type { User, } from "revolt-api"; -import type { Client } from "../Client.js"; -import { MessageEmbed } from "../classes/MessageEmbed.js"; -import { hydrate } from "../hydration/index.js"; +import type { Client } from "../Client.ts"; +import { MessageEmbed } from "../classes/MessageEmbed.ts"; +import { hydrate } from "../hydration/index.ts"; /** * Version 1 of the events protocol @@ -37,21 +33,21 @@ export type ProtocolV1 = { type ClientMessage = | { type: "Authenticate"; token: string } | { - type: "BeginTyping"; - channel: string; - } + type: "BeginTyping"; + channel: string; + } | { - type: "EndTyping"; - channel: string; - } + type: "EndTyping"; + channel: string; + } | { - type: "Ping"; - data: number; - } + type: "Ping"; + data: number; + } | { - type: "Pong"; - data: number; - }; + type: "Pong"; + data: number; + }; /** * Messages sent from the server @@ -65,46 +61,46 @@ type ServerMessage = | { type: "Pong"; data: number } | ({ type: "Message" } & Message) | { - type: "MessageUpdate"; - id: string; - channel: string; - data: Partial; - } + type: "MessageUpdate"; + id: string; + channel: string; + data: Partial; + } | { - type: "MessageAppend"; - id: string; - channel: string; - append: Pick, "embeds">; - } + type: "MessageAppend"; + id: string; + channel: string; + append: Pick, "embeds">; + } | { type: "MessageDelete"; id: string; channel: string } | { - type: "MessageReact"; - id: string; - channel_id: string; - user_id: string; - emoji_id: string; - } + type: "MessageReact"; + id: string; + channel_id: string; + user_id: string; + emoji_id: string; + } | { - type: "MessageUnreact"; - id: string; - channel_id: string; - user_id: string; - emoji_id: string; - } + type: "MessageUnreact"; + id: string; + channel_id: string; + user_id: string; + emoji_id: string; + } | { - type: "MessageRemoveReaction"; - id: string; - channel_id: string; - emoji_id: string; - } + type: "MessageRemoveReaction"; + id: string; + channel_id: string; + emoji_id: string; + } | { type: "BulkMessageDelete"; channel: string; ids: string[] } | ({ type: "ChannelCreate" } & Channel) | { - type: "ChannelUpdate"; - id: string; - data: Partial; - clear?: FieldsChannel[]; - } + type: "ChannelUpdate"; + id: string; + data: Partial; + clear?: FieldsChannel[]; + } | { type: "ChannelDelete"; id: string } | { type: "ChannelGroupJoin"; id: string; user: string } | { type: "ChannelGroupLeave"; id: string; user: string } @@ -112,63 +108,66 @@ type ServerMessage = | { type: "ChannelStopTyping"; id: string; user: string } | { type: "ChannelAck"; id: string; user: string; message_id: string } | { - type: "ServerCreate"; - id: string; - server: Server; - channels: Channel[]; - } + type: "ServerCreate"; + id: string; + server: Server; + channels: Channel[]; + } | { - type: "ServerUpdate"; - id: string; - data: Partial; - clear?: FieldsServer[]; - } + type: "ServerUpdate"; + id: string; + data: Partial; + clear?: FieldsServer[]; + } | { type: "ServerDelete"; id: string } | { - type: "ServerMemberUpdate"; - id: MemberCompositeKey; - data: Partial; - clear?: FieldsMember[]; - } + type: "ServerMemberUpdate"; + id: MemberCompositeKey; + data: Partial; + clear?: FieldsMember[]; + } | { type: "ServerMemberJoin"; id: string; user: string } | { type: "ServerMemberLeave"; id: string; user: string } | { - type: "ServerRoleUpdate"; - id: string; - role_id: string; - data: Partial; - } + type: "ServerRoleUpdate"; + id: string; + role_id: string; + data: Partial; + } | { type: "ServerRoleDelete"; id: string; role_id: string } | { - type: "UserUpdate"; - id: string; - data: Partial; - clear?: FieldsUser[]; - } + type: "UserUpdate"; + id: string; + data: Partial; + clear?: FieldsUser[]; + } | { type: "UserRelationship"; user: User; status: RelationshipStatus } | { type: "UserPresence"; id: string; online: boolean } | { - type: "UserSettingsUpdate"; - id: string; - update: { [key: string]: [number, string] }; - } + type: "UserSettingsUpdate"; + id: string; + update: { [key: string]: [number, string] }; + } | { type: "UserPlatformWipe"; user_id: string; flags: number } | ({ type: "EmojiCreate" } & Emoji) | { type: "EmojiDelete"; id: string } - | ({ + | ( + & { type: "Auth"; - } & ( + } + & ( | { - event_type: "DeleteSession"; - user_id: string; - session_id: string; - } + event_type: "DeleteSession"; + user_id: string; + session_id: string; + } | { - event_type: "DeleteAllSessions"; - user_id: string; - exclude_session_id: string; - } - )); + event_type: "DeleteAllSessions"; + user_id: string; + exclude_session_id: string; + } + ) + ); /** * Initial synchronisation packet @@ -190,7 +189,7 @@ type ReadyData = { export async function handleEvent( client: Client, event: ServerMessage, - setReady: Setter, + setReady: (value: boolean) => void, ): Promise { if (client.options.debug) { console.debug("[S->C]", event); @@ -204,31 +203,29 @@ export async function handleEvent( break; } case "Ready": { - batch(() => { - for (const user of event.users) { - const u = client.users.getOrCreate(user._id, user); + for (const user of event.users) { + const u = client.users.getOrCreate(user._id, user); - if (u.relationship === "User") { - client.user = u; - } + if (u.relationship === "User") { + client.user = u; } + } - for (const server of event.servers) { - client.servers.getOrCreate(server._id, server); - } + for (const server of event.servers) { + client.servers.getOrCreate(server._id, server); + } - for (const member of event.members) { - client.serverMembers.getOrCreate(member._id, member); - } + for (const member of event.members) { + client.serverMembers.getOrCreate(member._id, member); + } - for (const channel of event.channels) { - client.channels.getOrCreate(channel._id, channel); - } + for (const channel of event.channels) { + client.channels.getOrCreate(channel._id, channel); + } - for (const emoji of event.emojis) { - client.emojis.getOrCreate(emoji._id, emoji); - } - }); + for (const emoji of event.emojis) { + client.emojis.getOrCreate(emoji._id, emoji); + } if (client.options.syncUnreads) { await client.channelUnreads.sync(); @@ -241,25 +238,23 @@ export async function handleEvent( } case "Message": { if (!client.messages.has(event._id)) { - batch(() => { - if (event.member) { - client.serverMembers.getOrCreate(event.member._id, event.member); - } + if (event.member) { + client.serverMembers.getOrCreate(event.member._id, event.member); + } - if (event.user) { - client.users.getOrCreate(event.user._id, event.user); - } + if (event.user) { + client.users.getOrCreate(event.user._id, event.user); + } - delete event.member; - delete event.user; + delete event.member; + delete event.user; - client.messages.getOrCreate(event._id, event, true); - client.channels.updateUnderlyingObject( - event.channel, - "lastMessageId", - event._id, - ); - }); + client.messages.getOrCreate(event._id, event, true); + client.channels.setUnderlyingKey( + event.channel, + "lastMessageId", + event._id, + ); } break; } @@ -271,7 +266,7 @@ export async function handleEvent( channelId: event.channel, }; - client.messages.updateUnderlyingObject(event.id, { + client.messages.setUnderlyingObject(event.id, { ...hydrate( "message", { ...event.data, channel: event.channel }, @@ -293,18 +288,14 @@ export async function handleEvent( channelId: event.channel, }; - client.messages.updateUnderlyingObject(event.id, "embeds", (embeds) => [ - ...(embeds ?? []), + client.messages.setUnderlyingKey(event.id, "embeds", [ + ...(previousMessage.embeds ?? []), ...(event.append.embeds?.map((embed) => - MessageEmbed.from(client, embed), + MessageEmbed.from(client, embed) ) ?? []), ]); - client.messages.updateUnderlyingObject( - event.id, - "channelId", - event.channel, - ); + client.messages.setUnderlyingKey(event.id, "channelId", event.channel); client.emit("messageUpdate", message, previousMessage); } @@ -312,29 +303,29 @@ export async function handleEvent( } case "MessageDelete": { if (client.messages.getOrPartial(event.id)) { - const message = client.messages.getUnderlyingObject(event.id); - client.emit("messageDelete", message); + client.emit( + "messageDelete", + client.messages.getUnderlyingObject(event.id), + ); client.messages.delete(event.id); } break; } case "BulkMessageDelete": { - batch(() => - client.emit( - "messageDeleteBulk", - event.ids - .map((id) => { - if (client.messages.has(id)) { - const message = client.messages.getUnderlyingObject(id); - client.messages.delete(id); - return message!; - } - - return undefined!; - }) - .filter((x) => x), - client.channels.get(event.channel), - ), + client.emit( + "messageDeleteBulk", + event.ids + .map((id) => { + if (client.messages.has(id)) { + const message = client.messages.getUnderlyingObject(id); + client.messages.delete(id); + return message!; + } + + return undefined!; + }) + .filter((x) => x), + client.channels.get(event.channel), ); break; } @@ -347,7 +338,7 @@ export async function handleEvent( if (set.has(event.user_id)) return; set.add(event.user_id); } else { - reactions.set(event.emoji_id, new ReactiveSet([event.user_id])); + reactions.set(event.emoji_id, new Set([event.user_id])); } client.emit( @@ -401,9 +392,7 @@ export async function handleEvent( case "ChannelUpdate": { const channel = client.channels.getOrPartial(event.id); if (channel) { - const previousChannel = { - ...client.channels.getUnderlyingObject(event.id), - }; + const previousChannel = client.channels.getUnderlyingObject(event.id); const changes = hydrate("channel", event.data, client, false); @@ -423,15 +412,17 @@ export async function handleEvent( } } - client.channels.updateUnderlyingObject(event.id, changes); + client.channels.setUnderlyingObject(event.id, changes); client.emit("channelUpdate", channel, previousChannel); } break; } case "ChannelDelete": { if (client.channels.getOrPartial(event.id)) { - const channel = client.channels.getUnderlyingObject(event.id); - client.emit("channelDelete", channel); + client.emit( + "channelDelete", + client.channels.getUnderlyingObject(event.id), + ); client.channels.delete(event.id); } break; @@ -513,22 +504,18 @@ export async function handleEvent( } case "ServerCreate": { if (!client.servers.has(event.server._id)) { - batch(() => { - for (const channel of event.channels) { - client.channels.getOrCreate(channel._id, channel); - } + for (const channel of event.channels) { + client.channels.getOrCreate(channel._id, channel); + } - client.servers.getOrCreate(event.server._id, event.server, true); - }); + client.servers.getOrCreate(event.server._id, event.server, true); } break; } case "ServerUpdate": { const server = client.servers.getOrPartial(event.id); if (server) { - const previousServer = { - ...client.servers.getUnderlyingObject(event.id), - }; + const previousServer = client.servers.getUnderlyingObject(event.id); const changes = hydrate("server", event.data, client, false); @@ -554,7 +541,7 @@ export async function handleEvent( } } - client.servers.updateUnderlyingObject(event.id, changes); + client.servers.setUnderlyingObject(event.id, changes); client.emit("serverUpdate", server, previousServer); } break; @@ -622,11 +609,9 @@ export async function handleEvent( case "ServerMemberUpdate": { const member = client.serverMembers.getOrPartial(event.id); if (member) { - const previousMember = { - ...client.serverMembers.getUnderlyingObject( - event.id.server + event.id.user, - ), - }; + const previousMember = client.serverMembers.getUnderlyingObject( + event.id.server + event.id.user, + ); const changes = hydrate("serverMember", event.data, client, false); @@ -649,7 +634,7 @@ export async function handleEvent( } } - client.serverMembers.updateUnderlyingObject( + client.serverMembers.setUnderlyingObject( event.id.server + event.id.user, changes as never, ); @@ -690,9 +675,7 @@ export async function handleEvent( case "UserUpdate": { const user = client.users.getOrPartial(event.id); if (user) { - const previousUser = { - ...client.users.getUnderlyingObject(event.id), - }; + const previousUser = client.users.getUnderlyingObject(event.id); const changes = hydrate("user", event.data, client, false); @@ -720,7 +703,7 @@ export async function handleEvent( } } - client.users.updateUnderlyingObject(event.id, changes as never); + client.users.setUnderlyingObject(event.id, changes as never); client.emit("userUpdate", user, previousUser); } break; @@ -758,37 +741,35 @@ export async function handleEvent( break; } case "UserPlatformWipe": { - batch(() => { - handleEvent( - client, - { - type: "BulkMessageDelete", - channel: "0", - ids: client.messages - .toList() - .filter((message) => message.authorId === event.user_id) - .map((message) => message.id), - }, - setReady, - ); + handleEvent( + client, + { + type: "BulkMessageDelete", + channel: "0", + ids: client.messages + .toList() + .filter((message) => message.authorId === event.user_id) + .map((message) => message.id), + }, + setReady, + ); - handleEvent( - client, - { - type: "UserUpdate", - id: event.user_id, - data: { - username: `Deleted User`, - online: false, - flags: event.flags, - badges: 0, - relationship: "None", - }, - clear: ["Avatar", "StatusPresence", "StatusText"], + handleEvent( + client, + { + type: "UserUpdate", + id: event.user_id, + data: { + username: `Deleted User`, + online: false, + flags: event.flags, + badges: 0, + relationship: "None", }, - setReady, - ); - }); + clear: ["Avatar", "StatusPresence", "StatusText"], + }, + setReady, + ); break; } @@ -800,8 +781,7 @@ export async function handleEvent( } case "EmojiDelete": { if (client.emojis.getOrPartial(event.id)) { - const emoji = client.emojis.getUnderlyingObject(event.id); - client.emit("emojiDelete", emoji); + client.emit("emojiDelete", client.emojis.getUnderlyingObject(event.id)); client.emojis.delete(event.id); } break; diff --git a/src/hydration/bot.ts b/src/hydration/bot.ts index 663d49a8..bed9ffdc 100644 --- a/src/hydration/bot.ts +++ b/src/hydration/bot.ts @@ -1,6 +1,6 @@ -import type { Bot as APIBot } from "revolt-api"; +import type { Bot } from "revolt-api"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedBot = { id: string; @@ -15,7 +15,7 @@ export type HydratedBot = { flags: BotFlags; }; -export const botHydration: Hydrate = { +export const botHydration: Hydrate = { keyMapping: { _id: "id", owner: "ownerId", @@ -41,4 +41,5 @@ export const botHydration: Hydrate = { /** * Flags attributed to users */ +// deno-lint-ignore no-empty-enum export enum BotFlags {} diff --git a/src/hydration/channel.ts b/src/hydration/channel.ts index 5307ff6f..da917598 100644 --- a/src/hydration/channel.ts +++ b/src/hydration/channel.ts @@ -1,23 +1,22 @@ -import { ReactiveSet } from "@solid-primitives/set"; -import type { Channel as APIChannel, OverrideField } from "revolt-api"; +import type { Channel, OverrideField } from "revolt-api"; -import type { Client } from "../Client.js"; -import { File } from "../classes/File.js"; -import type { Merge } from "../lib/merge.js"; +import type { Client } from "../Client.ts"; +import { File } from "../classes/File.ts"; +import type { Merge } from "../lib/merge.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedChannel = { id: string; - channelType: APIChannel["channel_type"]; + channelType: Channel["channel_type"]; name: string; description?: string; icon?: File; active: boolean; - typingIds: ReactiveSet; - recipientIds: ReactiveSet; + typingIds: Set; + recipientIds: Set; userId?: string; ownerId?: string; @@ -31,7 +30,7 @@ export type HydratedChannel = { lastMessageId?: string; }; -export const channelHydration: Hydrate, HydratedChannel> = { +export const channelHydration: Hydrate, HydratedChannel> = { keyMapping: { _id: "id", channel_type: "channelType", @@ -50,8 +49,8 @@ export const channelHydration: Hydrate, HydratedChannel> = { description: (channel) => channel.description!, icon: (channel, ctx) => new File(ctx as Client, channel.icon!), active: (channel) => channel.active || false, - typingIds: () => new ReactiveSet(), - recipientIds: (channel) => new ReactiveSet(channel.recipients), + typingIds: () => new Set(), + recipientIds: (channel) => new Set(channel.recipients), userId: (channel) => channel.user, ownerId: (channel) => channel.owner, serverId: (channel) => channel.server, @@ -62,7 +61,7 @@ export const channelHydration: Hydrate, HydratedChannel> = { lastMessageId: (channel) => channel.last_message_id!, }, initialHydration: () => ({ - typingIds: new ReactiveSet(), - recipientIds: new ReactiveSet(), + typingIds: new Set(), + recipientIds: new Set(), }), }; diff --git a/src/hydration/channelUnread.ts b/src/hydration/channelUnread.ts index b30f503c..d9010428 100644 --- a/src/hydration/channelUnread.ts +++ b/src/hydration/channelUnread.ts @@ -1,14 +1,13 @@ -import { ReactiveSet } from "@solid-primitives/set"; import type { ChannelUnread } from "revolt-api"; -import type { Merge } from "../lib/merge.js"; +import type { Merge } from "../lib/merge.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedChannelUnread = { id: string; lastMessageId?: string; - messageMentionIds: ReactiveSet; + messageMentionIds: Set; }; export const channelUnreadHydration: Hydrate< @@ -23,9 +22,9 @@ export const channelUnreadHydration: Hydrate< functions: { id: (unread) => unread._id.channel, lastMessageId: (unread) => unread.last_id!, - messageMentionIds: (unread) => new ReactiveSet(unread.mentions!), + messageMentionIds: (unread) => new Set(unread.mentions!), }, initialHydration: () => ({ - messageMentionIds: new ReactiveSet(), + messageMentionIds: new Set(), }), }; diff --git a/src/hydration/channelWebhook.ts b/src/hydration/channelWebhook.ts index ecf3abfb..6188d615 100644 --- a/src/hydration/channelWebhook.ts +++ b/src/hydration/channelWebhook.ts @@ -1,10 +1,10 @@ import type { Webhook } from "revolt-api"; -import type { Client } from "../Client.js"; -import { File } from "../classes/File.js"; -import type { Merge } from "../lib/merge.js"; +import type { Client } from "../Client.ts"; +import { File } from "../classes/File.ts"; +import type { Merge } from "../lib/merge.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedChannelWebhook = { id: string; diff --git a/src/hydration/emoji.ts b/src/hydration/emoji.ts index 90e0564f..df91fbea 100644 --- a/src/hydration/emoji.ts +++ b/src/hydration/emoji.ts @@ -1,8 +1,8 @@ -import type { Emoji as APIEmoji, EmojiParent } from "revolt-api"; +import type { Emoji, EmojiParent } from "revolt-api"; -import type { Merge } from "../lib/merge.js"; +import type { Merge } from "../lib/merge.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedEmoji = { id: string; @@ -13,7 +13,7 @@ export type HydratedEmoji = { nsfw: boolean; }; -export const emojiHydration: Hydrate, HydratedEmoji> = { +export const emojiHydration: Hydrate, HydratedEmoji> = { keyMapping: { _id: "id", creator_id: "creatorId", diff --git a/src/hydration/index.ts b/src/hydration/index.ts index 0852ef9d..6eb9dd25 100644 --- a/src/hydration/index.ts +++ b/src/hydration/index.ts @@ -1,13 +1,13 @@ -import { botHydration } from "./bot.js"; -import { channelHydration } from "./channel.js"; -import { channelUnreadHydration } from "./channelUnread.js"; -import { channelWebhookHydration } from "./channelWebhook.js"; -import { emojiHydration } from "./emoji.js"; -import { messageHydration } from "./message.js"; -import { serverHydration } from "./server.js"; -import { serverMemberHydration } from "./serverMember.js"; -import { sessionHydration } from "./session.js"; -import { userHydration } from "./user.js"; +import { botHydration } from "./bot.ts"; +import { channelHydration } from "./channel.ts"; +import { channelUnreadHydration } from "./channelUnread.ts"; +import { channelWebhookHydration } from "./channelWebhook.ts"; +import { emojiHydration } from "./emoji.ts"; +import { messageHydration } from "./message.ts"; +import { serverHydration } from "./server.ts"; +import { serverMemberHydration } from "./serverMember.ts"; +import { sessionHydration } from "./session.ts"; +import { userHydration } from "./user.ts"; /** * Functions to map from one object to another @@ -81,10 +81,10 @@ const hydrators = { export type Hydrators = typeof hydrators; -// eslint-disable-next-line @typescript-eslint/no-explicit-any +// deno-lint-ignore no-explicit-any type ExtractInput = T extends Hydrate ? I : never; -// eslint-disable-next-line @typescript-eslint/no-explicit-any +// deno-lint-ignore no-explicit-any type ExtractOutput = T extends Hydrate ? O : never; /** @@ -104,5 +104,5 @@ export function hydrate( hydrators[type] as never, initial ? { ...hydrators[type].initialHydration(), ...input } : input, context, - ) as ExtractOutput; + ); } diff --git a/src/hydration/message.ts b/src/hydration/message.ts index 22744988..435e84d5 100644 --- a/src/hydration/message.ts +++ b/src/hydration/message.ts @@ -1,15 +1,13 @@ -import { ReactiveMap } from "@solid-primitives/map"; -import { ReactiveSet } from "@solid-primitives/set"; import type { Interactions, Masquerade, Message } from "revolt-api"; -import type { Client } from "../Client.js"; -import { File } from "../classes/File.js"; -import { MessageWebhook } from "../classes/Message.js"; -import { MessageEmbed } from "../classes/MessageEmbed.js"; -import { SystemMessage } from "../classes/SystemMessage.js"; -import type { Merge } from "../lib/merge.js"; +import type { Client } from "../Client.ts"; +import { File } from "../classes/File.ts"; +import { MessageWebhook } from "../classes/Message.ts"; +import { MessageEmbed } from "../classes/MessageEmbed.ts"; +import { SystemMessage } from "../classes/SystemMessage.ts"; +import type { Merge } from "../lib/merge.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedMessage = { id: string; @@ -24,7 +22,7 @@ export type HydratedMessage = { embeds?: MessageEmbed[]; mentionIds?: string[]; replyIds?: string[]; - reactions: ReactiveMap>; + reactions: Map>; interactions?: Interactions; masquerade?: Masquerade; flags?: number; @@ -60,10 +58,10 @@ export const messageHydration: Hydrate, HydratedMessage> = { mentionIds: (message) => message.mentions!, replyIds: (message) => message.replies!, reactions: (message) => { - const map = new ReactiveMap>(); + const map = new Map>(); if (message.reactions) { for (const reaction of Object.keys(message.reactions)) { - map.set(reaction, new ReactiveSet(message.reactions![reaction])); + map.set(reaction, new Set(message.reactions![reaction])); } } return map; @@ -73,6 +71,6 @@ export const messageHydration: Hydrate, HydratedMessage> = { flags: (message) => message.flags!, }, initialHydration: () => ({ - reactions: new ReactiveMap(), + reactions: new Map(), }), }; diff --git a/src/hydration/server.ts b/src/hydration/server.ts index 0cb19b03..cde73f14 100644 --- a/src/hydration/server.ts +++ b/src/hydration/server.ts @@ -1,16 +1,9 @@ -import { ReactiveMap } from "@solid-primitives/map"; -import { ReactiveSet } from "@solid-primitives/set"; -import type { - Server as APIServer, - Category, - Role, - SystemMessageChannels, -} from "revolt-api"; +import type { Category, Role, Server, SystemMessageChannels } from "revolt-api"; -import type { Client } from "../Client.js"; -import { File } from "../classes/File.js"; +import type { Client } from "../Client.ts"; +import { File } from "../classes/File.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedServer = { id: string; @@ -22,11 +15,11 @@ export type HydratedServer = { icon?: File; banner?: File; - channelIds: ReactiveSet; + channelIds: Set; categories?: Category[]; systemMessages?: SystemMessageChannels; - roles: ReactiveMap; + roles: Map; defaultPermissions: number; flags: ServerFlags; @@ -35,7 +28,7 @@ export type HydratedServer = { nsfw: boolean; }; -export const serverHydration: Hydrate = { +export const serverHydration: Hydrate = { keyMapping: { _id: "id", owner: "ownerId", @@ -48,13 +41,11 @@ export const serverHydration: Hydrate = { ownerId: (server) => server.owner, name: (server) => server.name, description: (server) => server.description!, - channelIds: (server) => new ReactiveSet(server.channels), + channelIds: (server) => new Set(server.channels), categories: (server) => server.categories ?? [], systemMessages: (server) => server.system_messages ?? {}, roles: (server) => - new ReactiveMap( - Object.keys(server.roles!).map((id) => [id, server.roles![id]]), - ), + new Map(Object.keys(server.roles!).map((id) => [id, server.roles![id]])), defaultPermissions: (server) => server.default_permissions, icon: (server, ctx) => new File(ctx as Client, server.icon!), banner: (server, ctx) => new File(ctx as Client, server.banner!), @@ -64,8 +55,8 @@ export const serverHydration: Hydrate = { nsfw: (server) => server.nsfw || false, }, initialHydration: () => ({ - channelIds: new ReactiveSet(), - roles: new ReactiveMap(), + channelIds: new Set(), + roles: new Map(), }), }; diff --git a/src/hydration/serverMember.ts b/src/hydration/serverMember.ts index ce3137ae..54feb44f 100644 --- a/src/hydration/serverMember.ts +++ b/src/hydration/serverMember.ts @@ -1,10 +1,10 @@ -import type { Member as APIMember, MemberCompositeKey } from "revolt-api"; +import type { Member, MemberCompositeKey } from "revolt-api"; -import type { Client } from "../Client.js"; -import { File } from "../classes/File.js"; -import type { Merge } from "../lib/merge.js"; +import type { Client } from "../Client.ts"; +import { File } from "../classes/File.ts"; +import type { Merge } from "../lib/merge.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedServerMember = { id: MemberCompositeKey; @@ -16,7 +16,7 @@ export type HydratedServerMember = { }; export const serverMemberHydration: Hydrate< - Merge, + Merge, HydratedServerMember > = { keyMapping: { diff --git a/src/hydration/session.ts b/src/hydration/session.ts index d16221e4..7f37f873 100644 --- a/src/hydration/session.ts +++ b/src/hydration/session.ts @@ -1,13 +1,13 @@ -import type { SessionInfo as APISession } from "revolt-api"; +import type { SessionInfo } from "revolt-api"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedSession = { id: string; name: string; }; -export const sessionHydration: Hydrate = { +export const sessionHydration: Hydrate = { keyMapping: { _id: "id", }, diff --git a/src/hydration/user.ts b/src/hydration/user.ts index 952b5290..e0240315 100644 --- a/src/hydration/user.ts +++ b/src/hydration/user.ts @@ -1,14 +1,14 @@ import type { - User as APIUser, BotInformation, RelationshipStatus, + User, UserStatus, } from "revolt-api"; -import type { Client } from "../Client.js"; -import { File } from "../classes/File.js"; +import type { Client } from "../Client.ts"; +import { File } from "../classes/File.ts"; -import type { Hydrate } from "./index.js"; +import type { Hydrate } from "./index.ts"; export type HydratedUser = { id: string; @@ -29,7 +29,7 @@ export type HydratedUser = { bot?: BotInformation; }; -export const userHydration: Hydrate = { +export const userHydration: Hydrate = { keyMapping: { _id: "id", display_name: "displayName", diff --git a/src/index.ts b/src/index.ts index e15d7e9f..7d64bd5c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,9 @@ -export * as API from "revolt-api"; -export { Client } from "./Client.js"; -export type { ClientOptions, Session as PrivateSession } from "./Client.js"; -export * from "./classes/index.js"; -export * from "./collections/index.js"; -export { ConnectionState, EventClient } from "./events/EventClient.js"; -export { BotFlags } from "./hydration/bot.js"; -export { ServerFlags } from "./hydration/server.js"; -export { UserBadges, UserFlags } from "./hydration/user.js"; -export * from "./lib/regex.js"; +export { Client } from "./Client.ts"; +export type { ClientOptions, Session as PrivateSession } from "./Client.ts"; +export * from "./classes/index.ts"; +export * from "./collections/index.ts"; +export { ConnectionState, EventClient } from "./events/EventClient.ts"; +export { BotFlags } from "./hydration/bot.ts"; +export { ServerFlags } from "./hydration/server.ts"; +export { UserBadges, UserFlags } from "./hydration/user.ts"; +export * from "./lib/regex.ts"; diff --git a/src/lib/merge.ts b/src/lib/merge.ts index 99324d55..510a206b 100644 --- a/src/lib/merge.ts +++ b/src/lib/merge.ts @@ -1,21 +1,23 @@ // Merge type provided by https://dev.to/lucianbc/union-type-merging-in-typescript-9al -export type Merge = { - [k in CommonKeys]: PickTypeOf; -} & { - [k in NonCommonKeys]?: PickTypeOf; -}; +export type Merge = + & { + [k in CommonKeys]: PickTypeOf; + } + & { + [k in NonCommonKeys]?: PickTypeOf; + }; -type PickTypeOf = - K extends AllKeys ? PickType : never; +type PickTypeOf = K extends AllKeys + ? PickType + : never; -// eslint-disable-next-line -type PickType> = T extends { [k in K]?: any } - ? T[K] +// deno-lint-ignore no-explicit-any +type PickType> = T extends { [k in K]?: any } ? T[K] : undefined; type Subtract = A extends C ? never : A; type NonCommonKeys = Subtract, CommonKeys>; -// eslint-disable-next-line +// deno-lint-ignore no-explicit-any type AllKeys = T extends any ? keyof T : never; type CommonKeys = keyof T; diff --git a/src/permissions/calculator.ts b/src/permissions/calculator.ts index 2daab6ef..d47b3864 100644 --- a/src/permissions/calculator.ts +++ b/src/permissions/calculator.ts @@ -1,4 +1,7 @@ -import { Channel, Client, Server, ServerMember } from "../index.js"; +import type { Client } from "../Client.ts"; +import type { Channel } from "../classes/Channel.ts"; +import { Server } from "../classes/Server.ts"; +import type { ServerMember } from "../classes/ServerMember.ts"; import { ALLOW_IN_TIMEOUT, @@ -6,7 +9,7 @@ import { DEFAULT_PERMISSION_VIEW_ONLY, Permission, UserPermission, -} from "./definitions.js"; +} from "./definitions.ts"; /** * Check whether `b` is present in `a` @@ -123,8 +126,7 @@ export function calculatePermission( // 6. Apply default allows and denies for channel. if (target.defaultPermissions) { - perm = - (perm | BigInt(target.defaultPermissions.a)) & + perm = (perm | BigInt(target.defaultPermissions.a)) & ~BigInt(target.defaultPermissions.d); } diff --git a/src/permissions/definitions.ts b/src/permissions/definitions.ts index f711adf3..abe05f25 100644 --- a/src/permissions/definitions.ts +++ b/src/permissions/definitions.ts @@ -99,20 +99,19 @@ export const U32_MAX = 2 ** 32 - 1; // 4294967295 /** * Permissions allowed for a user while in timeout */ -export const ALLOW_IN_TIMEOUT = - Permission.ViewChannel + Permission.ReadMessageHistory; +export const ALLOW_IN_TIMEOUT = Permission.ViewChannel + + Permission.ReadMessageHistory; /** * Default permissions if we can only view */ -export const DEFAULT_PERMISSION_VIEW_ONLY = - Permission.ViewChannel + Permission.ReadMessageHistory; +export const DEFAULT_PERMISSION_VIEW_ONLY = Permission.ViewChannel + + Permission.ReadMessageHistory; /** * Default base permissions for channels */ -export const DEFAULT_PERMISSION = - DEFAULT_PERMISSION_VIEW_ONLY + +export const DEFAULT_PERMISSION = DEFAULT_PERMISSION_VIEW_ONLY + Permission.SendMessage + Permission.InviteOthers + Permission.SendEmbeds + @@ -128,14 +127,13 @@ export const DEFAULT_PERMISSION_SAVED_MESSAGES = Permission.GrantAllSafe; /** * Permissions in direct message channels / default permissions for group DMs */ -export const DEFAULT_PERMISSION_DIRECT_MESSAGE = - DEFAULT_PERMISSION + Permission.React + Permission.ManageChannel; +export const DEFAULT_PERMISSION_DIRECT_MESSAGE = DEFAULT_PERMISSION + + Permission.React + Permission.ManageChannel; /** * Permissions in server text / voice channel */ -export const DEFAULT_PERMISSION_SERVER = - DEFAULT_PERMISSION + +export const DEFAULT_PERMISSION_SERVER = DEFAULT_PERMISSION + Permission.React + Permission.ChangeNickname + Permission.ChangeAvatar; diff --git a/src/storage/ObjectStorage.ts b/src/storage/ObjectStorage.ts deleted file mode 100644 index 366389c1..00000000 --- a/src/storage/ObjectStorage.ts +++ /dev/null @@ -1,50 +0,0 @@ -import type { SetStoreFunction } from "solid-js/store"; -import { createStore } from "solid-js/store"; - -import { type Hydrators, hydrate } from "../hydration/index.js"; - -/** - * Wrapper around Solid.js store - */ -export class ObjectStorage { - private store: Record; - readonly set: SetStoreFunction>; - - /** - * Create new object storage - */ - constructor() { - const [store, setStore] = createStore({}); - this.store = store as never; - this.set = setStore; - this.get = this.get.bind(this); - } - - /** - * Get object by ID - * @param id ID - * @returns Object - */ - get(id: string): T | undefined { - return this.store[id]; - } - - /** - * Hydrate some data into storage - * @param id ID - * @param type Hydration type - * @param context Context - * @param data Input Data - */ - hydrate( - id: string, - type: keyof Hydrators, - context: unknown, - data?: unknown - ): void { - if (data) { - data = { partial: false, ...data }; - this.set(id, hydrate(type, data as never, context, true) as T); - } - } -} diff --git a/test.mjs b/test.mjs deleted file mode 100644 index 0ebc8c76..00000000 --- a/test.mjs +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env -S node --env-file -import { env } from "node:process"; - -import { Client } from "./lib/index.js"; - -const client = new Client({ debug: true }); - -client.on("ready", () => console.info(`Logged in as ${client.user.username}!`)); -client.on("disconnected", () => console.info("Disconnected.")); - -client.on("messageCreate", (message) => console.info(message.content)); - -client.loginBot(env.TOKEN); diff --git a/tsconfig.json b/tsconfig.json index a39ec41d..a320659e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,13 @@ { "compilerOptions": { + "allowImportingTsExtensions": true, "target": "ES2022", "module": "ES6", "moduleResolution": "node", "rootDir": "./src", "declaration": true, "declarationMap": true, + "lib": ["ES2022", "DOM"], "outDir": "./lib", "esModuleInterop": true, "forceConsistentCasingInFileNames": true,