catchup

index.ts

@@ -2,4 +2,4 @@ import 'reflect-metadata';
 export * from './src/register';
 export * from './src/decorators';
 export * from './src/def/interfaces';
-export * from 'koishi-utils-schemagen';
+export * from 'schemastery-gen';

package.json

@@ -28,24 +28,25 @@
   "author": "Nanahira <nanahira@momobako.com>",
   "license": "MIT",
   "devDependencies": {
-    "@koishijs/plugin-adapter-onebot": "^4.0.0-beta.0",
-    "@types/node": "^16.11.7",
+    "@koishijs/plugin-adapter-onebot": "^4.0.0-beta.2",
+    "@types/node": "^16.11.9",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.1",
-    "koishi": "^4.0.0-beta.1",
+    "koishi": "^4.0.0-beta.2",
     "prettier": "^2.4.1",
-    "typescript": "^4.4.4",
+    "typescript": "^4.5.2",
     "ws": "^8.2.3"
   },
   "peerDependencies": {
-    "koishi": "^4.0.0-beta.1"
+    "koishi": "^4.0.0-beta.2"
   },
   "dependencies": {
-    "koishi-utils-schemagen": "^1.1.9",
     "reflect-metadata": "^0.1.13",
-    "typed-reflector": "^1.0.4"
+    "schemastery": "^1.0.0",
+    "schemastery-gen": "^1.0.1",
+    "typed-reflector": "^1.0.5"
   }
 }

src/decorators.ts

@@ -225,8 +225,7 @@ export const InjectContext = (select?: Selection) =>
     }
   });
 export const InjectApp = () => InjectSystem((obj) => obj.__ctx.app);
-export const InjectConfig = (raw = false) =>
-  InjectSystem((obj) => (raw ? obj.__rawConfig : obj.__config));
+export const InjectConfig = () => InjectSystem((obj) => obj.__config);
 export const InjectLogger = (name?: string) =>
   InjectSystem((obj, config) =>
     obj.__ctx.logger(

src/register.ts

@@ -15,7 +15,6 @@ import {
   OnContextFunction,
   Type,
 } from './def';
-import { schemaFromClass, schemaTransform } from 'koishi-utils-schemagen';
 import { reflector } from './meta/meta-fetch';
 import { applySelector } from './utility/utility';
 
@@ -27,7 +26,6 @@ export interface KoishiPluginRegistrationOptions<T = any> {
 export interface PluginClass<T = any> {
   __ctx: Context;
   __config: T;
-  __rawConfig: T;
   __pluginOptions: KoishiPluginRegistrationOptions<T>;
 }
 
@@ -51,16 +49,6 @@ function getContextFromFilters(ctx: Context, filters: OnContextFunction[]) {
   return targetCtx;
 }
 
-function getSchemaFromOption<T>(schema: Schema<T> | Type<T>): Schema<T> {
-  if (!schema) {
-    return;
-  }
-  if (typeof schema !== 'function') {
-    return schema;
-  }
-  return schemaFromClass(schema);
-}
-
 export function KoishiPlugin<T = any>(
   options: KoishiPluginRegistrationOptions<T> = {},
 ) {
@@ -68,12 +56,9 @@ export function KoishiPlugin<T = any>(
     C extends { new (...args: any[]): any; schema?: Schema; name?: string }
   >(originalClass: C) {
     const newClass = class extends originalClass implements PluginClass {
-      static schema = getSchemaFromOption(
-        options.schema || originalClass.schema,
-      );
+      static schema = options.schema;
       __ctx: Context;
       __config: T;
-      __rawConfig: T;
       __pluginOptions: KoishiPluginRegistrationOptions<T>;
 
       _handleSystemInjections() {
@@ -323,21 +308,14 @@ export function KoishiPlugin<T = any>(
 
       constructor(...args: any[]) {
         const originalCtx: Context = args[0];
-        const rawConfig = args[1];
+        const config = args[1];
         const contextFilters = [
           ...reflector.getArray(KoishiOnContextScope, originalClass),
           ...reflector.getArray(KoishiOnContextScope, newClass),
         ];
         const ctx = getContextFromFilters(originalCtx, contextFilters);
-        const config =
-          typeof options.schema === 'function'
-            ? schemaTransform(options.schema, rawConfig)
-            : options.schema
-            ? Schema.validate(rawConfig, options.schema)
-            : rawConfig;
         super(ctx, config, ...args.slice(2));
         this.__ctx = ctx;
-        this.__rawConfig = rawConfig;
         this.__config = config;
         this.__pluginOptions = options;
         this._initializePluginClass().then();