@ripple-ts/language-server 0.3.41 → 0.3.42

package/src/typescriptDiagnosticPlugin.js

@@ -1,139 +0,0 @@
-/**
- @import {
-	LanguageServicePlugin,
-	LanguageServicePluginInstance,
-	LanguageServiceContext,
-	Diagnostic,
-} from '@volar/language-server';
-@import {TextDocument} from 'vscode-languageserver-textdocument';
- */
-
-import { getVirtualCode, createLogging, deobfuscateIdentifiers } from './utils.js';
-
-const { log, logError } = createLogging('[Ripple TypeScript Diagnostic Plugin]');
-
-/**
- * @param {Diagnostic} diagnostic
- * @param {Diagnostic[]} items
- */
-function process(diagnostic, items) {
-	diagnostic.message = deobfuscateIdentifiers(diagnostic.message);
-	items.push(diagnostic);
-}
-
-/**
- * Filter diagnostics based on suppressed diagnostic codes in mappings.
- * @param {TextDocument} document
- * @param {LanguageServiceContext} context
- * @param {Diagnostic[]} diagnostics
- * @returns {Diagnostic[]}
- */
-function processDiagnostics(document, context, diagnostics) {
-	if (!diagnostics || diagnostics.length === 0) {
-		return diagnostics;
-	}
-
-	log(`Filtering ${diagnostics.length} TypeScript diagnostics for ${document.uri}`);
-
-	const { virtualCode } = getVirtualCode(document, context);
-
-	if (!virtualCode || virtualCode.languageId !== 'ripple') {
-		return diagnostics;
-	}
-
-	/** @type {Diagnostic[]} */
-	const result = [];
-
-	for (const diagnostic of diagnostics) {
-		if (virtualCode.fatalErrors.length > 0 && diagnostic.code !== 'tsrx-compile-error') {
-			// skip all TS diagnostics since we're dealing directly with the source code
-			continue;
-		}
-
-		const range = diagnostic.range;
-		const rangeStart = document.offsetAt(range.start);
-		const rangeEnd = document.offsetAt(range.end);
-		const mapping = virtualCode.findMappingByGeneratedRange(rangeStart, rangeEnd);
-
-		if (!mapping) {
-			process(diagnostic, result);
-			continue;
-		}
-
-		const suppressedCodes = mapping.data.customData?.suppressedDiagnostics;
-
-		if (!suppressedCodes || suppressedCodes.length === 0) {
-			process(diagnostic, result);
-			continue;
-		}
-
-		const diagnosticCode =
-			typeof diagnostic.code === 'number'
-				? diagnostic.code
-				: typeof diagnostic.code === 'string'
-					? parseInt(diagnostic.code)
-					: null;
-
-		if (diagnosticCode && suppressedCodes.includes(diagnosticCode)) {
-			log(`Suppressing diagnostic ${diagnosticCode}: ${diagnostic.message}`);
-			continue;
-		}
-
-		process(diagnostic, result);
-	}
-
-	log(`Filtered from ${diagnostics.length} to ${result.length} diagnostics`);
-	return result;
-}
-
-/**
- * Creates a plugin that wraps typescript-semantic's provideDiagnostics
- * to filter out suppressed diagnostics while maintaining the original
- * plugin association. This is crucial for code actions (like "Add import")
- * to work correctly, as volar matches diagnostics by pluginIndex.
- * @returns {LanguageServicePlugin}
- */
-export function createTypeScriptDiagnosticFilterPlugin() {
-	log('Creating TypeScript diagnostic filter plugin...');
-
-	return {
-		name: 'ripple-typescript-diagnostic-filter',
-		// No capabilities - this plugin only wraps typescript-semantic
-		capabilities: {},
-		create(context) {
-			/** @type {LanguageServicePluginInstance['provideDiagnostics'] | undefined} */
-			let originalProvider;
-			/** @type {LanguageServicePluginInstance | undefined} */
-			let originalInstance;
-
-			for (const [plugin, instance] of context.plugins) {
-				if (plugin.name === 'typescript-semantic') {
-					originalInstance = instance;
-					originalProvider = instance.provideDiagnostics;
-
-					// Wrap the original function to filter diagnostics
-					// This maintains the plugin association for code actions
-					instance.provideDiagnostics = async function (document, token) {
-						const diagnostics = await originalProvider?.call(originalInstance, document, token);
-						return processDiagnostics(document, context, diagnostics ?? []);
-					};
-
-					log('Successfully wrapped typescript-semantic provideDiagnostics');
-
-					break;
-				}
-			}
-
-			if (!originalProvider) {
-				logError(
-					"'typescript-semantic plugin' was not found or has no 'provideDiagnostics'. \
-					This plugin must be loaded after Volar's typescript-semantic plugin.",
-				);
-			}
-
-			// This plugin doesn't provide any functionality itself,
-			// it only wraps typescript-semantic
-			return {};
-		},
-	};
-}

package/src/typescriptService.js

