@astrojs/ts-plugin 0.2.1 → 0.3.0

package/src/language-service/implementation.ts

@@ -1,38 +1,36 @@
 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 { Logger } from '../logger.js';
+import { isAstroFilePath, isNotNullOrUndefined } from '../utils.js';
 
 export function decorateGetImplementation(
-    ls: ts.LanguageService,
-    snapshotManager: AstroSnapshotManager,
-    logger: Logger
+	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;
-                }
+	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,6 +1,6 @@
 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from '../logger';
 import { AstroSnapshotManager } from '../astro-snapshots.js';
+import { Logger } from '../logger';
 import { isAstroFilePath } from '../utils.js';
 import { decorateCompletions } from './completions.js';
 import { decorateGetDefinition } from './definition.js';
@@ -10,34 +10,34 @@ import { decorateGetImplementation } from './implementation.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;
+	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;
-    }
+	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);
-    };
-}
+	// 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 { 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);
+	}
+}

package/src/module-loader.ts

@@ -1,47 +1,47 @@
 import type ts from 'typescript/lib/tsserverlibrary';
-import { Logger } from './logger.js';
 import { AstroSnapshotManager } from './astro-snapshots.js';
 import { createAstroSys } from './astro-sys.js';
+import { Logger } from './logger.js';
 import { ensureRealAstroFilePath, isVirtualAstroFilePath } from './utils.js';
 
 /**
  * Caches resolved modules.
  */
 class ModuleResolutionCache {
-    private cache = new Map<string, ts.ResolvedModule>();
+	private cache = new Map<string, ts.ResolvedModule>();
 
-    /**
-     * Tries to get a cached module.
-     */
-    get(moduleName: string, containingFile: string): ts.ResolvedModule | undefined {
-        return this.cache.get(this.getKey(moduleName, containingFile));
-    }
+	/**
+	 * Tries to get a cached module.
+	 */
+	get(moduleName: string, containingFile: string): ts.ResolvedModule | undefined {
+		return this.cache.get(this.getKey(moduleName, containingFile));
+	}
 
-    /**
-     * Caches resolved module, if it is not undefined.
-     */
-    set(moduleName: string, containingFile: string, resolvedModule: ts.ResolvedModule | undefined) {
-        if (!resolvedModule) {
-            return;
-        }
-        this.cache.set(this.getKey(moduleName, containingFile), resolvedModule);
-    }
+	/**
+	 * Caches resolved module, if it is not undefined.
+	 */
+	set(moduleName: string, containingFile: string, resolvedModule: ts.ResolvedModule | undefined) {
+		if (!resolvedModule) {
+			return;
+		}
+		this.cache.set(this.getKey(moduleName, containingFile), resolvedModule);
+	}
 
-    /**
-     * Deletes module from cache. Call this if a file was deleted.
-     * @param resolvedModuleName full path of the module
-     */
-    delete(resolvedModuleName: string): void {
-        this.cache.forEach((val, key) => {
-            if (val.resolvedFileName === resolvedModuleName) {
-                this.cache.delete(key);
-            }
-        });
-    }
+	/**
+	 * Deletes module from cache. Call this if a file was deleted.
+	 * @param resolvedModuleName full path of the module
+	 */
+	delete(resolvedModuleName: string): void {
+		this.cache.forEach((val, key) => {
+			if (val.resolvedFileName === resolvedModuleName) {
+				this.cache.delete(key);
+			}
+		});
+	}
 
-    private getKey(moduleName: string, containingFile: string) {
-        return containingFile + ':::' + ensureRealAstroFilePath(moduleName);
-    }
+	private getKey(moduleName: string, containingFile: string) {
+		return containingFile + ':::' + ensureRealAstroFilePath(moduleName);
+	}
 }
 
 /**
@@ -54,92 +54,84 @@ class ModuleResolutionCache {
  * In order to fix this, we need to wrap typescript's module resolution and reroute all `.astro.ts` file lookups to .astro.
  */
 export function patchModuleLoader(
-    logger: Logger,
-    snapshotManager: AstroSnapshotManager,
-    typescript: typeof ts,
-    lsHost: ts.LanguageServiceHost,
-    project: ts.server.Project
+	logger: Logger,
+	snapshotManager: AstroSnapshotManager,
+	typescript: typeof ts,
+	lsHost: ts.LanguageServiceHost,
+	project: ts.server.Project
 ): void {
-    const astroSys = createAstroSys(logger);
-    const moduleCache = new ModuleResolutionCache();
-    const origResolveModuleNames = lsHost.resolveModuleNames?.bind(lsHost);
+	const astroSys = createAstroSys(logger);
+	const moduleCache = new ModuleResolutionCache();
+	const origResolveModuleNames = lsHost.resolveModuleNames?.bind(lsHost);
 
-    lsHost.resolveModuleNames = resolveModuleNames;
+	lsHost.resolveModuleNames = resolveModuleNames;
 
-    const origRemoveFile = project.removeFile.bind(project);
-    project.removeFile = (info, fileExists, detachFromProject) => {
-        logger.log('File is being removed. Delete from cache: ', info.fileName);
-        moduleCache.delete(info.fileName);
-        return origRemoveFile(info, fileExists, detachFromProject);
-    };
+	const origRemoveFile = project.removeFile.bind(project);
+	project.removeFile = (info, fileExists, detachFromProject) => {
+		logger.log('File is being removed. Delete from cache: ', info.fileName);
+		moduleCache.delete(info.fileName);
+		return origRemoveFile(info, fileExists, detachFromProject);
+	};
 
-    function resolveModuleNames(
-        moduleNames: string[],
-        containingFile: string,
-        reusedNames: string[] | undefined,
-        redirectedReference: ts.ResolvedProjectReference | undefined,
-        compilerOptions: ts.CompilerOptions
-    ): Array<ts.ResolvedModule | undefined> {
-        logger.log('Resolving modules names for ' + containingFile);
-        // Try resolving all module names with the original method first.
-        // The ones that are undefined will be re-checked if they are a
-        // astro file and if so, are resolved, too. This way we can defer
-        // all module resolving logic except for astro files to TypeScript.
-        const resolved =
-            origResolveModuleNames?.(
-                moduleNames,
-                containingFile,
-                reusedNames,
-                redirectedReference,
-                compilerOptions
-            ) || Array.from<undefined>(Array(moduleNames.length));
+	function resolveModuleNames(
+		moduleNames: string[],
+		containingFile: string,
+		reusedNames: string[] | undefined,
+		redirectedReference: ts.ResolvedProjectReference | undefined,
+		compilerOptions: ts.CompilerOptions
+	): Array<ts.ResolvedModule | undefined> {
+		logger.log('Resolving modules names for ' + containingFile);
+		// Try resolving all module names with the original method first.
+		// The ones that are undefined will be re-checked if they are a
+		// astro file and if so, are resolved, too. This way we can defer
+		// all module resolving logic except for astro files to TypeScript.
+		const resolved =
+			origResolveModuleNames?.(moduleNames, containingFile, reusedNames, redirectedReference, compilerOptions) ||
+			Array.from<undefined>(Array(moduleNames.length));
 
-        return resolved.map((moduleName, idx) => {
-            const fileName = moduleNames[idx];
-            if (moduleName || !ensureRealAstroFilePath(fileName).endsWith('.astro')) {
-                return moduleName;
-            }
+		return resolved.map((moduleName, idx) => {
+			const fileName = moduleNames[idx];
+			if (moduleName || !ensureRealAstroFilePath(fileName).endsWith('.astro')) {
+				return moduleName;
+			}
 
-            const cachedModule = moduleCache.get(fileName, containingFile);
-            if (cachedModule) {
-                return cachedModule;
-            }
+			const cachedModule = moduleCache.get(fileName, containingFile);
+			if (cachedModule) {
+				return cachedModule;
+			}
 
-            const resolvedModule = resolveModuleName(fileName, containingFile, compilerOptions);
-            moduleCache.set(fileName, containingFile, resolvedModule);
-            return resolvedModule;
-        });
-    }
+			const resolvedModule = resolveModuleName(fileName, containingFile, compilerOptions);
+			moduleCache.set(fileName, containingFile, resolvedModule);
+			return resolvedModule;
+		});
+	}
 
-    function resolveModuleName(
-        name: string,
-        containingFile: string,
-        compilerOptions: ts.CompilerOptions
-    ): ts.ResolvedModule | undefined {
-        const astroResolvedModule = typescript.resolveModuleName(
-            name,
-            containingFile,
-            compilerOptions,
-            astroSys
-        ).resolvedModule;
-        if (
-            !astroResolvedModule ||
-            !isVirtualAstroFilePath(astroResolvedModule.resolvedFileName)
-        ) {
-            return astroResolvedModule;
-        }
+	function resolveModuleName(
+		name: string,
+		containingFile: string,
+		compilerOptions: ts.CompilerOptions
+	): ts.ResolvedModule | undefined {
+		const astroResolvedModule = typescript.resolveModuleName(
+			name,
+			containingFile,
+			compilerOptions,
+			astroSys
+		).resolvedModule;
+		if (!astroResolvedModule || !isVirtualAstroFilePath(astroResolvedModule.resolvedFileName)) {
+			return astroResolvedModule;
+		}
 
-        const resolvedFileName = ensureRealAstroFilePath(astroResolvedModule.resolvedFileName);
-        logger.log('Resolved', name, 'to astro file', resolvedFileName);
-        const snapshot = snapshotManager.create(resolvedFileName);
-        if (!snapshot) {
-            return undefined;
-        }
+		const resolvedFileName = ensureRealAstroFilePath(astroResolvedModule.resolvedFileName);
+		logger.log('Resolved', name, 'to astro file', resolvedFileName);
+		const snapshot = snapshotManager.create(resolvedFileName);
+		if (!snapshot) {
+			return undefined;
+		}
 
-        const resolvedAstroModule: ts.ResolvedModuleFull = {
-            extension: snapshot.isTsFile ? typescript.Extension.Tsx : typescript.Extension.Jsx,
-            resolvedFileName
-        };
-        return resolvedAstroModule;
-    }
-}
+		const resolvedAstroModule: ts.ResolvedModuleFull = {
+			extension: snapshot.isTsFile ? typescript.Extension.Tsx : typescript.Extension.Jsx,
+			resolvedFileName,
+		};
+		return resolvedAstroModule;
+	}
+}