fix(compiler-sfc): adjusting the type compilation of defineModel in t…

…he prod
vuejs · Nov 15, 2023 · fe82150 · fe82150
1 parent d6277b1
commit fe82150
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineModel.spec.ts.snap b/packages/compiler-sfc/__tests__/compileScript/__snapshots__/defineModel.spec.ts.snap
@@ -28,7 +28,7 @@ exports[`defineModel() > w/ Boolean types, production mode 1`] = `
 
 export default /*#__PURE__*/_defineComponent({
   props: {
-    \\"modelValue\\": { type: [Boolean, String, Number] },
+    \\"modelValue\\": { type: [Boolean, String] },
   },
   emits: [\\"update:modelValue\\"],
   setup(__props, { expose: __expose }) {

diff --git a/packages/compiler-sfc/__tests__/compileScript/defineModel.spec.ts b/packages/compiler-sfc/__tests__/compileScript/defineModel.spec.ts
@@ -192,7 +192,7 @@ describe('defineModel()', () => {
       { defineModel: true, isProd: true }
     )
     assertCode(content)
-    expect(content).toMatch('"modelValue": { type: [Boolean, String, Number] }')
+    expect(content).toMatch('"modelValue": { type: [Boolean, String] }')
     expect(content).toMatch('emits: ["update:modelValue"]')
     expect(content).toMatch(
       `const modelValue = _useModel(__props, "modelValue")`

diff --git a/packages/compiler-sfc/src/script/defineModel.ts b/packages/compiler-sfc/src/script/defineModel.ts
@@ -118,19 +118,19 @@ export function genModelProps(ctx: ScriptCompileContext) {
 
     let runtimeTypes = type && inferRuntimeType(ctx, type)
     if (runtimeTypes) {
+      const hasBoolean = runtimeTypes.includes('Boolean')
       const hasUnknownType = runtimeTypes.includes(UNKNOWN_TYPE)
 
-      runtimeTypes = runtimeTypes.filter(el => el !== UNKNOWN_TYPE)
-
-      if (
-        isProd &&
-        !runtimeTypes.some(
-          el => el === 'Boolean' || (el === 'Function' && options)
+      if (isProd || hasUnknownType) {
+        runtimeTypes = runtimeTypes.filter(
+          t =>
+            t === 'Boolean' ||
+            (hasBoolean && t === 'String') ||
+            (t === 'Function' && options)
         )
-      ) {
-        runtimeTypes = []
+
+        skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0
       }
-      skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0
     }
 
     let runtimeType =