@ripple-ts/language-server 0.3.13 → 0.3.15

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ripple-ts/language-server
 
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ripple-ts/typescript-plugin@0.3.15
+
+## 0.3.14
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ripple-ts/typescript-plugin@0.3.14
+
 ## 0.3.13
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ripple-ts/language-server",
-  "version": "0.3.13",
+  "version": "0.3.15",
   "description": "Language Server Protocol implementation for Ripple",
   "main": "index.js",
   "bin": {
@@ -19,10 +19,10 @@
     "volar-service-typescript": "0.0.70",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0",
-    "@ripple-ts/typescript-plugin": "0.3.13"
+    "@ripple-ts/typescript-plugin": "0.3.15"
   },
   "devDependencies": {
-    "ripple": "0.3.13"
+    "@tsrx/ripple": "0.0.3"
   },
   "peerDependencies": {
     "typescript": "^5.9.3"

package/src/compileErrorDiagnosticPlugin.js

@@ -1,10 +1,10 @@
 /**
  * @import {Diagnostic, Range, LanguageServicePlugin, LanguageServiceContext, Position, Mapper} from '@volar/language-server';
  * @import {TextDocument} from 'vscode-languageserver-textdocument';
- * @import {RippleVirtualCode} from '@ripple-ts/typescript-plugin/src/language.js';
+ * @import {TSRXVirtualCode} from '@ripple-ts/typescript-plugin/src/language.js';
  */
 // @ts-expect-error: ESM type import is fine
-/** @import {RippleCompileError} from 'ripple/compiler'; */
+/** @import {TSRXCompileError} from '@tsrx/ripple'; */
 
 const { getVirtualCode, createLogging } = require('./utils.js');
 
@@ -62,8 +62,8 @@ function createCompileErrorDiagnosticPlugin() {
 }
 
 /**
- * @param {RippleCompileError} error
- * @param {RippleVirtualCode} virtualCode
+ * @param {TSRXCompileError} error
+ * @param {TSRXVirtualCode} virtualCode
  * @param {Mapper | undefined} sourceMap
  * @param {TextDocument} document
  * @returns {Diagnostic}
@@ -121,7 +121,7 @@ function parseCompilationErrorWithDocument(error, virtualCode, sourceMap, docume
 }
 
 /**
- * @param {RippleCompileError} error
+ * @param {TSRXCompileError} error
  * @param {TextDocument} document
  * @returns {Range}
  */
@@ -134,7 +134,7 @@ function get_error_range_from_source(error, document) {
 }
 
 /**
- * @param {RippleCompileError} error
+ * @param {TSRXCompileError} error
  * @param {number} [start_offset]
  * @returns {number}
  */
@@ -148,7 +148,7 @@ function get_end_offset_from_error(error, start_offset) {
 }
 
 /**
- * @param {RippleCompileError} error
+ * @param {TSRXCompileError} error
  * @returns {number}
  */
 function get_start_offset_from_error(error) {

package/src/definitionPlugin.js

@@ -1,6 +1,6 @@
 /** @import { LanguageServicePlugin, LocationLink } from '@volar/language-server'; */
 // @ts-expect-error type-only import from ESM module into CJS is fine
-/** @import { DefinitionLocation } from 'ripple/compiler'; */
+/** @import { DefinitionLocation } from '@tsrx/ripple'; */
 
 const { TextDocument } = require('vscode-languageserver-textdocument');
 const { getVirtualCode, createLogging, getWordFromPosition } = require('./utils.js');

package/src/utils.js

@@ -1,8 +1,8 @@
 /** @import { TextDocument } from 'vscode-languageserver-textdocument' */
 /** @import { LanguageServiceContext, Mapper, SourceScript } from '@volar/language-server' */
-/** @import {RippleVirtualCode} from '@ripple-ts/typescript-plugin/src/language.js' */
+/** @typedef {import('@ripple-ts/typescript-plugin/src/language.js').TSRXVirtualCode} TSRXVirtualCode */
 // @ts-expect-error: ESM type import is fine
-/** @import {is_identifier_obfuscated, deobfuscate_identifier, IDENTIFIER_OBFUSCATION_PREFIX} from 'ripple/compiler/internal/identifier/utils' */
+/** @import { isIdentifierObfuscated, deobfuscateIdentifier, IDENTIFIER_OBFUSCATION_PREFIX } from '@tsrx/core' */
 
 const { URI } = require('vscode-uri');
 const {
@@ -26,21 +26,21 @@ const IMPORT_EXPORT_REGEX = {
 
 const RIPPLE_EXTENSIONS = ['.ripple', '.rsrx', '.tsrx'];
 
-/** @type {is_identifier_obfuscated}  */
+/** @type {typeof isIdentifierObfuscated} */
 let is_identifier_obfuscated;
-/** @type {deobfuscate_identifier} */
+/** @type {typeof deobfuscateIdentifier} */
 let deobfuscate_identifier;
-/** @type {IDENTIFIER_OBFUSCATION_PREFIX} */
-let IDENTIFIER_OBFUSCATION_PREFIX;
+/** @type {typeof IDENTIFIER_OBFUSCATION_PREFIX} */
+let identifier_obfuscation_prefix;
 /** @type {RegExp} */
 let obfuscated_identifier_regex;
 
-import('ripple/compiler/internal/identifier/utils').then((imports) => {
-	is_identifier_obfuscated = imports.is_identifier_obfuscated;
-	deobfuscate_identifier = imports.deobfuscate_identifier;
-	IDENTIFIER_OBFUSCATION_PREFIX = imports.IDENTIFIER_OBFUSCATION_PREFIX;
+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 + '+',
+		escapeRegExp(identifier_obfuscation_prefix) + charAllowedWordRegex.source + '+',
 		'gm',
 	);
 });
@@ -76,7 +76,7 @@ function concatMarkdownContents(...contents) {
  * @param {TextDocument} document
  * @returns
 	{{
- 		virtualCode: RippleVirtualCode;
+ 		virtualCode: TSRXVirtualCode;
 		sourceUri: URI;
 		sourceScript: SourceScript<URI> | undefined;
 		sourceMap: Mapper | undefined;
@@ -89,7 +89,7 @@ function getVirtualCode(document, context) {
 	);
 	const [sourceUri, virtualCodeId] = decoded;
 	const sourceScript = context.language.scripts.get(sourceUri);
-	const virtualCode = /** @type {RippleVirtualCode} */ (
+	const virtualCode = /** @type {TSRXVirtualCode} */ (
 		sourceScript?.generated?.embeddedCodes.get(virtualCodeId)
 	);