refa: use unwrapExports

packages/cli/src/addons/watcher.ts

@@ -72,19 +72,20 @@ class Watcher {
   }
 
   start() {
+    const { loader } = this.ctx
     const { root = '', ignored = [] } = this.config
-    this.root = resolve(this.ctx.loader.dirname, root)
+    this.root = resolve(loader.dirname, root)
     this.watcher = watch(this.root, {
       ...this.config,
       ignored: ['**/node_modules/**', '**/.git/**', '**/logs/**', ...ignored],
     })
 
     // files independent from any plugins will trigger a full reload
-    this.externals = loadDependencies(__filename, new Set(Object.keys(this.ctx.loader.cache)))
+    this.externals = loadDependencies(__filename, new Set(Object.values(loader.cache)))
     const triggerLocalReload = debounce(this.config.debounce, () => this.triggerLocalReload())
 
     this.watcher.on('change', (path) => {
-      const isEntry = path === this.ctx.loader.filename
+      const isEntry = path === loader.filename
       if (this.suspend && isEntry) {
         this.suspend = false
         return
@@ -120,9 +121,10 @@ class Watcher {
 
   private triggerEntryReload() {
     // use original config
-    const oldConfig = this.ctx.loader.config
-    this.ctx.loader.loadConfig()
-    const newConfig = this.ctx.loader.config
+    const { loader } = this.ctx
+    const oldConfig = loader.config
+    loader.loadConfig()
+    const newConfig = loader.config
 
     // check non-plugin changes
     const merged = { ...oldConfig, ...newConfig }
@@ -138,9 +140,9 @@ class Watcher {
       if (name.startsWith('~')) continue
       if (deepEqual(oldPlugins[name], newPlugins[name])) continue
       if (name in newPlugins) {
-        this.ctx.loader.reloadPlugin(name)
+        loader.reloadPlugin(name)
       } else {
-        this.ctx.loader.unloadPlugin(name)
+        loader.unloadPlugin(name)
       }
     }
   }

plugins/frontend/manager/src/packages.ts

@@ -1,4 +1,4 @@
-import { Adapter, App, Context, Dict, omit, pick, Plugin, remove, Schema } from 'koishi'
+import { Adapter, App, Context, Dict, omit, pick, Plugin, remove, Schema, unwrapExports } from 'koishi'
 import { DataSource } from '@koishijs/plugin-console'
 import { promises as fsp } from 'fs'
 import { dirname } from 'path'
@@ -7,10 +7,6 @@ import {} from '@koishijs/cli'
 
 const { readdir, readFile } = fsp
 
-function unwrap(module: any) {
-  return module.default || module
-}
-
 /** require without affecting the dependency tree */
 function getExports(id: string) {
   const path = require.resolve(id)
@@ -21,7 +17,7 @@ function getExports(id: string) {
     remove(module.children, result)
     delete require.cache[path]
   }
-  return unwrap(result.exports)
+  return unwrapExports(result.exports)
 }
 
 class PackageProvider extends DataSource<Dict<PackageProvider.Data>> {
@@ -47,7 +43,7 @@ class PackageProvider extends DataSource<Dict<PackageProvider.Data>> {
 
   private async updatePackage(plugin: Plugin, id: string) {
     const entry = Object.keys(require.cache).find((key) => {
-      return unwrap(require.cache[key].exports) === plugin
+      return unwrapExports(require.cache[key].exports) === plugin
     })
     if (!this.cache[entry]) return
     const local = await this.cache[entry]