(fix) type error for component with no props (#1744)

#1739 This is necessary because {} is roughly equal to the any type. It worked before because JSX makes an exception for this on components.
sveltejs · Nov 29, 2022 · 67a6ed8 · 67a6ed8
1 parent 3a4c838
commit 67a6ed8
Show file tree

Hide file tree

Showing 248 changed files with 295 additions and 263 deletions.
diff --git a/...ver/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expected.json b/...ver/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expected.json
@@ -12,8 +12,19 @@
     },
     {
         "range": {
-            "start": { "line": 40, "character": 0 },
-            "end": { "line": 40, "character": 49 }
+            "start": { "line": 37, "character": 10 },
+            "end": { "line": 37, "character": 25 }
+        },
+        "severity": 1,
+        "source": "ts",
+        "message": "Type 'boolean' is not assignable to type 'never'.",
+        "code": 2322,
+        "tags": []
+    },
+    {
+        "range": {
+            "start": { "line": 41, "character": 0 },
+            "end": { "line": 41, "character": 49 }
         },
         "severity": 1,
         "source": "ts",
@@ -23,8 +34,8 @@
     },
     {
         "range": {
-            "start": { "line": 40, "character": 1 },
-            "end": { "line": 40, "character": 11 }
+            "start": { "line": 41, "character": 1 },
+            "end": { "line": 41, "character": 11 }
         },
         "severity": 1,
         "source": "ts",
@@ -34,8 +45,8 @@
     },
     {
         "range": {
-            "start": { "line": 40, "character": 48 },
-            "end": { "line": 40, "character": 48 }
+            "start": { "line": 41, "character": 48 },
+            "end": { "line": 41, "character": 48 }
         },
         "severity": 1,
         "source": "ts",
@@ -45,8 +56,8 @@
     },
     {
         "range": {
-            "start": { "line": 40, "character": 24 },
-            "end": { "line": 42, "character": 12 }
+            "start": { "line": 41, "character": 24 },
+            "end": { "line": 43, "character": 12 }
         },
         "severity": 1,
         "source": "ts",

diff --git a/...r/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expectedv2.json b/...r/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/expectedv2.json
@@ -12,8 +12,19 @@
     },
     {
         "range": {
-            "start": { "line": 37, "character": 24 },
-            "end": { "line": 37, "character": 34 }
+            "start": { "line": 37, "character": 10 },
+            "end": { "line": 37, "character": 25 }
+        },
+        "severity": 1,
+        "source": "ts",
+        "message": "Type 'boolean' is not assignable to type 'never'.",
+        "code": 2322,
+        "tags": []
+    },
+    {
+        "range": {
+            "start": { "line": 38, "character": 24 },
+            "end": { "line": 38, "character": 34 }
         },
         "severity": 1,
         "source": "ts",
@@ -23,8 +34,8 @@
     },
     {
         "range": {
-            "start": { "line": 40, "character": 1 },
-            "end": { "line": 40, "character": 11 }
+            "start": { "line": 41, "character": 1 },
+            "end": { "line": 41, "character": 11 }
         },
         "severity": 1,
         "source": "ts",
@@ -34,8 +45,8 @@
     },
     {
         "range": {
-            "start": { "line": 43, "character": 24 },
-            "end": { "line": 43, "character": 34 }
+            "start": { "line": 44, "character": 24 },
+            "end": { "line": 44, "character": 34 }
         },
         "severity": 1,
         "source": "ts",

diff --git a/...rver/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/input.svelte b/...rver/test/plugins/typescript/features/diagnostics/fixtures/component-invalid/input.svelte
@@ -35,6 +35,7 @@
 
 <!-- invalid -->
 <DoesntWork />
+<Imported propDoesntExist={true} />
 <svelte:component this={DoesntWork} />
 
 <!-- invalid, no additional errors for new transformation (everything else is any) -->

diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
@@ -346,13 +346,18 @@ export class ExportedNames {
             );
         }
 
+        if (names.length === 0) {
+            // Necessary, because {} roughly equals to any
+            return isTsFile
+                ? '{} as Record<string, never>'
+                : '/** @type {Record<string, never>} */ ({})';
+        }
+
         const dontAddTypeDef =
-            !isTsFile ||
-            names.length === 0 ||
-            names.every(([_, value]) => !value.type && value.required);
+            !isTsFile || names.every(([_, value]) => !value.type && value.required);
         const returnElements = this.createReturnElements(names, dontAddTypeDef);
         if (dontAddTypeDef) {
-            // No exports or only `typeof` exports -> omit the `as {...}` completely.
+            // Only `typeof` exports -> omit the `as {...}` completely.
             // If not TS, omit the types to not have a "cannot use types in jsx" error.
             return `{${returnElements.join(' , ')}}`;
         }

