@astrojs/ts-plugin 1.0.10 → 1.1.1

package/dist/astro-sys.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAstroSys = void 0;
-const utils_js_1 = require("./utils.js");
-/**
- * This should only be accessed by TS astro module resolution.
- */
-function createAstroSys(logger, typescript) {
-    const astroSys = {
-        ...typescript.sys,
-        fileExists(path) {
-            return typescript.sys.fileExists((0, utils_js_1.ensureRealAstroFilePath)(path));
-        },
-        readDirectory(path, extensions, exclude, include, depth) {
-            const extensionsWithAstro = (extensions ?? []).concat('.astro');
-            return typescript.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
-        },
-    };
-    if (typescript.sys.realpath) {
-        const realpath = typescript.sys.realpath;
-        astroSys.realpath = function (path) {
-            if ((0, utils_js_1.isVirtualAstroFilePath)(path)) {
-                return realpath((0, utils_js_1.toRealAstroFilePath)(path)) + '.ts';
-            }
-            return realpath(path);
-        };
-    }
-    return astroSys;
-}
-exports.createAstroSys = createAstroSys;

package/dist/language-service/completions.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { Logger } from '../logger.js';
-export declare function decorateCompletions(ls: ts.LanguageService, logger: Logger): void;

package/dist/language-service/completions.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateCompletions = void 0;
-const utils_js_1 = require("../utils.js");
-const componentPostfix = '__AstroComponent_';
-function decorateCompletions(ls, logger) {
-    const getCompletionsAtPosition = ls.getCompletionsAtPosition;
-    ls.getCompletionsAtPosition = (fileName, position, options) => {
-        const completions = getCompletionsAtPosition(fileName, position, options);
-        if (!completions) {
-            return completions;
-        }
-        return {
-            ...completions,
-            entries: completions.entries.map((entry) => {
-                if (!(0, utils_js_1.isAstroFilePath)(entry.source || '') || !entry.name.endsWith(componentPostfix)) {
-                    return entry;
-                }
-                return {
-                    ...entry,
-                    name: entry.name.slice(0, -componentPostfix.length),
-                };
-            }),
-        };
-    };
-    const getCompletionEntryDetails = ls.getCompletionEntryDetails;
-    ls.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
-        if (!(0, utils_js_1.isAstroFilePath)(source || '')) {
-            const details = getCompletionEntryDetails(fileName, position, entryName, formatOptions, source, preferences, data);
-            if (details) {
-                return details;
-            }
-        }
-        // In the completion list we removed the component postfix. Internally,
-        // the language service saved the list with the postfix, so details
-        // won't match anything. Therefore add it back and remove it afterwards again.
-        const astroDetails = getCompletionEntryDetails(fileName, position, entryName + componentPostfix, formatOptions, source, preferences, data);
-        if (!astroDetails) {
-            return undefined;
-        }
-        logger.debug('Found Astro Component import completion details');
-        return (0, utils_js_1.replaceDeep)(astroDetails, componentPostfix, '');
-    };
-}
-exports.decorateCompletions = decorateCompletions;

