Merge pull request #2342 from yoyo930021/fix-2314

Fix error when optional camel-cased props are missing
vuejs · Oct 30, 2020 · 962b035 · 962b035
2 parents e21eae3 + ed77808
commit 962b035
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - 🙌 Respect typescript language settings. Thanks to contribution from [@yoyo930021](https://github.com/yoyo930021). #2109 and #2375.
 - 🙌 Slim syntax highlighting. Thanks to contribution from [@Antti](https://github.com/Antti).
 - 🙌 Stop computing outdated diagnostics with CancellationToken. Thanks to contribution from [@yoyo930021](https://github.com/yoyo930021). #1263 and #2332.
+- 🙌 Fix error when optional camel-cased props are missing. Thanks to contribution from [@yoyo930021](https://github.com/yoyo930021). #2314 and #2342.
 
 ### 0.28.0 | 2020-09-23 | [VSIX](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/octref/vsextensions/vetur/0.28.0/vspackage)
 

diff --git a/server/src/services/typescriptService/preprocess.ts b/server/src/services/typescriptService/preprocess.ts
@@ -299,10 +299,13 @@ function convertChildComponentsInfoToSource(childComponents: ChildComponent[]) {
 
     const propTypeStrings: string[] = [];
     c.info?.componentInfo.props?.forEach(p => {
-      let typeKey = p.required ? kebabCase(p.name) : kebabCase(p.name) + '?';
-      if (typeKey.indexOf('-') !== -1) {
+      let typeKey = kebabCase(p.name);
+      if (typeKey.includes('-')) {
         typeKey = `'` + typeKey + `'`;
       }
+      if (!p.required) {
+        typeKey += '?';
+      }
 
       if (p.typeString) {
         propTypeStrings.push(`${typeKey}: ${p.typeString}`);

diff --git a/test/interpolation/fixture/diagnostics/propTypeValidation/TSChild.vue b/test/interpolation/fixture/diagnostics/propTypeValidation/TSChild.vue
@@ -8,7 +8,8 @@ export default Vue.extend({
     callback: {
       type: Function as PropType<() => void>
     },
-    arr: Array as PropType<string[]>
+    arr: Array as PropType<string[]>,
+    camelCase: { type: Boolean, default: false }
   }
 });
 </script>
diff --git a/test/vue3/fixture/diagnostics/propTypeValidation/TSChild.vue b/test/vue3/fixture/diagnostics/propTypeValidation/TSChild.vue
@@ -8,7 +8,8 @@ export default defineComponent({
     callback: {
       type: Function as PropType<() => void>
     },
-    arr: Array as PropType<string[]>
+    arr: Array as PropType<string[]>,
+    camelCase: { type: Boolean, default: false }
   }
 });
 </script>