ripple 0.2.173 → 0.2.175

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.173",
+  "version": "0.2.175",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",
@@ -78,9 +78,10 @@
   "devDependencies": {
     "@types/estree": "^1.0.8",
     "@types/node": "^24.3.0",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.2",
+    "@volar/language-core": "~2.4.23"
   },
   "peerDependencies": {
-    "ripple": "0.2.173"
+    "ripple": "0.2.175"
   }
 }

package/src/compiler/index.js

@@ -25,20 +25,22 @@ export function parse(source) {
 export function compile(source, filename, options = {}) {
 	const ast = parse_module(source);
 	const analysis = analyze(ast, filename, options);
-	const result = options.mode === 'server'
-		? transform_server(filename, source, analysis)
-		: transform_client(filename, source, analysis, false);
+	const result =
+		options.mode === 'server'
+			? transform_server(filename, source, analysis)
+			: transform_client(filename, source, analysis, false);
 
 	return result;
 }
 
 /** @import { PostProcessingChanges, LineOffsets } from './phases/3-transform/client/index.js' */
+/** @import { MappingsResult } from './phases/3-transform/segments.js' */
 
 /**
  * Compile Ripple component to Volar virtual code with TypeScript mappings
  * @param {string} source
  * @param {string} filename
- * @returns {object} Volar mappings object
+ * @returns {MappingsResult} Volar mappings object
  */
 export function compile_to_volar_mappings(source, filename) {
 	const ast = parse_module(source);
@@ -51,7 +53,7 @@ export function compile_to_volar_mappings(source, filename) {
 		source,
 		transformed.js.code,
 		transformed.js.map,
-    /** @type {PostProcessingChanges} */(transformed.js.post_processing_changes),
-    /** @type {LineOffsets} */(transformed.js.line_offsets)
+		/** @type {PostProcessingChanges} */ (transformed.js.post_processing_changes),
+		/** @type {LineOffsets} */ (transformed.js.line_offsets),
 	);
 }

package/src/compiler/phases/3-transform/client/index.js

@@ -2527,6 +2527,62 @@ function create_tsx_with_typescript_support() {
 		FunctionExpression(node, context) {
 			handle_function(node, context);
 		},
+		// Custom handler for ImportDeclaration to ensure 'import' keyword has source mapping
+		// This creates a source map entry at the start of the import statement
+		// Esrap's default handler writes 'import' without passing the node, so no source map entry
+		ImportDeclaration(node, context) {
+			// Write 'import' keyword with node location for source mapping
+			context.write('import', node);
+			context.write(' ');
+
+			// Write specifiers - handle default, namespace, and named imports
+			if (node.specifiers && node.specifiers.length > 0) {
+				let default_specifier = null;
+				let namespace_specifier = null;
+				const named_specifiers = [];
+
+				for (const spec of node.specifiers) {
+					if (spec.type === 'ImportDefaultSpecifier') {
+						default_specifier = spec;
+					} else if (spec.type === 'ImportNamespaceSpecifier') {
+						namespace_specifier = spec;
+					} else if (spec.type === 'ImportSpecifier') {
+						named_specifiers.push(spec);
+					}
+				}
+
+				// Write default import
+				if (default_specifier) {
+					context.visit(default_specifier);
+					if (namespace_specifier || named_specifiers.length > 0) {
+						context.write(', ');
+					}
+				}
+
+				// Write namespace import
+				if (namespace_specifier) {
+					context.visit(namespace_specifier);
+					if (named_specifiers.length > 0) {
+						context.write(', ');
+					}
+				}
+
+				// Write named imports
+				if (named_specifiers.length > 0) {
+					context.write('{ ');
+					for (let i = 0; i < named_specifiers.length; i++) {
+						if (i > 0) context.write(', ');
+						context.visit(named_specifiers[i]);
+					}
+					context.write(' }');
+				}
+
+				context.write(' from ');
+			}
+
+			// Write source
+			context.visit(node.source);
+		},
 		// Custom handler for TSParenthesizedType: (Type)
 		TSParenthesizedType(node, context) {
 			context.write('(');

package/src/compiler/phases/3-transform/segments.js

@@ -1,19 +1,28 @@
+/**
+ * @typedef {Object} CustomMappingData
+ * @property {number[]} generatedLengths
+ */
+
+/**
+ * @typedef {import('estree').Position} Position
+ * @typedef {{start: Position, end: Position}} Location
+ * @typedef {import('@volar/language-core').CodeMapping} VolarCodeMapping
+ * @typedef {VolarCodeMapping['data'] & {customData: CustomMappingData}} MappingData
+ * @typedef {VolarCodeMapping & {data: MappingData}} CodeMapping
+ * @typedef {{code: string, mappings: CodeMapping[]}} MappingsResult
+ */
+
 import { walk } from 'zimmerframe';
 import { build_source_to_generated_map, get_generated_position } from '../../source-map-utils.js';
 
+/** @type {VolarCodeMapping['data']} */
 export const mapping_data = {
 	verification: true,
 	completion: true,
 	semantic: true,
 	navigation: true,
-	rename: true,
-	codeActions: false, // set to false to disable auto import when importing yourself
-	formatting: false, // not doing formatting through Volar, using Prettier.
-	// these 3 below will be true by default
-	// leaving for reference
-	// hover: true,
-	// definition: true,
-	// references: true,
+	structure: true,
+	format: false,
 };
 
 /**
@@ -28,14 +37,25 @@ export const mapping_data = {
  * @param {object} esrap_source_map - Esrap source map for accurate position lookup
  * @param {PostProcessingChanges } post_processing_changes - Optional post-processing changes
  * @param {number[]} line_offsets - Pre-computed line offsets array for generated code
- * @returns {{ code: string, mappings: Array<{sourceOffsets: number[], generatedOffsets: number[], lengths: number[], data: any}> }}
+ * @returns {MappingsResult}
  */
-export function convert_source_map_to_mappings(ast, source, generated_code, esrap_source_map, post_processing_changes, line_offsets) {
-	/** @type {Array<{sourceOffsets: number[], generatedOffsets: number[], lengths: number[], data: any}>} */
+export function convert_source_map_to_mappings(
+	ast,
+	source,
+	generated_code,
+	esrap_source_map,
+	post_processing_changes,
+	line_offsets,
+) {
+	/** @type {CodeMapping[]} */
 	const mappings = [];
+	let isImportDeclarationPresent = false;
 
-	// Build line offset maps for source and generated code
-	// This allows us to convert line/column positions to byte offsets
+	/**
+	 * Converts line/column positions to byte offsets
+	 * @param {string} text
+	 * @returns {number[]}
+	 */
 	const build_line_offsets = (text) => {
 		const offsets = [0]; // Line 1 starts at offset 0
 		for (let i = 0; i < text.length; i++) {
@@ -52,10 +72,14 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 	 * @param {number} line
 	 * @param {number} column
 	 * @param {number[]} line_offsets
-	 * @returns {number | null}
+	 * @returns {number}
 	 */
 	const loc_to_offset = (line, column, line_offsets) => {
-		if (line < 1 || line > line_offsets.length) return null;
+		if (line < 1 || line > line_offsets.length) {
+			throw new Error(
+				`Location line or line offsets length is out of bounds, line: ${line}, line offsets length: ${line_offsets.length}`,
+			);
+		}
 		return line_offsets[line - 1] + column;
 	};
 
@@ -73,17 +97,20 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 	const adjusted_source_map = build_source_to_generated_map(
 		esrap_source_map,
 		post_processing_changes,
-		line_offsets
+		line_offsets,
 	);
 
 	// Collect text tokens from AST nodes
 	// All tokens must have source/generated text and loc property for accurate positioning
-	/** @type {Array<{
-		source: string,
-		generated: string,
-		is_import_statement?: boolean,
-		loc: {start: {line: number, column: number}, end: {line: number, column: number}}
-	}>} */
+	/**
+	 * @type {Array<{
+	 *		source: string,
+	 *		generated: string,
+	 *		is_full_import_statement?: boolean,
+	 *		loc: Location,
+	 *		end_loc?: Location,
+	 * }>}
+	 */
 	const tokens = [];
 
 	// We have to visit everything in generated order to maintain correct indices
@@ -96,11 +123,19 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 				if (node.name && node.loc) {
 					// Check if this identifier has tracked_shorthand metadata (e.g., TrackedMap -> #Map)
 					if (node.metadata?.tracked_shorthand) {
-						tokens.push({ source: node.metadata.tracked_shorthand, generated: node.name, loc: node.loc });
+						tokens.push({
+							source: node.metadata.tracked_shorthand,
+							generated: node.name,
+							loc: node.loc,
+						});
 					} else if (node.metadata?.is_capitalized) {
 						// This identifier was capitalized during transformation
 						// Map the original lowercase name to the capitalized generated name
-						tokens.push({ source: node.metadata.original_name, generated: node.name, loc: node.loc });
+						tokens.push({
+							source: node.metadata.original_name,
+							generated: node.name,
+							loc: node.loc,
+						});
 					} else {
 						// No transformation - source and generated names are the same
 						tokens.push({ source: node.name, generated: node.name, loc: node.loc });
@@ -111,7 +146,11 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 				// JSXIdentifiers can also be capitalized (for dynamic components)
 				if (node.loc && node.name) {
 					if (node.metadata?.is_capitalized) {
-						tokens.push({ source: node.metadata.original_name, generated: node.name, loc: node.loc });
+						tokens.push({
+							source: node.metadata.original_name,
+							generated: node.name,
+							loc: node.loc,
+						});
 					} else {
 						tokens.push({ source: node.name, generated: node.name, loc: node.loc });
 					}
@@ -123,14 +162,17 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 				}
 				return; // Leaf node, don't traverse further
 			} else if (node.type === 'ImportDeclaration') {
+				isImportDeclarationPresent = true;
+
 				// Add import declaration as a special token for full-statement mapping
 				// TypeScript reports unused imports with diagnostics covering the entire statement
-				if (node.loc) {
+				if (node.loc && node.source?.loc) {
 					tokens.push({
 						source: '',
 						generated: '',
 						loc: node.loc,
-						is_import_statement: true
+						is_full_import_statement: true,
+						end_loc: node.source.loc,
 					});
 				}
 
@@ -152,7 +194,10 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 					visit(node.local);
 				}
 				return;
-			} else if (node.type === 'ImportDefaultSpecifier' || node.type === 'ImportNamespaceSpecifier') {
+			} else if (
+				node.type === 'ImportDefaultSpecifier' ||
+				node.type === 'ImportNamespaceSpecifier'
+			) {
 				// Just visit local
 				if (node.local) {
 					visit(node.local);
@@ -246,17 +291,32 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 				}
 
 				// 3. Push closing tag name (not visited by AST walker)
-				if (!node.openingElement?.selfClosing && node.closingElement?.name?.type === 'JSXIdentifier') {
+				if (
+					!node.openingElement?.selfClosing &&
+					node.closingElement?.name?.type === 'JSXIdentifier'
+				) {
 					const closingNameNode = node.closingElement.name;
 					if (closingNameNode.metadata?.is_capitalized) {
-						tokens.push({ source: closingNameNode.metadata.original_name, generated: closingNameNode.name, loc: closingNameNode.loc });
+						tokens.push({
+							source: closingNameNode.metadata.original_name,
+							generated: closingNameNode.name,
+							loc: closingNameNode.loc,
+						});
 					} else {
-						tokens.push({ source: closingNameNode.name, generated: closingNameNode.name, loc: closingNameNode.loc });
+						tokens.push({
+							source: closingNameNode.name,
+							generated: closingNameNode.name,
+							loc: closingNameNode.loc,
+						});
 					}
 				}
 
 				return;
-			} else if (node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression') {
+			} else if (
+				node.type === 'FunctionDeclaration' ||
+				node.type === 'FunctionExpression' ||
+				node.type === 'ArrowFunctionExpression'
+			) {
 				// Add function/component keyword token
 				if (node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') {
 					const source_keyword = node.metadata?.was_component ? 'component' : 'function';
@@ -266,8 +326,11 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 						generated: 'function',
 						loc: {
 							start: { line: node.loc.start.line, column: node.loc.start.column },
-							end: { line: node.loc.start.line, column: node.loc.start.column + source_keyword.length }
-						}
+							end: {
+								line: node.loc.start.line,
+								column: node.loc.start.column + source_keyword.length,
+							},
+						},
 					});
 				}
 
@@ -654,7 +717,11 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 					}
 				}
 				return;
-			} else if (node.type === 'JSXClosingElement' || node.type === 'JSXClosingFragment' || node.type === 'JSXOpeningFragment') {
+			} else if (
+				node.type === 'JSXClosingElement' ||
+				node.type === 'JSXClosingFragment' ||
+				node.type === 'JSXOpeningFragment'
+			) {
 				// These are handled by their parent nodes
 				return;
 			} else if (node.type === 'JSXMemberExpression') {
@@ -736,7 +803,10 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 				}
 				// Skip typeAnnotation
 				return;
-			} else if (node.type === 'TSTypeParameterInstantiation' || node.type === 'TSTypeParameterDeclaration') {
+			} else if (
+				node.type === 'TSTypeParameterInstantiation' ||
+				node.type === 'TSTypeParameterDeclaration'
+			) {
 				// Generic type parameters - visit to collect type variable names
 				if (node.params) {
 					for (const param of node.params) {
@@ -881,7 +951,10 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 					visit(node.typeAnnotation);
 				}
 				return;
-			} else if (node.type === 'TSCallSignatureDeclaration' || node.type === 'TSConstructSignatureDeclaration') {
+			} else if (
+				node.type === 'TSCallSignatureDeclaration' ||
+				node.type === 'TSConstructSignatureDeclaration'
+			) {
 				// Call or construct signature
 				if (node.typeParameters) {
 					visit(node.typeParameters);
@@ -1078,7 +1151,22 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 					visit(node.typeAnnotation);
 				}
 				return;
-			} else if (node.type === 'TSAnyKeyword' || node.type === 'TSUnknownKeyword' || node.type === 'TSNumberKeyword' || node.type === 'TSObjectKeyword' || node.type === 'TSBooleanKeyword' || node.type === 'TSBigIntKeyword' || node.type === 'TSStringKeyword' || node.type === 'TSSymbolKeyword' || node.type === 'TSVoidKeyword' || node.type === 'TSUndefinedKeyword' || node.type === 'TSNullKeyword' || node.type === 'TSNeverKeyword' || node.type === 'TSThisType' || node.type === 'TSIntrinsicKeyword') {
+			} else if (
+				node.type === 'TSAnyKeyword' ||
+				node.type === 'TSUnknownKeyword' ||
+				node.type === 'TSNumberKeyword' ||
+				node.type === 'TSObjectKeyword' ||
+				node.type === 'TSBooleanKeyword' ||
+				node.type === 'TSBigIntKeyword' ||
+				node.type === 'TSStringKeyword' ||
+				node.type === 'TSSymbolKeyword' ||
+				node.type === 'TSVoidKeyword' ||
+				node.type === 'TSUndefinedKeyword' ||
+				node.type === 'TSNullKeyword' ||
+				node.type === 'TSNeverKeyword' ||
+				node.type === 'TSThisType' ||
+				node.type === 'TSIntrinsicKeyword'
+			) {
 				// Primitive type keywords - leaf nodes, no children
 				return;
 			} else if (node.type === 'TSDeclareFunction') {
@@ -1120,67 +1208,77 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 			}
 
 			throw new Error(`Unhandled AST node type in mapping walker: ${node.type}`);
-		}
+		},
 	});
 
