@astrojs/ts-plugin 0.2.1 → 0.4.0

package/src/language-service/find-references.ts

@@ -1,95 +1,86 @@
 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { isNotNullOrUndefined, isAstroFilePath } from '../utils.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import type { Logger } from '../logger';
+import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
 
 export function decorateFindReferences(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
+	ls: ts.LanguageService,
+	snapshotManager: AstroSnapshotManager,
+	logger: Logger
 ): void {
-    decorateGetReferencesAtPosition(ls, snapshotManager, logger);
-    _decorateFindReferences(ls, snapshotManager, logger);
+	decorateGetReferencesAtPosition(ls, snapshotManager, logger);
+	_decorateFindReferences(ls, snapshotManager, logger);
 }
 
-function _decorateFindReferences(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
-) {
-    const findReferences = ls.findReferences;
-    ls.findReferences = (fileName, position) => {
-        const references = findReferences(fileName, position);
-        return references
-            ?.map((reference) => {
-                const snapshot = snapshotManager.get(reference.definition.fileName);
-                if (!isAstroFilePath(reference.definition.fileName) || !snapshot) {
-                    return reference;
-                }
+function _decorateFindReferences(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager, logger: Logger) {
+	const findReferences = ls.findReferences;
+	ls.findReferences = (fileName, position) => {
+		const references = findReferences(fileName, position);
+		return references
+			?.map((reference) => {
+				const snapshot = snapshotManager.get(reference.definition.fileName);
+				if (!isAstroFilePath(reference.definition.fileName) || !snapshot) {
+					return reference;
+				}
 
-                const textSpan = snapshot.getOriginalTextSpan(reference.definition.textSpan);
-                if (!textSpan) {
-                    return null;
-                }
+				const textSpan = snapshot.getOriginalTextSpan(reference.definition.textSpan);
+				if (!textSpan) {
+					return null;
+				}
 
-                return {
-                    definition: {
-                        ...reference.definition,
-                        textSpan,
-                        // Spare the work for now
-                        originalTextSpan: undefined
-                    },
-                    references: mapReferences(reference.references, snapshotManager, logger)
-                };
-            })
-            .filter(isNotNullOrUndefined);
-    };
+				return {
+					definition: {
+						...reference.definition,
+						textSpan,
+						// Spare the work for now
+						originalTextSpan: undefined,
+					},
+					references: mapReferences(reference.references, snapshotManager, logger),
+				};
+			})
+			.filter(isNotNullOrUndefined);
+	};
 }
 
 function decorateGetReferencesAtPosition(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
+	ls: ts.LanguageService,
+	snapshotManager: AstroSnapshotManager,
+	logger: Logger
 ) {
-    const getReferencesAtPosition = ls.getReferencesAtPosition;
-    ls.getReferencesAtPosition = (fileName, position) => {
-        const references = getReferencesAtPosition(fileName, position);
-        return references && mapReferences(references, snapshotManager, logger);
-    };
+	const getReferencesAtPosition = ls.getReferencesAtPosition;
+	ls.getReferencesAtPosition = (fileName, position) => {
+		const references = getReferencesAtPosition(fileName, position);
+		return references && mapReferences(references, snapshotManager, logger);
+	};
 }
 
 function mapReferences(
-    references: ts.ReferenceEntry[],
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
+	references: ts.ReferenceEntry[],
+	snapshotManager: AstroSnapshotManager,
+	logger: Logger
 ): ts.ReferenceEntry[] {
-    return references
-        .map((reference) => {
-            const snapshot = snapshotManager.get(reference.fileName);
-            if (!isAstroFilePath(reference.fileName) || !snapshot) {
-                return reference;
-            }
+	return references
+		.map((reference) => {
+			const snapshot = snapshotManager.get(reference.fileName);
+			if (!isAstroFilePath(reference.fileName) || !snapshot) {
+				return reference;
+			}
 
-            const textSpan = snapshot.getOriginalTextSpan(reference.textSpan);
-            if (!textSpan) {
-                return null;
-            }
+			const textSpan = snapshot.getOriginalTextSpan(reference.textSpan);
+			if (!textSpan) {
+				return null;
+			}
 
-            logger.debug(
-                'Find references; map textSpan: changed',
-                reference.textSpan,
-                'to',
-                textSpan
-            );
+			logger.debug('Find references; map textSpan: changed', reference.textSpan, 'to', textSpan);
 
-            return {
-                ...reference,
-                textSpan,
-                // Spare the work for now
-                contextSpan: undefined,
-                originalTextSpan: undefined,
-                originalContextSpan: undefined
-            };
-        })
-        .filter(isNotNullOrUndefined);
-}
+			return {
+				...reference,
+				textSpan,
+				// Spare the work for now
+				contextSpan: undefined,
+				originalTextSpan: undefined,
+				originalContextSpan: undefined,
+			};
+		})
+		.filter(isNotNullOrUndefined);
+}

