bump again

package-lock.json

@@ -38,7 +38,7 @@
         "ws": "^8.2.3"
       },
       "peerDependencies": {
-        "koishi": "^4.7.3",
+        "koishi": "^4.7.4",
         "schemastery": "^3.4.3"
       }
     },
@@ -1028,13 +1028,13 @@
       }
     },
     "node_modules/@koishijs/core": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.7.3.tgz",
-      "integrity": "sha512-05ZfusnZPbGt5oIBFkhYh1I6eCYGDpoIyR1tvmfEtPXya9zdNtdhHK0PR3/TwFUq8hSz8Xko1oqCLY3pqr0ZXg==",
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.7.4.tgz",
+      "integrity": "sha512-S4pPaO05WC0htkQVcTMTluBZv4g8sEEBJ2ItHN2zJA8syet3iKJidT+s2gYt8d2rBo0Ndlvo1gBLGLNl/Zc9yg==",
       "peer": true,
       "dependencies": {
         "@koishijs/utils": "^5.4.5",
-        "cordis": "^1.3.2",
+        "cordis": "^1.3.3",
         "fastest-levenshtein": "^1.0.12",
         "minato": "^1.1.0"
       },
@@ -2298,9 +2298,9 @@
       "peer": true
     },
     "node_modules/cordis": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/cordis/-/cordis-1.3.2.tgz",
-      "integrity": "sha512-nfz0iJlfwhSmTDpxbu4s7kRxYsn8XZ7s3hyXJrVdNj4UmB3xXDUYblKFbJKAfcAnwYLlAtpvP+7LRhU+zDyMcA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/cordis/-/cordis-1.3.3.tgz",
+      "integrity": "sha512-mpyBWAEVYX8/YHoGWIqaOjrOk6DmtrOWZfsBSinNR+nDBlB39Ks6aC1B5oZ7AdnVoRE2ZYBCGecoHrlxcRxd6w==",
       "peer": true,
       "dependencies": {
         "cosmokit": "^1.1.2"
@@ -4766,13 +4766,13 @@
       }
     },
     "node_modules/koishi": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.7.3.tgz",
-      "integrity": "sha512-JfQJwUKXlfpybNSjXHUbdGB7giDt5FWzEcwD6brhhE/uM9PGs7c5dHyZsOKnlMi3JTCjjvdSxBz4C/KxXZko1g==",
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.7.4.tgz",
+      "integrity": "sha512-VVHf3TyFsTuKrB8IZffxwmwiGx+zyhDo+DNNEFQjvomgqFdGEceAnLxNIf10K48aB1CDmkmi37b6uaURi4Z1Hw==",
       "peer": true,
       "dependencies": {
         "@koa/router": "^10.1.1",
-        "@koishijs/core": "^4.7.3",
+        "@koishijs/core": "^4.7.4",
         "@koishijs/utils": "^5.4.5",
         "@types/koa": "*",
         "@types/koa__router": "*",
@@ -7690,13 +7690,13 @@
       }
     },
     "@koishijs/core": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.7.3.tgz",
-      "integrity": "sha512-05ZfusnZPbGt5oIBFkhYh1I6eCYGDpoIyR1tvmfEtPXya9zdNtdhHK0PR3/TwFUq8hSz8Xko1oqCLY3pqr0ZXg==",
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.7.4.tgz",
+      "integrity": "sha512-S4pPaO05WC0htkQVcTMTluBZv4g8sEEBJ2ItHN2zJA8syet3iKJidT+s2gYt8d2rBo0Ndlvo1gBLGLNl/Zc9yg==",
       "peer": true,
       "requires": {
         "@koishijs/utils": "^5.4.5",
-        "cordis": "^1.3.2",
+        "cordis": "^1.3.3",
         "fastest-levenshtein": "^1.0.12",
         "minato": "^1.1.0"
       }
@@ -8715,9 +8715,9 @@
       "peer": true
     },
     "cordis": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/cordis/-/cordis-1.3.2.tgz",
-      "integrity": "sha512-nfz0iJlfwhSmTDpxbu4s7kRxYsn8XZ7s3hyXJrVdNj4UmB3xXDUYblKFbJKAfcAnwYLlAtpvP+7LRhU+zDyMcA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/cordis/-/cordis-1.3.3.tgz",
+      "integrity": "sha512-mpyBWAEVYX8/YHoGWIqaOjrOk6DmtrOWZfsBSinNR+nDBlB39Ks6aC1B5oZ7AdnVoRE2ZYBCGecoHrlxcRxd6w==",
       "peer": true,
       "requires": {
         "cosmokit": "^1.1.2"
@@ -10574,13 +10574,13 @@
       }
     },
     "koishi": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.7.3.tgz",
-      "integrity": "sha512-JfQJwUKXlfpybNSjXHUbdGB7giDt5FWzEcwD6brhhE/uM9PGs7c5dHyZsOKnlMi3JTCjjvdSxBz4C/KxXZko1g==",
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.7.4.tgz",
+      "integrity": "sha512-VVHf3TyFsTuKrB8IZffxwmwiGx+zyhDo+DNNEFQjvomgqFdGEceAnLxNIf10K48aB1CDmkmi37b6uaURi4Z1Hw==",
       "peer": true,
       "requires": {
         "@koa/router": "^10.1.1",
-        "@koishijs/core": "^4.7.3",
+        "@koishijs/core": "^4.7.4",
         "@koishijs/utils": "^5.4.5",
         "@types/koa": "*",
         "@types/koa__router": "*",

package.json

@@ -75,7 +75,7 @@
     "testEnvironment": "node"
   },
   "peerDependencies": {
-    "koishi": "^4.7.3",
+    "koishi": "^4.7.4",
     "schemastery": "^3.4.3"
   }
 }

src/decorators.ts

@@ -98,7 +98,7 @@ export const InjectContext = (select?: Selection) =>
 export const InjectApp = () => InjectSystem((obj) => obj.__ctx.app);
 export const InjectConfig = () => InjectSystem((obj) => obj.__config);
 export const InjectLogger = (name?: string) =>
-  InjectSystem((obj) => obj.__ctx.logger(name || obj.constructor.name));
+  InjectSystem((obj, cl) => obj.__ctx.logger(name || cl.name));
 export const InjectParent = () => InjectSystem((obj) => obj.__ctx.__parent);
 export const Caller = () =>
   InjectSystem((obj) => {

src/def/interfaces.ts

@@ -5,7 +5,10 @@ export * from 'koishi-decorators/dist/src/def/interfaces';
 
 // Command stuff
 
-export type SystemInjectFun = <T = any>(obj: PluginMeta<T>) => any;
+export type SystemInjectFun = <T = any>(
+  obj: PluginMeta<T>,
+  cl: PluginClass,
+) => any;
 
 export type ServiceName = keyof Context | string;
 

src/register.ts

@@ -117,7 +117,7 @@ export function DefinePlugin<T>(
           Object.defineProperty(this, key, {
             configurable: true,
             enumerable: true,
-            get: () => valueFunction(this),
+            get: () => valueFunction(this, newClass),
           });
         }
       }