Skip to content

untyped and any should have the same behaviour #1410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2022
Merged

untyped and any should have the same behaviour #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f67066
write tests
ivanhofer Mar 12, 2022
66d2c92
Merge branch 'master' into ts-untyped-variable
Mar 14, 2022
6f73f2e
initialize untyped uninitialized vars
Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...-server/test/plugins/typescript/features/diagnostics/fixtures/props-untyped/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
1 change: 1 addition & 0 deletions ...erver/test/plugins/typescript/features/diagnostics/fixtures/props-untyped/expectedv2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
13 changes: 13 additions & 0 deletions ...e-server/test/plugins/typescript/features/diagnostics/fixtures/props-untyped/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script lang="ts">
import Component from './untyped-ts.svelte'
</script>

<Component typedAsAny={undefined} untyped={undefined} />
<Component typedAsAny={null} untyped={null} />
<Component typedAsAny={true} untyped={true} />
<Component typedAsAny={123} untyped={123} />
<Component typedAsAny='string' untyped='string' />
<Component typedAsAny={{some: 'object'}} untyped={{some: 'object'}} />
<Component typedAsAny={['string', 'array']} untyped={['string', 'array']} />
<Component typedAsAny={['array', 123, false]} untyped={['array', 123, false]} />
<Component typedAsAny={['array', 123, false]} untyped={['array', 123, false]} />
4 changes: 4 additions & 0 deletions ...ver/test/plugins/typescript/features/diagnostics/fixtures/props-untyped/untyped-ts.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<script lang="ts">
export let untyped;
export let typedAsAny: any;
</script>
32 changes: 18 additions & 14 deletions packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,28 @@ export class ExportedNames {
const type = tsType || jsDocType;

if (
!ts.isIdentifier(identifier) ||
(!type &&
ts.isIdentifier(identifier) &&
// Ensure initialization for proper control flow and to avoid "possibly undefined" type errors.
// Also ensure prop is typed as any with a type annotation in TS strict mode
(!declaration.initializer ||
// Widen the type, else it's narrowed to the initializer
type ||
// Edge case: TS infers `export let bla = false` to type `false`.
// prevent that by adding the any-wrap in this case, too.
![ts.SyntaxKind.FalseKeyword, ts.SyntaxKind.TrueKeyword].includes(
declaration.initializer?.kind
))
(!type &&
[ts.SyntaxKind.FalseKeyword, ts.SyntaxKind.TrueKeyword].includes(
declaration.initializer.kind
)))
) {
return;
const name = identifier.getText();
const end = declaration.end + this.astOffset;

preprendStr(
this.str,
end,
surroundWithIgnoreComments(`;${name} = __sveltets_1_any(${name});`)
);
}
const name = identifier.getText();
const end = declaration.end + this.astOffset;

preprendStr(
this.str,
end,
surroundWithIgnoreComments(`;${name} = __sveltets_1_any(${name});`)
);
};

const findComma = (target: ts.Node) =>
Expand Down
14 changes: 8 additions & 6 deletions packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,17 @@ s
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
{/**
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
let slug; {/**
╚•let•slug;↲ [generated] line 35
let slug/*Ωignore_startΩ*/;slug = __sveltets_1_any(slug);/*Ωignore_endΩ*/; {/**
╚•let•slug/*Ωignore_startΩ*/;slug•=•__sveltets_1_any(slug);/*Ωignore_endΩ*/;↲ [generated] line 35
╚•let•slug; ↲
╚ •let•slug;↲
╚export•let•slug;↲ [original] line 29
╚export•let•slug;↲ [original] line 29
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
let chapter; {/**
╚•let•chapter;↲ [generated] line 36
let chapter/*Ωignore_startΩ*/;chapter = __sveltets_1_any(chapter);/*Ωignore_endΩ*/; {/**
╚•let•chapter/*Ωignore_startΩ*/;chapter•=•__sveltets_1_any(chapter);/*Ωignore_endΩ*/;↲ [generated] line 36
╚•let•chapter; ↲
╚ •let•chapter;↲
╚export•let•chapter;↲ [original] line 30
╚export•let•chapter;↲ [original] line 30
------------------------------------------------------------------------------------------------------------------------------------------------------ */}

const { sections } = getContext('tutorial');
Expand Down
12 changes: 6 additions & 6 deletions packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
↲
<script>↲ [original] line 1 (rest generated at line 2)
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
let prop/*Ωignore_startΩ*/;let $prop = __sveltets_1_store_get(prop);/*Ωignore_endΩ*/ {/**
╚•let•prop/*Ωignore_startΩ*/;let•$prop•=•__sveltets_1_store_get(prop);/*Ωignore_endΩ*/↲ [generated] line 4
╚•let•prop ↲
╚ •let•prop↲
╚export•let•prop↲ [original] line 2
------------------------------------------------------------------------------------------------------------------------------------------------------ */}
let prop/*Ωignore_startΩ*/;let $prop = __sveltets_1_store_get(prop);/*Ωignore_endΩ*//*Ωignore_startΩ*/;prop = __sveltets_1_any(prop);/*Ωignore_endΩ*/
╚•let•prop/*Ωignore_startΩ*/;let•$prop•=•__sveltets_1_store_get(prop);/*Ωignore_endΩ*//*Ωignore_startΩ*/;prop•=•__sveltets_1_any(prop);/*Ωignore_endΩ*/↲ [generated] line 4
╚•let•prop ↲
╚ •let•prop↲
╚export•let•prop↲ [original] line 2
//----------------------------------------------------------------------------------------------------------------------------------------------------
let foo = __sveltets_1_invalidate(() => prop); {/**
╚let••foo•=•__sveltets_1_invalidate(()•=>•prop);↲ [generated] line 5
╚ •foo•=• prop; ↲
Expand Down
10 changes: 5 additions & 5 deletions packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
/**
* DOCS!
*/
let a;
let a/*Ωignore_startΩ*/;a = __sveltets_1_any(a);/*Ωignore_endΩ*/;
/**
* not this
*/
/**
* MORE DOCS!
*/
let b;
let c;
let b/*Ωignore_startΩ*/;b = __sveltets_1_any(b);/*Ωignore_endΩ*/;
let c/*Ωignore_startΩ*/;c = __sveltets_1_any(c);/*Ωignore_endΩ*/;
/**
* d
*/
let d;let
let d/*Ωignore_startΩ*/;d = __sveltets_1_any(d);/*Ωignore_endΩ*/;let
/**
* e
*/
e;
e/*Ωignore_startΩ*/;e = __sveltets_1_any(e);/*Ωignore_endΩ*/;
;
() => (<></>);
return { props: {
Expand Down
10 changes: 5 additions & 5 deletions packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
/**
* DOCS!
*/
let a;
let a/*Ωignore_startΩ*/;a = __sveltets_1_any(a);/*Ωignore_endΩ*/;
/**
* not this
*/
/**
* MORE DOCS!
*/
let b;
let c;
let b/*Ωignore_startΩ*/;b = __sveltets_1_any(b);/*Ωignore_endΩ*/;
let c/*Ωignore_startΩ*/;c = __sveltets_1_any(c);/*Ωignore_endΩ*/;
/**
* d
*/
let d;let
let d/*Ωignore_startΩ*/;d = __sveltets_1_any(d);/*Ωignore_endΩ*/;let
/**
* e
*/
e;
e/*Ωignore_startΩ*/;e = __sveltets_1_any(e);/*Ωignore_endΩ*/;
;
async () => {};
return { props: {
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
///<reference types="svelte" />
<></>;function render() {

let a;
let b;
let a/*Ωignore_startΩ*/;a = __sveltets_1_any(a);/*Ωignore_endΩ*/;
let b/*Ωignore_startΩ*/;b = __sveltets_1_any(b);/*Ωignore_endΩ*/;
let c = 123;
;
() => (<></>);
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
///<reference types="svelte" />
;function render() {

let a;
let b;
let a/*Ωignore_startΩ*/;a = __sveltets_1_any(a);/*Ωignore_endΩ*/;
let b/*Ωignore_startΩ*/;b = __sveltets_1_any(b);/*Ωignore_endΩ*/;
let c = 123;
;
async () => {};
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<></>;function render() {

let name1 = "world"
let name2
let name2/*Ωignore_startΩ*/;name2 = __sveltets_1_any(name2);/*Ωignore_endΩ*/

let rename1 = '';
let rename2;
let rename2/*Ωignore_startΩ*/;rename2 = __sveltets_1_any(rename2);/*Ωignore_endΩ*/;

class Foo {}
function bar() {}
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/svelte2tsx/samples/export-list/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
;function render() {

let name1 = "world"
let name2
let name2/*Ωignore_startΩ*/;name2 = __sveltets_1_any(name2);/*Ωignore_endΩ*/

let rename1 = '';
let rename2;
let rename2/*Ωignore_startΩ*/;rename2 = __sveltets_1_any(rename2);/*Ωignore_endΩ*/;

class Foo {}
function bar() {}
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* DOCS!
* @typedef {'ABC'} ABC
*/
let a;
let a/*Ωignore_startΩ*/;a = __sveltets_1_any(a);/*Ωignore_endΩ*/;
;
() => (<></>);
return { props: {
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* DOCS!
* @typedef {'ABC'} ABC
*/
let a;
let a/*Ωignore_startΩ*/;a = __sveltets_1_any(a);/*Ωignore_endΩ*/;
;
async () => {};
return { props: {
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
* MORE DOCS!
*/
let b = 1;
let c;
let c/*Ωignore_startΩ*/;c = __sveltets_1_any(c);/*Ωignore_endΩ*/;

// not this one
let d;
let d/*Ωignore_startΩ*/;d = __sveltets_1_any(d);/*Ωignore_endΩ*/;
;
() => (<></>);
return { props: {a: a , b: b , c: c , d: d} as {
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expectedv2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
* MORE DOCS!
*/
let b = 1;
let c;
let c/*Ωignore_startΩ*/;c = __sveltets_1_any(c);/*Ωignore_endΩ*/;

// not this one
let d;
let d/*Ωignore_startΩ*/;d = __sveltets_1_any(d);/*Ωignore_endΩ*/;
;
async () => {};
return { props: {a: a , b: b , c: c , d: d} as {
Expand Down