@astrojs/language-server 0.19.5 → 0.20.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @astrojs/language-server
 
+## 0.20.1
+
+### Patch Changes
+
+- e6996f5: Fixed many situations where the language server would warn abusively about not being able to find Astro
+- 4589c2b: Fix the language server not warning properly when a package is implicitely any due to missing types
+
+## 0.20.0
+
+### Minor Changes
+
+- ba0fab1: Load language integrations from the user's project instead of bundling them in the language server
+
+### Patch Changes
+
+- fa3f0f7: Updated exports for `astro check`
+
+## 0.19.6
+
+### Patch Changes
+
+- 4c1045d: Empty changeset because publish failed
+
 ## 0.19.5
 
 ### Patch Changes

package/dist/check.d.ts

@@ -1,6 +1,8 @@
-import type { Diagnostic } from 'vscode-languageserver';
-export { DiagnosticSeverity } from 'vscode-languageserver-protocol';
-interface GetDiagnosticsResult {
+import type { Diagnostic } from 'vscode-languageserver-types';
+import { LSConfig } from './core/config';
+export { DiagnosticSeverity } from 'vscode-languageserver-types';
+export { Diagnostic };
+export interface GetDiagnosticsResult {
     filePath: string;
     text: string;
     diagnostics: Diagnostic[];
@@ -9,7 +11,7 @@ export declare class AstroCheck {
     private docManager;
     private configManager;
     private pluginHost;
-    constructor(workspacePath: string);
+    constructor(workspacePath: string, options?: LSConfig);
     upsertDocument(doc: {
         text: string;
         uri: string;

package/dist/check.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstroCheck = exports.DiagnosticSeverity = void 0;
-const documents_1 = require("./core/documents");
 const config_1 = require("./core/config");
+const documents_1 = require("./core/documents");
 const plugins_1 = require("./plugins");
-var vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
-Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return vscode_languageserver_protocol_1.DiagnosticSeverity; } });
+var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return vscode_languageserver_types_1.DiagnosticSeverity; } });
 class AstroCheck {
-    constructor(workspacePath) {
+    constructor(workspacePath, options) {
         this.docManager = documents_1.DocumentManager.newInstance();
         this.configManager = new config_1.ConfigManager();
         this.pluginHost = new plugins_1.PluginHost(this.docManager);
         this.initialize(workspacePath);
+        if (options) {
+            this.configManager.updateGlobalConfig(options);
+        }
     }
     upsertDocument(doc) {
         this.docManager.openDocument({

package/dist/importPackage.d.ts

@@ -0,0 +1,6 @@
+import type * as svelte from '@astrojs/svelte/dist/editor.cjs';
+import type * as vue from '@astrojs/svelte/dist/editor.cjs';
+export declare function setIsTrusted(_isTrusted: boolean): void;
+export declare function getPackagePath(packageName: string, fromPath: string): string | undefined;
+export declare function importSvelteIntegration(fromPath: string): typeof svelte | undefined;
+export declare function importVueIntegration(fromPath: string): typeof vue | undefined;

package/dist/importPackage.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importVueIntegration = exports.importSvelteIntegration = exports.getPackagePath = exports.setIsTrusted = void 0;
+const path_1 = require("path");
+let isTrusted = true;
+function setIsTrusted(_isTrusted) {
+    isTrusted = _isTrusted;
+}
+exports.setIsTrusted = setIsTrusted;
+function getPackagePath(packageName, fromPath) {
+    const paths = [];
+    if (isTrusted) {
+        paths.unshift(fromPath);
+    }
+    try {
+        const packageJSONPath = require.resolve(`${packageName}/package.json`, {
+            paths,
+        });
+        return (0, path_1.dirname)(packageJSONPath);
+    }
+    catch (e) {
+        return undefined;
+    }
+}
+exports.getPackagePath = getPackagePath;
+function importEditorIntegration(packageName, fromPath) {
+    const pkgPath = getPackagePath(packageName, fromPath);
+    if (pkgPath) {
+        const main = (0, path_1.resolve)(pkgPath, 'dist', 'editor.cjs');
+        return require(main);
+    }
+    return undefined;
+}
+function importSvelteIntegration(fromPath) {
+    return importEditorIntegration('@astrojs/svelte', fromPath);
+}
+exports.importSvelteIntegration = importSvelteIntegration;
+function importVueIntegration(fromPath) {
+    return importEditorIntegration('@astrojs/vue', fromPath);
+}
+exports.importVueIntegration = importVueIntegration;

package/dist/index.d.ts

@@ -1 +1,2 @@
-export { AstroCheck, DiagnosticSeverity } from './check';
+export { AstroCheck, Diagnostic, DiagnosticSeverity, GetDiagnosticsResult } from './check';
+export { offsetAt } from './core/documents';

package/dist/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DiagnosticSeverity = exports.AstroCheck = void 0;
+exports.offsetAt = exports.DiagnosticSeverity = exports.AstroCheck = void 0;
 var check_1 = require("./check");
 Object.defineProperty(exports, "AstroCheck", { enumerable: true, get: function () { return check_1.AstroCheck; } });
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return check_1.DiagnosticSeverity; } });
+var documents_1 = require("./core/documents");
+Object.defineProperty(exports, "offsetAt", { enumerable: true, get: function () { return documents_1.offsetAt; } });

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

@@ -5,13 +5,13 @@ import { DiagnosticsProvider } from '../../interfaces';
 import { LanguageServiceManager } from '../LanguageServiceManager';
 export declare enum DiagnosticCodes {
     SPREAD_EXPECTED = 1005,
+    IS_NOT_A_MODULE = 2306,
     DUPLICATED_JSX_ATTRIBUTES = 17001,
     MUST_HAVE_PARENT_ELEMENT = 2657,
     CANT_RETURN_OUTSIDE_FUNC = 1108,
     ISOLATED_MODULE_COMPILE_ERR = 1208,
     TYPE_NOT_ASSIGNABLE = 2322,
     JSX_NO_CLOSING_TAG = 17008,
-    NO_DECL_IMPLICIT_ANY_TYPE = 7016,
     JSX_ELEMENT_NO_CALL = 2604
 }
 export declare class DiagnosticsProviderImpl implements DiagnosticsProvider {

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

@@ -13,13 +13,13 @@ const utils_1 = require("../utils");
 var DiagnosticCodes;
 (function (DiagnosticCodes) {
     DiagnosticCodes[DiagnosticCodes["SPREAD_EXPECTED"] = 1005] = "SPREAD_EXPECTED";
+    DiagnosticCodes[DiagnosticCodes["IS_NOT_A_MODULE"] = 2306] = "IS_NOT_A_MODULE";
     DiagnosticCodes[DiagnosticCodes["DUPLICATED_JSX_ATTRIBUTES"] = 17001] = "DUPLICATED_JSX_ATTRIBUTES";
     DiagnosticCodes[DiagnosticCodes["MUST_HAVE_PARENT_ELEMENT"] = 2657] = "MUST_HAVE_PARENT_ELEMENT";
     DiagnosticCodes[DiagnosticCodes["CANT_RETURN_OUTSIDE_FUNC"] = 1108] = "CANT_RETURN_OUTSIDE_FUNC";
     DiagnosticCodes[DiagnosticCodes["ISOLATED_MODULE_COMPILE_ERR"] = 1208] = "ISOLATED_MODULE_COMPILE_ERR";
     DiagnosticCodes[DiagnosticCodes["TYPE_NOT_ASSIGNABLE"] = 2322] = "TYPE_NOT_ASSIGNABLE";
     DiagnosticCodes[DiagnosticCodes["JSX_NO_CLOSING_TAG"] = 17008] = "JSX_NO_CLOSING_TAG";
-    DiagnosticCodes[DiagnosticCodes["NO_DECL_IMPLICIT_ANY_TYPE"] = 7016] = "NO_DECL_IMPLICIT_ANY_TYPE";
     DiagnosticCodes[DiagnosticCodes["JSX_ELEMENT_NO_CALL"] = 2604] = "JSX_ELEMENT_NO_CALL";
 })(DiagnosticCodes = exports.DiagnosticCodes || (exports.DiagnosticCodes = {}));
 class DiagnosticsProviderImpl {
@@ -86,7 +86,6 @@ class DiagnosticsProviderImpl {
                 isNoSpreadExpected(diag, document) &&
                 isNoCantReturnOutsideFunction(diag) &&
                 isNoIsolatedModuleError(diag) &&
-                isNoImportImplicitAnyType(diag) &&
                 isNoJsxCannotHaveMultipleAttrsError(diag));
         })
             .map(enhanceIfNecessary);
@@ -172,9 +171,6 @@ function isNoJsxCannotHaveMultipleAttrsError(diagnostic) {
 function isNoJSXMustHaveOneParent(diagnostic) {
     return diagnostic.code !== DiagnosticCodes.MUST_HAVE_PARENT_ELEMENT;
 }
-function isNoImportImplicitAnyType(diagnostic) {
-    return diagnostic.code !== DiagnosticCodes.NO_DECL_IMPLICIT_ANY_TYPE;
-}
 /**
  * When using the shorthand syntax for props TSX expects you to use the spread operator
  * Since the shorthand syntax works differently in Astro and this is not required, hide this message
@@ -190,7 +186,7 @@ function isNoSpreadExpected(diagnostic, document) {
 }
 /**
  * Ignore "Can't return outside of function body"
- * Since the frontmatter is at the top level, users trying to return a Response  for SSR mode run into this
+ * Since the frontmatter is at the top level, users trying to return a Response for SSR mode run into this
  */
 function isNoCantReturnOutsideFunction(diagnostic) {
     return diagnostic.code !== DiagnosticCodes.CANT_RETURN_OUTSIDE_FUNC;
@@ -206,6 +202,19 @@ function isNoIsolatedModuleError(diagnostic) {
  * Some diagnostics have JSX-specific nomenclature or unclear description. Enhance them for more clarity.
  */
 function enhanceIfNecessary(diagnostic) {
+    // When the language integrations are not installed, the content of the imported snapshot is empty
+    // As such, it triggers the "is not a module error", which we can enhance with a more helpful message for the related framework
+    if (diagnostic.code === DiagnosticCodes.IS_NOT_A_MODULE) {
+        if (diagnostic.message.includes('.svelte')) {
+            diagnostic.message +=
+                '\n\nIs the `@astrojs/svelte` package installed? You can add it to your project by running the following command: `astro add svelte`. If already installed, restarting the language server might be necessary in order for the change to take effect';
+        }
+        if (diagnostic.message.includes('.vue')) {
+            diagnostic.message +=
+                '\n\nIs the `@astrojs/vue` package installed? You can add it to your project by running the following command: `astro add vue`. If already installed, restarting the language server might be necessary in order for the change to take effect';
+        }
+        return diagnostic;
+    }
     // JSX element has no closing tag. JSX -> HTML
     if (diagnostic.code === DiagnosticCodes.JSX_NO_CLOSING_TAG) {
         return {
@@ -224,7 +233,7 @@ function enhanceIfNecessary(diagnostic) {
     }
     // For the rare case where an user might try to put a client directive on something that is not a component
     if (diagnostic.code === DiagnosticCodes.TYPE_NOT_ASSIGNABLE) {
-        if (diagnostic.message.includes("Property 'client:") && diagnostic.message.includes("to type 'HTMLProps")) {
+        if (diagnostic.message.includes("Property 'client:") && diagnostic.message.includes("to type 'HTMLAttributes")) {
             return {
                 ...diagnostic,
                 message: 'Client directives are only available on framework components',

package/dist/plugins/typescript/language-service.js

@@ -90,7 +90,9 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     const scriptFileNames = [];
     // Before Astro 1.0, JSX definitions were inside of the language-server instead of inside Astro
     // TODO: Remove this and astro-jsx.d.ts in types when we consider having support for Astro < 1.0 unnecessary
-    if (astroVersion.major === 0 || astroVersion.full === '1.0.0-beta.0') {
+    if ((astroVersion.major === 0 || astroVersion.full === '1.0.0-beta.0') &&
+        !astroVersion.full.startsWith('0.0.0-rc-') // 1.0.0's RC is considered to be 0.0.0, so we have to check for it
+    ) {
         const astroTSXFile = typescript_1.default.sys.resolvePath((0, path_1.resolve)(languageServerDirectory, '../types/astro-jsx.d.ts'));
         scriptFileNames.push(astroTSXFile);
         console.warn("Version lower than 1.0 detected, using internal types instead of Astro's");
@@ -219,19 +221,23 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         });
     }
     function getParsedTSConfig() {
-        let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
+        let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {
+            compilerOptions: getDefaultCompilerOptions(astroVersion),
+        };
         // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config
         if (configJson.compilerOptions?.types) {
             if (!configJson.compilerOptions?.types.includes('astro/env')) {
                 configJson.compilerOptions.types.push('astro/env');
             }
-            if (astroVersion.major >= 1 &&
+            if ((astroVersion.major >= 1 || astroVersion.full.startsWith('0.0.0-rc-')) &&
                 astroVersion.full !== '1.0.0-beta.0' &&
                 !configJson.compilerOptions?.types.includes('astro/astro-jsx')) {
                 configJson.compilerOptions.types.push('astro/astro-jsx');
             }
         }
-        configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(astroVersion), configJson.compilerOptions);
+        else {
+            configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(astroVersion), configJson.compilerOptions);
+        }
         // Delete include so that .astro files don't get mistakenly excluded by the user
         delete configJson.include;
         // If the user supplied exclude, let's use theirs otherwise, use ours
@@ -241,6 +247,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
             noEmit: true,
             declaration: false,
             resolveJsonModule: true,
+            allowSyntheticDefaultImports: true,
             allowNonTsExtensions: true,
             allowJs: true,
             jsx: typescript_1.default.JsxEmit.Preserve,
@@ -267,16 +274,14 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     }
 }
 /**
- * Default configuration used as a base and when the user doesn't have any
+ * Default compiler configuration used when the user doesn't have any
  */
 function getDefaultCompilerOptions(astroVersion) {
     const types = ['astro/env'];
-    if (astroVersion.major >= 1 && astroVersion.full !== '1.0.0-beta.0') {
+    if ((astroVersion.major >= 1 && astroVersion.full !== '1.0.0-beta.0') || astroVersion.full.startsWith('0.0.0-rc-')) {
         types.push('astro/astro-jsx');
     }
     return {
-        maxNodeModuleJsDepth: 2,
-        allowSyntheticDefaultImports: true,
         types: types,
     };
 }

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

@@ -9,9 +9,8 @@ const astro2tsx_1 = __importDefault(require("../astro2tsx"));
 const vscode_uri_1 = require("vscode-uri");
 const utils_1 = require("../utils");
 const DocumentSnapshot_1 = require("./DocumentSnapshot");
-const svelte_language_integration_1 = require("@astrojs/svelte-language-integration");
-const vue_language_integration_1 = require("@astrojs/vue-language-integration");
 const utils_2 = require("../../../utils");
+const importPackage_1 = require("../../../importPackage");
 // Utilities to create Snapshots from different contexts
 function createFromDocument(document) {
     const { code } = (0, astro2tsx_1.default)(document.getText(), classNameFromFilename(document.getURL()));
@@ -75,10 +74,16 @@ function createFromFrameworkFilePath(filePath, framework) {
     const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     let code = '';
     if (framework === 'svelte') {
-        code = (0, svelte_language_integration_1.toTSX)(originalText, className);
+        const svelteIntegration = (0, importPackage_1.importSvelteIntegration)(filePath);
+        if (svelteIntegration) {
+            code = svelteIntegration.toTSX(originalText, className);
+        }
     }
     else if (framework === 'vue') {
-        code = (0, vue_language_integration_1.toTSX)(originalText, className);
+        const vueIntegration = (0, importPackage_1.importVueIntegration)(filePath);
+        if (vueIntegration) {
+            code = vueIntegration.toTSX(originalText, className);
+        }
     }
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, code, typescript_1.default.ScriptKind.TSX);
 }

package/dist/server.js

@@ -49,6 +49,11 @@ function startLanguageServer(connection) {
         const workspaceUris = params.workspaceFolders?.map((folder) => folder.uri.toString()) ?? [params.rootUri ?? ''];
         workspaceUris.forEach((uri) => {
             uri = (0, utils_1.urlToPath)(uri);
+            // If the workspace is not an Astro project, we shouldn't warn about not finding Astro
+            // Unless the extension enabled itself in an untitled workspace, in which case the warning is valid
+            if (!(0, utils_1.isAstroWorkspace)(uri) && uri !== '/' && uri !== '') {
+                return;
+            }
             const astroVersion = (0, utils_1.getUserAstroVersion)(uri);
             if (astroVersion.exist === false) {
                 connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
@@ -56,12 +61,6 @@ function startLanguageServer(connection) {
                     type: vscode_languageserver_1.MessageType.Warning,
                 });
             }
-            if (astroVersion.exist && astroVersion.major === 0 && astroVersion.minor < 24 && astroVersion.patch < 5) {
-                connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
-                    message: `The version of Astro you're using (${astroVersion.full}) is not supported by this version of the Astro language server. Please upgrade Astro to any version higher than 0.23.4 or if using the VS Code extension, downgrade the extension to 0.8.10`,
-                    type: vscode_languageserver_1.MessageType.Error,
-                });
-            }
         });
         hasConfigurationCapability = !!(params.capabilities.workspace && !!params.capabilities.workspace.configuration);
         pluginHost.initialize({

package/dist/utils.d.ts

@@ -65,6 +65,10 @@ export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPre
  * @param milliseconds Number of milliseconds to debounce/throttle
  */
 export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, milliseconds: number): T;
+/**
+ * Try to determine if a workspace could be an Astro project based on the content of `package.json`
+ */
+export declare function isAstroWorkspace(workspacePath: string): boolean;
 export interface AstroVersion {
     full: string;
     major: number;

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.regexLastIndexOf = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.modifyLines = exports.toPascalCase = exports.mergeDeep = exports.get = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
+exports.getUserAstroVersion = exports.isAstroWorkspace = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.regexLastIndexOf = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.modifyLines = exports.toPascalCase = exports.mergeDeep = exports.get = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
 const vscode_uri_1 = require("vscode-uri");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
@@ -197,6 +197,23 @@ function debounceThrottle(fn, milliseconds) {
     return maybeCall;
 }
 exports.debounceThrottle = debounceThrottle;
+/**
+ * Try to determine if a workspace could be an Astro project based on the content of `package.json`
+ */
+function isAstroWorkspace(workspacePath) {
+    try {
+        const astroPackageJson = require.resolve('./package.json', { paths: [workspacePath] });
+        const deps = Object.assign(require(astroPackageJson).dependencies ?? {}, require(astroPackageJson).devDependencies ?? {});
+        if (Object.keys(deps).includes('astro')) {
+            return true;
+        }
+    }
+    catch (e) {
+        return false;
+    }
+    return false;
+}
+exports.isAstroWorkspace = isAstroWorkspace;
 function getUserAstroVersion(basePath) {
     let version = '0.0.0';
     let exist = true;
@@ -213,7 +230,7 @@ function getUserAstroVersion(basePath) {
         catch (e) {
             // If we still couldn't find it, it probably just doesn't exist
             exist = false;
-            console.error(e);
+            console.error(`${basePath} seems to be an Astro project, but we couldn't find Astro or Astro is not installed`);
         }
     }
     let [major, minor, patch] = version.split('.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.19.5",
+  "version": "0.20.1",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -19,8 +19,6 @@
     "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --timeout 20000 --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
-    "@astrojs/vue-language-integration": "^0.1.1",
-    "@astrojs/svelte-language-integration": "^0.1.6",
     "@vscode/emmet-helper": "^2.8.4",
     "source-map": "^0.7.3",
     "typescript": "~4.6.4",
@@ -33,15 +31,19 @@
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
+    "@astrojs/svelte": "^0.2.1",
+    "@astrojs/vue": "^0.2.1",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.1.0",
     "@types/sinon": "^10.0.11",
-    "astro": "^1.0.0-beta.1",
+    "astro": "^1.0.0-beta.72",
     "astro-scripts": "0.0.1",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",
     "mocha": "^9.2.2",
     "sinon": "^13.0.1",
-    "ts-node": "^10.7.0"
+    "svelte": "^3.49.0",
+    "ts-node": "^10.7.0",
+    "vue": "^3.2.37"
   }
 }