@tsrx/core 0.0.1 → 0.0.2

package/src/scope.js

@@ -2,7 +2,7 @@
 @import {
 	Binding,
 	ScopeInterface,
-	ScopeRoot as ScopeRootInterface,
+	ScopeRootInterface,
 	Context,
 	ScopeConstructorInterface,
 	ScopeConstructorParameters

package/src/source-map-utils.js

@@ -1,26 +1,26 @@
 /**
- @import { PostProcessingChanges, LineOffsets } from '../types/index';
- @import * as AST from 'estree';
- @import { CodeMapping } from '../types/index';
- @import { CodeMapping as VolarCodeMapping } from '@volar/language-core';
- @import { RawSourceMap } from 'source-map';
+ * @import { PostProcessingChanges, LineOffsets } from '../types/index.js';
+ * @import * as AST from 'estree';
+ * @import { CodeMapping } from '../types/index.js';
+ * @import { CodeMapping as VolarCodeMapping } from '@volar/language-core';
+ * @import { RawSourceMap } from 'source-map';
  */
 
 /**
- @typedef {{
-	 line: number,
-	column: number,
-	end_line: number,
-	end_column: number,
-	code: string,
-	metadata: {
-		css?: AST.Element['metadata']['css']
-	},
-}} CodePosition
-
-@typedef {Map<string, CodePosition[]>} CodeToGeneratedMap
-@typedef {Map<string, {line: number, column: number}[]>} GeneratedToSourceMap
-*/
+ * @typedef {{
+ *   line: number,
+ *   column: number,
+ *   end_line: number,
+ *   end_column: number,
+ *   code: string,
+ *   metadata: {
+ *     css?: AST.Element['metadata']['css']
+ *   },
+ * }} CodePosition
+ */
+
+/** @typedef {Map<string, CodePosition[]>} CodeToGeneratedMap */
+/** @typedef {Map<string, {line: number, column: number}[]>} GeneratedToSourceMap */
 
 import { decode } from '@jridgewell/sourcemap-codec';
 

package/src/transform/segments.js

@@ -9,6 +9,7 @@
 	CodeMapping,
 	VolarMappingsResult,
 	PostProcessingChanges,
+	LineOffsets,
 } from '../../types/index';
 @import { CodeMapping as VolarCodeMapping } from '@volar/language-core';
  */
@@ -982,9 +983,11 @@ export function convert_source_map_to_mappings(
 					visit(node.body);
 				}
 
-				mappings.push(
-					get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
-				);
+				if (node.loc) {
+					mappings.push(
+						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
+					);
+				}
 
 				return;
 			} else if (node.type === 'WhileStatement' || node.type === 'DoWhileStatement') {
@@ -1321,9 +1324,11 @@ export function convert_source_map_to_mappings(
 					}
 				}
 
-				mappings.push(
-					get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
-				);
+				if (node.loc) {
+					mappings.push(
+						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
+					);
+				}
 
 				return;
 			} else if (node.type === 'SwitchCase') {
@@ -2030,11 +2035,16 @@ export function convert_source_map_to_mappings(
 		);
 		const source_length = source_text.length;
 		const gen_length = gen_text.length;
-		const gen_line_col = get_generated_position(
-			token.loc.start.line,
-			token.loc.start.column,
-			src_to_gen_map,
-		);
+		let gen_line_col;
+		try {
+			gen_line_col = get_generated_position(
+				token.loc.start.line,
+				token.loc.start.column,
+				src_to_gen_map,
+			);
+		} catch {
+			continue;
+		}
 		const gen_start = loc_to_offset(gen_line_col.line, gen_line_col.column, gen_line_offsets);
 
 		/** @type {CustomMappingData} */
@@ -2138,3 +2148,83 @@ export function convert_source_map_to_mappings(
 		cssMappings,
 	};
 }
