From 91aad42eca1c15aff4224b05d478d77a35a2f298 Mon Sep 17 00:00:00 2001
From: Shigma <shigma10826@gmail.com>
Date: Mon, 11 Jul 2022 18:46:04 +0800
Subject: [PATCH] feat(client): support tagged union

---
 package.json                                           |  4 +++-
 plugins/adapter/kook/src/index.ts                      |  6 +++---
 .../client/client/components/form/primitive.vue        |  6 +-----
 .../frontend/client/client/components/form/schema.vue  | 10 +++++++---
 .../frontend/client/client/components/form/utils.ts    |  9 +++------
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 314a563ece..33a5f22f9b 100644
--- a/package.json
+++ b/package.json
@@ -89,13 +89,15 @@
     "yakumo": "^0.2.8",
     "yakumo-mocha": "^0.2.5",
     "yakumo-publish": "^0.2.4",
+    "yakumo-tsc": "^0.2.4",
     "yakumo-upgrade": "^0.2.3",
     "yakumo-version": "^0.2.5",
     "yml-register": "^1.0.0"
   },
   "yakumo": {
     "require": [
-      "esbuild-register"
+      "esbuild-register",
+      "yml-register"
     ]
   }
 }
diff --git a/plugins/adapter/kook/src/index.ts b/plugins/adapter/kook/src/index.ts
index ee9fd28c4d..601f285769 100644
--- a/plugins/adapter/kook/src/index.ts
+++ b/plugins/adapter/kook/src/index.ts
@@ -1,4 +1,4 @@
-import KaiheilaBot from '@satorijs/adapter-kaiheila'
+import KookBot from '@satorijs/adapter-kook'
 
-export default KaiheilaBot
-export * from '@satorijs/adapter-kaiheila'
+export default KookBot
+export * from '@satorijs/adapter-kook'
diff --git a/plugins/frontend/client/client/components/form/primitive.vue b/plugins/frontend/client/client/components/form/primitive.vue
index f7efa208ba..f14d959c52 100644
--- a/plugins/frontend/client/client/components/form/primitive.vue
+++ b/plugins/frontend/client/client/components/form/primitive.vue
@@ -1,9 +1,5 @@
 <template>
-  <template v-if="schema.type === 'const'">
-    {{ schema.value }}
-  </template>
-
-  <el-switch v-else-if="schema.type === 'boolean'" v-model="value" :disabled="disabled"></el-switch>
+  <el-switch v-if="schema.type === 'boolean'" v-model="value" :disabled="disabled"></el-switch>
 
   <template v-else-if="schema.type === 'number'">
     <el-slider v-if="schema.meta.role === 'slider'" style="width: 200px"
diff --git a/plugins/frontend/client/client/components/form/schema.vue b/plugins/frontend/client/client/components/form/schema.vue
index 27f606e76c..282ba6ed61 100644
--- a/plugins/frontend/client/client/components/form/schema.vue
+++ b/plugins/frontend/client/client/components/form/schema.vue
@@ -30,7 +30,9 @@
     </k-schema>
   </template>
 
-  <schema-item v-else-if="prefix || !isComposite" :disabled="disabled" :class="{ changed, required, invalid }" @command="handleCommand">
+  <template v-else-if="schema.type === 'const'"></template>
+
+  <schema-item v-else-if="prefix || (!isComposite && schema?.type !== 'union')" :disabled="disabled" :class="{ changed, required, invalid }" @command="handleCommand">
     <template #menu>
       <el-dropdown-item command="discard">撤销更改</el-dropdown-item>
       <el-dropdown-item command="default">恢复默认值</el-dropdown-item>
@@ -96,6 +98,7 @@
       </schema-group>
     </div>
 
+    <!-- top level array / dict -->
     <template v-else>
       <h2>
         {{ schema.meta.description || '配置列表' }}
@@ -107,6 +110,7 @@
     </template>
   </template>
 
+  <!-- union containing object -->
   <template v-else-if="schema?.type === 'union' && choices.length > 1 && ['object', 'intersect'].includes(active?.type)">
     <k-schema 
       v-model="config"
@@ -203,7 +207,7 @@ watch(() => props.modelValue, (value) => {
     } catch {}
   }
   config.value = value ?? getFallback(props.schema)
-}, { immediate: true })
+}, { immediate: true, deep: true })
 
 watch(config, (value) => {
   if (!props.schema) return
@@ -215,7 +219,7 @@ watch(config, (value) => {
 }, { deep: true })
 
 function isPrimitive(schema: Schema) {
-  return ['string', 'number', 'boolean', 'const'].includes(schema.type)
+  return ['string', 'number', 'boolean'].includes(schema.type)
 }
 
 function handleCommand(action: string) {
diff --git a/plugins/frontend/client/client/components/form/utils.ts b/plugins/frontend/client/client/components/form/utils.ts
index 20b28ddea7..a3fdcf1b40 100644
--- a/plugins/frontend/client/client/components/form/utils.ts
+++ b/plugins/frontend/client/client/components/form/utils.ts
@@ -14,17 +14,14 @@ export function isObjectSchema(schema: Schema) {
   } else if (schema.type === 'intersect') {
     return schema.list.every(isObjectSchema)
   } else if (schema.type === 'union') {
-    const choices = schema.list.filter(item => !dynamic.includes(item.type))
-    return choices.length === 1 && isObjectSchema(choices[0])
+    return getChoices(schema).every(isObjectSchema)
   } else {
     return false
   }
 }
 
 export function getChoices(schema: Schema) {
-  return schema.list
-    .filter(item => !item.meta.hidden && !dynamic.includes(item.type))
-    .flatMap(item => item.type === 'union' ? getChoices(item) : item, 1)
+  return schema.list.filter(item => !item.meta.hidden && !dynamic.includes(item.type))
 }
 
 export function getFallback(schema: Schema, required = false) {
@@ -47,7 +44,7 @@ export function validate(schema: Schema): boolean {
     return schema.list.every(isObjectSchema)
   } else if (schema.type === 'union') {
     const choices = getChoices(schema)
-    return choices.length === 1 || choices.every(item => validate(item) && (item.type === 'const' || item.meta.description))
+    return choices.length === 1 || choices.every(item => validate(item))
   } else if (composite.includes(schema.type)) {
     return validate(schema.inner)
   } else {