@ripple-ts/language-server 0.3.71 → 0.3.74

package/dist/language-server.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_server = require('./server-CiwRUSRR.js');
+const require_server = require('./server-Coiob8an.js');
 
 //#region src/language-server.js
 require_server.createRippleLanguageServer();

package/dist/{server-CiwRUSRR.js → server-Coiob8an.js}

@@ -20054,12 +20054,18 @@ function parseCompilationErrorWithDocument(error, virtualCode, sourceMap, docume
 		if (mapping) {
 			start = document.positionAt(mapping.generatedOffsets[0]);
 			end = document.positionAt(mapping.generatedOffsets[0] + mapping.generatedLengths[0]);
-		} else if (sourceMap) {
-			const result = sourceMap.toGeneratedRange(start_offset, end_offset, true).next().value;
-			if (result) {
-				const [gen_start_offset, gen_end_offset] = result;
-				start = document.positionAt(gen_start_offset);
-				end = document.positionAt(gen_end_offset);
+		} else {
+			const generated = virtualCode.findGeneratedRangeBySourceRange(start_offset, end_offset);
+			if (generated) {
+				start = document.positionAt(generated[0]);
+				end = document.positionAt(generated[1]);
+			} else if (sourceMap) {
+				const result = sourceMap.toGeneratedRange(start_offset, end_offset, true).next().value;
+				if (result) {
+					const [gen_start_offset, gen_end_offset] = result;
+					start = document.positionAt(gen_start_offset);
+					end = document.positionAt(gen_end_offset);
+				}
 			}
 		}
 	}
@@ -20149,8 +20155,7 @@ const COMPILER_CANDIDATES = [
 		[
 			"@tsrx/ripple",
 			"ripple",
-			"@ripple-ts/vite-plugin",
-			"@ripple-ts/compat-react"
+			"@ripple-ts/vite-plugin"
 		]
 	],
 	[
@@ -20486,8 +20491,54 @@ var TSRXVirtualCode = class {
 		this.#buildMappingCache();
 		return this.#mappingSourceToGen.get(`${start}-${end}`) ?? null;
 	}
+	/**
+	* Resolve a source range to a generated `[start, end]` offset pair by spanning
+	* the token mappings that overlap it.
+	*
+	* Statement and element source ranges are only ever covered by several
+	* granular token mappings (e.g. `const test = 5;` maps as `const `, `test`,
+	* ` = `, `5`, `;`), and keywords/punctuation are frequently dropped entirely,
+	* so an exact `findMappingBySourceRange` lookup never matches a multi-token
+	* range and the endpoints often fall on unmapped tokens. Callers that have a
+	* range with no exact mapping (such as compile-error diagnostics) use this to
+	* land on the range: the generated start comes from the first overlapping
+	* token and the generated end from the last, so an error pointing at a `const`
+	* keyword still resolves via the `test`/`5` tokens that follow it.
+	*
+	* @param {number} start - Start of the source range
+	* @param {number} end - Exclusive end of the source range
+	* @returns {[number, number] | null} Generated `[start, end]`, or null if no
+	*   token overlaps the range
+	*/
+	findGeneratedRangeBySourceRange(start, end) {
+		/** @type {CodeMapping | null} */
+		let first = null;
+		/** @type {CodeMapping | null} */
+		let last = null;
+		for (let i = 0; i < this.mappings.length; i++) {
+			const mapping = this.mappings[i];
+			const sourceStart = mapping.sourceOffsets[0];
+			const sourceEnd = sourceStart + mapping.lengths[0];
+			if (sourceEnd <= start || sourceStart >= end) continue;
+			if (!first || sourceStart < first.sourceOffsets[0]) first = mapping;
+			if (!last || sourceEnd > last.sourceOffsets[0] + last.lengths[0]) last = mapping;
+		}
+		if (!first || !last) return null;
+		const generated_start = first.generatedOffsets[0] + clamp_offset(start - first.sourceOffsets[0], first.generatedLengths[0]);
+		const generated_end = last.generatedOffsets[0] + clamp_offset(end - last.sourceOffsets[0], last.generatedLengths[0]);
+		return [generated_start, Math.max(generated_end, generated_start + 1)];
+	}
 };
 /**
+* Clamp an intra-token offset into `[0, length]`.
+* @param {number} offset
+* @param {number} length
+* @returns {number}
+*/
+function clamp_offset(offset, length) {
+	return Math.min(Math.max(offset, 0), length);
+}
+/**
 * @param {string} file_name
 * @param {ReadonlyArray<unknown>} errors
 */
@@ -21218,7 +21269,7 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "Ripple component function",
 		documentation: "Create a new Ripple component",
-		insertText: "function ${1:ComponentName}(${2:props}) {\n	return <>\n		$0\n	</>;\n}",
+		insertText: "function ${1:ComponentName}(${2:props}) @{\n	$0\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-function-component"
 	},
