@astrojs/language-server 0.8.6 → 0.8.9

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @astrojs/language-server
 
+## 0.8.9
+
+### Patch Changes
+
+- d0485a2: Only apply content transformations for TSX generation in relevant places
+
+## 0.8.8
+
+### Patch Changes
+
+- 526d5c7: Bring back loading the user js/tsconfig.json, notably, this allow us to support aliases
+
+## 0.8.7
+
+### Patch Changes
+
+- 897ab35: Provide vite client types to Astro files
+
 ## 0.8.6
 
 ### Patch Changes

package/README.md

@@ -0,0 +1,16 @@
+# @astrojs/language-server
+
+The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)
+
+## Folder structure
+
+```plaintext
+├── bin             # .js file used to start the server
+├── dist            # Compiled files, generated by TypeScript
+├── src             # Source files
+│   ├── core        # Core code such as .astro file parsing, configuration manager, document definition etc
+│   └── plugins     # Modules for the different languages supported in .astro files
+├── test            # Tests
+├── types           # Types
+└── astro.d.ts      # Types injected into .astro files by the language server
+```

package/dist/plugins/typescript/astro2tsx.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
 const os_1 = require("os");
+const parseAstro_1 = require("../../core/documents/parseAstro");
 const ASTRO_DEFINITION_BYTES = (0, fs_1.readFileSync)(require.resolve('../../../astro.d.ts'));
 const ASTRO_DEFINITION_STR = ASTRO_DEFINITION_BYTES.toString('utf-8');
 function addProps(content, dtsContent) {
@@ -17,16 +18,26 @@ function escapeTemplateLiteralContent(content) {
     return content.replace(/`/g, '\\`');
 }
 function default_1(content) {
+    var _a, _b, _c;
     let result = {
-        code: ''
+        code: '',
     };
-    // Replace frontmatter marks with comments
-    let raw = content
-        // Handle case where semicolons is not used in the frontmatter section
-        .replace(/((?!^)(?<!;)\n)(---)/g, (_whole, start, _dashes) => {
-        return start + ';' + '//';
-    })
-        .replace(/---/g, '///')
+    const astroDocument = (0, parseAstro_1.parseAstro)(content);
+    // Frontmatter replacements
+    let frontMatterRaw = '';
+    if (astroDocument.frontmatter.state === 'closed') {
+        frontMatterRaw = content
+            .substring((_a = astroDocument.frontmatter.startOffset) !== null && _a !== void 0 ? _a : 0, ((_b = astroDocument.frontmatter.endOffset) !== null && _b !== void 0 ? _b : 0) + 3)
+            // Handle case where semicolons is not used in the frontmatter section
+            .replace(/((?!^)(?<!;)\n)(---)/g, (_whole, start, _dashes) => {
+            return start + ';' + '//';
+        })
+            // Replace frontmatter marks with comments
+            .replace(/---/g, '///');
+    }
+    // Content replacement
+    let htmlRaw = content
+        .substring((_c = astroDocument.content.firstNonWhitespaceOffset) !== null && _c !== void 0 ? _c : 0)
         // Turn comments into JS comments
         .replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => {
         return `{/*${whole}*/}`;
@@ -64,9 +75,13 @@ function default_1(content) {
         .replace(/<!(doctype html)>/gi, (_whole, main) => {
         return `<${main.toLowerCase()}/>`;
     });
-    result.code = (raw + os_1.EOL +
-        // Add TypeScript definitions
-        addProps(raw, ASTRO_DEFINITION_STR));
+    result.code =
+        frontMatterRaw +
+            '\n' +
+            htmlRaw +
+            os_1.EOL +
+            // Add TypeScript definitions
+            addProps(frontMatterRaw, ASTRO_DEFINITION_STR);
     return result;
 }
 exports.default = default_1;

package/dist/plugins/typescript/languageService.js

@@ -52,17 +52,31 @@ async function getLanguageServiceForPath(path, workspaceUris, docContext) {
 }
 exports.getLanguageServiceForPath = getLanguageServiceForPath;
 async function createLanguageService(tsconfigPath, workspaceRoot, docContext) {
+    var _a, _b, _c;
     const parseConfigHost = {
         ...ts.sys,
         readDirectory: (path, extensions, exclude, include, depth) => {
             return ts.sys.readDirectory(path, [...extensions, '.vue', '.svelte', '.astro', '.js', '.jsx'], exclude, include, depth);
         },
     };
-    const configJson = getDefaultJsConfig();
+    let configJson = (tsconfigPath && ts.readConfigFile(tsconfigPath, ts.sys.readFile).config) || {};
+    // If our user has types in their config but it doesn't include the types for ImportMeta, let's add them for them
+    if (((_a = configJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) &&
+        !((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes("vite/client"))) {
+        configJson.compilerOptions.types.push("vite/client");
+    }
+    configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(), configJson.compilerOptions);
+    // If the user supplied exclude, let's use theirs
+    (_c = configJson.exclude) !== null && _c !== void 0 ? _c : (configJson.exclude = getDefaultExclude());
+    // Delete include so that .astro files don't get mistakenly excluded by the user
+    delete configJson.include;
+    // Everything here will always, unconditionally, be in the resulting config, not the opposite, tricky
     const existingCompilerOptions = {
+        // Setting strict to true for .astro files leads to a lot of unrelated errors (see language-tools#91) so we force it off for .astro files
+        strict: false,
         jsx: ts.JsxEmit.Preserve,
         module: ts.ModuleKind.ESNext,
-        target: ts.ScriptTarget.ESNext
+        target: ts.ScriptTarget.ESNext,
     };
     const project = ts.parseJsonConfigFileContent(configJson, parseConfigHost, workspaceRoot, existingCompilerOptions, (0, path_1.basename)(tsconfigPath), undefined, [
         { extension: '.vue', isMixedContent: true, scriptKind: ts.ScriptKind.Deferred },
@@ -142,15 +156,13 @@ async function createLanguageService(tsconfigPath, workspaceRoot, docContext) {
         return doc;
     }
 }
-function getDefaultJsConfig() {
-    let compilerOptions = {
+function getDefaultCompilerOptions() {
+    return {
         maxNodeModuleJsDepth: 2,
         allowSyntheticDefaultImports: true,
         allowJs: true,
-    };
-    return {
-        compilerOptions,
-        exclude: getDefaultExclude(),
+        // By providing vite/client here, our users get proper typing on import.meta in .astro files
+        types: ["vite/client"],
     };
 }
 function getDefaultExclude() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.8.6",
-  "author": "Skypack",
+  "version": "0.8.9",
+  "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",
     "ts-morph": "^12.0.0",
-    "typescript": "^4.5.2",
+    "typescript": "^4.5.4",
     "vscode-css-languageservice": "^5.1.1",
     "vscode-emmet-helper": "2.1.2",
     "vscode-html-languageservice": "^3.0.3",