+
+/**
+ * Build a `VolarMappingsResult` from generated code plus source-map metadata.
+ *
+ * Framework packages are responsible for producing the generated AST/code/map.
+ * Core owns the generic mapping conversion and result envelope so the editor
+ * integration is not coupled to any specific framework package.
+ *
+ * @param {{
+ * 	ast: AST.Program,
+ * 	ast_from_source: AST.Program,
+ * 	source: string,
+ * 	generated_code: string,
+ * 	source_map: RawSourceMap,
+ * 	errors?: import('../../types/index').CompileError[],
+ * 	post_processing_changes?: PostProcessingChanges,
+ * 	line_offsets?: LineOffsets,
+ * }} params
+ * @returns {VolarMappingsResult}
+ */
+export function create_volar_mappings_result({
+	ast,
+	ast_from_source,
+	source,
+	generated_code,
+	source_map,
+	errors = [],
+	post_processing_changes,
+	line_offsets,
+}) {
+	return {
+		...convert_source_map_to_mappings(
+			ast,
+			ast_from_source,
+			source,
+			generated_code,
+			source_map,
+			/** @type {PostProcessingChanges} */ (post_processing_changes),
+			line_offsets ?? build_line_offsets(generated_code),
+		),
+		errors,
+	};
+}
+
+/**
+ * Build a coarse `VolarMappingsResult` when a framework can emit valid TS/TSX
+ * for checking but does not yet produce a location-rich generated AST for the
+ * fine-grained source-map conversion path.
+ *
+ * @param {{
+ * 	source: string,
+ * 	generated_code: string,
+ * 	errors?: import('../../types/index').CompileError[],
+ * }} params
+ * @returns {VolarMappingsResult}
+ */
+export function create_basic_volar_mappings_result({ source, generated_code, errors = [] }) {
+	const shared_length = Math.min(source.length, generated_code.length);
+
+	return {
+		code: generated_code,
+		mappings:
+			shared_length > 0
+				? [
+						{
+							sourceOffsets: [0],
+							generatedOffsets: [0],
+							lengths: [shared_length],
+							generatedLengths: [shared_length],
+							data: {
+								...mapping_data,
+								customData: {},
+							},
+						},
+					]
+				: [],
+		cssMappings: [],
+		errors,
+	};
+}

package/types/index.d.ts

@@ -1,10 +1,10 @@
 import type * as AST from 'estree';
 import type * as ESTreeJSX from 'estree-jsx';
 import type { TSESTree } from '@typescript-eslint/types';
-import type { Parse } from './parse';
+import type { Parse } from './parse.js';
 import type * as ESRap from 'esrap';
 import type { Position } from 'acorn';
-import type { RequireAllOrNone } from '../src/helpers';
+import type { RequireAllOrNone } from '../src/helpers.js';
 
 export type { Parse };
 
