Skip to content

Commit 325d573

Browse files
authored
Merge branch 'main' into on-demand-style-parsing
2 parents 7c527eb + 8b28d21 commit 325d573

7 files changed

+9
-9
lines changed

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"prettier-plugin-svelte": "^2.10.1",
104104
"rimraf": "^5.0.1",
105105
"semver": "^7.5.1",
106-
"svelte": "^4.0.0-next.1",
106+
"svelte": "^4.0.0-next.2",
107107
"svelte2tsx": "^0.6.15",
108108
"typescript": "~5.1.3",
109109
"typescript-eslint-parser-for-extra-files": "^0.5.0"
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="typescript">
2-
import Component from 'foo.svelte' // Component: any
2+
import Component from 'foo.svelte' // Component: typeof SvelteComponent
33
</script>
44
<button on:click="{e=>{}}"></button> <!-- e: MouseEvent & { currentTarget: EventTarget & HTMLButtonElement; } -->
5-
<Component on:click="{e=>{}}"></Component> <!-- Component: any, e: any -->
5+
<Component on:click="{e=>{}}"></Component> <!-- Component: typeof SvelteComponent, e: CustomEvent<any> -->

Diff for: tests/fixtures/parser/ast/ts-event05-type-output.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script lang="ts">
2-
import Component from './ts-event03-input.svelte'; // Component: any
2+
import Component from './ts-event03-input.svelte'; // Component: typeof SvelteComponent
33
</script>
44

5-
<Component on:foo="{e=>{ // Component: any, e: any
5+
<Component on:foo="{e=>{ // Component: typeof SvelteComponent, e: CustomEvent<any>
66
// e.detail is number
77
// `@typescript-eslint/parser` doesn't get the correct types.
88
// Using `typescript-eslint-parser-for-extra-files` will give we the correct types.

Diff for: tests/fixtures/parser/ast/ts-reactive02-type-output.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
2+
import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
33
let x = "hello" // x: string
44
const get = ()=>"hello" // get: () => string
55

Diff for: tests/fixtures/parser/ast/ts-reactive05-type-output.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
2+
import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
33
44
const a = writable(0) // a: Writable<number>, writable(0): Writable<number>
55
$: aValue = $a // $: any, aValue: number, $a: number

Diff for: tests/fixtures/parser/ast/ts-store01-type-output.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
2+
import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
33
const a = writable(0) // a: Writable<number>, writable(0): Writable<number>
44
const b = writable(0) // b: Writable<number>, writable(0): Writable<number>
55
const $b = 'abc' // $b: "abc"

Diff for: tests/fixtures/parser/ast/ts-store02-type-output.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script context="module" lang="ts">
2-
import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
2+
import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
33
const a = writable(0) // a: Writable<number>, writable(0): Writable<number>
44
declare const $a: string // $a: string
55
</script>

0 commit comments

Comments
 (0)