@tsrx/core 0.0.22 → 0.0.24

package/src/transform/segments.js

@@ -380,6 +380,37 @@ export function convert_source_map_to_mappings(
 		css_element_info,
 	});
 
+	/** @type {Map<string, number>} */
+	const generated_position_indexes = new Map();
+
+	/**
+	 * When a transform expands one source identifier into multiple generated
+	 * identifiers (e.g. `import { foo } from server` -> `const foo =
+	 * _$_server_$_.foo`), esrap records multiple generated positions for the
+	 * same source location. Keep token mappings in generated-order by consuming
+	 * the next matching generated token instead of always using the first one.
+	 * @param {Token} token
+	 * @returns {{ line: number; column: number }}
+	 */
+	function get_generated_position_for_token(token) {
+		const key = `${token.loc.start.line}:${token.loc.start.column}`;
+		const positions = src_to_gen_map.get(key);
+		if (!positions || positions.length === 0) {
+			throw new Error(`No source map entry for position "${key}"`);
+		}
+
+		const matching_positions = positions.filter((position) => {
+			const offset = loc_to_offset(position.line, position.column, gen_line_offsets);
+			return generated_code.startsWith(token.generated, offset);
+		});
+		const candidates = matching_positions.length > 0 ? matching_positions : positions;
+		const index_key = `${key}:${token.generated}`;
+		const index = generated_position_indexes.get(index_key) ?? 0;
+		generated_position_indexes.set(index_key, index + 1);
+
+		return candidates[Math.min(index, candidates.length - 1)];
+	}
+
 	/**
 	 * Needed for a mapping that includes the computed brackets for diagnostics
 	 * @param {AST.MethodDefinition | AST.Property} node
@@ -2182,11 +2213,7 @@ export function convert_source_map_to_mappings(
 		const gen_length = gen_text.length;
 		let gen_line_col;
 		try {
-			gen_line_col = get_generated_position(
-				token.loc.start.line,
-				token.loc.start.column,
-				src_to_gen_map,
-			);
+			gen_line_col = get_generated_position_for_token(token);
 		} catch {
 			continue;
 		}

package/src/utils/builders.js

@@ -1343,6 +1343,15 @@ export const break_statement = {
 	metadata: { path: [] },
 };
 
+/**
+ * @type {AST.ContinueStatement}
+ */
+export const continue_statement = {
+	type: 'ContinueStatement',
+	label: null,
+	metadata: { path: [] },
+};
+
 export {
 	await_builder as await,
 	let_builder as let,
@@ -1352,6 +1361,7 @@ export {
 	true_instance as true,
 	false_instance as false,
 	break_statement as break,
+	continue_statement as continue,
 	for_builder as for,
 	switch_builder as switch,
 	function_builder as function,

package/types/index.d.ts

@@ -64,8 +64,9 @@ interface BaseNodeMetaData {
 	scoped?: boolean;
 	path: AST.Node[];
 	has_template?: boolean;
-	source_name?: string | '#server' | '#style';
+	source_name?: string;
 	source_length?: number;
+	module_keyword?: 'module' | 'namespace';
 	is_capitalized?: boolean;
 	commentContainerId?: number;
 	parenthesized?: boolean;
@@ -73,6 +74,7 @@ interface BaseNodeMetaData {
 	returns?: AST.ReturnStatement[];
 	has_return?: boolean;
 	has_throw?: boolean;
+	has_continue?: boolean;
 	is_reactive?: boolean;
 	lone_return?: boolean;
 	forceMapping?: boolean;
@@ -206,12 +208,9 @@ declare module 'estree' {
 		TsxCompat: TsxCompat;
 		TSRXExpression: TSRXExpression;
 		Html: Html;
+		Style: Style;
 		Element: Element;
 		Text: TextNode;
-		ServerBlock: ServerBlock;
-		ServerBlockStatement: ServerBlockStatement;
-		ServerIdentifier: ServerIdentifier;
-		StyleIdentifier: StyleIdentifier;
 		Attribute: Attribute;
 		RefAttribute: RefAttribute;
 		SpreadAttribute: SpreadAttribute;
@@ -220,8 +219,7 @@ declare module 'estree' {
 	}
 
 	interface ExpressionMap {
-		StyleIdentifier: StyleIdentifier;
-		ServerIdentifier: ServerIdentifier;
+		Style: Style;
 		Text: TextNode;
 		JSXEmptyExpression: ESTreeJSX.JSXEmptyExpression;
 		ParenthesizedExpression: ParenthesizedExpression;
@@ -268,14 +266,6 @@ declare module 'estree' {
 		key?: AST.Expression | null;
 	}
 
-	interface ServerIdentifier extends AST.BaseExpression {
-		type: 'ServerIdentifier';
-	}
-
-	interface StyleIdentifier extends AST.BaseExpression {
-		type: 'StyleIdentifier';
-	}
-
 	interface ImportDeclaration {
 		importKind: TSESTree.ImportDeclaration['importKind'];
 	}
@@ -338,7 +328,6 @@ declare module 'estree' {
 		metadata: BaseNodeMetaData & {
 			topScopedClasses?: TopScopedClasses;
 			styleClasses?: StyleClasses;
-			styleIdentifierPresent?: boolean;
 		};
 		default: boolean;
 		typeParameters?: AST.TSTypeParameterDeclaration;
@@ -370,6 +359,12 @@ declare module 'estree' {
 		expression: AST.Expression;
 	}
 
+	interface Style extends AST.BaseExpression {
+		type: 'Style';
+		value: AST.Literal;
+		loc?: AST.SourceLocation;
+	}
+
 	export interface TSRXExpression extends AST.BaseExpression {
 		type: 'TSRXExpression';
 		expression: AST.Expression;
@@ -416,18 +411,6 @@ declare module 'estree' {
 		loc?: AST.SourceLocation;
 	}
 
-	interface ServerBlockStatement extends Omit<BlockStatement, 'body'> {
-		body: (AST.Statement | AST.ExportNamedDeclaration)[];
-	}
-
-	interface ServerBlock extends AST.BaseNode {
-		type: 'ServerBlock';
-		body: ServerBlockStatement;
-		metadata: BaseNodeMetaData & {
-			exports: Set<string>;
-		};
-	}
-
 	interface ScriptContent extends Omit<AST.Element, 'type'> {
 		type: 'ScriptContent';
 		content: string;
@@ -694,6 +677,7 @@ declare module 'estree-jsx' {
 	interface JSXExpressionContainer {
 		html?: boolean;
 		text?: boolean;
+		style?: boolean;
 	}
 
 	interface JSXMemberExpression {
@@ -977,6 +961,9 @@ declare module 'estree' {
 	> {
 		body: TSModuleBlock;
 		id: AST.Identifier;
+		metadata: BaseNodeMetaData & {
+			exports?: Set<string>;
+		};
 	}
 	interface TSNamedTupleMember extends Omit<
 		AcornTSNode<TSESTree.TSNamedTupleMember>,
@@ -1184,7 +1171,9 @@ export interface AnalysisResult {
 	scope: ScopeInterface;
 	component_metadata: Array<{ id: string }>;
 	metadata: {
-		serverIdentifierPresent: boolean;
+		serverImportsPresent: boolean;
+		serverImportDeclarations: AST.ImportDeclaration[];
+		serverModule: AST.TSModuleDeclaration | null;
 	};
 	errors: CompileError[];
 	comments: AST.CommentWithLocation[];
@@ -1209,6 +1198,7 @@ export type DeclarationKind =
 	| 'rest_param'
 	| 'component'
 	| 'import'
+	| 'module'
 	| 'using'
 	| 'await using';
 
@@ -1239,7 +1229,8 @@ export interface Binding {
 		| AST.Expression
 		| AST.FunctionDeclaration
 		| AST.ClassDeclaration
-		| AST.ImportDeclaration;
+		| AST.ImportDeclaration
+		| AST.TSModuleDeclaration;
 	/** Whether this binding has been reassigned */
 	reassigned: boolean;
 	/** Whether this binding has been mutated (property access) */
@@ -1331,7 +1322,8 @@ export interface ScopeInterface {
 			| AST.Expression
 			| AST.FunctionDeclaration
 			| AST.ClassDeclaration
-			| AST.ImportDeclaration,
+			| AST.ImportDeclaration
+			| AST.TSModuleDeclaration,
 	): Binding;
 	/** Get binding by name */
 	get(name: string): Binding | null;
@@ -1357,8 +1349,7 @@ export interface BaseState {
 	/** For utils */
 	scope: ScopeInterface;
 	scopes: Map<AST.Node | AST.Node[], ScopeInterface>;
-	serverIdentifierPresent: boolean;
-	ancestor_server_block: AST.ServerBlock | undefined;
+	ancestor_server_block: AST.TSModuleDeclaration | undefined;
 	inside_head?: boolean;
 	keep_component_style?: boolean;
 

package/types/jsx-platform.d.ts

@@ -29,6 +29,7 @@ export interface JsxTransformContext {
 	needs_error_boundary: boolean;
 	needs_suspense: boolean;
 	needs_merge_refs: boolean;
+	needs_fragment: boolean;
 	helper_state: {
 		base_name: string;
 		next_id: number;
@@ -239,6 +240,11 @@ export interface JsxPlatform {
 	name: string;
 
 	imports: {
+		/**
+		 * Module to import `Fragment` from when a keyed fragment is required
+		 * for a multi-child loop body. React: `'react'`. Preact: `'preact'`.
+		 */
+		fragment?: string;
 		/**
 		 * Module to import `Suspense` from when a `try { ... } pending { ... }`
 		 * block appears. React: `'react'`. Preact: `'preact/compat'`.

package/types/parse.d.ts

@@ -930,7 +930,7 @@ export namespace Parse {
 			refDestructuringErrors?: DestructuringErrors,
 			forInit?: ForInit,
 			forNew?: boolean,
-		): AST.ServerIdentifier | AST.StyleIdentifier | AST.Component | AST.Identifier | AST.Literal;
+		): AST.Component | AST.Identifier | AST.Literal;
 
 		/** Default handler for parseExprAtom when no other case matches */
 		parseExprAtomDefault(): AST.Expression;
@@ -1172,8 +1172,6 @@ export namespace Parse {
 		 */
 		parseTopLevel(node: AST.Program): AST.Program;
 
-		parseServerBlock(): AST.ServerBlock;
-
 		parseElement(): AST.Element | AST.Tsx | AST.TsxCompat;
 
 		parseDoubleQuotedTextChild(): AST.TextNode;
@@ -1210,7 +1208,6 @@ export namespace Parse {
 			| AST.TextNode
 			| ESTreeJSX.JSXEmptyExpression
 			| ESTreeJSX.JSXExpressionContainer
-			| AST.ServerBlock
 			| AST.Component
 			| AST.ExpressionStatement
 			| ReturnType<Parser['parseElement']>
@@ -1543,7 +1540,7 @@ export namespace Parse {
 		/**
 		 * Check if a local export refers to a defined variable.
 		 * Acorn's default implementation only checks the top-level module scope,
-		 * but Ripple overrides this to check all scopes (for server blocks).
+		 * but Ripple overrides this to check all scopes (for submodules).
 		 * @param id The identifier being exported
 		 */
 		checkLocalExport(id: AST.Identifier): void;