remove unwrap_ts_expression

Author: dummdidumm

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

@@ -7,8 +7,7 @@ import {
 	extract_paths,
 	is_event_attribute,
 	is_text_attribute,
-	object,
-	unwrap_ts_expression
+	object
 } from '../../utils/ast.js';
 import * as b from '../../utils/builders.js';
 import { ReservedKeywords, Runes, SVGElements } from '../constants.js';
@@ -706,7 +705,7 @@ const runes_scope_tweaker = {
 		}
 	},
 	VariableDeclarator(node, { state }) {
-		const init = unwrap_ts_expression(node.init);
+		const init = node.init;
 		if (!init || init.type !== 'CallExpression') return;
 		const rune = get_rune(init, state.scope);
 		if (rune === null) return;

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

@@ -1,10 +1,5 @@
 import { error } from '../../errors.js';
-import {
-	extract_identifiers,
-	get_parent,
-	is_text_attribute,
-	unwrap_ts_expression
-} from '../../utils/ast.js';
+import { extract_identifiers, get_parent, is_text_attribute } from '../../utils/ast.js';
 import { warn } from '../../warnings.js';
 import fuzzymatch from '../1-parse/utils/fuzzymatch.js';
 import { disallowed_parapgraph_contents, interactive_elements } from '../1-parse/utils/html.js';
@@ -338,11 +333,11 @@ const validation = {
 	BindDirective(node, context) {
 		validate_no_const_assignment(node, node.expression, context.state.scope, true);
 
-		const assignee = unwrap_ts_expression(node.expression);
+		const assignee = node.expression;
 		let left = assignee;
 
 		while (left.type === 'MemberExpression') {
-			left = unwrap_ts_expression(/** @type {import('estree').MemberExpression} */ (left.object));
+			left = /** @type {import('estree').MemberExpression} */ (left.object);
 		}
 
 		if (left.type !== 'Identifier') {
@@ -950,7 +945,7 @@ export const validation_runes = merge(validation, a11y_validators, {
 		next({ ...state });
 	},
 	VariableDeclarator(node, { state, path }) {
-		const init = unwrap_ts_expression(node.init);
+		const init = node.init;
 		const rune = get_rune(init, state.scope);
 
 		if (rune === null) return;

packages/svelte/src/compiler/phases/3-transform/client/utils.js

@@ -1,10 +1,5 @@
 import * as b from '../../../utils/builders.js';
-import {
-	extract_paths,
-	is_simple_expression,
-	object,
-	unwrap_ts_expression
-} from '../../../utils/ast.js';
+import { extract_paths, is_simple_expression, object } from '../../../utils/ast.js';
 import { error } from '../../../errors.js';
 import {
 	PROPS_IS_LAZY_INITIAL,
@@ -228,7 +223,7 @@ function is_expression_async(expression) {
 export function serialize_set_binding(node, context, fallback, options) {
 	const { state, visit } = context;
 
-	const assignee = unwrap_ts_expression(node.left);
+	const assignee = node.left;
 	if (
 		assignee.type === 'ArrayPattern' ||
 		assignee.type === 'ObjectPattern' ||

packages/svelte/src/compiler/phases/3-transform/client/visitors/javascript-runes.js

@@ -3,7 +3,7 @@ import { is_hoistable_function, transform_inspect_rune } from '../../utils.js';
 import * as b from '../../../../utils/builders.js';
 import * as assert from '../../../../utils/assert.js';
 import { get_prop_source, is_state_source, should_proxy_or_freeze } from '../utils.js';
-import { extract_paths, unwrap_ts_expression } from '../../../../utils/ast.js';
+import { extract_paths } from '../../../../utils/ast.js';
 
 /** @type {import('../types.js').ComponentVisitors} */
 export const javascript_visitors_runes = {
@@ -174,7 +174,7 @@ export const javascript_visitors_runes = {
 		const declarations = [];
 
 		for (const declarator of node.declarations) {
-			const init = unwrap_ts_expression(declarator.init);
+			const init = declarator.init;
 			const rune = get_rune(init, state.scope);
 			if (!rune || rune === '$effect.active' || rune === '$effect.root' || rune === '$inspect') {
 				if (init != null && is_hoistable_function(init)) {

packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js

@@ -3,8 +3,7 @@ import {
 	extract_paths,
 	is_event_attribute,
 	is_text_attribute,
-	object,
-	unwrap_ts_expression
+	object
 } from '../../../../utils/ast.js';
 import { binding_properties } from '../../../bindings.js';
 import {
@@ -2576,7 +2575,7 @@ export const template_visitors = {
 	},
 	BindDirective(node, context) {
 		const { state, path, visit } = context;
-		const expression = unwrap_ts_expression(node.expression);
+		const expression = node.expression;
 		const getter = b.thunk(/** @type {import('estree').Expression} */ (visit(expression)));
 		const assignment = b.assignment('=', expression, b.id('$$value'));
 		const setter = b.arrow(

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

@@ -1,11 +1,6 @@
 import { walk } from 'zimmerframe';
 import { set_scope, get_rune } from '../../scope.js';
-import {
-	extract_identifiers,
-	extract_paths,
-	is_event_attribute,
-	unwrap_ts_expression
-} from '../../../utils/ast.js';
+import { extract_identifiers, extract_paths, is_event_attribute } from '../../../utils/ast.js';
 import * as b from '../../../utils/builders.js';
 import is_reference from 'is-reference';
 import {
@@ -569,7 +564,7 @@ const javascript_visitors_runes = {
 		const declarations = [];
 
 		for (const declarator of node.declarations) {
-			const init = unwrap_ts_expression(declarator.init);
+			const init = declarator.init;
 			const rune = get_rune(init, state.scope);
 			if (!rune || rune === '$effect.active' || rune === '$inspect') {
 				declarations.push(/** @type {import('estree').VariableDeclarator} */ (visit(declarator)));

packages/svelte/src/compiler/utils/ast.js

@@ -6,13 +6,10 @@ import * as b from '../utils/builders.js';
  * @returns {import('estree').Identifier | null}
  */
 export function object(expression) {
-	expression = unwrap_ts_expression(expression);
-
 	while (expression.type === 'MemberExpression') {
 		expression = /** @type {import('estree').MemberExpression | import('estree').Identifier} */ (
 			expression.object
 		);
-		expression = unwrap_ts_expression(expression);
 	}
 
 	if (expression.type !== 'Identifier') {
@@ -268,37 +265,6 @@ function _extract_paths(assignments = [], param, expression, update_expression)
 	return assignments;
 }
 
-/**
- * The Acorn TS plugin defines `foo!` as a `TSNonNullExpression` node, and
- * `foo as Bar` as a `TSAsExpression` node. This function unwraps those.
- *
- * We can't just remove the typescript AST nodes in the parser stage because subsequent
- * parsing would fail, since AST start/end nodes would point at the wrong positions.
- *
- * @template {import('#compiler').SvelteNode | undefined | null} T
- * @param {T} node
- * @returns {T}
- */
-export function unwrap_ts_expression(node) {
-	if (!node) {
-		return node;
-	}
-
-	if (
-		// @ts-expect-error these types don't exist on the base estree types
-		node.type === 'TSNonNullExpression' ||
-		// @ts-expect-error these types don't exist on the base estree types
-		node.type === 'TSAsExpression' ||
-		// @ts-expect-error these types don't exist on the base estree types
-		node.type === 'TSSatisfiesExpression'
-	) {
-		// @ts-expect-error
-		return node.expression;
-	}
-
-	return node;
-}
-
 /**
  * Like `path.at(x)`, but skips over `TSNonNullExpression` and `TSAsExpression` nodes and eases assertions a bit
  * by removing the `| undefined` from the resulting type.