package/dist/language-service/definition.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots';
-export declare function decorateGetDefinition(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void;

package/dist/language-service/definition.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateGetDefinition = void 0;
-const utils_1 = require("../utils");
-function decorateGetDefinition(ls, snapshotManager) {
-    const getDefinitionAndBoundSpan = ls.getDefinitionAndBoundSpan;
-    ls.getDefinitionAndBoundSpan = (fileName, position) => {
-        const definition = getDefinitionAndBoundSpan(fileName, position);
-        if (!definition?.definitions) {
-            return definition;
-        }
-        return {
-            ...definition,
-            definitions: definition.definitions
-                .map((def) => {
-                if (!(0, utils_1.isAstroFilePath)(def.fileName)) {
-                    return def;
-                }
-                let textSpan = snapshotManager.get(def.fileName)?.getOriginalTextSpan(def.textSpan);
-                if (!textSpan) {
-                    // Unmapped positions are for example the default export.
-                    // Fall back to the start of the file to at least go to the correct file.
-                    textSpan = { start: 0, length: 1 };
-                }
-                return {
-                    ...def,
-                    textSpan,
-                    // Spare the work for now
-                    originalTextSpan: undefined,
-                    contextSpan: undefined,
-                    originalContextSpan: undefined,
-                };
-            })
-                .filter(utils_1.isNotNullOrUndefined),
-        };
-    };
-}
-exports.decorateGetDefinition = decorateGetDefinition;

package/dist/language-service/diagnostics.d.ts

@@ -1,7 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-type _ts = typeof ts;
-export declare enum DiagnosticCodes {
-    CANNOT_FIND_MODULE = 2307
-}
-export declare function decorateDiagnostics(ls: ts.LanguageService, typescript: _ts): void;
-export {};

package/dist/language-service/diagnostics.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateDiagnostics = exports.DiagnosticCodes = void 0;
-const utils_js_1 = require("../utils.js");
-var DiagnosticCodes;
-(function (DiagnosticCodes) {
-    DiagnosticCodes[DiagnosticCodes["CANNOT_FIND_MODULE"] = 2307] = "CANNOT_FIND_MODULE";
-})(DiagnosticCodes || (exports.DiagnosticCodes = DiagnosticCodes = {}));
-function decorateDiagnostics(ls, typescript) {
-    decorateSyntacticDiagnostics(ls);
-    decorateSemanticDiagnostics(ls, typescript);
-    decorateSuggestionDiagnostics(ls);
-}
-exports.decorateDiagnostics = decorateDiagnostics;
-function decorateSyntacticDiagnostics(ls) {
-    const getSyntacticDiagnostics = ls.getSyntacticDiagnostics;
-    ls.getSyntacticDiagnostics = (fileName) => {
-        // Diagnostics inside Astro files are done
-        // by the @astrojs/language-server / Astro for VS Code extension
-        if ((0, utils_js_1.isAstroFilePath)(fileName)) {
-            return [];
-        }
-        return getSyntacticDiagnostics(fileName);
-    };
-}
-function decorateSemanticDiagnostics(ls, typescript) {
-    const getSemanticDiagnostics = ls.getSemanticDiagnostics;
-    ls.getSemanticDiagnostics = (fileName) => {
-        // Diagnostics inside Astro files are done
-        // by the @astrojs/language-server / Astro for VS Code extension
-        if ((0, utils_js_1.isAstroFilePath)(fileName)) {
-            return [];
-        }
-        let diagnostics = getSemanticDiagnostics(fileName);
-        diagnostics = diagnostics.map((diag) => {
-            const message = typescript.flattenDiagnosticMessageText(diag.messageText, typescript.sys.newLine);
-            if (diag.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
-                message.includes('astro:content') &&
-                // TypeScript will keep the diagnostics here in cache, so if we just blindly always add to it, our added message will be there twice
-                // Not sure if there's a generic way to ensure that we only add it once, so for now we'll just check for the message we want to add
-                !message.includes('content collections')) {
-                diag.messageText =
-                    message +
-                        `${typescript.sys.newLine}${typescript.sys.newLine}` +
-                        "If you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the TS Server might be necessary in order for the change to take effect.";
-            }
-            return diag;
-        });
-        return diagnostics;
-    };
-}
-function decorateSuggestionDiagnostics(ls) {
-    const getSuggestionDiagnostics = ls.getSuggestionDiagnostics;
-    ls.getSuggestionDiagnostics = (fileName) => {
-        // Diagnostics inside Astro files are done
-        // by the @astrojs/language-server / Astro for VS Code extension
-        if ((0, utils_js_1.isAstroFilePath)(fileName)) {
-            return [];
-        }
-        return getSuggestionDiagnostics(fileName);
-    };
-}

package/dist/language-service/file-references.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots.js';
-export declare function decorateGetFileReferences(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void;

package/dist/language-service/file-references.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateGetFileReferences = void 0;
-const utils_js_1 = require("../utils.js");
-function decorateGetFileReferences(ls, snapshotManager) {
-    const getFileReferences = ls.getFileReferences;
-    ls.getFileReferences = (fileName) => {
-        const references = getFileReferences(fileName);
-        return references
-            ?.map((ref) => {
-            if (!(0, utils_js_1.isAstroFilePath)(ref.fileName)) {
-                return ref;
-            }
-            const textSpan = snapshotManager.get(ref.fileName)?.getOriginalTextSpan(ref.textSpan);
-            if (!textSpan) {
-                return undefined;
-            }
-            return {
-                ...ref,
-                textSpan,
-                // Spare the work for now
-                contextSpan: undefined,
-                originalTextSpan: undefined,
-                originalContextSpan: undefined,
-            };
-        })
-            .filter(utils_js_1.isNotNullOrUndefined);
-    };
-}
-exports.decorateGetFileReferences = decorateGetFileReferences;

package/dist/language-service/find-references.d.ts

@@ -1,4 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots.js';
-import type { Logger } from '../logger';
-export declare function decorateFindReferences(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager, logger: Logger): void;

package/dist/language-service/find-references.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateFindReferences = void 0;
-const utils_js_1 = require("../utils.js");
-function decorateFindReferences(ls, snapshotManager, logger) {
-    decorateGetReferencesAtPosition(ls, snapshotManager, logger);
-    _decorateFindReferences(ls, snapshotManager, logger);
-}
-exports.decorateFindReferences = decorateFindReferences;
-function _decorateFindReferences(ls, snapshotManager, 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 (!(0, utils_js_1.isAstroFilePath)(reference.definition.fileName) || !snapshot) {
-                return reference;
-            }
-            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(utils_js_1.isNotNullOrUndefined);
-    };
-}
-function decorateGetReferencesAtPosition(ls, snapshotManager, logger) {
-    const getReferencesAtPosition = ls.getReferencesAtPosition;
-    ls.getReferencesAtPosition = (fileName, position) => {
-        const references = getReferencesAtPosition(fileName, position);
-        return references && mapReferences(references, snapshotManager, logger);
-    };
-}
-function mapReferences(references, snapshotManager, logger) {
-    return references
-        .map((reference) => {
-        const snapshot = snapshotManager.get(reference.fileName);
-        if (!(0, utils_js_1.isAstroFilePath)(reference.fileName) || !snapshot) {
-            return reference;
-        }
-        const textSpan = snapshot.getOriginalTextSpan(reference.textSpan);
-        if (!textSpan) {
-            return null;
-        }
-        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(utils_js_1.isNotNullOrUndefined);
-}

package/dist/language-service/implementation.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots.js';
-export declare function decorateGetImplementation(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void;

package/dist/language-service/implementation.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateGetImplementation = void 0;
-const utils_js_1 = require("../utils.js");
-function decorateGetImplementation(ls, snapshotManager) {
-    const getImplementationAtPosition = ls.getImplementationAtPosition;
-    ls.getImplementationAtPosition = (fileName, position) => {
-        const implementation = getImplementationAtPosition(fileName, position);
-        return implementation
-            ?.map((impl) => {
-            if (!(0, utils_js_1.isAstroFilePath)(impl.fileName)) {
-                return impl;
-            }
-            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(utils_js_1.isNotNullOrUndefined);
-    };
-}
-exports.decorateGetImplementation = decorateGetImplementation;

package/dist/language-service/index.d.ts

@@ -1,5 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots.js';
-import type { Logger } from '../logger';
-export declare function isPatched(ls: ts.LanguageService): boolean;
-export declare function decorateLanguageService(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager, ts: typeof import('typescript/lib/tsserverlibrary'), logger: Logger): ts.LanguageService;

package/dist/language-service/index.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateLanguageService = exports.isPatched = void 0;
-const completions_js_1 = require("./completions.js");
-const definition_js_1 = require("./definition.js");
-const diagnostics_js_1 = require("./diagnostics.js");
-const file_references_js_1 = require("./file-references.js");
-const find_references_js_1 = require("./find-references.js");
-const implementation_js_1 = require("./implementation.js");
-const line_column_offset_js_1 = require("./line-column-offset.js");
-const rename_js_1 = require("./rename.js");
-const astroPluginPatchSymbol = Symbol('astroPluginPatchSymbol');
-function isPatched(ls) {
-    return ls[astroPluginPatchSymbol] === true;
-}
-exports.isPatched = isPatched;
-function decorateLanguageService(ls, snapshotManager, ts, logger) {
-    const proxy = new Proxy(ls, createProxyHandler());
-    (0, line_column_offset_js_1.decorateLineColumnOffset)(proxy, snapshotManager);
-    (0, rename_js_1.decorateRename)(proxy, snapshotManager, logger);
-    (0, diagnostics_js_1.decorateDiagnostics)(proxy, ts);
-    (0, find_references_js_1.decorateFindReferences)(proxy, snapshotManager, logger);
-    (0, completions_js_1.decorateCompletions)(proxy, logger);
-    (0, definition_js_1.decorateGetDefinition)(proxy, snapshotManager);
-    (0, implementation_js_1.decorateGetImplementation)(proxy, snapshotManager);
-    (0, file_references_js_1.decorateGetFileReferences)(proxy, snapshotManager);
-    return proxy;
-}
-exports.decorateLanguageService = decorateLanguageService;
-function createProxyHandler() {
-    const decorated = {};
-    return {
-        get(target, p) {
-            if (p === astroPluginPatchSymbol) {
-                return true;
-            }
-            return decorated[p] ?? target[p];
-        },
-        set(_, p, value) {
-            decorated[p] = value;
-            return true;
-        },
-    };
-}

package/dist/language-service/line-column-offset.d.ts

@@ -1,3 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots';
-export declare function decorateLineColumnOffset(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager): void;

package/dist/language-service/line-column-offset.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateLineColumnOffset = void 0;
-const utils_1 = require("../utils");
-function decorateLineColumnOffset(ls, snapshotManager) {
-    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 ((0, utils_1.isAstroFilePath)(fileName)) {
-            const snapshot = snapshotManager.get(fileName);
-            if (snapshot) {
-                return snapshot.positionAt(position);
-            }
-        }
-        return toLineColumnOffset(fileName, position);
-    };
-}
-exports.decorateLineColumnOffset = decorateLineColumnOffset;

package/dist/language-service/rename.d.ts

@@ -1,4 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from '../astro-snapshots.js';
-import type { Logger } from '../logger.js';
-export declare function decorateRename(ls: ts.LanguageService, snapshotManager: AstroSnapshotManager, logger: Logger): void;

package/dist/language-service/rename.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateRename = void 0;
-const utils_js_1 = require("../utils.js");
-function decorateRename(ls, snapshotManager, logger) {
-    const findRenameLocations = ls.findRenameLocations;
-    ls.findRenameLocations = (fileName, position, findInStrings, findInComments, preferences) => {
-        const renameLocations = findRenameLocations(fileName, position, findInStrings, findInComments, preferences);
-        return renameLocations
-            ?.map((renameLocation) => {
-            const snapshot = snapshotManager.get(renameLocation.fileName);
-            if (!(0, utils_js_1.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;
-            }
-            const converted = {
-                ...renameLocation,
-                textSpan,
-            };
-            if (converted.contextSpan) {
-                // Not important, spare the work
-                converted.contextSpan = undefined;
-            }
-            logger.debug('Converted rename location ', converted);
-            return converted;
-        })
-            .filter(utils_js_1.isNotNullOrUndefined);
-    };
-}
-exports.decorateRename = decorateRename;

package/dist/logger.d.ts

@@ -1,8 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-export declare class Logger {
-    private tsLogService;
-    private logDebug;
-    constructor(tsLogService: ts.server.Logger, suppressNonAstroLogs?: boolean, logDebug?: boolean);
-    log(...args: any[]): void;
-    debug(...args: any[]): void;
-}

package/dist/logger.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logger = void 0;
-class Logger {
-    constructor(tsLogService, suppressNonAstroLogs = false, logDebug = false) {
-        this.tsLogService = tsLogService;
-        this.logDebug = logDebug;
-        if (suppressNonAstroLogs) {
-            const log = this.tsLogService.info.bind(this.tsLogService);
-            this.tsLogService.info = (s) => {
-                if (s.startsWith('-Astro Plugin-')) {
-                    log(s);
-                }
-            };
-        }
-    }
-    log(...args) {
-        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) {
-        if (!this.logDebug) {
-            return;
-        }
-        this.log(...args);
-    }
-}
-exports.Logger = Logger;

package/dist/module-loader.d.ts

@@ -1,13 +0,0 @@
-import type ts from 'typescript/lib/tsserverlibrary';
-import type { AstroSnapshotManager } from './astro-snapshots.js';
-import type { Logger } from './logger.js';
-/**
- * Creates a module loader than can also resolve `.astro` files.
- *
- * The typescript language service tries to look up other files that are referenced in the currently open astro file.
- * For `.ts`/`.js` files this works, for `.astro` files it does not by default.
- * Reason: The typescript language service does not know about the `.astro` file ending,
- * so it assumes it's a normal typescript file and searches for files like `../Component.astro.ts`, which is wrong.
- * In order to fix this, we need to wrap typescript's module resolution and reroute all `.astro.ts` file lookups to .astro.
- */
-export declare function patchModuleLoader(logger: Logger, snapshotManager: AstroSnapshotManager, typescript: typeof ts, lsHost: ts.LanguageServiceHost, project: ts.server.Project): void;