@@ -21263,7 +21314,7 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "for...of loop",
 		documentation: "Iterate over items in Ripple template",
-		insertText: "for (const ${1:item} of ${2:items}) {\n	<${3:li}>{${1:item}}</${3:li}>\n}",
+		insertText: "@for (const ${1:item} of ${2:items}) {\n	<${3:li}>{${1:item}}</${3:li}>\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-for-of"
 	},
@@ -21272,7 +21323,7 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "for...of loop with index",
 		documentation: "Iterate with index",
-		insertText: "for (const ${1:item} of ${2:items}; index ${3:i}) {\n	<${4:li}>{${1:item}}{\" at \"}{${3:i}}</${4:li}>\n}",
+		insertText: "@for (const ${1:item} of ${2:items}; index ${3:i}) {\n	<${4:li}>{${1:item}} at {${3}}</${4:li}>\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-for-index"
 	},
@@ -21281,16 +21332,25 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "for...of loop with key",
 		documentation: "Iterate with key for identity",
-		insertText: "for (const ${1:item} of ${2:items}; key ${1:item}.${3:id}) {\n	<${4:li}>{${1:item}.${5:text}}</${4:li}>\n}",
+		insertText: "@for (const ${1:item} of ${2:items}; key ${1:item}.${3:id}) {\n	<${4:li}>{${1:item}.${5:text}}</${4:li}>\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-for-key"
 	},
+	{
+		label: "for-empty",
+		kind: import_language_server.CompletionItemKind.Snippet,
+		detail: "for...of loop with empty fallback",
+		documentation: "Iterate over items with an empty fallback",
+		insertText: "@for (const ${1:item} of ${2:items}; key ${1:item}.${3:id}) {\n	<${4:li}>{${1:item}.${5:text}}</${4:li}>\n} @empty {\n	<${6:li}>${7:No items}</${6:li}>\n}",
+		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
+		sortText: "0-for-empty"
+	},
 	{
 		label: "for-index-key",
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "for...of loop with key",
 		documentation: "Iterate with key for identity",
-		insertText: "for (const ${1:item} of ${2:items}; index ${3:i}; key ${1:item}.${4:id}) {\n	<${5:li}>{${1:item}.${6:text}}{' at index '}{${3}}</${5:li}>\n}",
+		insertText: "@for (const ${1:item} of ${2:items}; index ${3:i}; key ${1:item}.${4:id}) {\n	<${5:li}>{${1:item}.${6:text}} at index {${3}}</${5:li}>\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-for-key-index"
 	},
@@ -21299,7 +21359,7 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "if...else statement",
 		documentation: "Conditional rendering",
-		insertText: "if (${1:condition}) {\n	$2\n} else {\n	$3\n}",
+		insertText: "@if (${1:condition}) {\n	<>\n		$2\n	</>\n} else {\n	<>\n		$3\n	</>\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-if-else"
 	},
@@ -21308,7 +21368,7 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "switch statement",
 		documentation: "Switch-based conditional rendering",
-		insertText: "switch (${1:value}) {\n	case ${2:'case1'}:\n		$3\n		break;\n	case ${4:'case2'}:\n		$5\n		break;\n	default:\n		$6\n}",
+		insertText: "@switch (${1:value}) {\n	case ${2:'case1'}: {\n		<>\n			$3\n		</>\n	}\n	case ${4:'case2'}: {\n		<>\n			$5\n		</>\n	}\n	default: {\n		<>\n			$6\n		</>\n	}\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-switch-case"
 	},