package/src/language-service/implementation.ts

@@ -1,38 +1,31 @@
 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger.js';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { isNotNullOrUndefined, isAstroFilePath } from '../utils.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
 
-export function decorateGetImplementation(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
-): void {
-    const getImplementationAtPosition = ls.getImplementationAtPosition;
-    ls.getImplementationAtPosition = (fileName, position) => {
-        const implementation = getImplementationAtPosition(fileName, position);
-        return implementation
-            ?.map((impl) => {
-                if (!isAstroFilePath(impl.fileName)) {
-                    return impl;
-                }
+export function decorateGetImplementation(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void {
+	const getImplementationAtPosition = ls.getImplementationAtPosition;
+	ls.getImplementationAtPosition = (fileName, position) => {
+		const implementation = getImplementationAtPosition(fileName, position);
+		return implementation
+			?.map((impl) => {
+				if (!isAstroFilePath(impl.fileName)) {
+					return impl;
+				}
 
-                const textSpan = snapshotManager
-                    .get(impl.fileName)
-                    ?.getOriginalTextSpan(impl.textSpan);
-                if (!textSpan) {
-                    return undefined;
-                }
+				const textSpan = snapshotManager.get(impl.fileName)?.getOriginalTextSpan(impl.textSpan);
+				if (!textSpan) {
+					return undefined;
+				}
 
-                return {
-                    ...impl,
-                    textSpan,
-                    // Spare the work for now
-                    contextSpan: undefined,
-                    originalTextSpan: undefined,
-                    originalContextSpan: undefined
-                };
-            })
-            .filter(isNotNullOrUndefined);
-    };
-}
+				return {
+					...impl,
+					textSpan,
+					// Spare the work for now
+					contextSpan: undefined,
+					originalTextSpan: undefined,
+					originalContextSpan: undefined,
+				};
+			})
+			.filter(isNotNullOrUndefined);
+	};
+}

package/src/language-service/index.ts

@@ -1,43 +1,28 @@
 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { isAstroFilePath } from '../utils.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import type { Logger } from '../logger';
 import { decorateCompletions } from './completions.js';
 import { decorateGetDefinition } from './definition.js';
 import { decorateDiagnostics } from './diagnostics.js';
+import { decorateGetFileReferences } from './file-references.js';
 import { decorateFindReferences } from './find-references.js';
 import { decorateGetImplementation } from './implementation.js';
+import { decorateLineColumnOffset } from './line-column-offset.js';
 import { decorateRename } from './rename.js';
 
 export function decorateLanguageService(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
+	ls: ts.LanguageService,
+	snapshotManager: AstroSnapshotManager,
+	logger: Logger
 ): ts.LanguageService {
-    patchLineColumnOffset(ls, snapshotManager);
-    decorateRename(ls, snapshotManager, logger);
-    decorateDiagnostics(ls, logger);
-    decorateFindReferences(ls, snapshotManager, logger);
-    decorateCompletions(ls, logger);
-    decorateGetDefinition(ls, snapshotManager, logger);
-    decorateGetImplementation(ls, snapshotManager, logger);
-    return ls;
-}
-
-function patchLineColumnOffset(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager) {
-    if (!ls.toLineColumnOffset) {
-        return;
-    }
+	decorateLineColumnOffset(ls, snapshotManager);
+	decorateRename(ls, snapshotManager, logger);
+	decorateDiagnostics(ls);
+	decorateFindReferences(ls, snapshotManager, logger);
+	decorateCompletions(ls, logger);
+	decorateGetDefinition(ls, snapshotManager);
+	decorateGetImplementation(ls, snapshotManager);
+	decorateGetFileReferences(ls, snapshotManager);
 
-    // We need to patch this because (according to source, only) getDefinition uses this
-    const toLineColumnOffset = ls.toLineColumnOffset;
-    ls.toLineColumnOffset = (fileName, position) => {
-        if (isAstroFilePath(fileName)) {
-            const snapshot = snapshotManager.get(fileName);
-            if (snapshot) {
-                return snapshot.positionAt(position);
-            }
-        }
-        return toLineColumnOffset(fileName, position);
-    };
-}
+	return ls;
+}

package/src/language-service/line-column-offset.ts

@@ -0,0 +1,21 @@
+import type ts from 'typescript/lib/tsserverlibrary';
+import type { AstroSnapshotManager } from '../astro-snapshots';
+import { isAstroFilePath } from '../utils';
+
+export function decorateLineColumnOffset(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager) {
+	if (!ls.toLineColumnOffset) {
+		return;
+	}
+
+	// We need to patch this because (according to source, only) getDefinition uses this
+	const toLineColumnOffset = ls.toLineColumnOffset;
+	ls.toLineColumnOffset = (fileName, position) => {
+		if (isAstroFilePath(fileName)) {
+			const snapshot = snapshotManager.get(fileName);
+			if (snapshot) {
+				return snapshot.positionAt(position);
+			}
+		}
+		return toLineColumnOffset(fileName, position);
+	};
+}

