Skip to content

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

catchup minato

parent c7984f5e
Hide whitespace changes
Inline Side-by-side
Showing with 212 additions and 292 deletions
package-lock.json
View file @ b8d56f0c
......@@ -9,7 +9,7 @@
"version": "11.1.11",
"license": "MIT",
"dependencies": {
"minato-decorators": "^2.1.0",
"minato-decorators": "^2.2.0",
"rxjs": "^7.5.6",
"satori-decorators": "^1.1.1"
},
......@@ -31,7 +31,7 @@
"typescript": "^4.8.2"
},
"peerDependencies": {
"koishi": "^4.9.7"
"koishi": "^4.10.3"
}
},
"node_modules/@ampproject/remapping": {
......@@ -1106,15 +1106,15 @@
}
},
"node_modules/@koishijs/core": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.9.7.tgz",
"integrity": "sha512-jmt6BKvH0az25z/BJs4SNFn9dvx7Ji3TjIRl5AtvagO0bzOQfbn1Tavhtfn3sHVJqQUQIZQcFR3969G4dvchhA==",
"version": "4.10.3",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.3.tgz",
"integrity": "sha512-h/YI1nM1gVeh/fvxIJdQpkG8l/oMdNk3ibUi0Ae6PumnMa+IsjzwbCUFAbn7jSTic/uGULBQ8ALYchba1Q+siw==",
"peer": true,
"dependencies": {
"@koishijs/utils": "^6.2.4",
"@minatojs/core": "^1.3.2",
"@satorijs/core": "^1.3.1",
"cordis": "^2.5.0",
"@koishijs/utils": "^6.2.5",
"@minatojs/core": "^2.0.1",
"@satorijs/core": "^1.4.2",
"cordis": "^2.6.0",
"cosmokit": "^1.3.3"
}
},
......@@ -1132,9 +1132,9 @@
}
},
"node_modules/@koishijs/utils": {
"version": "6.2.4",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.4.tgz",
"integrity": "sha512-AfZA1TX8oOQCNFTOmG5cBRPC0YbSUPgbUYkninFg8F2sp98C8VSn1hua1OVjCM5zC9XISWtj5QpKJHPJRIa+BA==",
"version": "6.2.5",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.5.tgz",
"integrity": "sha512-ZpiHO6LBRIUm/bWJlGHC2N/f6hl0jgVU2QmUwiL3PfAH4i2xu17TZpU8hoQkrP751Lw37W9GcXoxw22mGaqdXw==",
"peer": true,
"dependencies": {
"cosmokit": "^1.3.3",
......@@ -1144,10 +1144,9 @@
}
},
"node_modules/@minatojs/core": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-1.3.2.tgz",
"integrity": "sha512-hEMzHobEqY8yD3M5lLiUjfsvNV4NTLBZJkKNJ4wTi+zhm4LbDmaJpV0LoUtgzl8v0SE79gBYZGXNhkeMg/cX0w==",
"peer": true,
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.0.1.tgz",
"integrity": "sha512-li7js0EZGw3PV28VM9B/aBX2QeKwvk32U4Haf4uvq0iBTH7L4JRq4YbOqlO5ZjrExoZS4RHBZtz4wzfW3Ay3jw==",
"dependencies": {
"cosmokit": "^1.3.3"
}
......@@ -1188,37 +1187,37 @@
}
},
"node_modules/@satorijs/core": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.3.1.tgz",
"integrity": "sha512-kwjHQ+PYtY97/RBN2D0B5q4Duf6t5xwbHa8qQFVMQ2K1w+Rq0gbwke4eccsj6l5w0gjo5W5UIJUcnwrDYo4sww==",
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.2.tgz",
"integrity": "sha512-ae51u7DJuw/E+R+93UvtBIX8AKiXy6gOzKNcyxMCuxlydVr1RWiIffeOXNwYR0Yl6PJVVNguN5zPIGI+lKvLnw==",
"peer": true,
"dependencies": {
"@satorijs/element": "^2.0.0",
"cordis": "^2.5.0",
"cordis-axios": "^2.1.3",
"@satorijs/element": "^2.1.4",
"cordis": "^2.6.0",
"cordis-axios": "^2.1.5",
"cosmokit": "^1.3.3",
"reggol": "^1.3.1",
"reggol": "^1.3.2",
"schemastery": "^3.5.4",
"ws": "^8.8.1"
}
},
"node_modules/@satorijs/element": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.0.0.tgz",
"integrity": "sha512-Eq0Q3Z9XiSPrV5KdBZgiQK6EWPzfT7Vx0bqNyhwlByY3pSZcGGwnTw8DDIQzd2y+T5flOr36h3bASXSbxweogA==",
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.1.6.tgz",
"integrity": "sha512-ROnWE2uLJKG7hTmukqAji3UfNzzMWCAHMKM9UvBi24uKR93rlk9lqcaRIuuPhlQwmbbwrGx3Qf+F0jkiv6LdKw==",
"peer": true,
"dependencies": {
"cosmokit": "^1.3.3"
}
},
"node_modules/@satorijs/satori": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.3.1.tgz",
"integrity": "sha512-T7elZqVtoQiXo6rLxlNx8KB0Y3b8zJuuSTjiSNjrqhEvd0QCGKxSzs3RSvCfIHqc5kdhXzdH48CEE5hQgYkrFw==",
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.2.tgz",
"integrity": "sha512-6Sb/swPSJz64l8dz4WC+tlSfX07qK7iBDpzMvLf8h0FRYoWmYNJEFn3pXUentG3wqwVMpt/G1ERcftAmolkDWw==",
"peer": true,
"dependencies": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.3.1",
"@satorijs/core": "1.4.2",
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^8.5.3",
......@@ -1237,29 +1236,6 @@
"node": ">=12.0.0"
}
},
"node_modules/@satorijs/satori/node_modules/@tootallnate/once": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
"peer": true,
"engines": {
"node": ">= 10"
}
},
"node_modules/@satorijs/satori/node_modules/http-proxy-agent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"peer": true,
"dependencies": {
"@tootallnate/once": "2",
"agent-base": "6",
"debug": "4"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/@sinclair/typebox": {
"version": "0.24.51",
"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
......@@ -1290,6 +1266,15 @@
"integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
"peer": true
},
"node_modules/@tootallnate/once": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
"peer": true,
"engines": {
"node": ">= 10"
}
},
"node_modules/@types/accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
......@@ -2392,21 +2377,21 @@
"peer": true
},
"node_modules/cordis": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/cordis/-/cordis-2.5.0.tgz",
"integrity": "sha512-69/LJyoaXEtimJiiYF4bMSXHlMCZLOYQ3OF1DcNFq1amAD5tODDkz0JEpcisU0YboLhUwXsUXJe/rBHkoAhUcg==",
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/cordis/-/cordis-2.6.0.tgz",
"integrity": "sha512-4VUY2x6ufctBr1zYAML3c+b1eXwgY94nkqLP7/icb3QVGXMBJuH4Nztakf6ADVonN5MvgJ06RRawRvmWdx3LxA==",
"peer": true,
"dependencies": {
"cosmokit": "^1.3.3"
}
},
"node_modules/cordis-axios": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.1.3.tgz",
"integrity": "sha512-W6RCzZ4u+q/2D+BSAYV3aA3dMuz1bi+c9L1RI8g9SLaA5Z2QoaJ5zX1faIrS8y79AWtXm8joIGj+gzPVnvO8ww==",
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.1.5.tgz",
"integrity": "sha512-L5cHolNBlo4MxhfWRETpz1G20jF6J0Hu+5zPxebo0XJthqO0eI6U/2DrbQvXARnyMhuQIIZfoPJLvSNgd0Rjzw==",
"peer": true,
"dependencies": {
"axios": "^1.1.2",
"axios": "~1.1.3",
"cosmokit": "^1.3.3",
"file-type": "^16.5.4",
"mime-db": "^1.52.0",
......@@ -2416,7 +2401,7 @@
"node": ">=12.0.0"
},
"peerDependencies": {
"cordis": "^2.5.0"
"cordis": "^2.6.0"
}
},
"node_modules/cordis-axios/node_modules/mime-db": {
......@@ -2448,8 +2433,7 @@
"node_modules/cosmokit": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/cosmokit/-/cosmokit-1.3.3.tgz",
"integrity": "sha512-jpEp5zDrGbycu8AdaCjmNNr2J617NAFvAU6GM8o/dJP2/pe80qTbPoflqyJzAuMhiaC6QCXlBP0KCusTsDemPQ==",
"peer": true
"integrity": "sha512-jpEp5zDrGbycu8AdaCjmNNr2J617NAFvAU6GM8o/dJP2/pe80qTbPoflqyJzAuMhiaC6QCXlBP0KCusTsDemPQ=="
},
"node_modules/cross-spawn": {
"version": "7.0.3",
......@@ -3385,6 +3369,20 @@
"node": ">= 0.6"
}
},
"node_modules/http-proxy-agent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"peer": true,
"dependencies": {
"@tootallnate/once": "2",
"agent-base": "6",
"debug": "4"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/https-proxy-agent": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
......@@ -4553,14 +4551,14 @@
}
},
"node_modules/koishi": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.9.7.tgz",
"integrity": "sha512-InvvfPx5sqRkgOlTWksQu1dWjASCcf92guRGQmm+UIqZh0GBTJi+uFmpAMPA/E+nHOoLDOy/U9DVtpSPipi2+g==",
"version": "4.10.3",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.3.tgz",
"integrity": "sha512-eLv4A39atVmO8E9HlUyoVtc3kGawSRxyYyuN3ROE6Sz5hvX0jq73O6CsyZaWarksRYjPHvQKqndgrBNDFOs8aQ==",
"peer": true,
"dependencies": {
"@koishijs/core": "^4.9.7",
"@koishijs/utils": "^6.2.4",
"@satorijs/satori": "^1.3.1",
"@koishijs/core": "^4.10.3",
"@koishijs/utils": "^6.2.5",
"@satorijs/satori": "^1.4.2",
"file-type": "^16.5.4",
"ns-require": "^1.1.4"
},
......@@ -4768,15 +4766,13 @@
}
},
"node_modules/minato-decorators": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.1.0.tgz",
"integrity": "sha512-s4F4bCxktODrEqLRzU3ljsIipv3ExOV6qCjH+wMiMFXjMBQvy3UaodOWOYf2UZ7GRFiGT0rij9zIrBhWdJVd0A==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.2.0.tgz",
"integrity": "sha512-qJmm2Ggjk0aM0cizWDnGtI5JZKX7wplchqMiZGuLoGjGhNNgfaMistABjcJiZsMVMU+XNAvIurEVc+gHoyOg5g==",
"dependencies": {
"@minatojs/core": "^2.0.1",
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
},
"peerDependencies": {
"@minatojs/core": "^1.3.0"
}
},
"node_modules/minimatch": {
......@@ -5291,27 +5287,10 @@
"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
"dev": true
},
"node_modules/readable-web-to-node-stream": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
"integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
"peer": true,
"dependencies": {
"readable-stream": "^3.6.0"
},
"engines": {
"node": ">=8"
},
"funding": {
"type": "github",
"url": "https://github.com/sponsors/Borewit"
}
},
"node_modules/readable-web-to-node-stream/node_modules/readable-stream": {
"node_modules/readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"peer": true,
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
......@@ -5321,33 +5300,20 @@
"node": ">= 6"
}
},
"node_modules/readable-web-to-node-stream/node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
],
"peer": true
},
"node_modules/readable-web-to-node-stream/node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"node_modules/readable-web-to-node-stream": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
"integrity": "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==",
"peer": true,
"dependencies": {
"safe-buffer": "~5.2.0"
"readable-stream": "^3.6.0"
},
"engines": {
"node": ">=8"
},
"funding": {
"type": "github",
"url": "https://github.com/sponsors/Borewit"
}
},
"node_modules/reflect-metadata": {
......@@ -5368,9 +5334,9 @@
}
},
"node_modules/reggol": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.1.tgz",
"integrity": "sha512-KeT+Sih6edb0Ec0l7fQhkM2S4WxmQ9fh/1qftybMTyA4cr5+6lpUi3U3VrrgGF30Uppkx1YI/laq+49t/ljY6g==",
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.2.tgz",
"integrity": "sha512-vI+nWzdBJlO9OsrDCJ/z5NS4/o1mzHjwrZcn6LoESHn2get7LrbZ0TZB/dEkCtUlah324rxd5E2zciT/98Op1Q==",
"peer": true,
"dependencies": {
"cosmokit": "^1.3.3",
......@@ -5770,6 +5736,33 @@
"node": ">= 0.6"
}
},
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dependencies": {
"safe-buffer": "~5.2.0"
}
},
"node_modules/string_decoder/node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
]
},
"node_modules/string-length": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
......@@ -5878,49 +5871,6 @@
"node": ">= 7.0.0"
}
},
"node_modules/superagent/node_modules/readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"dev": true,
"dependencies": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/superagent/node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"dev": true,
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/feross"
},
{
"type": "patreon",
"url": "https://www.patreon.com/feross"
},
{
"type": "consulting",
"url": "https://feross.org/support"
}
]
},
"node_modules/superagent/node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dev": true,
"dependencies": {
"safe-buffer": "~5.2.0"
}
},
"node_modules/supertest": {
"version": "6.1.6",
"resolved": "https://registry.npmjs.org/supertest/-/supertest-6.1.6.tgz",
......@@ -7277,15 +7227,15 @@
}
},
"@koishijs/core": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.9.7.tgz",
"integrity": "sha512-jmt6BKvH0az25z/BJs4SNFn9dvx7Ji3TjIRl5AtvagO0bzOQfbn1Tavhtfn3sHVJqQUQIZQcFR3969G4dvchhA==",
"version": "4.10.3",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.10.3.tgz",
"integrity": "sha512-h/YI1nM1gVeh/fvxIJdQpkG8l/oMdNk3ibUi0Ae6PumnMa+IsjzwbCUFAbn7jSTic/uGULBQ8ALYchba1Q+siw==",
"peer": true,
"requires": {
"@koishijs/utils": "^6.2.4",
"@minatojs/core": "^1.3.2",
"@satorijs/core": "^1.3.1",
"cordis": "^2.5.0",
"@koishijs/utils": "^6.2.5",
"@minatojs/core": "^2.0.1",
"@satorijs/core": "^1.4.2",
"cordis": "^2.6.0",
"cosmokit": "^1.3.3"
}
},
......@@ -7300,9 +7250,9 @@
}
},
"@koishijs/utils": {
"version": "6.2.4",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.4.tgz",
"integrity": "sha512-AfZA1TX8oOQCNFTOmG5cBRPC0YbSUPgbUYkninFg8F2sp98C8VSn1hua1OVjCM5zC9XISWtj5QpKJHPJRIa+BA==",
"version": "6.2.5",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.5.tgz",
"integrity": "sha512-ZpiHO6LBRIUm/bWJlGHC2N/f6hl0jgVU2QmUwiL3PfAH4i2xu17TZpU8hoQkrP751Lw37W9GcXoxw22mGaqdXw==",
"peer": true,
"requires": {
"cosmokit": "^1.3.3",
......@@ -7312,10 +7262,9 @@
}
},
"@minatojs/core": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-1.3.2.tgz",
"integrity": "sha512-hEMzHobEqY8yD3M5lLiUjfsvNV4NTLBZJkKNJ4wTi+zhm4LbDmaJpV0LoUtgzl8v0SE79gBYZGXNhkeMg/cX0w==",
"peer": true,
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.0.1.tgz",
"integrity": "sha512-li7js0EZGw3PV28VM9B/aBX2QeKwvk32U4Haf4uvq0iBTH7L4JRq4YbOqlO5ZjrExoZS4RHBZtz4wzfW3Ay3jw==",
"requires": {
"cosmokit": "^1.3.3"
}
......@@ -7347,37 +7296,37 @@
}
},
"@satorijs/core": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.3.1.tgz",
"integrity": "sha512-kwjHQ+PYtY97/RBN2D0B5q4Duf6t5xwbHa8qQFVMQ2K1w+Rq0gbwke4eccsj6l5w0gjo5W5UIJUcnwrDYo4sww==",
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.4.2.tgz",
"integrity": "sha512-ae51u7DJuw/E+R+93UvtBIX8AKiXy6gOzKNcyxMCuxlydVr1RWiIffeOXNwYR0Yl6PJVVNguN5zPIGI+lKvLnw==",
"peer": true,
"requires": {
"@satorijs/element": "^2.0.0",
"cordis": "^2.5.0",
"cordis-axios": "^2.1.3",
"@satorijs/element": "^2.1.4",
"cordis": "^2.6.0",
"cordis-axios": "^2.1.5",
"cosmokit": "^1.3.3",
"reggol": "^1.3.1",
"reggol": "^1.3.2",
"schemastery": "^3.5.4",
"ws": "^8.8.1"
}
},
"@satorijs/element": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.0.0.tgz",
"integrity": "sha512-Eq0Q3Z9XiSPrV5KdBZgiQK6EWPzfT7Vx0bqNyhwlByY3pSZcGGwnTw8DDIQzd2y+T5flOr36h3bASXSbxweogA==",
"version": "2.1.6",
"resolved": "https://registry.npmjs.org/@satorijs/element/-/element-2.1.6.tgz",
"integrity": "sha512-ROnWE2uLJKG7hTmukqAji3UfNzzMWCAHMKM9UvBi24uKR93rlk9lqcaRIuuPhlQwmbbwrGx3Qf+F0jkiv6LdKw==",
"peer": true,
"requires": {
"cosmokit": "^1.3.3"
}
},
"@satorijs/satori": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.3.1.tgz",
"integrity": "sha512-T7elZqVtoQiXo6rLxlNx8KB0Y3b8zJuuSTjiSNjrqhEvd0QCGKxSzs3RSvCfIHqc5kdhXzdH48CEE5hQgYkrFw==",
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.4.2.tgz",
"integrity": "sha512-6Sb/swPSJz64l8dz4WC+tlSfX07qK7iBDpzMvLf8h0FRYoWmYNJEFn3pXUentG3wqwVMpt/G1ERcftAmolkDWw==",
"peer": true,
"requires": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.3.1",
"@satorijs/core": "1.4.2",
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^8.5.3",
......@@ -7391,25 +7340,6 @@
"schemastery": "^3.5.4",
"socks-proxy-agent": "^5.0.1",
"ws": "^8.8.1"
},
"dependencies": {
"@tootallnate/once": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
"peer": true
},
"http-proxy-agent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"peer": true,
"requires": {
"@tootallnate/once": "2",
"agent-base": "6",
"debug": "4"
}
}
}
},
"@sinclair/typebox": {
......@@ -7442,6 +7372,12 @@
"integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==",
"peer": true
},
"@tootallnate/once": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
"peer": true
},
"@types/accepts": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
......@@ -8301,21 +8237,21 @@
"peer": true
},
"cordis": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/cordis/-/cordis-2.5.0.tgz",
"integrity": "sha512-69/LJyoaXEtimJiiYF4bMSXHlMCZLOYQ3OF1DcNFq1amAD5tODDkz0JEpcisU0YboLhUwXsUXJe/rBHkoAhUcg==",
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/cordis/-/cordis-2.6.0.tgz",
"integrity": "sha512-4VUY2x6ufctBr1zYAML3c+b1eXwgY94nkqLP7/icb3QVGXMBJuH4Nztakf6ADVonN5MvgJ06RRawRvmWdx3LxA==",
"peer": true,
"requires": {
"cosmokit": "^1.3.3"
}
},
"cordis-axios": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.1.3.tgz",
"integrity": "sha512-W6RCzZ4u+q/2D+BSAYV3aA3dMuz1bi+c9L1RI8g9SLaA5Z2QoaJ5zX1faIrS8y79AWtXm8joIGj+gzPVnvO8ww==",
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.1.5.tgz",
"integrity": "sha512-L5cHolNBlo4MxhfWRETpz1G20jF6J0Hu+5zPxebo0XJthqO0eI6U/2DrbQvXARnyMhuQIIZfoPJLvSNgd0Rjzw==",
"peer": true,
"requires": {
"axios": "^1.1.2",
"axios": "~1.1.3",
"cosmokit": "^1.3.3",
"file-type": "^16.5.4",
"mime-db": "^1.52.0",
......@@ -8346,8 +8282,7 @@
"cosmokit": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/cosmokit/-/cosmokit-1.3.3.tgz",
"integrity": "sha512-jpEp5zDrGbycu8AdaCjmNNr2J617NAFvAU6GM8o/dJP2/pe80qTbPoflqyJzAuMhiaC6QCXlBP0KCusTsDemPQ==",
"peer": true
"integrity": "sha512-jpEp5zDrGbycu8AdaCjmNNr2J617NAFvAU6GM8o/dJP2/pe80qTbPoflqyJzAuMhiaC6QCXlBP0KCusTsDemPQ=="
},
"cross-spawn": {
"version": "7.0.3",
......@@ -9036,6 +8971,17 @@
"toidentifier": "1.0.1"
}
},
"http-proxy-agent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"peer": true,
"requires": {
"@tootallnate/once": "2",
"agent-base": "6",
"debug": "4"
}
},
"https-proxy-agent": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
......@@ -9924,14 +9870,14 @@
}
},
"koishi": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.9.7.tgz",
"integrity": "sha512-InvvfPx5sqRkgOlTWksQu1dWjASCcf92guRGQmm+UIqZh0GBTJi+uFmpAMPA/E+nHOoLDOy/U9DVtpSPipi2+g==",
"version": "4.10.3",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.10.3.tgz",
"integrity": "sha512-eLv4A39atVmO8E9HlUyoVtc3kGawSRxyYyuN3ROE6Sz5hvX0jq73O6CsyZaWarksRYjPHvQKqndgrBNDFOs8aQ==",
"peer": true,
"requires": {
"@koishijs/core": "^4.9.7",
"@koishijs/utils": "^6.2.4",
"@satorijs/satori": "^1.3.1",
"@koishijs/core": "^4.10.3",
"@koishijs/utils": "^6.2.5",
"@satorijs/satori": "^1.4.2",
"file-type": "^16.5.4",
"ns-require": "^1.1.4"
}
......@@ -10090,10 +10036,11 @@
"dev": true
},
"minato-decorators": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.1.0.tgz",
"integrity": "sha512-s4F4bCxktODrEqLRzU3ljsIipv3ExOV6qCjH+wMiMFXjMBQvy3UaodOWOYf2UZ7GRFiGT0rij9zIrBhWdJVd0A==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.2.0.tgz",
"integrity": "sha512-qJmm2Ggjk0aM0cizWDnGtI5JZKX7wplchqMiZGuLoGjGhNNgfaMistABjcJiZsMVMU+XNAvIurEVc+gHoyOg5g==",
"requires": {
"@minatojs/core": "^2.0.1",
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
}
......@@ -10467,6 +10414,16 @@
"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
"dev": true
},
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
}
},
"readable-web-to-node-stream": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz",
......@@ -10474,34 +10431,6 @@
"peer": true,
"requires": {
"readable-stream": "^3.6.0"
},
"dependencies": {
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"peer": true,
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
}
},
"safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"peer": true
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"peer": true,
"requires": {
"safe-buffer": "~5.2.0"
}
}
}
},
"reflect-metadata": {
......@@ -10516,9 +10445,9 @@
"dev": true
},
"reggol": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.1.tgz",
"integrity": "sha512-KeT+Sih6edb0Ec0l7fQhkM2S4WxmQ9fh/1qftybMTyA4cr5+6lpUi3U3VrrgGF30Uppkx1YI/laq+49t/ljY6g==",
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/reggol/-/reggol-1.3.2.tgz",
"integrity": "sha512-vI+nWzdBJlO9OsrDCJ/z5NS4/o1mzHjwrZcn6LoESHn2get7LrbZ0TZB/dEkCtUlah324rxd5E2zciT/98Op1Q==",
"peer": true,
"requires": {
"cosmokit": "^1.3.3",
......@@ -10821,6 +10750,21 @@
"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
"peer": true
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"requires": {
"safe-buffer": "~5.2.0"
},
"dependencies": {
"safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
}
}
},
"string-length": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
......@@ -10896,34 +10840,6 @@
"qs": "^6.9.4",
"readable-stream": "^3.6.0",
"semver": "^7.3.2"
},
"dependencies": {
"readable-stream": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
"string_decoder": "^1.1.1",
"util-deprecate": "^1.0.1"
}
},
"safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
"dev": true
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dev": true,
"requires": {
"safe-buffer": "~5.2.0"
}
}
}
},
"supertest": {
......
package.json
View file @ b8d56f0c
......@@ -46,7 +46,7 @@
"typescript": "^4.8.2"
},
"dependencies": {
"minato-decorators": "^2.1.0",
"minato-decorators": "^2.2.0",
"rxjs": "^7.5.6",
"satori-decorators": "^1.1.1"
},
......@@ -69,6 +69,6 @@
"testEnvironment": "node"
},
"peerDependencies": {
"koishi": "^4.9.7"
"koishi": "^4.10.3"
}
}
src/decorators/plugin.ts
View file @ b8d56f0c
......@@ -7,7 +7,9 @@ export * from 'satori-decorators/dist/src/decorators/plugin';
export const { DefinePlugin } = koishiRegistrar.pluginDecorators();
export const UseModel = koishiRegistrar.decorateTopLevelAction(
(ctx, obj, ...models: ModelClassType[]) => {
const registrar = new ModelRegistrar(ctx.model);
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const registrar = new ModelRegistrar<Tables>(ctx.model);
models.forEach((m) => registrar.registerModel(m));
},
);
......@@ -19,7 +21,9 @@ export const MixinModel = <K extends Keys<Tables>>(
},
): ClassDecorator =>
koishiRegistrar.decorateTopLevelAction((ctx, obj) => {
const registrar = new ModelRegistrar(ctx.model);
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const registrar = new ModelRegistrar<Tables>(ctx.model);
registrar.mixinModel(tableName, classDict);
})();
......
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