Skip to content

K
Koishi Thirdeye
Commit 3fcf14d2 authored by nanahira's avatar nanahira
Browse files
Options

adapt latest koishi

parent 79d85ae0
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 79 deletions
package-lock.json
View file @ 3fcf14d2
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"typescript": "^4.8.2" "typescript": "^4.8.2"
}, },
"peerDependencies": { "peerDependencies": {
"koishi": "^4.10.3" "koishi": "^4.10.4"
} }
}, },
"node_modules/@ampproject/remapping": { "node_modules/@ampproject/remapping": {
...@@ -1106,16 +1106,17 @@ ...@@ -1106,16 +1106,17 @@
} }
}, },
"node_modules/@koishijs/core": { "node_modules/@koishijs/core": {
"version": "4.10.3", "version": "4.10.4",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.3.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.4.tgz",
"integrity": "sha512-h/YI1nM1gVeh/fvxIJdQpkG8l/oMdNk3ibUi0Ae6PumnMa+IsjzwbCUFAbn7jSTic/uGULBQ8ALYchba1Q+siw==", "integrity": "sha512-uhR2RoslHs3ynhElWP+jIwzqn8PprlPGF10qWQvTpW1l5XmPr+PiWgf5HmAGt1XucWcuij9n1Z179yqZs6xLNg==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@koishijs/utils": "^6.2.5", "@koishijs/utils": "^6.2.6",
"@minatojs/core": "^2.0.1", "@minatojs/core": "^2.0.1",
"@satorijs/core": "^1.4.2", "@satorijs/core": "^1.4.3",
"cordis": "^2.6.0", "cordis": "^2.6.0",
"cosmokit": "^1.3.3" "cosmokit": "^1.3.3",
"fastest-levenshtein": "^1.0.16"
} }
}, },
"node_modules/@koishijs/plugin-adapter-onebot": { "node_modules/@koishijs/plugin-adapter-onebot": {
...@@ -1132,14 +1133,14 @@ ...@@ -1132,14 +1133,14 @@
} }
}, },
"node_modules/@koishijs/utils": { "node_modules/@koishijs/utils": {
"version": "6.2.5", "version": "6.2.6",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.5.tgz", "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.6.tgz",
"integrity": "sha512-ZpiHO6LBRIUm/bWJlGHC2N/f6hl0jgVU2QmUwiL3PfAH4i2xu17TZpU8hoQkrP751Lw37W9GcXoxw22mGaqdXw==", "integrity": "sha512-JAqzAmTLwLwd4LHRoLjMvCojHeyDiGaKqgpd7p3/PMeXL7aHtN+owPv0xtn9jB375llGHYQT51PMkiLMbAIpYw==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"cosmokit": "^1.3.3", "cosmokit": "^1.3.3",
"inaba": "^1.1.1", "inaba": "^1.1.1",
"reggol": "^1.3.1", "reggol": "^1.3.2",
"schemastery": "^3.5.4" "schemastery": "^3.5.4"
} }
}, },
...@@ -1187,37 +1188,37 @@ ...@@ -1187,37 +1188,37 @@
} }
}, },
"node_modules/@satorijs/core": { "node_modules/@satorijs/core": {
"version": "1.4.2", "version": "1.4.3",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.2.tgz", "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.3.tgz",
"integrity": "sha512-ae51u7DJuw/E+R+93UvtBIX8AKiXy6gOzKNcyxMCuxlydVr1RWiIffeOXNwYR0Yl6PJVVNguN5zPIGI+lKvLnw==", "integrity": "sha512-L0VJVq3jlb8r4IaYlNBMfh4A3vskDMeQwl9Y5lgXBlShxsMzn2XcgtDKfa4WgNH4HzRFjS8iLkVBSo9jDW+3TA==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@satorijs/element": "^2.1.4", "@satorijs/element": "^2.1.7",
"cordis": "^2.6.0", "cordis": "^2.6.0",
"cordis-axios": "^2.1.5", "cordis-axios": "^2.1.5",
"cosmokit": "^1.3.3", "cosmokit": "^1.3.3",
"reggol": "^1.3.2", "reggol": "^1.3.2",
"schemastery": "^3.5.4", "schemastery": "^3.5.4",
"ws": "^8.8.1" "ws": "^8.11.0"
} }
}, },
"node_modules/@satorijs/element": { "node_modules/@satorijs/element": {
"version": "2.1.6", "version": "2.1.7",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.1.6.tgz", "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.1.7.tgz",
"integrity": "sha512-ROnWE2uLJKG7hTmukqAji3UfNzzMWCAHMKM9UvBi24uKR93rlk9lqcaRIuuPhlQwmbbwrGx3Qf+F0jkiv6LdKw==", "integrity": "sha512-GCj/vkszJqg3kfhrMkzVATYh4wDqJnNyrPyTlOHWQ6CD1FWRDVhtoSEsSTbwMFZDiVM17Nf3OD37CM5WrlFL7g==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"cosmokit": "^1.3.3" "cosmokit": "^1.3.3"
} }
}, },
"node_modules/@satorijs/satori": { "node_modules/@satorijs/satori": {
"version": "1.4.2", "version": "1.4.3",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.2.tgz", "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.3.tgz",
"integrity": "sha512-6Sb/swPSJz64l8dz4WC+tlSfX07qK7iBDpzMvLf8h0FRYoWmYNJEFn3pXUentG3wqwVMpt/G1ERcftAmolkDWw==", "integrity": "sha512-XgMolxa9/9gWf4+VKqLioBkzuZA0QXQIMWZHFET1dVvQjbxNhaETF0NBmwFSjbVBOWvTN8vecTGTSLc3pQn+Rw==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@satorijs/core": "1.4.2", "@satorijs/core": "1.4.3",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
...@@ -1230,7 +1231,7 @@ ...@@ -1230,7 +1231,7 @@
"path-to-regexp": "^6.2.1", "path-to-regexp": "^6.2.1",
"schemastery": "^3.5.4", "schemastery": "^3.5.4",
"socks-proxy-agent": "^5.0.1", "socks-proxy-agent": "^5.0.1",
"ws": "^8.8.1" "ws": "^8.11.0"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=12.0.0"
...@@ -2989,6 +2990,15 @@ ...@@ -2989,6 +2990,15 @@
"integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
"dev": true "dev": true
}, },
"node_modules/fastest-levenshtein": {
"version": "1.0.16",
"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
"peer": true,
"engines": {
"node": ">= 4.9.1"
}
},
"node_modules/fastq": { "node_modules/fastq": {
"version": "1.13.0", "version": "1.13.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
...@@ -4551,14 +4561,14 @@ ...@@ -4551,14 +4561,14 @@
} }
}, },
"node_modules/koishi": { "node_modules/koishi": {
"version": "4.10.3", "version": "4.10.4",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.3.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.4.tgz",
"integrity": "sha512-eLv4A39atVmO8E9HlUyoVtc3kGawSRxyYyuN3ROE6Sz5hvX0jq73O6CsyZaWarksRYjPHvQKqndgrBNDFOs8aQ==", "integrity": "sha512-06ylHCmyyj8buQxPcnuSap7Yco6HtzC0o61AwBuBOikdILQj2WicexztohuLhQ/9ElA3pEOsJaHzDa/9Lh71Ng==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@koishijs/core": "^4.10.3", "@koishijs/core": "^4.10.4",
"@koishijs/utils": "^6.2.5", "@koishijs/utils": "^6.2.6",
"@satorijs/satori": "^1.4.2", "@satorijs/satori": "^1.4.3",
"file-type": "^16.5.4", "file-type": "^16.5.4",
"ns-require": "^1.1.4" "ns-require": "^1.1.4"
}, },
...@@ -6307,9 +6317,9 @@ ...@@ -6307,9 +6317,9 @@
} }
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "8.8.1", "version": "8.11.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
"integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==", "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
...@@ -7227,16 +7237,17 @@ ...@@ -7227,16 +7237,17 @@
} }
}, },
"@koishijs/core": { "@koishijs/core": {
"version": "4.10.3", "version": "4.10.4",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.3.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.4.tgz",
"integrity": "sha512-h/YI1nM1gVeh/fvxIJdQpkG8l/oMdNk3ibUi0Ae6PumnMa+IsjzwbCUFAbn7jSTic/uGULBQ8ALYchba1Q+siw==", "integrity": "sha512-uhR2RoslHs3ynhElWP+jIwzqn8PprlPGF10qWQvTpW1l5XmPr+PiWgf5HmAGt1XucWcuij9n1Z179yqZs6xLNg==",
"peer": true, "peer": true,
"requires": { "requires": {
"@koishijs/utils": "^6.2.5", "@koishijs/utils": "^6.2.6",
"@minatojs/core": "^2.0.1", "@minatojs/core": "^2.0.1",
"@satorijs/core": "^1.4.2", "@satorijs/core": "^1.4.3",
"cordis": "^2.6.0", "cordis": "^2.6.0",
"cosmokit": "^1.3.3" "cosmokit": "^1.3.3",
"fastest-levenshtein": "^1.0.16"
} }
}, },
"@koishijs/plugin-adapter-onebot": { "@koishijs/plugin-adapter-onebot": {
...@@ -7250,14 +7261,14 @@ ...@@ -7250,14 +7261,14 @@
} }
}, },
"@koishijs/utils": { "@koishijs/utils": {
"version": "6.2.5", "version": "6.2.6",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.5.tgz", "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.6.tgz",
"integrity": "sha512-ZpiHO6LBRIUm/bWJlGHC2N/f6hl0jgVU2QmUwiL3PfAH4i2xu17TZpU8hoQkrP751Lw37W9GcXoxw22mGaqdXw==", "integrity": "sha512-JAqzAmTLwLwd4LHRoLjMvCojHeyDiGaKqgpd7p3/PMeXL7aHtN+owPv0xtn9jB375llGHYQT51PMkiLMbAIpYw==",
"peer": true, "peer": true,
"requires": { "requires": {
"cosmokit": "^1.3.3", "cosmokit": "^1.3.3",
"inaba": "^1.1.1", "inaba": "^1.1.1",
"reggol": "^1.3.1", "reggol": "^1.3.2",
"schemastery": "^3.5.4" "schemastery": "^3.5.4"
} }
}, },
...@@ -7296,37 +7307,37 @@ ...@@ -7296,37 +7307,37 @@
} }
}, },
"@satorijs/core": { "@satorijs/core": {
"version": "1.4.2", "version": "1.4.3",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.2.tgz", "resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.3.tgz",
"integrity": "sha512-ae51u7DJuw/E+R+93UvtBIX8AKiXy6gOzKNcyxMCuxlydVr1RWiIffeOXNwYR0Yl6PJVVNguN5zPIGI+lKvLnw==", "integrity": "sha512-L0VJVq3jlb8r4IaYlNBMfh4A3vskDMeQwl9Y5lgXBlShxsMzn2XcgtDKfa4WgNH4HzRFjS8iLkVBSo9jDW+3TA==",
"peer": true, "peer": true,
"requires": { "requires": {
"@satorijs/element": "^2.1.4", "@satorijs/element": "^2.1.7",
"cordis": "^2.6.0", "cordis": "^2.6.0",
"cordis-axios": "^2.1.5", "cordis-axios": "^2.1.5",
"cosmokit": "^1.3.3", "cosmokit": "^1.3.3",
"reggol": "^1.3.2", "reggol": "^1.3.2",
"schemastery": "^3.5.4", "schemastery": "^3.5.4",
"ws": "^8.8.1" "ws": "^8.11.0"
} }
}, },
"@satorijs/element": { "@satorijs/element": {
"version": "2.1.6", "version": "2.1.7",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.1.6.tgz", "resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.1.7.tgz",
"integrity": "sha512-ROnWE2uLJKG7hTmukqAji3UfNzzMWCAHMKM9UvBi24uKR93rlk9lqcaRIuuPhlQwmbbwrGx3Qf+F0jkiv6LdKw==", "integrity": "sha512-GCj/vkszJqg3kfhrMkzVATYh4wDqJnNyrPyTlOHWQ6CD1FWRDVhtoSEsSTbwMFZDiVM17Nf3OD37CM5WrlFL7g==",
"peer": true, "peer": true,
"requires": { "requires": {
"cosmokit": "^1.3.3" "cosmokit": "^1.3.3"
} }
}, },
"@satorijs/satori": { "@satorijs/satori": {
"version": "1.4.2", "version": "1.4.3",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.2.tgz", "resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.3.tgz",
"integrity": "sha512-6Sb/swPSJz64l8dz4WC+tlSfX07qK7iBDpzMvLf8h0FRYoWmYNJEFn3pXUentG3wqwVMpt/G1ERcftAmolkDWw==", "integrity": "sha512-XgMolxa9/9gWf4+VKqLioBkzuZA0QXQIMWZHFET1dVvQjbxNhaETF0NBmwFSjbVBOWvTN8vecTGTSLc3pQn+Rw==",
"peer": true, "peer": true,
"requires": { "requires": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@satorijs/core": "1.4.2", "@satorijs/core": "1.4.3",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
...@@ -7339,7 +7350,7 @@ ...@@ -7339,7 +7350,7 @@
"path-to-regexp": "^6.2.1", "path-to-regexp": "^6.2.1",
"schemastery": "^3.5.4", "schemastery": "^3.5.4",
"socks-proxy-agent": "^5.0.1", "socks-proxy-agent": "^5.0.1",
"ws": "^8.8.1" "ws": "^8.11.0"
} }
}, },
"@sinclair/typebox": { "@sinclair/typebox": {
...@@ -8703,6 +8714,12 @@ ...@@ -8703,6 +8714,12 @@
"integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
"dev": true "dev": true
}, },
"fastest-levenshtein": {
"version": "1.0.16",
"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
"peer": true
},
"fastq": { "fastq": {
"version": "1.13.0", "version": "1.13.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
...@@ -9870,14 +9887,14 @@ ...@@ -9870,14 +9887,14 @@
} }
}, },
"koishi": { "koishi": {
"version": "4.10.3", "version": "4.10.4",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.3.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.4.tgz",
"integrity": "sha512-eLv4A39atVmO8E9HlUyoVtc3kGawSRxyYyuN3ROE6Sz5hvX0jq73O6CsyZaWarksRYjPHvQKqndgrBNDFOs8aQ==", "integrity": "sha512-06ylHCmyyj8buQxPcnuSap7Yco6HtzC0o61AwBuBOikdILQj2WicexztohuLhQ/9ElA3pEOsJaHzDa/9Lh71Ng==",
"peer": true, "peer": true,
"requires": { "requires": {
"@koishijs/core": "^4.10.3", "@koishijs/core": "^4.10.4",
"@koishijs/utils": "^6.2.5", "@koishijs/utils": "^6.2.6",
"@satorijs/satori": "^1.4.2", "@satorijs/satori": "^1.4.3",
"file-type": "^16.5.4", "file-type": "^16.5.4",
"ns-require": "^1.1.4" "ns-require": "^1.1.4"
} }
...@@ -11141,9 +11158,9 @@ ...@@ -11141,9 +11158,9 @@
} }
}, },
"ws": { "ws": {
"version": "8.8.1", "version": "8.11.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
"integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==", "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
"requires": {} "requires": {}
}, },
"y18n": { "y18n": {
......
package.json
View file @ 3fcf14d2
...@@ -69,6 +69,6 @@ ...@@ -69,6 +69,6 @@
"testEnvironment": "node" "testEnvironment": "node"
}, },
"peerDependencies": { "peerDependencies": {
"koishi": "^4.10.3" "koishi": "^4.10.4"
} }
} }
src/decorators/common.ts
View file @ 3fcf14d2
...@@ -23,7 +23,6 @@ export const { ...@@ -23,7 +23,6 @@ export const {
UseBeforeEvent, UseBeforeEvent,
UseMiddleware, UseMiddleware,
UsePreset, UsePreset,
UseFormatter,
UseInterval, UseInterval,
} = methodDecorators; } = methodDecorators;
...@@ -64,10 +63,14 @@ export const CommandDescription = koishiRegistrar.decorateCommandTransformer( ...@@ -64,10 +63,14 @@ export const CommandDescription = koishiRegistrar.decorateCommandTransformer(
export const CommandAlias = koishiRegistrar.decorateCommandTransformer( export const CommandAlias = koishiRegistrar.decorateCommandTransformer(
(ctx, cmd, ...names: string[]) => cmd.alias(...names), (ctx, cmd, ...names: string[]) => cmd.alias(...names),
); );
export const CommandShortcut = koishiRegistrar.decorateCommandTransformer( export const CommandShortcut = koishiRegistrar.decorateCommandTransformer(
(ctx, cmd, name: string | RegExp, config: Command.Shortcut = {}) => (ctx, cmd, pattern: string | RegExp, config: Command.Shortcut) =>
cmd.shortcut(name, config), // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
cmd.shortcut(pattern, config),
); );
export const CommandUsage = koishiRegistrar.decorateCommandTransformer( export const CommandUsage = koishiRegistrar.decorateCommandTransformer(
(ctx, cmd, text: Command.Usage) => cmd.usage(text), (ctx, cmd, text: Command.Usage) => cmd.usage(text),
); );
......
src/registrar.ts
View file @ 3fcf14d2
...@@ -147,21 +147,12 @@ export class KoishiRegistrar extends SatoriRegistrar<Context> { ...@@ -147,21 +147,12 @@ export class KoishiRegistrar extends SatoriRegistrar<Context> {
return command; return command;
}, },
), ),
UseFormatter: this.decorateMethod(
'formatter',
({ ctx }, fun: I18n.Formatter, name: string) => {
ctx.i18n.formatter(name, fun);
ctx.on('dispose', () => {
delete ctx.i18n._formatters[name];
});
},
),
UsePreset: this.decorateMethod( UsePreset: this.decorateMethod(
'preset', 'preset',
({ ctx }, fun: I18n.Renderer, name: string) => { ({ ctx }, fun: I18n.Renderer, name: string) => {
ctx.i18n.preset(name, fun); ctx.i18n.preset(name, fun);
ctx.on('dispose', () => { ctx.on('dispose', () => {
delete ctx.i18n._presets[fun.name]; delete ctx.i18n._presets[name];
}); });
}, },
), ),
......
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