@ripple-ts/language-server 0.3.16 → 0.3.18

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ripple-ts/language-server
 
+## 0.3.18
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ripple-ts/typescript-plugin@0.3.18
+
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ripple-ts/typescript-plugin@0.3.17
+
 ## 0.3.16
 
 ### Patch Changes

package/README.md

@@ -29,8 +29,8 @@ are also specialized plugins for popular editors.
 
 #### VS Code
 
-Use the [official
-extension](https://marketplace.visualstudio.com/items?itemName=Ripple-TS.ripple-ts-vscode-plugin
+Use the
+[official extension](https://marketplace.visualstudio.com/items?itemName=Ripple-TS.ripple-ts-vscode-plugin)
 It uses this language server internally.
 
 #### WebStorm/IntelliJ

package/package.json

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

package/src/compileErrorDiagnosticPlugin.js

@@ -1,9 +1,9 @@
 /**
  * @import {Diagnostic, Range, LanguageServicePlugin, LanguageServiceContext, Position, Mapper} from '@volar/language-server';
  * @import {TextDocument} from 'vscode-languageserver-textdocument';
- * @import {TSRXVirtualCode} from '@ripple-ts/typescript-plugin/src/language.js';
+ * @import {TSRXVirtualCodeInstance} from '@ripple-ts/typescript-plugin/src/language.js';
  */
-// @ts-expect-error: ESM type import is fine
+// @ts-ignore: ESM type import is fine
 /** @import {TSRXCompileError} from '@tsrx/ripple'; */
 
 const { getVirtualCode, createLogging } = require('./utils.js');
@@ -63,7 +63,7 @@ function createCompileErrorDiagnosticPlugin() {
 
 /**
  * @param {TSRXCompileError} error
- * @param {TSRXVirtualCode} virtualCode
+ * @param {TSRXVirtualCodeInstance} virtualCode
  * @param {Mapper | undefined} sourceMap
  * @param {TextDocument} document
  * @returns {Diagnostic}

package/src/definitionPlugin.js

@@ -1,5 +1,5 @@
 /** @import { LanguageServicePlugin, LocationLink } from '@volar/language-server'; */
-// @ts-expect-error type-only import from ESM module into CJS is fine
+// @ts-ignore type-only import from ESM module into CJS is fine
 /** @import { DefinitionLocation } from '@tsrx/ripple'; */
 
 const { TextDocument } = require('vscode-languageserver-textdocument');
@@ -140,7 +140,9 @@ function createDefinitionPlugin() {
 						const loc = /** @type {DefinitionLocation} */ (def.location);
 
 						const embeddedCode = loc.embeddedId
-							? virtualCode.embeddedCodes?.find(({ id }) => id === loc.embeddedId)
+							? virtualCode.embeddedCodes?.find(
+									(/** @type {{ id: string }} */ { id }) => id === loc.embeddedId,
+								)
 							: undefined;
 
 						if (embeddedCode) {

package/src/server.js

@@ -124,7 +124,7 @@ function createRippleLanguageServer() {
 
 		// Register file watchers for TypeScript/JavaScript files so the language
 		// server is notified when they change on disk. Without this, changes to
-		// .ts files that are imported by .ripple files are not detected, causing
+		// .ts files that are imported by .tsrx files are not detected, causing
 		// stale diagnostics until the server is restarted.
 		try {
 			await server.fileWatcher.watchFiles([

package/src/typescriptService.js

@@ -24,8 +24,8 @@ getUserPreferencesModule.getUserPreferences = async function (context, document)
 	return {
 		preferTypeOnlyAutoImports: true,
 		...origPreferences,
-		...tsConfig?.preferences,
-		...rippleConfig?.preferences,
+		.../** @type {any} */ (tsConfig)?.preferences,
+		.../** @type {any} */ (rippleConfig)?.preferences,
 	};
 };
 

package/src/utils.js

@@ -1,7 +1,7 @@
 /** @import { TextDocument } from 'vscode-languageserver-textdocument' */
 /** @import { LanguageServiceContext, Mapper, SourceScript } from '@volar/language-server' */
-/** @typedef {import('@ripple-ts/typescript-plugin/src/language.js').TSRXVirtualCode} TSRXVirtualCode */
-// @ts-expect-error: ESM type import is fine
+/** @import {TSRXVirtualCodeInstance} from '@ripple-ts/typescript-plugin/src/language.js'; */
+// @ts-ignore: ESM type import is fine
 /** @import { isIdentifierObfuscated, deobfuscateIdentifier, IDENTIFIER_OBFUSCATION_PREFIX } from '@tsrx/core' */
 
 const { URI } = require('vscode-uri');
@@ -24,7 +24,7 @@ const IMPORT_EXPORT_REGEX = {
 	from: /from\s*['"][^'"]*['"]\s*;?/,
 };
 
-const RIPPLE_EXTENSIONS = ['.ripple', '.rsrx', '.tsrx'];
+const RIPPLE_EXTENSIONS = ['.tsrx'];
 
 /** @type {typeof isIdentifierObfuscated} */
 let is_identifier_obfuscated;
@@ -76,7 +76,7 @@ function concatMarkdownContents(...contents) {
  * @param {TextDocument} document
  * @returns
 	{{
- 		virtualCode: TSRXVirtualCode;
+ 		virtualCode: TSRXVirtualCodeInstance;
 		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 {TSRXVirtualCode} */ (
+	const virtualCode = /** @type {TSRXVirtualCodeInstance} */ (
 		sourceScript?.generated?.embeddedCodes.get(virtualCodeId)
 	);
 

package/tsconfig.json

@@ -3,12 +3,14 @@
     "module": "node16",
     "moduleResolution": "node16",
     "target": "es2020",
+    "lib": ["es2020"],
     "allowJs": true,
     "checkJs": true,
     "noEmit": true,
     "strict": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
+    "skipLibCheck": true,
     "types": []
   },
   "include": ["src/**/*.js", "index.js", "bin/**/*.js"],

package/tsconfig.typecheck.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "lib": ["esnext", "dom", "dom.iterable"],
+    "target": "esnext"
+  }
+}