@@ -163,7 +163,7 @@ declare module 'estree' {
 		Component: Component;
 		Tsx: Tsx;
 		TsxCompat: TsxCompat;
-		RippleExpression: RippleExpression;
+		TSRXExpression: TSRXExpression;
 		Html: Html;
 		Element: Element;
 		Text: TextNode;
@@ -329,8 +329,8 @@ declare module 'estree' {
 		expression: AST.Expression;
 	}
 
-	export interface RippleExpression extends AST.BaseExpression {
-		type: 'RippleExpression';
+	export interface TSRXExpression extends AST.BaseExpression {
+		type: 'TSRXExpression';
 		expression: AST.Expression;
 		loc?: AST.SourceLocation;
 	}
@@ -339,7 +339,7 @@ declare module 'estree' {
 		type: 'Element';
 		// MemberExpression for namespaced or dynamic elements
 		id: AST.Identifier | AST.MemberExpression;
-		attributes: RippleAttribute[];
+		attributes: TSRXAttribute[];
 		children: AST.Node[];
 		selfClosing?: boolean;
 		unclosed?: boolean;
@@ -421,33 +421,33 @@ declare module 'estree' {
 	 * Ripple's extended Declaration type that includes Component
 	 * Use this instead of Declaration when you need Component support
 	 */
-	export type RippleDeclaration = AST.Declaration | Component | AST.TSDeclareFunction;
+	export type TSRXDeclaration = AST.Declaration | Component | AST.TSDeclareFunction;
 
 	/**
 	 * Ripple's extended ExportNamedDeclaration with Component support
 	 */
-	interface RippleExportNamedDeclaration extends Omit<AST.ExportNamedDeclaration, 'declaration'> {
-		declaration?: RippleDeclaration | null | undefined;
+	interface TSRXExportNamedDeclaration extends Omit<AST.ExportNamedDeclaration, 'declaration'> {
+		declaration?: TSRXDeclaration | null | undefined;
 	}
 
 	/**
 	 * Ripple's extended Program with Component support
 	 */
-	interface RippleProgram extends Omit<Program, 'body'> {
+	interface TSRXProgram extends Omit<Program, 'body'> {
 		body: (Program['body'][number] | Component | FunctionExpression)[];
 	}
 
-	interface RippleMethodDefinition extends Omit<AST.MethodDefinition, 'value'> {
+	interface TSRXMethodDefinition extends Omit<AST.MethodDefinition, 'value'> {
 		value: AST.MethodDefinition['value'] | Component;
 	}
 
-	interface RippleProperty extends Omit<AST.Property, 'value'> {
+	interface TSRXProperty extends Omit<AST.Property, 'value'> {
 		value: AST.Property['value'] | Component;
 	}
 
-	export type RippleAttribute = AST.Attribute | AST.SpreadAttribute | AST.RefAttribute;
+	export type TSRXAttribute = AST.Attribute | AST.SpreadAttribute | AST.RefAttribute;
 
-	export type RippleStatement = AST.Statement | TSESTree.Statement;
+	export type TSRXStatement = AST.Statement | TSESTree.Statement;
 
 	export type NodeWithChildren = AST.Element | AST.Tsx | AST.TsxCompat;
 
@@ -658,11 +658,11 @@ declare module 'estree-jsx' {
 		computed?: boolean;
 	}
 
-	interface RippleJSXOpeningElement extends Omit<JSXOpeningElement, 'name'> {
+	interface TSRXJSXOpeningElement extends Omit<JSXOpeningElement, 'name'> {
 		name: AST.MemberExpression | JSXIdentifier | JSXNamespacedName;
 	}
 
-	interface RippleJSXClosingElement extends Omit<JSXClosingElement, 'name'> {
+	interface TSRXJSXClosingElement extends Omit<JSXClosingElement, 'name'> {
 		name: AST.MemberExpression | JSXIdentifier | JSXNamespacedName;
 	}
 
@@ -1144,7 +1144,7 @@ export interface AnalysisResult {
 /**
  * Configuration for Ripple parser plugin
  */
-export interface RipplePluginConfig {
+export interface TSRXPluginConfig {
 	allowSatisfies?: boolean;
 }
 
@@ -1224,7 +1224,7 @@ export interface Binding {
 /**
  * Root scope manager
  */
-export interface ScopeRoot {
+export interface ScopeRootInterface {
 	/** Set of conflicting/reserved names */
 	conflicts: Set<string>;
 	/** Generate unique identifier name */
@@ -1232,7 +1232,7 @@ export interface ScopeRoot {
 }
 
 export interface ScopeConstructorInterface {
-	root: ScopeRoot;
+	root: ScopeRootInterface;
 	parent: ScopeInterface | null;
 	porous: boolean;
 	error_options: {
@@ -1255,7 +1255,7 @@ export type ScopeConstructorParameters = [
  */
 export interface ScopeInterface {
 	/** Root scope manager */
-	root: ScopeRoot;
+	root: ScopeRootInterface;
 	/** Parent scope */
 	parent: ScopeInterface | null;
 	/** Map of declared bindings */

package/types/parse.d.ts

@@ -14,7 +14,7 @@ import type * as acorn from 'acorn';
 import type * as AST from 'estree';
 import type * as ESTreeJSX from 'estree-jsx';
 import type * as ESRap from 'esrap';
-import type * as CoreCompiler from './index';
+import type * as CoreCompiler from './index.js';
 import type { RawSourceMap } from 'source-map';
 
 type ForInit = boolean | 'await';
@@ -1196,7 +1196,7 @@ export namespace Parse {
 			topLevel?: boolean,
 			exports?: AST.ExportSpecifier,
 		):
-			| AST.RippleExpression
+			| AST.TSRXExpression
 			| AST.Html
 			| AST.TextNode
 			| ESTreeJSX.JSXEmptyExpression
@@ -1634,7 +1634,7 @@ export namespace Parse {
 		 * Parse JSX attribute (name="value" or {spread})
 		 * @returns JSXAttribute or JSXSpreadAttribute
 		 */
-		jsx_parseAttribute(): AST.RippleAttribute | ESTreeJSX.JSXAttribute;
+		jsx_parseAttribute(): AST.TSRXAttribute | ESTreeJSX.JSXAttribute;
 
 		/**
 		 * Parse JSX opening element at position