@astrojs/language-server 1.0.0 → 1.0.1

package/dist/core/DiagnosticsManager.d.ts

@@ -1,7 +1,7 @@
 import type { Connection, Diagnostic, TextDocumentIdentifier } from 'vscode-languageserver';
 import type { AstroDocument, DocumentManager } from './documents';
-export declare type SendDiagnostics = Connection['sendDiagnostics'];
-export declare type GetDiagnostics = (doc: TextDocumentIdentifier) => Thenable<Diagnostic[]>;
+export type SendDiagnostics = Connection['sendDiagnostics'];
+export type GetDiagnostics = (doc: TextDocumentIdentifier) => Thenable<Diagnostic[]>;
 export declare class DiagnosticsManager {
     private sendDiagnostics;
     private docManager;

package/dist/core/config/ConfigManager.d.ts

@@ -4,7 +4,7 @@ import type { Connection, FormattingOptions } from 'vscode-languageserver';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { LSConfig, LSCSSConfig, LSHTMLConfig, LSTypescriptConfig } from './interfaces';
 export declare const defaultLSConfig: LSConfig;
-declare type DeepPartial<T> = T extends Record<string, unknown> ? {
+type DeepPartial<T> = T extends Record<string, unknown> ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
 /**

package/dist/core/documents/DocumentManager.d.ts

@@ -1,6 +1,6 @@
 import type { TextDocumentContentChangeEvent, TextDocumentItem, VersionedTextDocumentIdentifier } from 'vscode-languageserver';
 import { AstroDocument } from './AstroDocument';
-export declare type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
+export type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
 export declare class DocumentManager {
     private createDocument?;
     private emitter;

package/dist/plugins/css/features/getIdClassCompletions.d.ts

@@ -11,7 +11,7 @@ export declare enum NodeType {
     ClassSelector = 14,
     IdentifierSelector = 15
 }
-export declare type CSSNode = {
+export type CSSNode = {
     type: number;
     children: CSSNode[] | undefined;
     getText(): string;

package/dist/plugins/interfaces.d.ts

@@ -1,6 +1,6 @@
 import type { CodeAction, CodeActionContext, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FileChangeType, FoldingRange, FormattingOptions, Hover, InlayHint, LinkedEditingRanges, Location, Position, Range, ReferenceContext, SelectionRange, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, TextDocumentIdentifier, TextEdit, WorkspaceEdit } from 'vscode-languageserver';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare type Resolvable<T> = T | Promise<T>;
+export type Resolvable<T> = T | Promise<T>;
 export interface AppCompletionItem<T extends TextDocumentIdentifier = any> extends CompletionItem {
     data?: T;
 }
@@ -93,9 +93,9 @@ export interface OnWatchFileChangesProvider {
 export interface UpdateNonAstroFile {
     updateNonAstroFile(fileName: string, changes: TextDocumentContentChangeEvent[], text?: string): void;
 }
-declare type ProviderBase = DiagnosticsProvider & HoverProvider & CompletionsProvider & FileReferencesProvider & DefinitionsProvider & TypeDefinitionsProvider & ImplementationProvider & FormattingProvider & FoldingRangesProvider & TagCompleteProvider & DocumentColorsProvider & ColorPresentationsProvider & DocumentSymbolsProvider & UpdateImportsProvider & CodeActionsProvider & FindReferencesProvider & RenameProvider & SignatureHelpProvider & SemanticTokensProvider & SelectionRangeProvider & OnWatchFileChangesProvider & LinkedEditingRangesProvider & InlayHintsProvider & UpdateNonAstroFile;
-export declare type LSProvider = ProviderBase;
-export declare type Plugin = Partial<ProviderBase> & {
+type ProviderBase = DiagnosticsProvider & HoverProvider & CompletionsProvider & FileReferencesProvider & DefinitionsProvider & TypeDefinitionsProvider & ImplementationProvider & FormattingProvider & FoldingRangesProvider & TagCompleteProvider & DocumentColorsProvider & ColorPresentationsProvider & DocumentSymbolsProvider & UpdateImportsProvider & CodeActionsProvider & FindReferencesProvider & RenameProvider & SignatureHelpProvider & SemanticTokensProvider & SelectionRangeProvider & OnWatchFileChangesProvider & LinkedEditingRangesProvider & InlayHintsProvider & UpdateNonAstroFile;
+export type LSProvider = ProviderBase;
+export type Plugin = Partial<ProviderBase> & {
     __name: string;
 };
 export {};

package/dist/plugins/typescript/LanguageServiceManager.d.ts

@@ -1,3 +1,4 @@
+import type ts from 'typescript';
 import type { TextDocumentContentChangeEvent } from 'vscode-languageserver';
 import type { ConfigManager } from '../../core/config';
 import type { AstroDocument, DocumentManager } from '../../core/documents';
@@ -37,7 +38,7 @@ export declare class LanguageServiceManager {
         tsDoc: DocumentSnapshot;
         lang: ts.LanguageService;
     }>;
-    getLSForPath(path: string): Promise<import("typescript/lib/tsserverlibrary").LanguageService>;
+    getLSForPath(path: string): Promise<ts.LanguageService>;
     getTypeScriptLanguageService(filePath: string): Promise<LanguageServiceContainer>;
     /**
      * @internal Public for tests only

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptPlugin = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const astro2tsx_1 = __importDefault(require("./astro2tsx"));
+const astro2tsx_1 = require("./astro2tsx");
 const CodeActionsProvider_1 = require("./features/CodeActionsProvider");
 const CompletionsProvider_1 = require("./features/CompletionsProvider");
 const DefinitionsProvider_1 = require("./features/DefinitionsProvider");
@@ -139,7 +136,7 @@ class TypeScriptPlugin {
         return this.signatureHelpProvider.getSignatureHelp(document, position, context, cancellationToken);
     }
     getTSXForDocument(document) {
-        return (0, astro2tsx_1.default)(document.getText(), document.getURL());
+        return (0, astro2tsx_1.astro2tsx)(document.getText(), document.getURL());
     }
     /**
      * @internal Public for tests only

package/dist/plugins/typescript/astro-sys.d.ts

@@ -1,7 +1,8 @@
+import type ts from 'typescript';
 import type { DocumentSnapshot } from './snapshots/DocumentSnapshot';
 /**
  * This should only be accessed by TS Astro module resolution.
  */
-export declare function createAstroSys(getSnapshot: (fileName: string) => DocumentSnapshot, ts: typeof import('typescript/lib/tsserverlibrary')): import("typescript/lib/tsserverlibrary").System & {
+export declare function createAstroSys(getSnapshot: (fileName: string) => DocumentSnapshot, ts: typeof import('typescript/lib/tsserverlibrary')): ts.System & {
     deleteFromCache: (path: string) => void;
 };

package/dist/plugins/typescript/astro2tsx.d.ts

@@ -1,2 +1,2 @@
 import type { TSXResult } from '@astrojs/compiler/types';
-export default function (content: string, fileName: string): TSXResult;
+export declare function astro2tsx(content: string, fileName: string): TSXResult;

package/dist/plugins/typescript/astro2tsx.js

@@ -1,8 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const TSXService_1 = require("../../core/worker/TSXService");
-function default_1(content, fileName) {
-    const tsx = (0, TSXService_1.convertToTSX)(content, { filename: fileName });
-    return tsx;
+exports.astro2tsx = void 0;
+const sync_1 = require("@astrojs/compiler/sync");
+function astro2tsx(content, fileName) {
+    try {
+        const tsx = (0, sync_1.convertToTSX)(content, { filename: fileName });
+        return tsx;
+    }
+    catch (e) {
+        console.error(`There was an error transforming ${fileName} to TSX. An empty file will be returned instead. Please create an issue: https://github.com/withastro/language-tools/issues\nError: ${e}.`);
+        return {
+            code: '',
+            map: {
+                file: fileName,
+                sources: [],
+                sourcesContent: [],
+                names: [],
+                mappings: '',
+                version: 0,
+            },
+            diagnostics: [],
+        };
+    }
 }
-exports.default = default_1;
+exports.astro2tsx = astro2tsx;

package/dist/plugins/typescript/features/CompletionsProvider.d.ts

@@ -1,4 +1,4 @@
-import type ts from 'typescript/lib/tsserverlibrary';
+import type ts from 'typescript';
 import { CancellationToken, CompletionContext, Position, TextDocumentIdentifier, TextEdit } from 'vscode-languageserver';
 import type { ConfigManager } from '../../../core/config';
 import { AstroDocument } from '../../../core/documents';

package/dist/plugins/typescript/features/DiagnosticsProvider.d.ts

@@ -1,3 +1,4 @@
+import type ts from 'typescript';
 import { CancellationToken, DiagnosticSeverity } from 'vscode-languageserver';
 import { Diagnostic } from 'vscode-languageserver-types';
 import { AstroDocument } from '../../../core/documents';

package/dist/plugins/typescript/features/DiagnosticsProvider.js

@@ -125,6 +125,8 @@ class DiagnosticsProviderImpl {
                 return vscode_languageserver_1.DiagnosticSeverity.Hint;
             case this.ts.DiagnosticCategory.Message:
                 return vscode_languageserver_1.DiagnosticSeverity.Information;
+            default:
+                return vscode_languageserver_1.DiagnosticSeverity.Error;
         }
     }
 }

package/dist/plugins/typescript/features/SignatureHelpProvider.js

@@ -106,6 +106,6 @@ class SignatureHelpProviderImpl {
         };
     }
 }
-exports.SignatureHelpProviderImpl = SignatureHelpProviderImpl;
 SignatureHelpProviderImpl.triggerCharacters = ['(', ',', '<'];
 SignatureHelpProviderImpl.retriggerCharacters = [')'];
+exports.SignatureHelpProviderImpl = SignatureHelpProviderImpl;

package/dist/plugins/typescript/language-service.d.ts

@@ -1,3 +1,4 @@
+import type ts from 'typescript';
 import type { TextDocumentContentChangeEvent } from 'vscode-languageserver';
 import type { ConfigManager } from '../../core/config';
 import type { AstroDocument } from '../../core/documents';

package/dist/plugins/typescript/module-loader.d.ts

@@ -1,3 +1,4 @@
+import type ts from 'typescript';
 import type { ResolvedModule } from 'typescript';
 import type { DocumentSnapshot } from './snapshots/DocumentSnapshot';
 /**
@@ -12,7 +13,7 @@ import type { DocumentSnapshot } from './snapshots/DocumentSnapshot';
  * @param getSnapshot A function which returns a (in case of astro file fully preprocessed) typescript/javascript snapshot
  * @param compilerOptions The typescript compiler options
  */
-export declare function createAstroModuleLoader(getSnapshot: (fileName: string) => DocumentSnapshot, compilerOptions: ts.CompilerOptions, ts: typeof import('typescript/lib/tsserverlibrary')): {
+export declare function createAstroModuleLoader(getSnapshot: (fileName: string) => DocumentSnapshot, compilerOptions: ts.CompilerOptions, ts: typeof import('typescript/lib/tsserverlibrary'), tsResolveModuleName?: typeof ts.resolveModuleName): {
     fileExists: (path: string) => boolean;
     readFile: (path: string, encoding?: string | undefined) => string | undefined;
     readDirectory: (path: string, extensions?: readonly string[] | undefined, exclude?: readonly string[] | undefined, include?: readonly string[] | undefined, depth?: number | undefined) => string[];

package/dist/plugins/typescript/module-loader.js

@@ -98,8 +98,11 @@ class ImpliedNodeFormatResolver {
  * @param getSnapshot A function which returns a (in case of astro file fully preprocessed) typescript/javascript snapshot
  * @param compilerOptions The typescript compiler options
  */
-function createAstroModuleLoader(getSnapshot, compilerOptions, ts) {
+function createAstroModuleLoader(getSnapshot, compilerOptions, ts, 
+/* For tests */
+tsResolveModuleName) {
     const astroSys = (0, astro_sys_1.createAstroSys)(getSnapshot, ts);
+    const tsResolver = tsResolveModuleName ? tsResolveModuleName : ts.resolveModuleName;
     const moduleCache = new ModuleResolutionCache();
     const impliedNodeFormatResolver = new ImpliedNodeFormatResolver(ts);
     return {
@@ -131,11 +134,11 @@ function createAstroModuleLoader(getSnapshot, compilerOptions, ts) {
         // Delegate to the TS resolver first.
         // If that does not bring up anything, try the Astro Module loader
         // which is able to deal with .astro and other frameworks files.
-        const tsResolvedModule = ts.resolveModuleName(name, containingFile, compilerOptions, ts.sys, undefined, undefined, mode).resolvedModule;
+        const tsResolvedModule = tsResolver(name, containingFile, compilerOptions, ts.sys, undefined, undefined, mode).resolvedModule;
         if (tsResolvedModule && !(0, utils_2.isVirtualFilePath)(tsResolvedModule.resolvedFileName)) {
             return tsResolvedModule;
         }
-        const astroResolvedModule = ts.resolveModuleName(name, containingFile, compilerOptions, astroSys, undefined, undefined, mode).resolvedModule;
+        const astroResolvedModule = tsResolver(name, containingFile, compilerOptions, astroSys, undefined, undefined, mode).resolvedModule;
         if (!astroResolvedModule || !(0, utils_2.isVirtualFilePath)(astroResolvedModule.resolvedFileName)) {
             return astroResolvedModule;
         }

package/dist/plugins/typescript/previewer.d.ts

@@ -1,3 +1,7 @@
+/**
+ * adopted from https://github.com/microsoft/vscode/blob/10722887b8629f90cc38ee7d90d54e8246dc895f/extensions/typescript-language-features/src/utils/previewer.ts
+ */
+import type ts from 'typescript';
 export declare function getTagDocumentation(tag: ts.JSDocTagInfo, ts: typeof import('typescript/lib/tsserverlibrary')): string | undefined;
 export declare function plain(parts: ts.SymbolDisplayPart[] | string, ts: typeof import('typescript/lib/tsserverlibrary')): string;
 export declare function getMarkdownDocumentation(documentation: ts.SymbolDisplayPart[] | undefined, tags: ts.JSDocTagInfo[] | undefined, ts: typeof import('typescript/lib/tsserverlibrary')): string;

package/dist/plugins/typescript/previewer.js

@@ -5,9 +5,6 @@
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMarkdownDocumentation = exports.plain = exports.getTagDocumentation = void 0;
-/**
- * adopted from https://github.com/microsoft/vscode/blob/10722887b8629f90cc38ee7d90d54e8246dc895f/extensions/typescript-language-features/src/utils/previewer.ts
- */
 const utils_1 = require("../../utils");
 function replaceLinks(text) {
     return (text

package/dist/plugins/typescript/snapshots/DocumentSnapshot.d.ts

@@ -1,5 +1,6 @@
 import { DiagnosticMessage } from '@astrojs/compiler/types';
 import { EncodedSourceMap, TraceMap } from '@jridgewell/trace-mapping';
+import type ts from 'typescript';
 import { Position, TextDocumentContentChangeEvent } from 'vscode-languageserver';
 import { AstroDocument, DocumentMapper, FragmentMapper, IdentityMapper, SourceMapDocumentMapper, TagInformation } from '../../../core/documents';
 export interface DocumentSnapshot extends ts.IScriptSnapshot, DocumentMapper {

package/dist/plugins/typescript/snapshots/utils.js

@@ -1,18 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.classNameFromFilename = exports.createFromFrameworkFilePath = exports.createFromAstroFilePath = exports.createFromTSFilePath = exports.createFromNonAstroFilePath = exports.createFromFilePath = exports.createFromDocument = void 0;
 const vscode_uri_1 = require("vscode-uri");
 const importPackage_1 = require("../../../importPackage");
 const utils_1 = require("../../../utils");
-const astro2tsx_1 = __importDefault(require("../astro2tsx"));
+const astro2tsx_1 = require("../astro2tsx");
 const utils_2 = require("../utils");
 const DocumentSnapshot_1 = require("./DocumentSnapshot");
 // Utilities to create Snapshots from different contexts
 function createFromDocument(document, ts) {
-    const { code, map, diagnostics } = (0, astro2tsx_1.default)(document.getText(), document.getURL());
+    const { code, map, diagnostics } = (0, astro2tsx_1.astro2tsx)(document.getText(), document.getURL());
     const sourceMap = map;
     return new DocumentSnapshot_1.AstroSnapshot(document, code, sourceMap, ts.ScriptKind.TSX, diagnostics);
 }

package/dist/plugins/typescript/utils.d.ts

@@ -1,3 +1,4 @@
+import type ts from 'typescript';
 import type { Node } from 'vscode-html-languageservice';
 import { CompletionItemKind, Position, Range, SemanticTokensLegend, SymbolKind } from 'vscode-languageserver';
 import { AstroDocument, TagInformation } from '../../core/documents';
@@ -42,8 +43,8 @@ export declare function convertToLocationRange(defDoc: DocumentSnapshot, textSpa
 export declare function ensureFrontmatterInsert(resultRange: Range, document: AstroDocument): Range;
 export declare function checkEndOfFileCodeInsert(resultRange: Range, document: AstroDocument): Range;
 export declare function removeAstroComponentSuffix(name: string): string;
-export declare type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte';
-declare type FrameworkVirtualExt = 'ts' | 'tsx';
+export type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte';
+type FrameworkVirtualExt = 'ts' | 'tsx';
 export declare function getFrameworkFromFilePath(filePath: string): FrameworkExt;
 export declare function isVirtualFrameworkFilePath(ext: FrameworkExt, virtualExt: FrameworkVirtualExt, filePath: string): boolean;
 export declare function isAstroFilePath(filePath: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -19,13 +19,12 @@
     "types"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^1.3.2",
+    "@astrojs/compiler": "^1.4.1",
     "@jridgewell/trace-mapping": "^0.3.14",
     "@vscode/emmet-helper": "^2.8.4",
     "events": "^3.3.0",
     "prettier": "^2.8.8",
     "prettier-plugin-astro": "^0.8.0",
-    "synckit": "^0.8.4",
     "vscode-css-languageservice": "^6.2.1",
     "vscode-html-languageservice": "^5.0.0",
     "vscode-languageserver": "^8.0.1",
@@ -50,7 +49,7 @@
     "sinon": "^13.0.1",
     "svelte": "^3.49.0",
     "ts-node": "^10.7.0",
-    "typescript": "~4.8.2",
+    "typescript": "~5.0.2",
     "vue": "^3.2.37"
   },
   "scripts": {

package/dist/core/worker/TSXService.d.ts

@@ -1,7 +0,0 @@
-import type { TSXResult } from '@astrojs/compiler/types';
-/**
- * Parse code by `@astrojs/compiler`
- */
-export declare function convertToTSX(source: string, options: {
-    filename: string;
-}): TSXResult;

package/dist/core/worker/TSXService.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToTSX = void 0;
-const synckit_1 = require("synckit");
-const convertToTSXSync = (0, synckit_1.createSyncFn)(require.resolve('./TSXWorker'));
-/**
- * Parse code by `@astrojs/compiler`
- */
-function convertToTSX(source, options) {
-    return convertToTSXSync(source, options);
-}
-exports.convertToTSX = convertToTSX;

package/dist/core/worker/TSXWorker.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/core/worker/TSXWorker.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const synckit_1 = require("synckit");
-const dynamicImport = new Function('m', 'return import(m)');
-(0, synckit_1.runAsWorker)(async (source, options) => {
-    const { convertToTSX } = await dynamicImport('@astrojs/compiler');
-    const result = convertToTSX(source, options);
-    return result;
-});