diff --git a/packages/svelte2tsx/svelte-shims.d.ts b/packages/svelte2tsx/svelte-shims.d.ts
@@ -102,7 +102,7 @@ type SvelteAnimationReturnType = {
 
 type SvelteWithOptionalProps<Props, Keys extends keyof Props> = Omit<Props, Keys> & Partial<Pick<Props, Keys>>;
 type SvelteAllProps = { [index: string]: any }
-type SveltePropsAnyFallback<Props> = {[K in keyof Props]: Props[K] extends undefined ? any : Props[K]}
+type SveltePropsAnyFallback<Props> = {[K in keyof Props]: Props[K] extends never ? never : Props[K] extends undefined ? any : Props[K]}
 type SvelteSlotsAnyFallback<Slots> = {[K in keyof Slots]: {[S in keyof Slots[K]]: Slots[K][S] extends undefined ? any : Slots[K][S]}}
 type SvelteRestProps = { [index: string]: any }
 type SvelteSlots = { [index: string]: any }

diff --git a/packages/svelte2tsx/test/emitDts/samples/javascript/expected/TestNoScript.svelte.d.ts b/packages/svelte2tsx/test/emitDts/samples/javascript/expected/TestNoScript.svelte.d.ts
@@ -1,7 +1,9 @@
 /** @typedef {typeof __propDef.props}  TestNoScriptProps */
 /** @typedef {typeof __propDef.events}  TestNoScriptEvents */
 /** @typedef {typeof __propDef.slots}  TestNoScriptSlots */
-export default class TestNoScript extends SvelteComponentTyped<{}, {
+export default class TestNoScript extends SvelteComponentTyped<{
+    [x: string]: never;
+}, {
     click: MouseEvent;
 } & {
     [evt: string]: CustomEvent<any>;
@@ -14,7 +16,9 @@ export type TestNoScriptEvents = typeof __propDef.events;
 export type TestNoScriptSlots = typeof __propDef.slots;
 import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
-    props: {};
+    props: {
+        [x: string]: never;
+    };
     events: {
         click: MouseEvent;
     } & {

diff --git a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
@@ -67,7 +67,7 @@
 /></>↲    [generated] line 24                                                                                                                         
 />        [original] line 22                                                                                                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
@@ -58,7 +58,7 @@
 {                                                                                                                                                     
 {/await}                                                  [original] line 13                                                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
@@ -37,7 +37,7 @@
 /></>↲    [generated] line 19                                                                                                                         
 />        [original] line 17                                                                                                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
@@ -98,7 +98,7 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <p>No tasks today!</p>
 </>
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
@@ -57,7 +57,7 @@
 /></>↲    [generated] line 27                                                                                                                         
 />        [original] line 25                                                                                                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
@@ -15,7 +15,7 @@
 <button•on:     ={$check•?•method1•:•method2}•>Bla</button>                                                                                           
 <button•on:click={$check•?•method1•:•method2}•>Bla</button>       [original] line 2                                                                   
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
@@ -55,7 +55,7 @@
 {                                                                                                                                                     
 {/if}        [original] line 13                                                                                                                       
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx
@@ -24,7 +24,7 @@
 </script>    [original] line 4                                                                                                                        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 () => (<></>);
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
@@ -24,7 +24,7 @@
 </script>    [original] line 3                                                                                                                        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 () => (<></>);
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
@@ -7,7 +7,7 @@
   <button•      {count}>button</button>                                                                                                               
 <button•{count}>button</button>                [original] line 1                                                                                      
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
@@ -51,7 +51,7 @@
 {                                                                                                                                                     
 {/if}                 [original] line 13                                                                                                              
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial_with_any(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
@@ -7,7 +7,7 @@
   <h1>Hello•World</h1>                                                                                                                                
 <h1>Hello•World</h1>          [original] line 1                                                                                                       
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/slot-let/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/slot-let/mappings.jsx
@@ -17,7 +17,7 @@
      </Component>                                                                                                                                     
 </Component>             [original] line 3                                                                                                            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
@@ -36,7 +36,7 @@
 </slot></>↲    [generated] line 14                                                                                                                    
 </slot>        [original] line 11                                                                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-return { props: {}, slots: {'default': {}, 'foo': {}, 'bar': {foo:foo, baz:baz}}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {'default': {}, 'foo': {}, 'bar': {foo:foo, baz:baz}}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
@@ -17,7 +17,7 @@
     {...__sveltets_1_ensureAnimation($animateStore(__sveltets_1_mapElementTag('div'),__sveltets_1_AnimationMove,{}))}
 >
 </div></>);
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expectedv2.ts
@@ -11,7 +11,7 @@ async () => {
 
  {const $$action_0 = __sveltets_2_ensureAction($actionStore(svelteHTML.mapElementTag('div')));{ svelteHTML.createElement("div", __sveltets_2_union($$action_0), {      });__sveltets_2_ensureTransition($transitionStore(svelteHTML.mapElementTag('div'),({ y: 100 })));__sveltets_2_ensureTransition($inStore(svelteHTML.mapElementTag('div')));__sveltets_2_ensureTransition($outStore(svelteHTML.mapElementTag('div')));__sveltets_2_ensureAnimation($animateStore(svelteHTML.mapElementTag('div'),__sveltets_2_AnimationMove));
  }}};
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
@@ -23,7 +23,7 @@
     $store.b = false;
 ;
 () => (<></>);
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expectedv2.ts
@@ -23,7 +23,7 @@
     $store.b = false;
 ;
 async () => {};
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
@@ -3,7 +3,7 @@
 <>{someRecordOrArr[$store]}
 {someObject['$store']}
 {someObject.$store}</>
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expectedv2.ts
@@ -3,7 +3,7 @@
 async () => {someRecordOrArr[$store];
 someObject['$store'];
 someObject.$store;};
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-inside-block-without-braces/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-inside-block-without-braces/expected.tsx
@@ -27,7 +27,7 @@
         $store1
 ;
 () => (<></>);
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-inside-block-without-braces/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/$store-inside-block-without-braces/expectedv2.ts
@@ -27,7 +27,7 @@
         $store1
 ;
 async () => {};
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
diff --git a/...ges/svelte2tsx/test/svelte2tsx/samples/$store-no-instance-only-module-script/expected.tsx b/...ges/svelte2tsx/test/svelte2tsx/samples/$store-no-instance-only-module-script/expected.tsx
@@ -7,7 +7,7 @@
 
 {$store1}
 {$store2}</>
-return { props: {}, slots: {}, events: {} }}
+return { props: /** @type {Record<string, never>} */ ({}), slots: {}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }