Skip to content

K
Koishi Thirdeye
Commit 11672e0d authored by nanahira's avatar nanahira
Browse files
Options

catchup

parent 7806842c
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
package-lock.json
View file @ 11672e0d
......@@ -10,8 +10,8 @@
"license": "MIT",
"dependencies": {
"reflect-metadata": "^0.1.13",
"schemastery": "^1.0.0",
"schemastery-gen": "^1.0.5",
"schemastery": "^2.0.0",
"schemastery-gen": "^2.0.0",
"typed-reflector": "^1.0.5"
},
"devDependencies": {
......@@ -22,7 +22,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.1",
"koishi": "^4.0.0-beta.2",
"koishi": "^4.0.0-beta.3",
"prettier": "^2.4.1",
"typescript": "^4.5.2",
"ws": "^8.2.3"
......@@ -200,14 +200,14 @@
}
},
"node_modules/@koishijs/core": {
"version": "4.0.0-beta.2",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-beta.2.tgz",
"integrity": "sha512-L3KPpPOXJaxMCezDrn4Yv0whEKeOtLy1Xe71UQ36TKTDaQ/ytHTvu5ShLWxFYFvdh8yCCvcGx+6YErXJogfwmw==",
"version": "4.0.0-beta.3",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-beta.3.tgz",
"integrity": "sha512-ZCdjZOQ4yNN49/LdOzHKo61j/S+GwqckM116tXrZYF7gNHRZ5486HFJqJjYDCYO3n2AZvQ4nV6w8OSaoIXIPEQ==",
"dev": true,
"dependencies": {
"@koishijs/utils": "^5.0.0-beta.1",
"fastest-levenshtein": "^1.0.12",
"schemastery": "^1.0.0"
"schemastery": "^2.0.0"
},
"engines": {
"node": ">=12.0.0"
......@@ -227,15 +227,15 @@
}
},
"node_modules/@koishijs/plugin-cache-lru": {
"version": "1.0.0-beta.1",
"resolved": "https://registry.npmjs.org/@koishijs/plugin-cache-lru/-/plugin-cache-lru-1.0.0-beta.1.tgz",
"integrity": "sha512-8l5o4RKEZ58wZJIrII3x/2vmZYdxkHGzfuUm5jWOBXzw1bDmJRa0q8RrYhjabs/QKbTa9Q+fzmcMtaMnKEGtaw==",
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/@koishijs/plugin-cache-lru/-/plugin-cache-lru-1.0.0-beta.2.tgz",
"integrity": "sha512-RkLf6Gb+bvJcfBv9ZtfsEFo7NcCr+buQgiKccllfU5rANvUW5uXlPmjcTmV6AaKAr7fDZsCR3GRusiJtzS7STQ==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
},
"peerDependencies": {
"koishi": "^4.0.0-beta.2"
"koishi": "^4.0.0-beta.3"
}
},
"node_modules/@koishijs/utils": {
......@@ -2126,14 +2126,14 @@
}
},
"node_modules/koishi": {
"version": "4.0.0-beta.2",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-beta.2.tgz",
"integrity": "sha512-5nLpioIS/9aboZSQyyB8cacY8PMXUulP2fjDO1uAbacSpSANOGBp+KRvTZYqZPIVZxfKR+T8WdsqNAdcBmrCiQ==",
"version": "4.0.0-beta.3",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-beta.3.tgz",
"integrity": "sha512-sWTOU4maJnsRU7w8Upw8rBT1aZ0zEfN9Cs02tR2UP7qdmZiRTyrjWWFElaMhmnoj+6nTH7Udihmwb4MwbBimfA==",
"dev": true,
"dependencies": {
"@koa/router": "^10.1.1",
"@koishijs/core": "^4.0.0-beta.2",
"@koishijs/plugin-cache-lru": "^1.0.0-beta.1",
"@koishijs/core": "^4.0.0-beta.3",
"@koishijs/plugin-cache-lru": "^1.0.0-beta.2",
"@koishijs/utils": "^5.0.0-beta.1",
"@types/koa": "*",
"@types/koa__router": "*",
......@@ -2724,21 +2724,21 @@
"dev": true
},
"node_modules/schemastery": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-1.0.0.tgz",
"integrity": "sha512-TwjfFcstdU1rSkV9/dATEk8YFLa1OOxCuGT2mMepZxpMAATQdVm7Fw2tRr4tEsrqAitP+X1/8P5Vv51OUBClAw=="
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.0.0.tgz",
"integrity": "sha512-g628Fvc8cY3Laoyz+v45qZGiClwhTj0MsiGF+tSVlUh+hqYf6kVkTaWdIHNGhfj11h9QzRrs0A4wfvQZuHg3iA=="
},
"node_modules/schemastery-gen": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-1.0.5.tgz",
"integrity": "sha512-OCU1SnGzCQ9DjGXlOhE1G2pVOpA6MMOfy8SQFVOow3L4qmNrJ/Ihcc1SndOMqgFUMVC77+vCNR1QSnL4Q0jl3Q==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-2.0.0.tgz",
"integrity": "sha512-lTttqIWwNM8nizqUpUvJOERtb+Su4qkNe5Lp0ruINiZlCuN/HBCAOmf+OcdAlWLW8BRAY+xIzf4o1Kl043HVVQ==",
"dependencies": {
"lodash": "^4.17.21",
"reflect-metadata": "^0.1.13",
"typed-reflector": "^1.0.5"
},
"peerDependencies": {
"schemastery": "^1.0.0"
"schemastery": "^2.0.0"
}
},
"node_modules/semver": {
......@@ -3366,14 +3366,14 @@
}
},
"@koishijs/core": {
"version": "4.0.0-beta.2",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-beta.2.tgz",
"integrity": "sha512-L3KPpPOXJaxMCezDrn4Yv0whEKeOtLy1Xe71UQ36TKTDaQ/ytHTvu5ShLWxFYFvdh8yCCvcGx+6YErXJogfwmw==",
"version": "4.0.0-beta.3",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.0.0-beta.3.tgz",
"integrity": "sha512-ZCdjZOQ4yNN49/LdOzHKo61j/S+GwqckM116tXrZYF7gNHRZ5486HFJqJjYDCYO3n2AZvQ4nV6w8OSaoIXIPEQ==",
"dev": true,
"requires": {
"@koishijs/utils": "^5.0.0-beta.1",
"fastest-levenshtein": "^1.0.12",
"schemastery": "^1.0.0"
"schemastery": "^2.0.0"
}
},
"@koishijs/plugin-adapter-onebot": {
......@@ -3387,9 +3387,9 @@
}
},
"@koishijs/plugin-cache-lru": {
"version": "1.0.0-beta.1",
"resolved": "https://registry.npmjs.org/@koishijs/plugin-cache-lru/-/plugin-cache-lru-1.0.0-beta.1.tgz",
"integrity": "sha512-8l5o4RKEZ58wZJIrII3x/2vmZYdxkHGzfuUm5jWOBXzw1bDmJRa0q8RrYhjabs/QKbTa9Q+fzmcMtaMnKEGtaw==",
"version": "1.0.0-beta.2",
"resolved": "https://registry.npmjs.org/@koishijs/plugin-cache-lru/-/plugin-cache-lru-1.0.0-beta.2.tgz",
"integrity": "sha512-RkLf6Gb+bvJcfBv9ZtfsEFo7NcCr+buQgiKccllfU5rANvUW5uXlPmjcTmV6AaKAr7fDZsCR3GRusiJtzS7STQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
......@@ -4842,14 +4842,14 @@
}
},
"koishi": {
"version": "4.0.0-beta.2",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-beta.2.tgz",
"integrity": "sha512-5nLpioIS/9aboZSQyyB8cacY8PMXUulP2fjDO1uAbacSpSANOGBp+KRvTZYqZPIVZxfKR+T8WdsqNAdcBmrCiQ==",
"version": "4.0.0-beta.3",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.0.0-beta.3.tgz",
"integrity": "sha512-sWTOU4maJnsRU7w8Upw8rBT1aZ0zEfN9Cs02tR2UP7qdmZiRTyrjWWFElaMhmnoj+6nTH7Udihmwb4MwbBimfA==",
"dev": true,
"requires": {
"@koa/router": "^10.1.1",
"@koishijs/core": "^4.0.0-beta.2",
"@koishijs/plugin-cache-lru": "^1.0.0-beta.1",
"@koishijs/core": "^4.0.0-beta.3",
"@koishijs/plugin-cache-lru": "^1.0.0-beta.2",
"@koishijs/utils": "^5.0.0-beta.1",
"@types/koa": "*",
"@types/koa__router": "*",
......@@ -5289,14 +5289,14 @@
"dev": true
},
"schemastery": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-1.0.0.tgz",
"integrity": "sha512-TwjfFcstdU1rSkV9/dATEk8YFLa1OOxCuGT2mMepZxpMAATQdVm7Fw2tRr4tEsrqAitP+X1/8P5Vv51OUBClAw=="
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.0.0.tgz",
"integrity": "sha512-g628Fvc8cY3Laoyz+v45qZGiClwhTj0MsiGF+tSVlUh+hqYf6kVkTaWdIHNGhfj11h9QzRrs0A4wfvQZuHg3iA=="
},
"schemastery-gen": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-1.0.5.tgz",
"integrity": "sha512-OCU1SnGzCQ9DjGXlOhE1G2pVOpA6MMOfy8SQFVOow3L4qmNrJ/Ihcc1SndOMqgFUMVC77+vCNR1QSnL4Q0jl3Q==",
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-2.0.0.tgz",
"integrity": "sha512-lTttqIWwNM8nizqUpUvJOERtb+Su4qkNe5Lp0ruINiZlCuN/HBCAOmf+OcdAlWLW8BRAY+xIzf4o1Kl043HVVQ==",
"requires": {
"lodash": "^4.17.21",
"reflect-metadata": "^0.1.13",
......
src/register.ts
View file @ 11672e0d
......@@ -21,7 +21,7 @@ import { ClassType, SchemaClass } from 'schemastery-gen';
export interface KoishiPluginRegistrationOptions<T = any> {
name?: string;
schema?: Schema<T> | Type<T>;
schema?: Schema<any, T> | Type<T>;
}
export interface PluginClass<T = any> {
......@@ -58,7 +58,7 @@ export function KoishiPlugin<T = any>(
>(originalClass: C) {
const newClass = class extends originalClass implements PluginClass {
static schema = (options.schema as Schema).type
? (options.schema as Schema<T>)
? (options.schema as Schema<Partial<T>, T>)
: SchemaClass(options.schema as ClassType<T>);
__ctx: Context;
__config: T;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment