fix: bump esrap, prevent malformed AST (#14742)

* bump esrap, start fixing stuff

* ignore type exports when looking for undefineds

* sanitize stuff

* changeset

* fix

* oops

* try this?

* prettier

Author: Rich-Harris

.changeset/purple-donuts-talk.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+fix: bump esrap, prevent malformed AST

packages/svelte/package.json

@@ -147,7 +147,7 @@
     "aria-query": "^5.3.1",
     "axobject-query": "^4.1.0",
     "esm-env": "^1.2.1",
-    "esrap": "^1.2.3",
+    "esrap": "^1.3.1",
     "is-reference": "^3.0.3",
     "locate-character": "^3.0.0",
     "magic-string": "^0.30.11",

packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js

@@ -17,6 +17,16 @@ function remove_this_param(node, context) {
 
 /** @type {Visitors<any, null>} */
 const visitors = {
+	_(node, context) {
+		context.next();
+
+		// TODO there may come a time when we decide to preserve type annotations.
+		// until that day comes, we just delete them so they don't confuse esrap
+		delete node.typeAnnotation;
+		delete node.typeParameters;
+		delete node.returnType;
+		delete node.accessibility;
+	},
 	Decorator(node) {
 		e.typescript_invalid_feature(node, 'decorators (related TSC proposal is not stage 4 yet)');
 	},
@@ -78,23 +88,12 @@ const visitors = {
 	TSNonNullExpression(node, context) {
 		return context.visit(node.expression);
 	},
-	TSTypeAnnotation() {
-		// This isn't correct, strictly speaking, and could result in invalid ASTs (like an empty statement within function parameters),
-		// but esrap, our printing tool, just ignores these AST nodes at invalid positions, so it's fine
-		return b.empty;
-	},
 	TSInterfaceDeclaration() {
 		return b.empty;
 	},
 	TSTypeAliasDeclaration() {
 		return b.empty;
 	},
-	TSTypeParameterDeclaration() {
-		return b.empty;
-	},
-	TSTypeParameterInstantiation() {
-		return b.empty;
-	},
 	TSEnumDeclaration(node) {
 		e.typescript_invalid_feature(node, 'enums');
 	},

packages/svelte/src/compiler/phases/2-analyze/index.js

@@ -698,8 +698,16 @@ export function analyze_component(root, source, options) {
 	}
 
 	for (const node of analysis.module.ast.body) {
-		if (node.type === 'ExportNamedDeclaration' && node.specifiers !== null && node.source == null) {
+		if (
+			node.type === 'ExportNamedDeclaration' &&
+			// @ts-expect-error
+			node.exportKind !== 'type' &&
+			node.specifiers !== null &&
+			node.source == null
+		) {
 			for (const specifier of node.specifiers) {
+				// @ts-expect-error
+				if (specifier.exportKind === 'type') continue;
 				if (specifier.local.type !== 'Identifier') continue;
 
 				const binding = analysis.module.scope.get(specifier.local.name);

packages/svelte/src/compiler/phases/3-transform/index.js

@@ -33,12 +33,15 @@ export function transform_component(analysis, source, options) {
 			: client_component(analysis, options);
 
 	const js_source_name = get_source_name(options.filename, options.outputFilename, 'input.svelte');
+
+	// @ts-expect-error
 	const js = print(program, {
 		// include source content; makes it easier/more robust looking up the source map code
 		// (else esrap does return null for source and sourceMapContent which may trip up tooling)
 		sourceMapContent: source,
 		sourceMapSource: js_source_name
 	});
+
 	merge_with_preprocessor_map(js, options, js_source_name);
 
 	const css =
@@ -92,6 +95,7 @@ export function transform_module(analysis, source, options) {
 	}
 
 	return {
+		// @ts-expect-error
 		js: print(program, {
 			// include source content; makes it easier/more robust looking up the source map code
 			// (else esrap does return null for source and sourceMapContent which may trip up tooling)

packages/svelte/src/compiler/phases/scope.js

@@ -433,7 +433,13 @@ export function create_scopes(ast, root, allow_reactive_declarations, parent) {
 		},
 
 		ImportDeclaration(node, { state }) {
+			// @ts-expect-error
+			if (node.importKind === 'type') return;
+
 			for (const specifier of node.specifiers) {
+				// @ts-expect-error
+				if (specifier.importKind === 'type') continue;
+
 				state.scope.declare(specifier.local, 'normal', 'import', node);
 			}
 		},

packages/svelte/tests/runtime-runes/samples/typescript/main.svelte

@@ -24,7 +24,7 @@
 
 	declare module 'foobar' {}
 	namespace SomeNamespace {
-		export type Foo = true
+		export type Foo = true;
 	}
 
 	export function overload(a: boolean): boolean;

packages/svelte/tsconfig.json

@@ -40,5 +40,9 @@
 		"./tests/runtime-browser/test-ssr.ts",
 		"./tests/*/samples/*/_config.js"
 	],
-	"exclude": ["./scripts/process-messages/templates/", "./src/compiler/optimizer/"]
+	"exclude": [
+		"./scripts/process-messages/templates/",
+		"./scripts/_bundle.js",
+		"./src/compiler/optimizer/"
+	]
 }