Skip to content

K
Koishi Nestjs
Commit d7486f3e authored by nanahira's avatar nanahira
Browse files
Options

bump and kick lodash

parent 5c14fa72
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 203 deletions
install-npm.sh deleted 100755 → 0
View file @ 5c14fa72
#!/bin/bash
npm install --save \
lodash
npm install --save-dev \
@types/node \
@types/lodash \
typescript \
'@typescript-eslint/eslint-plugin@^4.28.2' \
'@typescript-eslint/parser@^4.28.2 '\
'eslint@^7.30.0' \
'eslint-config-prettier@^8.3.0' \
'eslint-plugin-prettier@^3.4.0' \
prettier
package-lock.json
View file @ d7486f3e
......@@ -14,8 +14,7 @@
"@types/ws": "^8.5.3",
"koa": "^2.13.4",
"koa-bodyparser": "^4.3.0",
"koishi-thirdeye": "^11.1.20",
"lodash": "^4.17.21",
"koishi-thirdeye": "^11.1.21",
"typed-reflector": "^1.0.11",
"ws": "^8.7.0"
},
......@@ -26,7 +25,6 @@
"@types/jest": "^29.2.0",
"@types/koa": "^2.13.4",
"@types/koa-bodyparser": "^4.3.7",
"@types/lodash": "^4.14.175",
"@types/node": "^16.10.2",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^4.32.0",
......@@ -46,7 +44,7 @@
"peerDependencies": {
"@nestjs/common": "^9.0.3 || ^8.0.0",
"@nestjs/core": "^9.0.3 || ^8.0.0",
"koishi": "^4.11.0",
"koishi": "^4.11.1",
"rxjs": "^7.5.5"
}
},
......@@ -1243,23 +1241,23 @@
}
},
"node_modules/@koishijs/core": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.0.tgz",
"integrity": "sha512-urQGWpqifyFAqJuhfkbZVnO+OdFw/p+PZcMEelfrFi6iaKCLVXVlIO4zK4yEu+lHTwQiYwBszqu5NeoE9Z2kuA==",
"version": "4.11.1",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.1.tgz",
"integrity": "sha512-HrzgBnimg/fgIzxTyH8BJb7nZpgt912i4zcfvRN9kNcPwbdOpjGllCVRuhRxSEBR21OJvCYTmT0dzf1qNPd3Vg==",
"peer": true,
"dependencies": {
"@koishijs/utils": "^6.4.0",
"@minatojs/core": "^2.1.0",
"@satorijs/core": "^1.5.2",
"@minatojs/core": "^2.1.1",
"@satorijs/core": "^2.0.1",
"cordis": "^2.6.0",
"cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16"
}
},
"node_modules/@koishijs/loader": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.0.tgz",
"integrity": "sha512-8StBIK7+/sDr65d+MEm8htXblVCrIZORXcEO/O7Wupn0eMyktm7GI0kL7C7uLhHT5Yoiby36T5LeNbaKWeKWlg==",
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.1.tgz",
"integrity": "sha512-ZNyzmL/sCTENPegZBx5rPs1mb+7YOxCb9Il0vyul9zuGzSJoJklSAIoTpBRt1v6BH/eUHEwY6ngcomkxQlf6xQ==",
"peer": true,
"dependencies": {
"dotenv": "^16.0.3",
......@@ -1267,7 +1265,7 @@
"ns-require": "^1.1.4"
},
"peerDependencies": {
"@koishijs/core": "^4.11.0"
"@koishijs/core": "^4.11.1"
}
},
"node_modules/@koishijs/loader/node_modules/argparse": {
......@@ -1301,9 +1299,9 @@
}
},
"node_modules/@minatojs/core": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.1.0.tgz",
"integrity": "sha512-buMhprBZoMmH5vcy98YDKyBSDrt/C6VSNgbPKILPEJf0jikVmURHniqV1zZ+KL7M1jbOIHcyJE5w3+cMe4ifLQ==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.1.1.tgz",
"integrity": "sha512-iGx1eydevDiuhaUhO/BkI0L2d+028wsVUMZ/pXi1z5IP1xZJvlr3LMrjr3zG4XdyKPO3JsdZy96G+wQSu6Jltg==",
"dependencies": {
"cosmokit": "^1.4.0"
}
......@@ -1575,14 +1573,14 @@
}
},
"node_modules/@satorijs/core": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.5.2.tgz",
"integrity": "sha512-5hnqwI6mSpDyzSHHIaaJBCwoiDjvDDBeD81rIwYW4JDKEKBOGWgVqNi4g+ru2s8gyR+M8cTvH71a1B2iOQiQTQ==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-2.0.1.tgz",
"integrity": "sha512-K+nNmUtFrU1uDJEn6Xov6TcaKhn8+Q9qtp6iBUh5DIhHO4hzoIHaPntvpoKJ5dfg5EyQyAi+JShTGl4voN5Ung==",
"peer": true,
"dependencies": {
"@satorijs/element": "^2.3.1",
"cordis": "^2.6.0",
"cordis-axios": "^2.2.0",
"cordis-axios": "^2.2.1",
"cosmokit": "^1.4.0",
"reggol": "^1.3.4",
"schemastery": "^3.6.1",
......@@ -1599,13 +1597,13 @@
}
},
"node_modules/@satorijs/satori": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.5.2.tgz",
"integrity": "sha512-e5l1NH9VVU8+4CeyKUWtr0mZ0E8WutvUzzqSuA5NCYkMMJ8A8xjqlHDOZtoEjtbp/AF9vnYVGHZC25DJw0zhig==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-2.0.1.tgz",
"integrity": "sha512-Mt8r8rYr7IOWgCKMTfyXaIvZIFQ2FAUXsDlOMnhWu6Sf/Q0KFS/o/aiXFlerhSnii1ptuGAZmSxaBhsGMkPmwg==",
"peer": true,
"dependencies": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.5.2",
"@satorijs/core": "2.0.1",
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^8.5.3",
......@@ -1862,7 +1860,6 @@
"version": "12.0.0",
"resolved": "https://registry.npmjs.org/@types/koa__router/-/koa__router-12.0.0.tgz",
"integrity": "sha512-S6eHyZyoWCZLNHyy8j0sMW85cPrpByCbGGU2/BO4IzGiI87aHJ92lZh4E9xfsM9DcbCT469/OIqyC0sSJXSIBQ==",
"peer": true,
"dependencies": {
"@types/koa": "*"
}
......@@ -1884,12 +1881,6 @@
"@types/koa": "*"
}
},
"node_modules/@types/lodash": {
"version": "4.14.182",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
"integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==",
"dev": true
},
"node_modules/@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
......@@ -2950,9 +2941,9 @@
}
},
"node_modules/cordis-axios": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.2.0.tgz",
"integrity": "sha512-gpFyu+nZoTSiPD1H8LsUxq2H7rtLFnm8UL5jOtwaTor20EmyVXiaSRV8Cc0yIcnobqmMmcY3VYVcXTir++DLtQ==",
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.2.1.tgz",
"integrity": "sha512-1OBl1FKLkYa1kEYeX56E13B4VdrxUve4poEYBfsBAygYn0IvcrUauvsdW9cl1rihBXtA/X6/K8BUY9O5KyOSQg==",
"peer": true,
"dependencies": {
"axios": "~1.1.3",
......@@ -2968,19 +2959,18 @@
}
},
"node_modules/cordis-decorators": {
"version": "1.0.22",
"resolved": "https://registry.npmjs.org/cordis-decorators/-/cordis-decorators-1.0.22.tgz",
"integrity": "sha512-S9oGzrse9xWlkVnanBdK0H6nw660kcgl2+t6yacRn+joZl7/jT0mLqKdI/3LFma84ULMYmR+hr7gAUPhbTzALw==",
"version": "1.0.24",
"resolved": "https://registry.npmjs.org/cordis-decorators/-/cordis-decorators-1.0.24.tgz",
"integrity": "sha512-yXD2Z0cRYTHQBh788mIADbhA7X2dV/WQfiC/4xcTrsF4R4A0ZoCQlt1AULKaGBAwD80VgNrc14Ok3SmKSRJmcQ==",
"dependencies": {
"lodash": "^4.17.21",
"mustache": "^4.2.0",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.5.6",
"schemastery-gen": "^3.1.15",
"schemastery-gen": "^3.1.17",
"typed-reflector": "^1.0.11"
},
"peerDependencies": {
"cordis": "^2.4.4",
"cordis": "^2.6.0",
"schemastery": "^3.5.1"
}
},
......@@ -5354,15 +5344,15 @@
}
},
"node_modules/koishi": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.0.tgz",
"integrity": "sha512-1XGqZRRZxkUn3a0RYY8/hQ2B5/8T7eWyH8C93VYLiLKpYoPZleh47mx4rpd/fI1zBBQC3VEym0m8ApfEqwGIkg==",
"version": "4.11.1",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.1.tgz",
"integrity": "sha512-sHMa8okx+kl5jHBwzT2gb4qGeOJRKG8AfLt4w5BLJwOPpvdo6cW9RiRy1uBwkXM7zf4yOvtr0+6WEu+AuD6bXQ==",
"peer": true,
"dependencies": {
"@koishijs/core": "^4.11.0",
"@koishijs/loader": "^2.5.0",
"@koishijs/core": "4.11.1",
"@koishijs/loader": "^2.5.1",
"@koishijs/utils": "^6.4.0",
"@satorijs/satori": "^1.5.2",
"@satorijs/satori": "^2.0.1",
"cac": "^6.7.14",
"chokidar": "^3.5.3",
"kleur": "^4.1.5",
......@@ -5377,16 +5367,18 @@
}
},
"node_modules/koishi-thirdeye": {
"version": "11.1.20",
"resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-11.1.20.tgz",
"integrity": "sha512-vWeK44PHhiLTbHTqK/h0ztcIidq7sQ3kNpersv7wSkSn6JYgZTRSdPMSOy+JNIpye+M7RXWz2y35Ua1OhNiyEw==",
"version": "11.1.21",
"resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-11.1.21.tgz",
"integrity": "sha512-7IiKSCcqPsxSaoK+00k+8R7CcoJA8l2kDZsTDCM7pEtsGFFZGkbeLuRHd0Py4L5KNzO4teMHwBFLfGyaFIktUQ==",
"dependencies": {
"minato-decorators": "^2.2.1",
"rxjs": "^7.5.6",
"satori-decorators": "^1.1.3"
"@types/koa": "^2.13.5",
"@types/koa__router": "^12.0.0",
"cordis-decorators": "^1.0.24",
"minato-decorators": "^2.2.2",
"rxjs": "^7.5.6"
},
"peerDependencies": {
"koishi": "^4.11.0"
"koishi": "^4.11.1"
}
},
"node_modules/koishi/node_modules/kleur": {
......@@ -5472,11 +5464,6 @@
"node": ">=8"
}
},
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"node_modules/lodash.memoize": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
......@@ -5625,12 +5612,11 @@
}
},
"node_modules/minato-decorators": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.2.1.tgz",
"integrity": "sha512-rxeXncznI/aShX2yI4ynP6UDIqtxPm/9R+2keACwxeN0Jzd0yh05ULS7HQZ5YG1VHrd+TJv/bqCrNObaYPe1Qg==",
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.2.2.tgz",
"integrity": "sha512-eAIcmEPGy1HMIgIsSG+f6KHCNNPmm/Z9TzDBaTfgksKfBNKVb/JE2eZqjOo8VpHKNvEGw0bpsg8w8q4SSUmxpQ==",
"dependencies": {
"@minatojs/core": "^2.0.1",
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
}
},
......@@ -6615,28 +6601,6 @@
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"node_modules/satori-decorators": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/satori-decorators/-/satori-decorators-1.1.3.tgz",
"integrity": "sha512-GTUiU7MiyXy+d6C3XFaFscrc9w3VkCbjUzS1MJG8yFZTaqwHK7QXEnugXXc5YBFx2SiBS1K93ElY3kkrSpB1kw==",
"dependencies": {
"@types/koa": "^2.13.5",
"@types/koa__router": "^8.0.11",
"cordis-decorators": "^1.0.22",
"lodash": "^4.17.21"
},
"peerDependencies": {
"koishi": "^4.11.0"
}
},
"node_modules/satori-decorators/node_modules/@types/koa__router": {
"version": "8.0.11",
"resolved": "https://registry.npmjs.org/@types/koa__router/-/koa__router-8.0.11.tgz",
"integrity": "sha512-WXgKWpBsbS14kzmzD9LeFapOIa678h7zvUHxDwXwSx4ETKXhXLVUAToX6jZ/U7EihM7qwyD9W/BZvB0MRu7MTQ==",
"dependencies": {
"@types/koa": "*"
}
},
"node_modules/schemastery": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-3.6.1.tgz",
......@@ -6647,16 +6611,15 @@
}
},
"node_modules/schemastery-gen": {
"version": "3.1.16",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.16.tgz",
"integrity": "sha512-bCcMZnz4bDFHqz26lL9jB/W+lBX8AnGLrOowxspyyaenp8e5e4n7oUo83+82AjWk//scl1AY0eplIcUq4B5YDQ==",
"version": "3.1.17",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.17.tgz",
"integrity": "sha512-Stull6TQusdkiacTkDZtekLCOecQjLDZq3XbtEIOObQSMZeyo55JuexQsXrRUJU+okHbx747ZENAiUtEewSV1g==",
"dependencies": {
"lodash": "^4.17.21",
"reflect-metadata": "^0.1.13",
"typed-reflector": "^1.0.10"
},
"peerDependencies": {
"schemastery": "^3.5.3"
"schemastery": "^3.6.1"
}
},
"node_modules/secure-json-parse": {
......@@ -8629,23 +8592,23 @@
}
},
"@koishijs/core": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.0.tgz",
"integrity": "sha512-urQGWpqifyFAqJuhfkbZVnO+OdFw/p+PZcMEelfrFi6iaKCLVXVlIO4zK4yEu+lHTwQiYwBszqu5NeoE9Z2kuA==",
"version": "4.11.1",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.11.1.tgz",
"integrity": "sha512-HrzgBnimg/fgIzxTyH8BJb7nZpgt912i4zcfvRN9kNcPwbdOpjGllCVRuhRxSEBR21OJvCYTmT0dzf1qNPd3Vg==",
"peer": true,
"requires": {
"@koishijs/utils": "^6.4.0",
"@minatojs/core": "^2.1.0",
"@satorijs/core": "^1.5.2",
"@minatojs/core": "^2.1.1",
"@satorijs/core": "^2.0.1",
"cordis": "^2.6.0",
"cosmokit": "^1.4.0",
"fastest-levenshtein": "^1.0.16"
}
},
"@koishijs/loader": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.0.tgz",
"integrity": "sha512-8StBIK7+/sDr65d+MEm8htXblVCrIZORXcEO/O7Wupn0eMyktm7GI0kL7C7uLhHT5Yoiby36T5LeNbaKWeKWlg==",
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/@koishijs/loader/-/loader-2.5.1.tgz",
"integrity": "sha512-ZNyzmL/sCTENPegZBx5rPs1mb+7YOxCb9Il0vyul9zuGzSJoJklSAIoTpBRt1v6BH/eUHEwY6ngcomkxQlf6xQ==",
"peer": true,
"requires": {
"dotenv": "^16.0.3",
......@@ -8683,9 +8646,9 @@
}
},
"@minatojs/core": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.1.0.tgz",
"integrity": "sha512-buMhprBZoMmH5vcy98YDKyBSDrt/C6VSNgbPKILPEJf0jikVmURHniqV1zZ+KL7M1jbOIHcyJE5w3+cMe4ifLQ==",
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-2.1.1.tgz",
"integrity": "sha512-iGx1eydevDiuhaUhO/BkI0L2d+028wsVUMZ/pXi1z5IP1xZJvlr3LMrjr3zG4XdyKPO3JsdZy96G+wQSu6Jltg==",
"requires": {
"cosmokit": "^1.4.0"
}
......@@ -8818,14 +8781,14 @@
}
},
"@satorijs/core": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-1.5.2.tgz",
"integrity": "sha512-5hnqwI6mSpDyzSHHIaaJBCwoiDjvDDBeD81rIwYW4JDKEKBOGWgVqNi4g+ru2s8gyR+M8cTvH71a1B2iOQiQTQ==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@satorijs/core/-/core-2.0.1.tgz",
"integrity": "sha512-K+nNmUtFrU1uDJEn6Xov6TcaKhn8+Q9qtp6iBUh5DIhHO4hzoIHaPntvpoKJ5dfg5EyQyAi+JShTGl4voN5Ung==",
"peer": true,
"requires": {
"@satorijs/element": "^2.3.1",
"cordis": "^2.6.0",
"cordis-axios": "^2.2.0",
"cordis-axios": "^2.2.1",
"cosmokit": "^1.4.0",
"reggol": "^1.3.4",
"schemastery": "^3.6.1",
......@@ -8842,13 +8805,13 @@
}
},
"@satorijs/satori": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-1.5.2.tgz",
"integrity": "sha512-e5l1NH9VVU8+4CeyKUWtr0mZ0E8WutvUzzqSuA5NCYkMMJ8A8xjqlHDOZtoEjtbp/AF9vnYVGHZC25DJw0zhig==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/@satorijs/satori/-/satori-2.0.1.tgz",
"integrity": "sha512-Mt8r8rYr7IOWgCKMTfyXaIvZIFQ2FAUXsDlOMnhWu6Sf/Q0KFS/o/aiXFlerhSnii1ptuGAZmSxaBhsGMkPmwg==",
"peer": true,
"requires": {
"@koa/router": "^10.1.1",
"@satorijs/core": "1.5.2",
"@satorijs/core": "2.0.1",
"@types/koa": "*",
"@types/koa__router": "*",
"@types/ws": "^8.5.3",
......@@ -9101,7 +9064,6 @@
"version": "12.0.0",
"resolved": "https://registry.npmjs.org/@types/koa__router/-/koa__router-12.0.0.tgz",
"integrity": "sha512-S6eHyZyoWCZLNHyy8j0sMW85cPrpByCbGGU2/BO4IzGiI87aHJ92lZh4E9xfsM9DcbCT469/OIqyC0sSJXSIBQ==",
"peer": true,
"requires": {
"@types/koa": "*"
}
......@@ -9123,12 +9085,6 @@
"@types/koa": "*"
}
},
"@types/lodash": {
"version": "4.14.182",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
"integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==",
"dev": true
},
"@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
......@@ -9923,9 +9879,9 @@
}
},
"cordis-axios": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.2.0.tgz",
"integrity": "sha512-gpFyu+nZoTSiPD1H8LsUxq2H7rtLFnm8UL5jOtwaTor20EmyVXiaSRV8Cc0yIcnobqmMmcY3VYVcXTir++DLtQ==",
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/cordis-axios/-/cordis-axios-2.2.1.tgz",
"integrity": "sha512-1OBl1FKLkYa1kEYeX56E13B4VdrxUve4poEYBfsBAygYn0IvcrUauvsdW9cl1rihBXtA/X6/K8BUY9O5KyOSQg==",
"peer": true,
"requires": {
"axios": "~1.1.3",
......@@ -9935,15 +9891,14 @@
}
},
"cordis-decorators": {
"version": "1.0.22",
"resolved": "https://registry.npmjs.org/cordis-decorators/-/cordis-decorators-1.0.22.tgz",
"integrity": "sha512-S9oGzrse9xWlkVnanBdK0H6nw660kcgl2+t6yacRn+joZl7/jT0mLqKdI/3LFma84ULMYmR+hr7gAUPhbTzALw==",
"version": "1.0.24",
"resolved": "https://registry.npmjs.org/cordis-decorators/-/cordis-decorators-1.0.24.tgz",
"integrity": "sha512-yXD2Z0cRYTHQBh788mIADbhA7X2dV/WQfiC/4xcTrsF4R4A0ZoCQlt1AULKaGBAwD80VgNrc14Ok3SmKSRJmcQ==",
"requires": {
"lodash": "^4.17.21",
"mustache": "^4.2.0",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.5.6",
"schemastery-gen": "^3.1.15",
"schemastery-gen": "^3.1.17",
"typed-reflector": "^1.0.11"
}
},
......@@ -11750,15 +11705,15 @@
}
},
"koishi": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.0.tgz",
"integrity": "sha512-1XGqZRRZxkUn3a0RYY8/hQ2B5/8T7eWyH8C93VYLiLKpYoPZleh47mx4rpd/fI1zBBQC3VEym0m8ApfEqwGIkg==",
"version": "4.11.1",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.11.1.tgz",
"integrity": "sha512-sHMa8okx+kl5jHBwzT2gb4qGeOJRKG8AfLt4w5BLJwOPpvdo6cW9RiRy1uBwkXM7zf4yOvtr0+6WEu+AuD6bXQ==",
"peer": true,
"requires": {
"@koishijs/core": "^4.11.0",
"@koishijs/loader": "^2.5.0",
"@koishijs/core": "4.11.1",
"@koishijs/loader": "^2.5.1",
"@koishijs/utils": "^6.4.0",
"@satorijs/satori": "^1.5.2",
"@satorijs/satori": "^2.0.1",
"cac": "^6.7.14",
"chokidar": "^3.5.3",
"kleur": "^4.1.5",
......@@ -11775,13 +11730,15 @@
}
},
"koishi-thirdeye": {
"version": "11.1.20",
"resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-11.1.20.tgz",
"integrity": "sha512-vWeK44PHhiLTbHTqK/h0ztcIidq7sQ3kNpersv7wSkSn6JYgZTRSdPMSOy+JNIpye+M7RXWz2y35Ua1OhNiyEw==",
"version": "11.1.21",
"resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-11.1.21.tgz",
"integrity": "sha512-7IiKSCcqPsxSaoK+00k+8R7CcoJA8l2kDZsTDCM7pEtsGFFZGkbeLuRHd0Py4L5KNzO4teMHwBFLfGyaFIktUQ==",
"requires": {
"minato-decorators": "^2.2.1",
"rxjs": "^7.5.6",
"satori-decorators": "^1.1.3"
"@types/koa": "^2.13.5",
"@types/koa__router": "^12.0.0",
"cordis-decorators": "^1.0.24",
"minato-decorators": "^2.2.2",
"rxjs": "^7.5.6"
}
},
"leven": {
......@@ -11847,11 +11804,6 @@
"p-locate": "^4.1.0"
}
},
"lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
},
"lodash.memoize": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
......@@ -11966,12 +11918,11 @@
"dev": true
},
"minato-decorators": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.2.1.tgz",
"integrity": "sha512-rxeXncznI/aShX2yI4ynP6UDIqtxPm/9R+2keACwxeN0Jzd0yh05ULS7HQZ5YG1VHrd+TJv/bqCrNObaYPe1Qg==",
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.2.2.tgz",
"integrity": "sha512-eAIcmEPGy1HMIgIsSG+f6KHCNNPmm/Z9TzDBaTfgksKfBNKVb/JE2eZqjOo8VpHKNvEGw0bpsg8w8q4SSUmxpQ==",
"requires": {
"@minatojs/core": "^2.0.1",
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
}
},
......@@ -12696,27 +12647,6 @@
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"satori-decorators": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/satori-decorators/-/satori-decorators-1.1.3.tgz",
"integrity": "sha512-GTUiU7MiyXy+d6C3XFaFscrc9w3VkCbjUzS1MJG8yFZTaqwHK7QXEnugXXc5YBFx2SiBS1K93ElY3kkrSpB1kw==",
"requires": {
"@types/koa": "^2.13.5",
"@types/koa__router": "^8.0.11",
"cordis-decorators": "^1.0.22",
"lodash": "^4.17.21"
},
"dependencies": {
"@types/koa__router": {
"version": "8.0.11",
"resolved": "https://registry.npmjs.org/@types/koa__router/-/koa__router-8.0.11.tgz",
"integrity": "sha512-WXgKWpBsbS14kzmzD9LeFapOIa678h7zvUHxDwXwSx4ETKXhXLVUAToX6jZ/U7EihM7qwyD9W/BZvB0MRu7MTQ==",
"requires": {
"@types/koa": "*"
}
}
}
},
"schemastery": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-3.6.1.tgz",
......@@ -12727,11 +12657,10 @@
}
},
"schemastery-gen": {
"version": "3.1.16",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.16.tgz",
"integrity": "sha512-bCcMZnz4bDFHqz26lL9jB/W+lBX8AnGLrOowxspyyaenp8e5e4n7oUo83+82AjWk//scl1AY0eplIcUq4B5YDQ==",
"version": "3.1.17",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.17.tgz",
"integrity": "sha512-Stull6TQusdkiacTkDZtekLCOecQjLDZq3XbtEIOObQSMZeyo55JuexQsXrRUJU+okHbx747ZENAiUtEewSV1g==",
"requires": {
"lodash": "^4.17.21",
"reflect-metadata": "^0.1.13",
"typed-reflector": "^1.0.10"
}
......
package.json
View file @ d7486f3e
......@@ -33,7 +33,7 @@
"peerDependencies": {
"@nestjs/common": "^9.0.3 || ^8.0.0",
"@nestjs/core": "^9.0.3 || ^8.0.0",
"koishi": "^4.11.0",
"koishi": "^4.11.1",
"rxjs": "^7.5.5"
},
"devDependencies": {
......@@ -43,7 +43,6 @@
"@types/jest": "^29.2.0",
"@types/koa": "^2.13.4",
"@types/koa-bodyparser": "^4.3.7",
"@types/lodash": "^4.14.175",
"@types/node": "^16.10.2",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^4.32.0",
......@@ -66,8 +65,7 @@
"@types/ws": "^8.5.3",
"koa": "^2.13.4",
"koa-bodyparser": "^4.3.0",
"koishi-thirdeye": "^11.1.20",
"lodash": "^4.17.21",
"koishi-thirdeye": "^11.1.21",
"typed-reflector": "^1.0.11",
"ws": "^8.7.0"
},
......
src/providers/koishi-metascan.service.ts
View file @ d7486f3e
......@@ -12,7 +12,6 @@ import {
KoishiCommandInterceptorRegistration,
KoishiModuleOptions,
} from '../utility/koishi.interfaces';
import _ from 'lodash';
import { KoishiContextService } from './koishi-context.service';
import { Module } from '@nestjs/core/injector/module';
import { KoishiMetadataFetcherService } from '../koishi-metadata-fetcher/koishi-metadata-fetcher.service';
......@@ -22,6 +21,7 @@ import { registerAtLeastEach } from '../utility/take-first-value';
import { koishiRegistrar } from 'koishi-thirdeye/dist/src/registrar';
import { CommandConfigExtended } from 'koishi-thirdeye/dist/src/def';
import { map } from 'rxjs';
import { uniq } from '../utility/utility';
@Injectable()
export class KoishiMetascanService {
......@@ -111,20 +111,15 @@ export class KoishiMetascanService {
fun: (ctx: Context, instance: any) => T,
): T[] {
const modules = Array.from(this.moduleContainer.values());
return _.flatten(
modules.map((module) => {
const moduleCtx = this.ctxService.getModuleCtx(ctx, module);
const allProviders = this.getAllActiveProvidersFromModule(module);
return allProviders.map((provider) => {
const instance = provider.instance;
const providerCtx = this.ctxService.getProviderCtx(
moduleCtx,
instance,
);
return fun(providerCtx, instance);
});
}),
);
return modules.flatMap((module) => {
const moduleCtx = this.ctxService.getModuleCtx(ctx, module);
const allProviders = this.getAllActiveProvidersFromModule(module);
return allProviders.map((provider) => {
const instance = provider.instance;
const providerCtx = this.ctxService.getProviderCtx(moduleCtx, instance);
return fun(providerCtx, instance);
});
});
}
preRegisterContext(ctx: Context) {
......@@ -138,7 +133,7 @@ export class KoishiMetascanService {
key: string,
command: Command,
) {
const interceptorDefs: KoishiCommandInterceptorRegistration[] = _.uniq(
const interceptorDefs: KoishiCommandInterceptorRegistration[] = uniq(
this.metaFetcher.getPropertyMetadataArray(
KoishiCommandInterceptorDef,
instance,
......
src/utility/utility.ts 0 → 100644
View file @ d7486f3e
export function uniq<T>(arr: T[]) {
return [...new Set(arr)];
}
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