@astrojs/language-server 0.19.6 → 0.20.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @astrojs/language-server
 
+## 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

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,6 +5,7 @@ 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,

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

@@ -13,6 +13,7 @@ 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";
@@ -206,6 +207,18 @@ 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';
+        }
+    }
     // JSX element has no closing tag. JSX -> HTML
     if (diagnostic.code === DiagnosticCodes.JSX_NO_CLOSING_TAG) {
         return {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.19.6",
+  "version": "0.20.0",
   "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,6 +31,8 @@
     "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",
@@ -42,6 +42,8 @@
     "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"
   }
 }