@tsrx/core 0.1.16 → 0.1.18

package/src/utils/ast.js

@@ -37,12 +37,7 @@ export function is_function_node(node) {
  * @returns {boolean}
  */
 export function is_function_or_component_node(node) {
-	return (
-		node.type === 'FunctionDeclaration' ||
-		node.type === 'FunctionExpression' ||
-		node.type === 'ArrowFunctionExpression' ||
-		node.type === 'Component'
-	);
+	return is_function_node(node);
 }
 
 /**
@@ -54,32 +49,29 @@ export function is_class_node(node) {
 }
 
 /**
- * @param {AST.Node} node
- * @returns {boolean}
- */
-export function is_component_node(node) {
-	return node.type === 'Component';
-}
-
-/**
- * Returns the closest component in an ancestry path. By default, function and
- * class boundaries stop the search so callers only match direct component
- * body/control-flow nodes.
+ * Returns the closest native TSRX function in an ancestry path. By default,
+ * function and class boundaries stop the search so callers only match direct
+ * native TSRX function body/control-flow nodes.
  *
  * @param {AST.Node[]} path
  * @param {boolean} [includes_functions=false]
- * @returns {AST.Component | undefined}
+ * @returns {AST.Function | undefined}
  */
 export function get_component_from_path(path, includes_functions = false) {
 	for (let i = path.length - 1; i >= 0; i -= 1) {
 		const node = path[i];
 
-		if (!includes_functions && (is_function_node(node) || is_class_node(node))) {
-			return;
+		if (is_function_node(node)) {
+			if (/** @type {any} */ (node).metadata?.native_tsrx_function) {
+				return /** @type {AST.Function} */ (node);
+			}
+			if (!includes_functions) {
+				return;
+			}
 		}
 
-		if (is_component_node(node)) {
-			return /** @type {AST.Component} */ (node);
+		if (!includes_functions && is_class_node(node)) {
+			return;
 		}
 	}
 }
@@ -87,7 +79,7 @@ export function get_component_from_path(path, includes_functions = false) {
 /**
  * @param {AST.Node[] | { path: AST.Node[] }} context_or_path
  * @param {boolean} [includes_functions=false]
- * @returns {AST.Component | undefined}
+ * @returns {AST.Function | undefined}
  */
 export function is_inside_component(context_or_path, includes_functions = false) {
 	const path = Array.isArray(context_or_path) ? context_or_path : context_or_path.path;

package/src/utils/builders.js

@@ -77,24 +77,6 @@ export function arrow(params, body, async = false, type_parameters, loc_info) {
 	return set_location(node, loc_info);
 }
 
-/**
- * @param {AST.Identifier} id
- * @param {AST.Pattern[]} params
- * @param {AST.Node[]} body
- * @returns {AST.Component}
- */
-export function component(id, params, body) {
-	return {
-		type: 'Component',
-		id,
-		params,
-		body,
-		css: null,
-		metadata: { path: [] },
-		default: false,
-	};
-}
-
 /**
  * @param {AST.AssignmentOperator} operator
  * @param {AST.Pattern} left

package/types/index.d.ts

@@ -11,7 +11,6 @@ import type {
 	JsxTransformContext,
 	JsxTransformOptions,
 	JsxTransformResult,
-	componentToFunctionDeclaration,
 	createJsxTransform,
 } from './jsx-platform';
 
@@ -23,7 +22,21 @@ export type {
 	JsxTransformOptions,
 	JsxTransformResult,
 };
-export { createJsxTransform, componentToFunctionDeclaration };
+export { createJsxTransform };
+
+export function collectStyleRefAttributes(node: any, refs?: any[]): any[];
+export function createStyleClassMap(component: any, css: any): AST.ObjectExpression;
+export function createStyleClassMapFromStylesheet(css: any): AST.ObjectExpression;
+export function createStyleRefSetupStatements(
+	refAttributes: any[],
+	styleMap: AST.Expression,
+	options?: {
+		allowMutableRefTarget?: boolean;
+		createTempIdentifier?: () => AST.Identifier;
+		visitExpression?: (expression: AST.Expression) => AST.Expression;
+	},
+): AST.Statement[];
+export function getStyleElementStylesheet(styleElement: any): any | null;
 
 /**
  * Compile error interface
@@ -77,10 +90,11 @@ interface BaseNodeMetaData {
 	has_continue?: boolean;
 	is_reactive?: boolean;
 	lone_return?: boolean;
+	regular_js?: boolean;
+	returned_tsrx_child?: boolean;
 	forceMapping?: boolean;
 	lazy_id?: string;
 	disable_verification?: boolean;
-	lazy_param_is_component?: boolean;
 	lazy_param_binding_mappings?: Array<{
 		source: AST.Identifier;
 		generated: AST.Identifier | AST.Literal;
@@ -88,11 +102,11 @@ interface BaseNodeMetaData {
 }
 
 interface FunctionMetaData extends BaseNodeMetaData {
-	// needed for volar tokens to recognize component functions
-	is_component?: boolean;
+	native_tsrx_function?: boolean;
 	is_method?: boolean;
 	tracked?: boolean;
 	has_lazy_descendants?: boolean;
+	synthetic_children?: boolean;
 }
 
 // Strip parent, loc, and range from TSESTree nodes to match @sveltejs/acorn-typescript output
@@ -142,6 +156,13 @@ declare module 'estree' {
 		};
 	}
 
+	interface ReturnStatement {
+		metadata: BaseNodeMetaData & {
+			invalid_tsrx_template_return?: boolean;
+			generated_loop_continue_return?: boolean;
+		};
+	}
+
 	type Accessibility = 'public' | 'protected' | 'private'; // missing in acorn-typescript types
 	interface MethodDefinition {
 		typeParameters?: TSTypeParameterDeclaration;
@@ -204,26 +225,19 @@ declare module 'estree' {
 
 	// Include TypeScript node types and TSRX-specific nodes in NodeMap
 	interface NodeMap {
-		Component: Component;
 		Tsx: Tsx;
 		Tsrx: Tsrx;
 		TsxCompat: TsxCompat;
 		TSRXExpression: TSRXExpression;
-		Html: Html;
-		Style: Style;
 		Element: Element;
 		Text: TextNode;
 		Attribute: Attribute;
-		RefAttribute: RefAttribute;
-		RefExpression: RefExpression;
 		SpreadAttribute: SpreadAttribute;
 		ParenthesizedExpression: ParenthesizedExpression;
 		ScriptContent: ScriptContent;
 	}
 
 	interface ExpressionMap {
-		Style: Style;
-		RefExpression: RefExpression;
 		Text: TextNode;
 		JSXEmptyExpression: ESTreeJSX.JSXEmptyExpression;
 		ParenthesizedExpression: ParenthesizedExpression;
@@ -319,25 +333,6 @@ declare module 'estree' {
 		trailingComments?: AST.Comment[] | undefined;
 	}
 
-	/**
-	 * TSRX custom interfaces and types section
-	 */
-	interface Component extends AST.BaseNode {
-		type: 'Component';
-		// null is for anonymous components, e.g. `component(props) => {}`
-		id: AST.Identifier | null;
-		params: AST.Pattern[];
-		body: AST.Node[];
-		css: CSS.StyleSheet | null;
-		metadata: BaseNodeMetaData & {
-			arrow?: boolean;
-			topScopedClasses?: TopScopedClasses;
-			styleClasses?: StyleClasses;
-		};
-		default: boolean;
-		typeParameters?: AST.TSTypeParameterDeclaration;
-	}
-
 	interface Tsx extends AST.BaseNode {
 		type: 'Tsx';
 		attributes: Array<any>;
@@ -369,17 +364,6 @@ declare module 'estree' {
 		closingElement: ESTreeJSX.JSXClosingElement;
 	}
 
-	interface Html extends AST.BaseNode {
-		type: 'Html';
-		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;
@@ -445,49 +429,23 @@ declare module 'estree' {
 		};
 	}
 
-	interface RefAttribute extends AST.BaseNode {
-		type: 'RefAttribute';
-		argument: AST.Expression;
-		loc?: AST.SourceLocation;
-	}
-
-	interface RefExpression extends AST.BaseNode {
-		type: 'RefExpression';
-		argument: AST.Expression;
-		loc?: AST.SourceLocation;
-	}
-
 	interface SpreadAttribute extends AST.BaseNode {
 		type: 'SpreadAttribute';
 		argument: AST.Expression;
 		loc?: AST.SourceLocation;
 	}
 
-	/**
-	 * TSRX's extended Declaration type that includes Component
-	 * Use this instead of Declaration when you need Component support
-	 */
-	export type TSRXDeclaration = AST.Declaration | Component | AST.TSDeclareFunction;
+	export type TSRXDeclaration = AST.Declaration | AST.TSDeclareFunction;
 
-	/**
-	 * TSRX's extended ExportNamedDeclaration with Component support
-	 */
 	interface TSRXExportNamedDeclaration extends Omit<AST.ExportNamedDeclaration, 'declaration'> {
 		declaration?: TSRXDeclaration | null | undefined;
 	}
 
-	/**
-	 * TSRX's extended Program with Component support
-	 */
 	interface TSRXProgram extends Omit<Program, 'body'> {
-		body: (Program['body'][number] | Component | FunctionExpression)[];
+		body: (Program['body'][number] | FunctionExpression)[];
 	}
 
-	interface TSRXProperty extends Omit<AST.Property, 'value'> {
-		value: AST.Property['value'] | Component;
-	}
-
-	export type TSRXAttribute = AST.Attribute | AST.SpreadAttribute | AST.RefAttribute;
+	export type TSRXAttribute = AST.Attribute | AST.SpreadAttribute;
 
 	export type TSRXStatement = AST.Statement | TSESTree.Statement;
 
@@ -692,7 +650,6 @@ declare module 'estree-jsx' {
 	}
 
 	interface JSXExpressionContainer {
-		html?: boolean;
 		text?: boolean;
 		style?: boolean;
 	}
@@ -1213,7 +1170,6 @@ export type DeclarationKind =
 	| 'function'
 	| 'param'
 	| 'rest_param'
-	| 'component'
 	| 'import'
 	| 'module'
 	| 'using'
@@ -1268,6 +1224,7 @@ export interface Binding {
 		lazy_array_index?: number;
 		lazy_array_source_tracked?: boolean;
 		lazy_array_rest?: boolean;
+		typeAnnotation?: AST.TypeNode;
 	} | null;
 	/** Kind of binding */
 	kind: BindingKind;
@@ -1378,10 +1335,11 @@ export interface BaseState {
 	ancestor_server_block: AST.TSModuleDeclaration | undefined;
 	inside_head?: boolean;
 	keep_component_style?: boolean;
+	regular_js?: boolean;
 
 	/** Common For All */
 	to_ts: boolean;
-	component?: AST.Component;
+	component?: AST.Function;
 }
 
 export interface AnalysisState extends BaseState {
@@ -1425,6 +1383,7 @@ export interface TransformServerState extends BaseState {
 	template_child?: boolean;
 	skip_regular_blocks?: boolean;
 	in_regular_block?: boolean;
+	is_tsrx_element?: boolean;
 	jsx_to_tsrx_element?: boolean;
 }
 
@@ -1461,6 +1420,7 @@ export interface TransformClientState extends BaseState {
 	return_flags?: Map<AST.ReturnStatement, { name: string; tracked: boolean }>;
 	is_tsrx_element?: boolean;
 	jsx_to_tsrx_element?: boolean;
+	template_child?: boolean;
 	ref_target_type?: AST.TypeNode;
 }
 

package/types/jsx-platform.d.ts

@@ -36,11 +36,12 @@ export interface JsxTransformContext {
 	needs_error_boundary: boolean;
 	needs_suspense: boolean;
 	needs_merge_refs: boolean;
-	needs_ref_prop: boolean;
 	needs_normalize_spread_props: boolean;
+	needs_normalize_spread_props_for_ref_attr: boolean;
 	needs_fragment: boolean;
 	needs_for_of_iterable: boolean;
 	needs_iteration_value_type: boolean;
+	stylesheets: AST.CSS.StyleSheet[];
 	module_scoped_hook_components: boolean;
 	helper_state: {
 		base_name: string;
@@ -48,10 +49,12 @@ export interface JsxTransformContext {
 		helpers: any[];
 		statics: any[];
 	} | null;
+	hook_helpers_enabled: boolean;
 	available_bindings: Map<string, AST.Identifier>;
 	lazy_next_id: number;
-	current_css_hash: string | null;
 	inside_element_child?: boolean;
+	/** Full source text for source-aware diagnostics. */
+	source: string;
 	/** Source filename for diagnostics; null when the caller did not supply one. */
 	filename: string | null;
 	/** True when recoverable errors should be collected onto `errors` instead of thrown. */
@@ -144,18 +147,6 @@ export interface JsxPlatformHooks {
 	 * Composition API state like `ref()`.
 	 */
 	isTopLevelSetupCall?: (callExpression: any, ctx: any) => boolean;
-	/**
-	 * Lower a `component` declaration to the replacement node for its current
-	 * position. React / Preact use the default helper and return a
-	 * `FunctionDeclaration`. Other targets may return a variable declaration or
-	 * an expression that wraps the shared lowered function body (for example,
-	 * `defineVaporComponent(...)`).
-	 *
-	 * The default lowering is exported as `componentToFunctionDeclaration()` so
-	 * platform hooks can build on it instead of reimplementing component body
-	 * handling.
-	 */
-	componentToFunction?: (component: any, ctx: any, helperState?: any) => any;
 	/**
 	 * Wrap a hoisted helper component declaration emitted by the shared control-
 	 * flow splitter. The default is the plain function declaration; Vue uses
@@ -163,6 +154,13 @@ export interface JsxPlatformHooks {
 	 * state behaves like normal component state.
 	 */
 	wrapHelperComponent?: (helperFn: any, helperId: any, ctx: any, sourceNode: any) => any;
+	/**
+	 * Wrap an uppercase JavaScript function that returns native TSRX as a target
+	 * component. Vue uses this to turn `function App() { return <></>; }` into a
+	 * `defineVaporComponent(function App() { ... })` binding while lowercase
+	 * TSRX-returning callbacks stay plain functions.
+	 */
+	wrapNativeFunctionComponent?: (fn: any, ctx: any, path: any[]) => any;
 	/**
 	 * Emit hook-isolation helper components as unique module-scope declarations
 	 * instead of lazily creating and caching them from the parent component body.
@@ -170,6 +168,11 @@ export interface JsxPlatformHooks {
 	 * Compiler's Rules of Hooks validation.
 	 */
 	moduleScopedHookComponents?: boolean;
+	/**
+	 * Split ordinary uppercase function component bodies when an early
+	 * conditional return would make later React/Preact hooks conditional.
+	 */
+	componentBodyHookHelpers?: boolean;
 	/**
 	 * Inject module-level imports after the main walk. Default: import
 	 * `Suspense` from `platform.imports.suspense` and `TsrxErrorBoundary`
@@ -188,9 +191,7 @@ export interface JsxPlatformHooks {
 	transformElementAttributes?: (attrs: any[], ctx: any, element: any) => any[];
 	/**
 	 * Rewrite or normalize raw Ripple attributes before the shared
-	 * `to_jsx_attribute()` mapping runs. Targets can use this to merge multiple
-	 * keyword attributes, such as collapsing repeated `{ref ...}` entries into a
-	 * single `RefAttribute` backed by an array expression.
+	 * `to_jsx_attribute()` mapping runs.
 	 */
 	preprocessElementAttributes?: (attrs: any[], ctx: any, element: any) => any[];
 	/**
@@ -260,7 +261,7 @@ export interface JsxPlatformHooks {
 	 * default child-to-JSX conversion runs.
 	 *
 	 * This lets a target support target-native DOM content props such as
-	 * `textContent` / `innerHTML` without forking the whole element lowering.
+	 * `textContent` without forking the whole element lowering.
 	 * The hook may mutate `attrs` directly and either return a replacement
 	 * `children` array (plus optional `selfClosing` override) or `null` to fall
 	 * back to the default child handling.
@@ -336,8 +337,7 @@ export interface JsxPlatform {
 		 */
 		mergeRefs?: string;
 		/**
-		 * Module to import named-ref-prop helpers from when compiling
-		 * `prop={ref expr}` or normalizing host spreads containing named refs.
+		 * Module to import host-spread normalization helpers from.
 		 */
 		refProp?: string;
 		/**
@@ -354,10 +354,15 @@ export interface JsxPlatform {
 
 	jsx: {
 		/**
-		 * Rewrite Ripple's `class` attribute to React's `className`. React: true.
-		 * Preact and Solid accept `class` natively, so: false.
+		 * Rewrite Ripple's `class` attribute to `className` for legacy targets
+		 * that require it. First-party targets keep authored `class`.
 		 */
 		rewriteClassAttr: boolean;
+		/**
+		 * Attribute name to use when TSRX injects scoped CSS classes. This does
+		 * not rewrite authored attributes.
+		 */
+		classAttrName?: 'class' | 'className';
 		/**
 		 * Accepted values of `kind` in `<tsx:kind>` compat blocks. React accepts
 		 * only `'react'`. Preact accepts both `'preact'` and `'react'`.
@@ -383,8 +388,6 @@ export interface JsxPlatform {
 		 * explicit `ref={normalized.ref}` attribute.
 		 */
 		hostSpreadRefStrategy?: 'explicit-ref-attr';
-		/** Native host prop used when lowering a sole child `{html ...}`. */
-		htmlProp?: 'dangerouslySetInnerHTML' | 'innerHTML';
 	};
 
 	validation: {
@@ -442,9 +445,3 @@ export function createJsxTransform(
 	filename?: string,
 	options?: JsxTransformOptions,
 ) => JsxTransformResult;
-
-export function componentToFunctionDeclaration(
-	component: any,
-	ctx: any,
-	helperState?: any,
-): AST.FunctionDeclaration | AST.FunctionExpression | AST.ArrowFunctionExpression;

package/types/parse.d.ts

@@ -930,7 +930,7 @@ export namespace Parse {
 			refDestructuringErrors?: DestructuringErrors,
 			forInit?: ForInit,
 			forNew?: boolean,
-		): AST.Component | AST.Identifier | AST.Literal;
+		): AST.Expression;
 
 		/** Default handler for parseExprAtom when no other case matches */
 		parseExprAtomDefault(): AST.Expression;
@@ -1180,17 +1180,6 @@ export namespace Parse {
 			body: (AST.Statement | AST.Node | ESTreeJSX.JSXText | ESTreeJSX.JSXElement['children'])[],
 		): void;
 
-		parseComponent(
-			params?:
-				| {
-						requireName?: boolean;
-						isDefault?: boolean;
-						declareName?: boolean;
-						skipName?: boolean;
-				  }
-				| undefined,
-		): AST.Component;
-
 		/**
 		 * Parse a statement
 		 * @param context Statement context ("for", "if", "label", etc.)
@@ -1204,11 +1193,9 @@ export namespace Parse {
 			exports?: AST.ExportSpecifier,
 		):
 			| AST.TSRXExpression
-			| AST.Html
 			| AST.TextNode
 			| ESTreeJSX.JSXEmptyExpression
 			| ESTreeJSX.JSXExpressionContainer
-			| AST.Component
 			| AST.ExpressionStatement
 			| ReturnType<Parser['parseElement']>
 			| AST.Statement;
@@ -1469,7 +1456,7 @@ export namespace Parse {
 		parseExportSpecifiers(exports?: Exports): AST.ExportSpecifier[];
 
 		/** Parse export default declaration */
-		parseExportDefaultDeclaration(): AST.Declaration | AST.Expression | AST.Component;
+		parseExportDefaultDeclaration(): AST.Declaration | AST.Expression;
 
 		/** Check if export statement should be parsed */
 		shouldParseExportStatement(): boolean;

package/types/runtime/ref.d.ts

@@ -37,3 +37,6 @@ export function normalize_spread_props<T extends Record<PropertyKey, any> | null
 	props: T,
 	...outer_refs: unknown[]
 ): T | Record<PropertyKey, any>;
+export function normalize_spread_props_for_ref_attr<
+	T extends Record<PropertyKey, any> | null | undefined,
+>(props: T, ...outer_refs: unknown[]): T | Record<PropertyKey, any>;