move ts handling from transform to before analysis

gtm-nayan · gtm-nayan · commit 7eef293fe5fa · 2024-01-31T13:54:40.000+05:45
diff --git a/packages/svelte/src/compiler/index.js b/packages/svelte/src/compiler/index.js
@@ -1,13 +1,13 @@
-import { parse as _parse } from './phases/1-parse/index.js';
+import { getLocator } from 'locate-character';
+import { walk } from 'zimmerframe';
+import { CompileError } from './errors.js';
+import { convert } from './legacy.js';
 import { parse as parse_acorn } from './phases/1-parse/acorn.js';
+import { parse as _parse } from './phases/1-parse/index.js';
+import { remove_typescript_nodes } from './phases/1-parse/remove_typescript_nodes.js';
 import { analyze_component, analyze_module } from './phases/2-analyze/index.js';
 import { transform_component, transform_module } from './phases/3-transform/index.js';
-import { getLocator } from 'locate-character';
-import { walk } from 'zimmerframe';
 import { validate_component_options, validate_module_options } from './validate-options.js';
-import { convert } from './legacy.js';
-import { CompileError } from './errors.js';
-import { strip_ts_assertions } from './phases/1-parse/strip_ts_assertions.js';
 export { default as preprocess } from './preprocess/index.js';
 
 /**
@@ -31,9 +31,9 @@ export function compile(source, options) {
 		if (parsed.metadata.ts) {
 			parsed = {
 				...parsed,
-				fragment: parsed.fragment && strip_ts_assertions(parsed.fragment),
-				instance: parsed.instance && strip_ts_assertions(parsed.instance),
-				module: parsed.module && strip_ts_assertions(parsed.module)
+				fragment: parsed.fragment && remove_typescript_nodes(parsed.fragment),
+				instance: parsed.instance && remove_typescript_nodes(parsed.instance),
+				module: parsed.module && remove_typescript_nodes(parsed.module)
 			};
 		}
 
diff --git a/packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js b/packages/svelte/src/compiler/phases/1-parse/remove_typescript_nodes.js
@@ -1,7 +1,8 @@
+import { walk } from 'zimmerframe';
 import * as b from '../../utils/builders.js';
 
-/** @type {import('zimmerframe').Visitors<any, any>} */
-export const remove_types = {
+/** @type {import('zimmerframe').Visitors<any, null>} */
+const visitors = {
 	ImportDeclaration(node) {
 		if (node.importKind === 'type') return b.empty;
 
@@ -54,3 +55,12 @@ export const remove_types = {
 		return b.empty;
 	}
 };
+
+/**
+ * @template T
+ * @param {T} ast
+ * @returns {T}
+ */
+export function remove_typescript_nodes(ast) {
+	return walk(ast, null, visitors);
+}
diff --git a/packages/svelte/src/compiler/phases/1-parse/strip_ts_assertions.js b/packages/svelte/src/compiler/phases/1-parse/strip_ts_assertions.js
diff --git a/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js b/packages/svelte/src/compiler/phases/3-transform/client/transform-client.js
@@ -8,7 +8,6 @@ import { javascript_visitors } from './visitors/javascript.js';
 import { javascript_visitors_runes } from './visitors/javascript-runes.js';
 import { javascript_visitors_legacy } from './visitors/javascript-legacy.js';
 import { is_state_source, serialize_get_binding } from './utils.js';
-import { remove_types } from '../typescript.js';
 
 /**
  * This function ensures visitor sets don't accidentally clobber each other
@@ -102,7 +101,6 @@ export function client_component(source, analysis, options) {
 			state,
 			combine_visitors(
 				set_scope(analysis.module.scopes),
-				remove_types,
 				global_visitors,
 				// @ts-expect-error TODO
 				javascript_visitors,
@@ -118,21 +116,18 @@ export function client_component(source, analysis, options) {
 			instance_state,
 			combine_visitors(
 				set_scope(analysis.instance.scopes),
-				{ ...remove_types, ImportDeclaration: undefined, ExportNamedDeclaration: undefined },
 				global_visitors,
 				// @ts-expect-error TODO
 				javascript_visitors,
 				analysis.runes ? javascript_visitors_runes : javascript_visitors_legacy,
 				{
-					ImportDeclaration(node, context) {
-						// @ts-expect-error
-						state.hoisted.push(remove_types.ImportDeclaration(node, context));
+					ImportDeclaration(node) {
+						state.hoisted.push(node);
 						return b.empty;
 					},
 					ExportNamedDeclaration(node, context) {
 						if (node.declaration) {
-							// @ts-expect-error
-							return remove_types.ExportNamedDeclaration(context.visit(node.declaration), context);
+							return context.visit(node.declaration);
 						}
 
 						return b.empty;
@@ -148,7 +143,6 @@ export function client_component(source, analysis, options) {
 			{ ...state, scope: analysis.instance.scope },
 			combine_visitors(
 				set_scope(analysis.template.scopes),
-				remove_types,
 				global_visitors,
 				// @ts-expect-error TODO
 				template_visitors
diff --git a/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js b/packages/svelte/src/compiler/phases/3-transform/server/transform-server.js
@@ -24,7 +24,6 @@ import { create_attribute, is_custom_element_node, is_element_node } from '../..
 import { error } from '../../../errors.js';
 import { binding_properties } from '../../bindings.js';
 import { regex_starts_with_newline, regex_whitespaces_strict } from '../../patterns.js';
-import { remove_types } from '../typescript.js';
 import { DOMBooleanAttributes } from '../../../../constants.js';
 import { sanitize_template_string } from '../../../utils/sanitize_template_string.js';
 
@@ -1975,34 +1974,36 @@ export function server_component(analysis, options) {
 	};
 
 	const module = /** @type {import('estree').Program} */ (
-		walk(/** @type {import('#compiler').SvelteNode} */ (analysis.module.ast), state, {
-			...set_scope(analysis.module.scopes),
-			...global_visitors,
-			...remove_types,
-			...javascript_visitors,
-			...(analysis.runes ? javascript_visitors_runes : javascript_visitors_legacy)
-		})
+		walk(
+			/** @type {import('#compiler').SvelteNode} */ (analysis.module.ast),
+			state,
+			// @ts-expect-error TODO: zimmerframe types
+			{
+				...set_scope(analysis.module.scopes),
+				...global_visitors,
+				...javascript_visitors,
+				...(analysis.runes ? javascript_visitors_runes : javascript_visitors_legacy)
+			}
+		)
 	);
 
 	const instance = /** @type {import('estree').Program} */ (
 		walk(
 			/** @type {import('#compiler').SvelteNode} */ (analysis.instance.ast),
 			{ ...state, scope: analysis.instance.scope },
+			// @ts-expect-error TODO: zimmerframe types
 			{
 				...set_scope(analysis.instance.scopes),
 				...global_visitors,
-				...{ ...remove_types, ImportDeclaration: undefined, ExportNamedDeclaration: undefined },
 				...javascript_visitors,
 				...(analysis.runes ? javascript_visitors_runes : javascript_visitors_legacy),
-				ImportDeclaration(node, context) {
-					// @ts-expect-error
-					state.hoisted.push(remove_types.ImportDeclaration(node, context));
+				ImportDeclaration(node) {
+					state.hoisted.push(node);
 					return b.empty;
 				},
 				ExportNamedDeclaration(node, context) {
 					if (node.declaration) {
-						// @ts-expect-error
-						return remove_types.ExportNamedDeclaration(context.visit(node.declaration), context);
+						return context.visit(node.declaration);
 					}
 
 					return b.empty;
@@ -2015,10 +2016,10 @@ export function server_component(analysis, options) {
 		walk(
 			/** @type {import('#compiler').SvelteNode} */ (analysis.template.ast),
 			{ ...state, scope: analysis.template.scope },
+			// @ts-expect-error TODO: zimmerframe types
 			{
 				...set_scope(analysis.template.scopes),
 				...global_visitors,
-				...remove_types,
 				...template_visitors
 			}
 		)
diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts
@@ -1090,6 +1090,10 @@ declare module 'svelte/compiler' {
 		instance: Script | null;
 		/** The parsed `<script context="module">` element, if exists */
 		module: Script | null;
+		metadata: {
+			/** Whether the component was parsed with typescript */
+			ts: boolean;
+		}
 	}
 
 	interface SvelteOptions {
