refa: use ctx.schema.component for schema extensions

koishijs · Jun 3, 2024 · 6ffd2b7 · 6ffd2b7
1 parent 81d0d3c
commit 6ffd2b7
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/packages/client/app/settings/index.ts b/packages/client/app/settings/index.ts
@@ -12,7 +12,7 @@ export default function (ctx: Context) {
     component: Settings,
   })
 
-  ctx.schema({
+  ctx.schema.component({
     type: 'string',
     role: 'theme',
     component: Theme,

diff --git a/packages/client/client/context.ts b/packages/client/client/context.ts
@@ -12,7 +12,7 @@ import ThemeService from './plugins/theme'
 
 // layout api
 
-export interface Events<C extends Context> extends cordis.Events<C> {}
+export interface Events<C extends Context = Context> extends cordis.Events<C> {}
 
 export interface Context {
   [Context.events]: Events<this>

diff --git a/packages/client/client/plugins/router.ts b/packages/client/client/plugins/router.ts
@@ -21,8 +21,7 @@ declare module '../context' {
     page(options: Activity.Options): () => void
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  interface Events<C> {
+  interface Events {
     'activity'(activity: Activity): boolean
   }
 }

diff --git a/packages/client/client/plugins/setting.ts b/packages/client/client/plugins/setting.ts
@@ -6,10 +6,15 @@ import { Dict, remove } from 'cosmokit'
 import { Component, computed, markRaw, reactive, ref, watch } from 'vue'
 import { Config } from '..'
 
+declare module '@cordisjs/schema' {
+  interface SchemaService {
+    component(extension: SchemaBase.Extension): () => void
+  }
+}
+
 declare module '../context' {
   interface Context {
     $setting: SettingService
-    schema(extension: SchemaBase.Extension): () => void
     settings(options: SettingOptions): () => void
   }
 
@@ -73,7 +78,10 @@ export const useConfig = (useOriginal = false) => useOriginal ? original : resol
 export default class SettingService extends Service {
   constructor(ctx: Context) {
     super(ctx, '$setting', true)
-    ctx.mixin('$setting', ['schema', 'settings'])
+    ctx.mixin('$setting', {
+      'schema': 'schema.component',
+      'settings': 'settings',
+    })
 
     ctx.internal.settings = reactive({})
 

diff --git a/packages/client/client/tsconfig.json b/packages/client/client/tsconfig.json
@@ -10,7 +10,7 @@
     "incremental": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "strictBindCallApply": true,
     "types": [
       "@koishijs/client/global",

diff --git a/plugins/explorer/.npmignore b/plugins/explorer/.npmignore
diff --git a/plugins/explorer/client/index.ts b/plugins/explorer/client/index.ts
@@ -11,7 +11,7 @@ import 'virtual:uno.css'
 import './editor.scss'
 
 export default (ctx: Context) => {
-  ctx.schema({
+  ctx.schema.component({
     type: 'string',
     role: 'path',
     component: FilePicker,