@@ -1,49 +0,0 @@
-/**
- * @import {LanguageServiceContext} from '@volar/language-server'
- * @import {TextDocument} from 'vscode-languageserver-textdocument'
- */
-
-import { createRequire } from 'node:module';
-
-// Monkey-patch getUserPreferences to inject Ripple-specific defaults.
-// We use createRequire to get the raw CJS module.exports object, bypassing
-// the bundler's __toESM wrapper which interferes with property assignment.
-// volar-service-typescript is also externalized (via regex in tsdown config)
-// so that its internal consumers (semantic.js, codeAction.js, etc.) load
-// getUserPreferences from the same Node module cache entry we patch here.
-const require = createRequire(import.meta.url);
-const getUserPreferencesModule = require('volar-service-typescript/lib/configs/getUserPreferences');
-const { create } = require('volar-service-typescript');
-
-const originalGetUserPreferences = getUserPreferencesModule.getUserPreferences;
-
-/**
- * Enhanced getUserPreferences to add all ts and ripple preferences
- * Specifically makes preferTypeOnlyAutoImports true if not set
- * @param {LanguageServiceContext} context
- * @param {TextDocument} document
- */
-getUserPreferencesModule.getUserPreferences = async function (context, document) {
-	const origPreferences = await originalGetUserPreferences.call(this, context, document);
-
-	const [tsConfig, rippleConfig] = await Promise.all([
-		context.env.getConfiguration?.('typescript'),
-		context.env.getConfiguration?.('ripple'),
-	]);
-
-	return {
-		preferTypeOnlyAutoImports: true,
-		...origPreferences,
-		.../** @type {any} */ (tsConfig)?.preferences,
-		.../** @type {any} */ (rippleConfig)?.preferences,
-	};
-};
-
-/**
- * Create TypeScript services with Ripple-specific enhancements.
- * @param {typeof import('typescript')} ts
- * @returns {ReturnType<typeof create>}
- */
-export function createTypeScriptServices(ts) {
-	return create(ts);
-}

package/src/utils.js

