bump and cleanups

package-lock.json

@@ -15,7 +15,7 @@
         "koishi-decorators": "^2.0.1",
         "lodash": "^4.17.21",
         "reflect-metadata": "^0.1.13",
-        "schemastery-gen": "^3.1.6",
+        "schemastery-gen": "^3.1.7",
         "typed-reflector": "^1.0.10"
       },
       "devDependencies": {
@@ -5853,9 +5853,9 @@
       }
     },
     "node_modules/schemastery-gen": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.6.tgz",
-      "integrity": "sha512-UiYsiuvj830k2IzznWx/+Ed9+j1+XwMZ1zfctpy6+rHe6Se0IrulBsh2XDmI2uDslFtd6HfjIi5BJksbVvXQ/w==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.7.tgz",
+      "integrity": "sha512-0M/9QLRQ2yuDxMVkwkcW0g3Lf+2De+dPlll8CEgzKJ4ow1zDd/H/k+gDPLawpAccAooHoGgV2++8RGWecXf7MQ==",
       "dependencies": {
         "lodash": "^4.17.21",
         "reflect-metadata": "^0.1.13",
@@ -11324,9 +11324,9 @@
       }
     },
     "schemastery-gen": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.6.tgz",
-      "integrity": "sha512-UiYsiuvj830k2IzznWx/+Ed9+j1+XwMZ1zfctpy6+rHe6Se0IrulBsh2XDmI2uDslFtd6HfjIi5BJksbVvXQ/w==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-3.1.7.tgz",
+      "integrity": "sha512-0M/9QLRQ2yuDxMVkwkcW0g3Lf+2De+dPlll8CEgzKJ4ow1zDd/H/k+gDPLawpAccAooHoGgV2++8RGWecXf7MQ==",
       "requires": {
         "lodash": "^4.17.21",
         "reflect-metadata": "^0.1.13",

package.json

@@ -54,7 +54,7 @@
     "koishi-decorators": "^2.0.1",
     "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.13",
-    "schemastery-gen": "^3.1.6",
+    "schemastery-gen": "^3.1.7",
     "typed-reflector": "^1.0.10"
   },
   "jest": {

src/def/interfaces.ts

@@ -27,8 +27,6 @@ export interface Instances<T> {
   instances: T[];
 }
 
-export type AnyClassType = { new (...args: any[]): any };
-
 export type TypeFromClass<T> = T extends { new (...args: any[]): infer U }
   ? U
   : never;

src/utility/to-instance-config.ts

-import { OriginalClassSym, SchemaClass, SchemaProperty } from 'schemastery-gen';
 import {
-  AnyClassType,
-  Instances,
-  ParamsFromClass,
-  TypeFromClass,
-} from '../def';
-import { kSchema } from 'schemastery-gen/dist/src/utility/kschema';
+  AnyClass,
+  OriginalClassSym,
+  SchemaClass,
+  SchemaProperty,
+} from 'schemastery-gen';
+import { Instances, ParamsFromClass, TypeFromClass } from '../def';
 
 export function ToInstancesConfig<Inner extends new (...args: any[]) => any>(
   instanceConfig: Inner,
 ): new () => Instances<TypeFromClass<Inner>>;
 export function ToInstancesConfig<
-  Inner extends new (...args: any[]) => any,
-  Outer extends new (...args: any[]) => any,
+  Inner extends AnyClass,
+  Outer extends AnyClass,
 >(
   instanceConfig: Inner,
   outerConfig?: Outer,
 ): new (...args: ParamsFromClass<Outer>) => Instances<TypeFromClass<Inner>> &
   TypeFromClass<Outer>;
 export function ToInstancesConfig<
-  Inner extends AnyClassType,
-  Outer extends AnyClassType,
+  Inner extends AnyClass,
+  Outer extends AnyClass,
 >(
   instanceConfig: Inner,
   outerConfig?: Outer,