@astrojs/language-server 0.8.8 → 0.9.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @astrojs/language-server
 
+## 0.9.0
+
+### Minor Changes
+
+- 6b6b47a: Remove internal astro.d.ts files, instead prefer the one provided by Astro itself
+
+## 0.8.10
+
+### Patch Changes
+
+- 5b16fb4: Fix errors showing on wrong line due to an error in TSX generation
+
+## 0.8.9
+
+### Patch Changes
+
+- d0485a2: Only apply content transformations for TSX generation in relevant places
+
 ## 0.8.8
 
 ### 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

@@ -1,32 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
 const os_1 = require("os");
-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) {
-    let defaultExportType = 'AstroBuiltinProps & Record<string, any>';
-    // Using TypeScript to parse here would cause a double-parse, slowing down the extension
-    // This needs to be done a different way when the new compiler is added.
+const parseAstro_1 = require("../../core/documents/parseAstro");
+function addProps(content) {
+    let defaultExportType = 'Record<string, any>';
     if (/(interface|type) Props/.test(content)) {
-        defaultExportType = 'AstroBuiltinProps & Props';
+        defaultExportType = 'Props';
     }
-    return dtsContent + os_1.EOL + `export default function (_props: ${defaultExportType}) { return <div></div>; }`;
+    return os_1.EOL + `export default function (_props: ${defaultExportType}) { return <div></div>; }`;
 }
 function escapeTemplateLiteralContent(content) {
     return content.replace(/`/g, '\\`');
 }
 function default_1(content) {
+    var _a, _b;
     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
+    const htmlBegin = astroDocument.frontmatter.endOffset ? astroDocument.frontmatter.endOffset + 3 : 0;
+    let htmlRaw = content
+        .substring(htmlBegin)
         // Turn comments into JS comments
         .replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => {
         return `{/*${whole}*/}`;
@@ -64,9 +71,12 @@ 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 +
+            htmlRaw +
+            os_1.EOL +
+            // Add TypeScript definitions
+            addProps(frontMatterRaw);
     return result;
 }
 exports.default = default_1;

package/dist/plugins/typescript/languageService.js

@@ -60,10 +60,10 @@ async function createLanguageService(tsconfigPath, workspaceRoot, docContext) {
         },
     };
     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 our user has types in their config but it doesn't include the types needed for Astro, add them to the config
     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");
+        !((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes("astro/env"))) {
+        configJson.compilerOptions.types.push("astro/env");
     }
     configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(), configJson.compilerOptions);
     // If the user supplied exclude, let's use theirs
@@ -161,8 +161,7 @@ function getDefaultCompilerOptions() {
         maxNodeModuleJsDepth: 2,
         allowSyntheticDefaultImports: true,
         allowJs: true,
-        // By providing vite/client here, our users get proper typing on import.meta in .astro files
-        types: ["vite/client"],
+        types: ["astro/env"]
     };
 }
 function getDefaultExclude() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.8.8",
-  "author": "Skypack",
+  "version": "0.9.0",
+  "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.116",
-    "astro": "0.19.1",
+    "astro": "0.23.5",
     "astro-scripts": "0.0.1",
     "tap": "^15.0.9"
   }

package/astro.d.ts

@@ -1,48 +0,0 @@
-export {};
-
-type AstroRenderedHTML = string;
-
-type AstroElement = any;
-type Fragment = (...a: any[]) => AstroElement;
-
-type FetchContentResultBase = {
-  astro: {
-    headers: string[];
-    source: string;
-    html: AstroRenderedHTML;
-  };
-  url: URL;
-};
-
-type FetchContentResult<T> = FetchContentResultBase & T;
-
-export type Params = Record<string, string | undefined>;
-
-interface AstroPageRequest {
-  url: URL;
-  canonicalURL: URL;
-  params: Params;
-}
-
-interface AstroBuiltinProps {
-  'client:load'?: boolean;
-  'client:idle'?: boolean;
-  'client:media'?: string;
-  'client:visible'?: boolean;
-}
-
-interface Astro {
-  isPage: boolean;
-  fetchContent<T = any>(globStr: string): FetchContentResult<T>[];
-  props: Record<string, number | string | any>;
-  request: AstroPageRequest;
-  resolve: (path: string) => string;
-  site: URL;
-  slots: Record<string, true | undefined>;
-}
-
-declare var Astro: Astro;
-declare var Fragment: string;
-
-void Astro;
-void Fragment;