@@ -21326,7 +21386,7 @@ const RIPPLE_SNIPPETS = [
 		kind: import_language_server.CompletionItemKind.Snippet,
 		detail: "try...pending block",
 		documentation: "Handle async content with loading fallback",
-		insertText: "try {\n	$1\n} pending {\n	<div>{'Loading...'}</div>\n}",
+		insertText: "@try {\n	$1\n} @pending {\n	<div>Loading...</div>\n}",
 		insertTextFormat: import_language_server.InsertTextFormat.Snippet,
 		sortText: "0-try-pending"
 	}
@@ -21367,7 +21427,11 @@ function createCompletionPlugin() {
 	return {
 		name: "ripple-completion-enhancer",
 		capabilities: { completionProvider: {
-			triggerCharacters: ["<", "{"],
+			triggerCharacters: [
+				"<",
+				"{",
+				"@"
+			],
 			resolveProvider: false
 		} },
 		create(context) {
@@ -21777,14 +21841,16 @@ function createDocumentSymbolPlugin() {
 				if (!is_ripple_document(document.uri)) return [];
 				const { virtualCode, sourceMap, sourceUri } = getVirtualCode(document, context);
 				const { sourceAst, languageId, originalCode } = virtualCode || {};
+				const fallbackFileName = sourceUri?.fsPath ?? document.uri;
+				if (!virtualCode) return collectFallbackDocumentSymbols(document, fallbackFileName) ?? [];
 				if (languageId !== "ripple") {
 					log$1(`Skipping symbols in the '${languageId}' context`);
 					return [];
 				}
 				const cacheKey = sourceUri.toString();
 				const cachedSymbols = documentSymbolCache.get(cacheKey) ?? [];
-				if (virtualCode?.fatalErrors?.length || virtualCode?.isDotCompletionMode) return cachedSymbols;
-				if (!sourceMap || !sourceAst) return [];
+				if (virtualCode?.fatalErrors?.length || virtualCode?.isDotCompletionMode) return collectFallbackDocumentSymbols(document, fallbackFileName) ?? cachedSymbols;
+				if (!sourceMap || !sourceAst) return collectFallbackDocumentSymbols(document, fallbackFileName) ?? [];
 				const sourceDocument = TextDocument.create(sourceUri.toString(), "ripple", 0, originalCode);
 				const symbols = mapDocumentSymbolsToGenerated(collectDocumentSymbols(sourceAst, sourceDocument), virtualCode, sourceDocument, document, sourceMap);
 				documentSymbolCache.set(cacheKey, symbols);
@@ -21794,6 +21860,29 @@ function createDocumentSymbolPlugin() {
 	};
 }
 /**
+* @param {TextDocument} document
+* @param {string} fileName
+* @returns {DocumentSymbol[] | null}
+*/
+function collectFallbackDocumentSymbols(document, fileName) {
+	try {
+		return toDocumentSymbols(collectDocumentSymbols((0, _tsrx_core.parseModule)(document.getText(), fileName), document));
+	} catch (error) {
+		logError$1(`Unable to collect fallback document symbols: ${error.message}`);
+		return null;
+	}
+}
+/**
+* @param {SymbolInfo[]} symbols
+* @returns {DocumentSymbol[]}
+*/
+function toDocumentSymbols(symbols) {
+	return symbols.map(([symbol]) => ({
+		...symbol,
+		children: symbol.children?.length ? toDocumentSymbols(symbol.children) : void 0
+	}));
+}
+/**
 * @param {SymbolInfo[]} symbols
 * @param {TSRXVirtualCodeInstance} virtualCode
 * @param {TextDocument} sourceDocument
@@ -22050,7 +22139,7 @@ function getReturnedTemplateSymbols(node, document) {
 * @returns {boolean}
 */
 function isTemplateNode(node) {
-	return !!node && (node.type === "Tsrx" || node.type === "Tsx" || node.type === "Element" || node.type === "JSXElement" || node.type === "JSXFragment");
+	return !!node && (node.type === "JSXElement" || node.type === "JSXFragment" || node.type === "JSXStyleElement");
 }
 /**
 * @param {AST.Node} node
@@ -22319,4 +22408,4 @@ Object.defineProperty(exports, 'createRippleLanguageServer', {
     return createRippleLanguageServer;
   }
 });
-//# sourceMappingURL=server-CiwRUSRR.js.map
+//# sourceMappingURL=server-Coiob8an.js.map