package/src/language-service/rename.ts

@@ -1,52 +1,42 @@
 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger.js';
-import { AstroSnapshotManager } from '../astro-snapshots.js';
-import { isNotNullOrUndefined, isAstroFilePath } from '../utils.js';
+import type { AstroSnapshotManager } from '../astro-snapshots.js';
+import type { Logger } from '../logger.js';
+import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
 
-export function decorateRename(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
-): void {
-    const findRenameLocations = ls.findRenameLocations;
-    ls.findRenameLocations = (
-        fileName,
-        position,
-        findInStrings,
-        findInComments,
-        providePrefixAndSuffixTextForRename
-    ) => {
-        const renameLocations = findRenameLocations(
-            fileName,
-            position,
-            findInStrings,
-            findInComments,
-            providePrefixAndSuffixTextForRename
-        );
-        return renameLocations
-            ?.map((renameLocation) => {
-                const snapshot = snapshotManager.get(renameLocation.fileName);
-                if (!isAstroFilePath(renameLocation.fileName) || !snapshot) {
-                    return renameLocation;
-                }
+export function decorateRename(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager, logger: Logger): void {
+	const findRenameLocations = ls.findRenameLocations;
+	ls.findRenameLocations = (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) => {
+		const renameLocations = findRenameLocations(
+			fileName,
+			position,
+			findInStrings,
+			findInComments,
+			providePrefixAndSuffixTextForRename
+		);
+		return renameLocations
+			?.map((renameLocation) => {
+				const snapshot = snapshotManager.get(renameLocation.fileName);
+				if (!isAstroFilePath(renameLocation.fileName) || !snapshot) {
+					return renameLocation;
+				}
 
-                // TODO more needed to filter invalid locations, see RenameProvider
-                const textSpan = snapshot.getOriginalTextSpan(renameLocation.textSpan);
-                if (!textSpan) {
-                    return null;
-                }
+				// TODO more needed to filter invalid locations, see RenameProvider
+				const textSpan = snapshot.getOriginalTextSpan(renameLocation.textSpan);
+				if (!textSpan) {
+					return null;
+				}
 
-                const converted = {
-                    ...renameLocation,
-                    textSpan
-                };
-                if (converted.contextSpan) {
-                    // Not important, spare the work
-                    converted.contextSpan = undefined;
-                }
-                logger.debug('Converted rename location ', converted);
-                return converted;
-            })
-            .filter(isNotNullOrUndefined);
-    };
-}
+				const converted = {
+					...renameLocation,
+					textSpan,
+				};
+				if (converted.contextSpan) {
+					// Not important, spare the work
+					converted.contextSpan = undefined;
+				}
+				logger.debug('Converted rename location ', converted);
+				return converted;
+			})
+			.filter(isNotNullOrUndefined);
+	};
+}

package/src/logger.ts

@@ -1,41 +1,37 @@
 import type ts from 'typescript/lib/tsserverlibrary';
 
 export class Logger {
-    constructor(
-        private tsLogService: ts.server.Logger,
-        suppressNonAstroLogs = false,
-        private logDebug = false
-    ) {
-        if (suppressNonAstroLogs) {
-            const log = this.tsLogService.info.bind(this.tsLogService);
-            this.tsLogService.info = (s: string) => {
-                if (s.startsWith('-Astro Plugin-')) {
-                    log(s);
-                }
-            };
-        }
-    }
+	constructor(private tsLogService: ts.server.Logger, suppressNonAstroLogs = false, private logDebug = false) {
+		if (suppressNonAstroLogs) {
+			const log = this.tsLogService.info.bind(this.tsLogService);
+			this.tsLogService.info = (s: string) => {
+				if (s.startsWith('-Astro Plugin-')) {
+					log(s);
+				}
+			};
+		}
+	}
 
-    log(...args: any[]) {
-        const str = args
-            .map((arg) => {
-                if (typeof arg === 'object') {
-                    try {
-                        return JSON.stringify(arg);
-                    } catch (e) {
-                        return '[object that cannot by stringified]';
-                    }
-                }
-                return arg;
-            })
-            .join(' ');
-        this.tsLogService.info('-Astro Plugin- ' + str);
-    }
+	log(...args: any[]) {
+		const str = args
+			.map((arg) => {
+				if (typeof arg === 'object') {
+					try {
+						return JSON.stringify(arg);
+					} catch (e) {
+						return '[object that cannot by stringified]';
+					}
+				}
+				return arg;
+			})
+			.join(' ');
+		this.tsLogService.info('-Astro Plugin- ' + str);
+	}
 
-    debug(...args: any[]) {
-        if (!this.logDebug) {
-            return;
-        }
-        this.log(...args);
-    }
-}
+	debug(...args: any[]) {
+		if (!this.logDebug) {
+			return;
+		}
+		this.log(...args);
+	}
+}