fix(api): keep string type when boolean exist

closes #351
vue-macros · May 1, 2023 · 791b2f3 · 791b2f3
1 parent ea44488
commit 791b2f3
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 1 deletion.
diff --git a/.changeset/young-owls-decide.md b/.changeset/young-owls-decide.md
@@ -0,0 +1,6 @@
+---
+'@vue-macros/better-define': patch
+'@vue-macros/api': patch
+---
+
+keep string type when boolean exist
diff --git a/packages/api/src/vue/utils.ts b/packages/api/src/vue/utils.ts
@@ -138,7 +138,11 @@ export function attachNodeLoc(node: Node, newNode: Node) {
 
 export function toRuntimeTypeString(types: string[], isProduction?: boolean) {
   if (isProduction) {
-    types = types.filter((t) => t === 'Boolean' || t === 'Function')
+    const hasBoolean = types.includes('Boolean')
+    types = types.filter(
+      (t) =>
+        t === 'Boolean' || (hasBoolean && t === 'String') || t === 'Function'
+    )
   }
   if (types.length === 0) return undefined
   return types.length > 1 ? `[${types.join(', ')}]` : types[0]

diff --git a/packages/better-define/tests/__snapshots__/fixtures.test.ts.snap b/packages/better-define/tests/__snapshots__/fixtures.test.ts.snap
@@ -412,6 +412,48 @@ export { issue328 as default };
 "
 `;
 
+exports[`fixtures > tests/fixtures/issue-351.vue > isProduction = false 1`] = `
+"import { defineComponent } from 'vue';
+import _export_sfc from '/plugin-vue/export-helper';
+
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: \\"issue-351\\",
+  props: {
+    \\"modelValue\\": { type: [String, Boolean], required: true }
+  },
+  setup(__props) {
+    return () => {
+    };
+  }
+});
+
+var issue351 = /* @__PURE__ */ _export_sfc(_sfc_main, [__FILE__]);
+
+export { issue351 as default };
+"
+`;
+
+exports[`fixtures > tests/fixtures/issue-351.vue > isProduction = true 1`] = `
+"import { defineComponent } from 'vue';
+import _export_sfc from '/plugin-vue/export-helper';
+
+var _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: \\"issue-351\\",
+  props: {
+    \\"modelValue\\": { type: [String, Boolean] }
+  },
+  setup(__props) {
+    return () => {
+    };
+  }
+});
+
+var issue351 = /* @__PURE__ */ _export_sfc(_sfc_main, [__FILE__]);
+
+export { issue351 as default };
+"
+`;
+
 exports[`fixtures > tests/fixtures/optional-method.vue > isProduction = false 1`] = `
 "import { defineComponent } from 'vue';
 import _export_sfc from '/plugin-vue/export-helper';

diff --git a/packages/better-define/tests/fixtures/issue-351.vue b/packages/better-define/tests/fixtures/issue-351.vue
@@ -0,0 +1,5 @@
+<script setup lang="ts">
+defineProps<{
+  modelValue: string | boolean
+}>()
+</script>