fix(api): resolve union event name

fix vuejs/core#7943
topsmart20 · Mar 23, 2023 · 63abe1d · 63abe1d
1 parent b4e29ed
commit 63abe1d
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 9 deletions.
diff --git a/.changeset/blue-falcons-crash.md b/.changeset/blue-falcons-crash.md
@@ -0,0 +1,6 @@
+---
+'@vue-macros/better-define': patch
+'@vue-macros/api': patch
+---
+
+resolve union event name for `api` and `betterDefine`, fix https://github.com/vuejs/core/issues/7943
diff --git a/packages/api/src/vue/emits.ts b/packages/api/src/vue/emits.ts
@@ -154,16 +154,24 @@ export async function handleTSEmitsDefinition({
         type: evtArg.typeAnnotation.typeAnnotation,
         scope: signature.scope,
       })
-      if (isTSExports(evtType) || evtType?.type.type !== 'TSLiteralType')
-        continue
 
-      const literal = evtType.type.literal
-      if (!isStaticExpression(literal)) continue
-      const evt = String(
-        resolveLiteral(literal as Exclude<typeof literal, UnaryExpression>)
-      )
-      if (!definitions[evt]) definitions[evt] = []
-      definitions[evt].push(buildDefinition(signature))
+      if (isTSExports(evtType) || !evtType?.type) continue
+
+      const types =
+        evtType.type.type === 'TSUnionType'
+          ? evtType.type.types
+          : [evtType.type]
+
+      for (const type of types) {
+        if (type.type !== 'TSLiteralType') continue
+        const literal = type.literal
+        if (!isStaticExpression(literal)) continue
+        const evt = String(
+          resolveLiteral(literal as Exclude<typeof literal, UnaryExpression>)
+        )
+        if (!definitions[evt]) definitions[evt] = []
+        definitions[evt].push(buildDefinition(signature))
+      }
     }
 
     return {

diff --git a/packages/better-define/tests/__snapshots__/fixtures.test.ts.snap b/packages/better-define/tests/__snapshots__/fixtures.test.ts.snap
@@ -706,6 +706,58 @@ export { union as default };
 "
 `;
 
+exports[`fixtures > tests/fixtures/union-emits.vue > isProduction = false 1`] = `
+"import { defineComponent } from 'vue';
+
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: \\"union-emits\\",
+  emits: [\\"some\\", \\"emit\\", \\"another\\"],
+  setup(__props, { emit }) {
+    return () => {
+    };
+  }
+});
+
+var _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+
+var unionEmits = /* @__PURE__ */ _export_sfc(_sfc_main, [__FILE__]);
+
+export { unionEmits as default };
+"
+`;
+
+exports[`fixtures > tests/fixtures/union-emits.vue > isProduction = true 1`] = `
+"import { defineComponent } from 'vue';
+
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: \\"union-emits\\",
+  emits: [\\"some\\", \\"emit\\", \\"another\\"],
+  setup(__props, { emit }) {
+    return () => {
+    };
+  }
+});
+
+var _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+
+var unionEmits = /* @__PURE__ */ _export_sfc(_sfc_main, [__FILE__]);
+
+export { unionEmits as default };
+"
+`;
+
 exports[`fixtures > tests/fixtures/unresolved.vue > isProduction = false 1`] = `
 "import { defineComponent } from 'vue';
 

diff --git a/packages/better-define/tests/fixtures/union-emits.vue b/packages/better-define/tests/fixtures/union-emits.vue
@@ -0,0 +1,7 @@
+<script setup lang="ts">
+type Emits = 'some' | 'emit'
+const emit = defineEmits<{
+  (e: Emits): void
+  (e: 'another', val: string): void
+}>()
+</script>