-	// Process each token in order
-	// All tokens now have .loc property - no need for fallback logic
 	for (const token of tokens) {
 		const source_text = token.source;
+		const gen_text = token.generated;
 
-		// Handle import statement full-statement mapping
-		if (token.is_import_statement) {
-			// Get source position from start
-			const source_start = loc_to_offset(token.loc.start.line, token.loc.start.column, source_line_offsets);
-			const source_end = loc_to_offset(token.loc.end.line, token.loc.end.column, source_line_offsets);
+		const source_start = loc_to_offset(
+			token.loc.start.line,
+			token.loc.start.column,
+			source_line_offsets,
+		);
 
-			// Get generated positions using source map
-			const gen_start_pos = get_generated_position(token.loc.start.line, token.loc.start.column, adjusted_source_map);
-			const gen_end_pos = get_generated_position(token.loc.end.line, token.loc.end.column, adjusted_source_map);
+		let source_length = source_text.length;
+		let gen_length = gen_text.length;
+		/** @type {MappingData} */
+		let data;
+		/** @type {number} */
+		let gen_start;
 
-			if (source_start !== null && source_end !== null && gen_start_pos && gen_end_pos) {
-				// Convert generated line:col to byte offsets
-				const gen_start = gen_loc_to_offset(gen_start_pos.line, gen_start_pos.column);
-				const gen_end = gen_loc_to_offset(gen_end_pos.line, gen_end_pos.column);
+		if (token.is_full_import_statement) {
+			const end_loc = /** @type {Location} */ (token.end_loc).end;
+			const source_end = loc_to_offset(end_loc.line, end_loc.column, source_line_offsets);
 
-				const source_length = source_end - source_start;
-				const gen_length = gen_end - gen_start;
+			// Look up where import keyword and source literal map to in generated code
+			const gen_start_pos = get_generated_position(
+				token.loc.start.line,
+				token.loc.start.column,
+				adjusted_source_map,
+			);
+			const gen_end_pos = get_generated_position(end_loc.line, end_loc.column, adjusted_source_map);
 
-				mappings.push({
-					sourceOffsets: [source_start],
-					generatedOffsets: [gen_start],
-					lengths: [Math.min(source_length, gen_length)],
-					data: {
-						// only verification (diagnostics) to avoid duplicate hover/completion
-						verification: true
-					},
-				});
-			}
-			continue;
-		}
+			gen_start = gen_loc_to_offset(gen_start_pos.line, gen_start_pos.column);
+			const gen_end = gen_loc_to_offset(gen_end_pos.line, gen_end_pos.column);
 
-		// Use .loc to get the exact source position
-		const source_pos = loc_to_offset(token.loc.start.line, token.loc.start.column, source_line_offsets);
+			source_length = source_end - source_start;
+			gen_length = gen_end - gen_start;
 
-		// Get generated position using source map
-		const gen_line_col = get_generated_position(token.loc.start.line, token.loc.start.column, adjusted_source_map);
-		let gen_pos = null;
-		if (gen_line_col) {
-			// Convert generated line:col to byte offset
-			gen_pos = gen_loc_to_offset(gen_line_col.line, gen_line_col.column);
+			data = {
+				// we only want verification here, like unused imports
+				// since this is synthetic and otherwise we'll get duplicated actions like intellisense
+				// each imported specifier has its own mapping
+				verification: true,
+				customData: {
+					generatedLengths: [gen_length],
+				},
+			};
 		} else {
-			// No mapping found in source map - this shouldn't happen since all tokens should have mappings
-			console.warn(`[segments.js] No source map entry for token "${source_text}" at ${token.loc.start.line}:${token.loc.start.column}`);
-		}
+			const gen_line_col = get_generated_position(
+				token.loc.start.line,
+				token.loc.start.column,
+				adjusted_source_map,
+			);
+			gen_start = gen_loc_to_offset(gen_line_col.line, gen_line_col.column);
 
-		if (source_pos !== null && gen_pos !== null) {
-			mappings.push({
-				sourceOffsets: [source_pos],
-				generatedOffsets: [gen_pos],
-				lengths: [source_text.length],
-				data: mapping_data,
-			});
+			data = {
+				...mapping_data,
+				customData: {
+					generatedLengths: [gen_length],
+				},
+			};
 		}
+
+		// !IMPORTANT: don't set generatedLengths, otherwise Volar will use that vs our source
+		// We're adding it to our custom metadata instead as we need it for patching positions
+		mappings.push({
+			sourceOffsets: [source_start],
+			generatedOffsets: [gen_start],
+			lengths: [source_length],
+			data,
+		});
 	}
 
 	// Sort mappings by source offset	// Sort mappings by source offset
@@ -1188,16 +1286,17 @@ export function convert_source_map_to_mappings(ast, source, generated_code, esra
 
 	// Add a mapping for the very beginning of the file to handle import additions
 	// This ensures that code actions adding imports at the top work correctly
-	if (mappings.length > 0 && mappings[0].sourceOffsets[0] > 0) {
+	if (!isImportDeclarationPresent && mappings.length > 0 && mappings[0].sourceOffsets[0] > 0) {
 		mappings.unshift({
 			sourceOffsets: [0],
 			generatedOffsets: [0],
 			lengths: [1],
 			data: {
 				...mapping_data,
-				codeActions: true, // auto-import
-				rename: false, // avoid rename for a “dummy” mapping
-			}
+				customData: {
+					generatedLengths: [1],
+				},
+			},
 		});
 	}
 

package/src/compiler/source-map-utils.js

@@ -44,7 +44,10 @@ export function build_source_to_generated_map(source_map, post_processing_change
 
 		while (left <= right) {
 			const mid = Math.floor((left + right) / 2);
-			if (offset >= line_offsets[mid] && (mid === line_offsets.length - 1 || offset < line_offsets[mid + 1])) {
+			if (
+				offset >= line_offsets[mid] &&
+				(mid === line_offsets.length - 1 || offset < line_offsets[mid + 1])
+			) {
 				line = mid + 1;
 				break;
 			} else if (offset < line_offsets[mid]) {
@@ -114,14 +117,15 @@ export function build_source_to_generated_map(source_map, post_processing_change
  * @param {number} source_line - 1-based line number in source
  * @param {number} source_column - 0-based column number in source
  * @param {SourceToGeneratedMap} source_to_gen_map - Lookup map
- * @returns {{line: number, column: number} | null} Generated position or null if not found
+ * @returns {{line: number, column: number}} Generated position
  */
 export function get_generated_position(source_line, source_column, source_to_gen_map) {
 	const key = `${source_line}:${source_column}`;
 	const positions = source_to_gen_map.get(key);
 
 	if (!positions || positions.length === 0) {
-		return null;
+		// No mapping found in source map - this shouldn't happen since all tokens should have mappings
+		throw new Error(`No source map entry for position "${source_line}:${source_column}"`);
 	}
 
 	// If multiple generated positions map to same source, return the first

package/src/runtime/internal/client/bindings.js

@@ -256,10 +256,10 @@ export function bindChecked(maybe_tracked) {
 		throw not_tracked_type_error('bindChecked()');
 	}
 
-	const tracked = /** @type {Tracked} */ (maybe_tracked);
+	var tracked = /** @type {Tracked} */ (maybe_tracked);
 
 	return (input) => {
-		const clear_event = on(input, 'change', () => {
+		var clear_event = on(input, 'change', () => {
 			set(tracked, input.checked);
 		});
 
@@ -281,10 +281,10 @@ export function bindIndeterminate(maybe_tracked) {
 		throw not_tracked_type_error('bindIndeterminate()');
 	}
 
-	const tracked = /** @type {Tracked} */ (maybe_tracked);
+	var tracked = /** @type {Tracked} */ (maybe_tracked);
 
 	return (input) => {
-		const clear_event = on(input, 'change', () => {
+		var clear_event = on(input, 'change', () => {
 			set(tracked, input.indeterminate);
 		});
 
@@ -367,7 +367,7 @@ function bind_element_size(maybe_tracked, type) {
 		);
 
 		effect(() => {
-			untrack(() => set(tracked, element[type]));
+			set(tracked, element[type]);
 			return unsubscribe;
 		});
 	};
@@ -474,10 +474,10 @@ export function bind_content_editable(maybe_tracked, property) {
 		throw not_tracked_type_error(`bind${property.charAt(0).toUpperCase() + property.slice(1)}()`);
 	}
 
-	const tracked = /** @type {Tracked} */ (maybe_tracked);
+	var tracked = /** @type {Tracked} */ (maybe_tracked);
 
 	return (element) => {
-		const clear_event = on(element, 'input', () => {
+		var clear_event = on(element, 'input', () => {
 			set(tracked, element[property]);
 		});
 
@@ -533,12 +533,22 @@ export function bindFiles(maybe_tracked) {
 		throw not_tracked_type_error('bindFiles()');
 	}
 
-	const tracked = /** @type {Tracked} */ (maybe_tracked);
+	var tracked = /** @type {Tracked} */ (maybe_tracked);
 
 	return (input) => {
-		return on(input, 'change', () => {
+		var clear_event = on(input, 'change', () => {
 			set(tracked, input.files);
 		});
+
+		effect(() => {
+			var value = get(tracked);
+
+			if (value !== input.files && value instanceof FileList) {
+				input.files = value;
+			}
+		});
+
+		return clear_event;
 	};
 }
 
@@ -552,7 +562,7 @@ export function bindNode(maybe_tracked) {
 		throw not_tracked_type_error('bindNode()');
 	}
 
-	const tracked = /** @type {Tracked} */ (maybe_tracked);
+	var tracked = /** @type {Tracked} */ (maybe_tracked);
 
 	/** @param {HTMLElement} node */
 	return (node) => {

package/src/runtime/internal/client/blocks.js

@@ -369,8 +369,10 @@ export function destroy_block(block, remove_dom = true) {
 
 	if ((remove_dom && (f & (BRANCH_BLOCK | ROOT_BLOCK)) !== 0) || (f & HEAD_BLOCK) !== 0) {
 		var s = block.s;
-		remove_block_dom(s.start, s.end);
-		removed = true;
+		if (s !== null) {
+			remove_block_dom(s.start, s.end);
+			removed = true;
+		}
 	}
 
 	destroy_block_children(block, remove_dom && !removed);

package/tests/client/basic/basic.components.test.ripple

@@ -284,4 +284,29 @@ describe('basic client > components & composition', () => {
 			render(App);
 		}).not.toThrow();
 	});
+
+	it('handles component without any output', () => {
+		component Noop() {
+			// No output
+		}
+
+		component Op() {
+			<div>{'Some HTML content'}</div>
+		}
+
+		component App() {
+			let Content = track(() => Noop);
+			<@Content />
+
+			<button onClick={() => @Content = Op}>{'Show Op'}</button>
+		}
+
+		render(App);
+
+		const button = container.querySelector('button');
+
+		expect(() => {
+			button.click();
+		}).not.toThrow();
+	});
 });

package/tests/client/composite/composite.props.test.ripple

@@ -81,7 +81,7 @@ describe('composite > props', () => {
 				logs.push(@count);
 			});
 
-			<button onClick={() => @count = @count + 1}>{'+'}</button>
+			<button onClick={() => (@count = @count + 1)}>{'+'}</button>
 		}
 
 		component App() {
@@ -122,7 +122,7 @@ describe('composite > props', () => {
 
 		component Toggle(props) {
 			const [pressed, rest] = trackSplit(props, ['pressed']);
-			const onClick = () => @pressed = !@pressed;
+			const onClick = () => (@pressed = !@pressed);
 			<Button {...@rest} class={@pressed ? 'on' : 'off'} {onClick}>{'button 1'}</Button>
 			<Button class={@pressed ? 'on' : 'off'} {onClick}>{'button 2'}</Button>
 		}