catchup

package.json

@@ -26,12 +26,12 @@
   },
   "homepage": "https://github.com/koishijs/koishi-plugin-pics",
   "dependencies": {
-    "koishi-utils-schemagen": "^1.1.9",
     "lodash": "^4.17.21",
+    "schemastery-gen": "^1.0.3",
     "source-map-support": "^0.5.20"
   },
   "peerDependencies": {
-    "koishi": "^4.0.0-beta.1"
+    "koishi": "^4.0.0-beta.2"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.176",
@@ -41,7 +41,7 @@
     "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",
     "raw-loader": "^4.0.2",
     "ts-loader": "^9.2.6",

src/config.ts

 import 'source-map-support/register';
-import { DefineSchema, schemaFromClass } from 'koishi-utils-schemagen';
+import { DefineSchema, RegisterSchema } from 'schemastery-gen';
+import { Schema } from 'koishi';
 
+@RegisterSchema()
 export class PicsPluginConfig {
   @DefineSchema({ desc: '命令名', default: 'pic', hidden: true })
   commandName: string;
@@ -47,4 +49,4 @@ export class PicSourceConfig implements PicSourceInfo {
   }
 }
 
-export const PicSourceSchema = schemaFromClass(PicSourceConfig);
+export const PicSourceSchema = (PicSourceConfig as unknown) as Schema<PicSourceInfo>;

src/index.ts

 import 'source-map-support/register';
 import { Context } from 'koishi';
 import { PicsPlugin } from './plugin';
-import { PicsPluginConfigLike } from './config';
+import { PicsPluginConfig } from './config';
 export * from './config';
 export * from './plugin';
 
@@ -10,6 +10,6 @@ Context.service('pics');
 export const name = 'pics';
 const plugin = new PicsPlugin();
 export const schema = plugin.schema;
-export function apply(ctx: Context, config: Partial<PicsPluginConfigLike>) {
+export function apply(ctx: Context, config: PicsPluginConfig) {
   ctx.plugin(plugin, config);
 }

src/plugin.ts

@@ -5,11 +5,6 @@ import {
   PicsPluginConfig,
   PicsPluginConfigLike,
 } from './config';
-import {
-  DefineSchema,
-  schemaFromClass,
-  schemaTransform,
-} from 'koishi-utils-schemagen';
 import _ from 'lodash';
 import { segment } from 'koishi';
 
@@ -172,10 +167,10 @@ export class PicsPlugin {
   private config: PicsPluginConfig;
   private ctx: Context;
   name = 'pics-main';
-  schema: Schema<PicsPluginConfigLike> = schemaFromClass(PicsPluginConfig);
-  apply(ctx: Context, config: PicsPluginConfigLike) {
+  schema = PicsPluginConfig;
+  apply(ctx: Context, config: PicsPluginConfig) {
     this.ctx = ctx;
-    this.config = schemaTransform(PicsPluginConfig, config);
+    this.config = config;
     ctx.pics = new PicsContainer(ctx);
     ctx
       .command(`${this.config.commandName}`, '获取随机图片')