@@ -1,162 +0,0 @@
-/** @import { TextDocument } from 'vscode-languageserver-textdocument' */
-/** @import { LanguageServiceContext, Mapper, SourceScript } from '@volar/language-server' */
-/** @import {TSRXVirtualCodeInstance} from '@tsrx/typescript-plugin/src/language.js'; */
-/** @import { isIdentifierObfuscated, deobfuscateIdentifier, IDENTIFIER_OBFUSCATION_PREFIX } from '@tsrx/core' */
-
-import { URI } from 'vscode-uri';
-import {
-	createLogging,
-	getWordFromPosition,
-	charAllowedWordRegex,
-	DEBUG,
-} from '@tsrx/typescript-plugin/src/utils.js';
-
-const IMPORT_EXPORT_REGEX = {
-	import: {
-		findBefore: /import\s+(?:\{[^}]*|\*\s+as\s+\w*|\w*)$/s,
-		sameLine: /^import\s/,
-	},
-	export: {
-		findBefore: /export\s+(?:\{[^}]*|\*\s+as\s+\w*|\w*)$/s,
-		sameLine: /^export\s/,
-	},
-	from: /from\s*['"][^'"]*['"]\s*;?/,
-};
-
-export const RIPPLE_EXTENSIONS = ['.tsrx'];
-
-/** @type {typeof isIdentifierObfuscated} */
-let is_identifier_obfuscated;
-/** @type {typeof deobfuscateIdentifier} */
-let deobfuscate_identifier;
-/** @type {typeof IDENTIFIER_OBFUSCATION_PREFIX} */
-let identifier_obfuscation_prefix;
-/** @type {RegExp} */
-let obfuscated_identifier_regex;
-
-import('@tsrx/core').then((imports) => {
-	is_identifier_obfuscated = imports.isIdentifierObfuscated;
-	deobfuscate_identifier = imports.deobfuscateIdentifier;
-	identifier_obfuscation_prefix = imports.IDENTIFIER_OBFUSCATION_PREFIX;
-	obfuscated_identifier_regex = new RegExp(
-		escapeRegExp(identifier_obfuscation_prefix) + charAllowedWordRegex.source + '+',
-		'gm',
-	);
-});
-
-/**
- * @param {string} source
- * @returns {string}
- */
-function escapeRegExp(source) {
-	// $& means the whole matched source
-	return source.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-/**
- * @param {string} text
- * @returns {string}
- */
-export function deobfuscateIdentifiers(text) {
-	return text.replace(obfuscated_identifier_regex, (match) => deobfuscate_identifier(match));
-}
-
-/**
- * @param  {...string} contents
- * @returns string
- */
-export function concatMarkdownContents(...contents) {
-	return contents.join('\n\n<br>\n\n---\n\n<br><br>\n\n');
-}
-
-/**
- * Get virtual code from the encoded document URI
- * @param {LanguageServiceContext} context
- * @param {TextDocument} document
- * @returns
-	{{
- 		virtualCode: TSRXVirtualCodeInstance;
-		sourceUri: URI;
-		sourceScript: SourceScript<URI> | undefined;
-		sourceMap: Mapper | undefined;
-	}}
- */
-export function getVirtualCode(document, context) {
-	const uri = URI.parse(document.uri);
-	const decoded = /** @type {[documentUri: URI, embeddedCodeId: string]} */ (
-		context.decodeEmbeddedDocumentUri(uri)
-	);
-	const [sourceUri, virtualCodeId] = decoded;
-	const sourceScript = context.language.scripts.get(sourceUri);
-	const virtualCode = /** @type {TSRXVirtualCodeInstance} */ (
-		sourceScript?.generated?.embeddedCodes.get(virtualCodeId)
-	);
-
-	const sourceMap =
-		sourceScript && virtualCode ? context.language.maps.get(virtualCode, sourceScript) : undefined;
-
-	return { virtualCode, sourceUri, sourceScript, sourceMap };
-}
-
-/**
- * @param {'import' | 'export'} type
- * @param {string} text
- * @param {number} start
- * @returns {boolean}
- */
-function isInsideImportOrExport(type, text, start) {
-	const textBeforeCursor = text.slice(0, start);
-
-	// Find the last 'import' keyword before cursor
-	const lastImportMatch = textBeforeCursor.match(IMPORT_EXPORT_REGEX[type].findBefore);
-	if (!lastImportMatch) {
-		// Check if we're on a line that starts with import
-		const lineStart = textBeforeCursor.lastIndexOf('\n') + 1;
-		const lineBeforeCursor = textBeforeCursor.slice(lineStart);
-		return IMPORT_EXPORT_REGEX[type].sameLine.test(lineBeforeCursor.trim());
-	}
-
-	// We found an import - check if it's been closed with 'from'
-	const importStart = textBeforeCursor.lastIndexOf(type);
-	const textFromImport = text.slice(importStart);
-
-	// Find the end of this import statement (semicolon or newline after 'from "..."')
-	const fromMatch = textFromImport.match(IMPORT_EXPORT_REGEX.from);
-	if (!fromMatch || fromMatch.index === undefined) {
-		// No 'from' found yet - we're inside an incomplete import
-		return true;
-	}
-
-	const importEndOffset = importStart + fromMatch.index + fromMatch[0].length;
-
-	// If cursor is before the import ends, we're inside it
-	return start < importEndOffset;
-}
-
-/**
- * @param {string} text
- * @param {number} start
- * @returns {boolean}
- */
-export function isInsideImport(text, start) {
-	return isInsideImportOrExport('import', text, start);
-}
-
-/**
- * @param {string} text
- * @param {number} start
- * @returns {boolean}
- */
-export function isInsideExport(text, start) {
-	return isInsideImportOrExport('export', text, start);
-}
-
-/**
- * @param {string} document_uri
- * @returns {boolean}
- */
-export function is_ripple_document(document_uri) {
-	return RIPPLE_EXTENSIONS.some((extension) => document_uri.endsWith(extension));
-}
-
-export { createLogging, getWordFromPosition, DEBUG };

package/tsconfig.json

@@ -1,17 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "target": "esnext",
-    "lib": ["esnext"],
-    "allowJs": true,
-    "checkJs": true,
-    "noEmit": true,
-    "strict": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "types": []
-  },
-  "include": ["src/**/*.js", "index.js", "bin/**/*.js"],
-  "exclude": ["node_modules", "dist"]
-}

package/tsconfig.typecheck.json

@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "lib": ["esnext", "dom", "dom.iterable"],
-    "skipLibCheck": true
-  }
-}

package/tsdown.config.js

@@ -1,41 +0,0 @@
-import { defineConfig } from 'tsdown';
-import fs from 'fs';
-import path from 'path';
-import { fileURLToPath } from 'url';
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-const isDev = process.env.NODE_ENV !== 'production';
-const ROOT_EXTERNAL_PACKAGES = [
-	'@tsrx/react',
-	'@tsrx/ripple',
-	'@tsrx/core',
-	'typescript',
-	'vscode-uri',
-	// need this for monkey patching
-	'volar-service-typescript',
-	/* also definitely need it for monkey patching */
-	/^volar-service-typescript(?:\/.*)?$/,
-];
-
-export default defineConfig({
-	inlineOnly: false,
-	entry: ['src/server.js', 'bin/language-server.js'],
-	format: ['cjs'],
-	outExtensions: () => ({ js: '.js' }),
-	platform: 'node',
-	target: 'node20',
-	outDir: 'dist',
-	sourcemap: isDev,
-	outputOptions: {
-		legalComments: 'inline',
-		minify: false,
-	},
-	external: [...ROOT_EXTERNAL_PACKAGES],
-	clean: true,
-	noExternal: /.+/,
-	hooks: {
-		'build:done': () => {
-			fs.writeFileSync(path.join(dirname, 'dist', 'package.json'), '{"type":"commonjs"}\n');
-		},
-	},
-});