@astrojs/language-server 0.8.9 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @astrojs/language-server
 
+## 0.9.1
+
+### Patch Changes
+
+- 7dc85cc: Add support for Emmet inside components, upgrade Emmet version
+
+## 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

package/dist/core/config/ConfigManager.d.ts

@@ -1,4 +1,4 @@
-import { VSCodeEmmetConfig } from 'vscode-emmet-helper';
+import { VSCodeEmmetConfig } from '@vscode/emmet-helper';
 import { UserPreferences } from 'typescript';
 /**
 * Representation of the language server config.

package/dist/core/documents/utils.d.ts

@@ -41,6 +41,8 @@ export declare function isInsideExpression(html: string, tagStart: number, posit
  */
 export declare function isInsideFrontmatter(text: string, offset: number): boolean;
 export declare function isInTag(position: Position, tagInfo: TagInformation | null): tagInfo is TagInformation;
+export declare function isComponentTag(node: Node): boolean;
+export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
 /**
  * Get the line and character based on the offset
  * @param offset The index of the position

package/dist/core/documents/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractStyleTag = exports.walk = exports.offsetAt = exports.positionAt = exports.isInTag = exports.isInsideFrontmatter = exports.isInsideExpression = exports.getFirstNonWhitespaceIndex = exports.getWordAt = exports.getWordRangeAt = void 0;
+exports.extractStyleTag = exports.walk = exports.offsetAt = exports.positionAt = exports.isInComponentStartTag = exports.isComponentTag = exports.isInTag = exports.isInsideFrontmatter = exports.isInsideExpression = exports.getFirstNonWhitespaceIndex = exports.getWordAt = exports.getWordRangeAt = void 0;
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../../utils");
@@ -76,6 +76,19 @@ function isInTag(position, tagInfo) {
     return !!tagInfo && (0, utils_1.isInRange)(position, vscode_languageserver_1.Range.create(tagInfo.startPos, tagInfo.endPos));
 }
 exports.isInTag = isInTag;
+function isComponentTag(node) {
+    if (!node.tag) {
+        return false;
+    }
+    const firstChar = node.tag[0];
+    return /[A-Z]/.test(firstChar);
+}
+exports.isComponentTag = isComponentTag;
+function isInComponentStartTag(html, offset) {
+    const node = html.findNodeAt(offset);
+    return (isComponentTag(node) && (!node.startTagEnd || offset < node.startTagEnd));
+}
+exports.isInComponentStartTag = isInComponentStartTag;
 /**
  * Get the line and character based on the offset
  * @param offset The index of the position

package/dist/plugins/css/CSSPlugin.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CSSPlugin = void 0;
-const vscode_emmet_helper_1 = require("vscode-emmet-helper");
+const emmet_helper_1 = require("@vscode/emmet-helper");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../../core/documents/utils");
 const CSSDocument_1 = require("./CSSDocument");
@@ -51,7 +51,7 @@ class CSSPlugin {
         if (isSASS(cssDocument)) {
             // the css language service does not support sass, still we can use
             // the emmet helper directly to at least get emmet completions
-            return (0, vscode_emmet_helper_1.doComplete)(document, position, 'sass', this.configManager.getEmmetConfig());
+            return (0, emmet_helper_1.doComplete)(document, position, 'sass', this.configManager.getEmmetConfig()) || null;
         }
         const type = extractLanguage(cssDocument);
         const lang = (0, service_1.getLanguageService)(type);
@@ -59,11 +59,6 @@ class CSSPlugin {
             isIncomplete: true,
             items: [],
         };
-        if (false /* this.configManager.getConfig().css.completions.emmet */) {
-            lang.setCompletionParticipants([
-                (0, vscode_emmet_helper_1.getEmmetCompletionParticipants)(cssDocument, cssDocument.getGeneratedPosition(position), (0, service_1.getLanguage)(type), this.configManager.getEmmetConfig(), emmetResults),
-            ]);
-        }
         const results = lang.doComplete(cssDocument, cssDocument.getGeneratedPosition(position), cssDocument.stylesheet);
         return vscode_languageserver_1.CompletionList.create([...(results ? results.items : []), ...emmetResults.items].map((completionItem) => (0, documents_1.mapCompletionItemToOriginal)(cssDocument, completionItem)), 
         // Emmet completions change on every keystroke, so they are never complete

package/dist/plugins/html/HTMLPlugin.d.ts

@@ -21,5 +21,4 @@ export declare class HTMLPlugin implements CompletionsProvider, FoldingRangeProv
     private getLangCompletions;
     private isInsideExpression;
     private isInsideFrontmatter;
-    private isComponentTag;
 }

package/dist/plugins/html/HTMLPlugin.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTMLPlugin = void 0;
-const vscode_emmet_helper_1 = require("vscode-emmet-helper");
+const emmet_helper_1 = require("@vscode/emmet-helper");
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../../core/documents/utils");
@@ -24,17 +24,17 @@ class HTMLPlugin {
         if (this.isInsideFrontmatter(document, position) || this.isInsideExpression(html, document, position)) {
             return null;
         }
-        const offset = document.offsetAt(position);
-        const node = html.findNodeAt(offset);
-        if (this.isComponentTag(node)) {
-            return null;
-        }
-        const emmetResults = {
+        let emmetResults = {
             isIncomplete: true,
             items: [],
         };
-        this.lang.setCompletionParticipants([(0, vscode_emmet_helper_1.getEmmetCompletionParticipants)(document, position, 'html', this.configManager.getEmmetConfig(), emmetResults)]);
-        const results = this.lang.doComplete(document, position, html);
+        this.lang.setCompletionParticipants([
+            {
+                onHtmlContent: () => (emmetResults = (0, emmet_helper_1.doComplete)(document, position, 'html', this.configManager.getEmmetConfig()) || emmetResults),
+            },
+        ]);
+        // For components, we only want Emmet completions inside the component (aka slots) because HTML properties are not necessarily valid for a component
+        const results = (0, utils_1.isInComponentStartTag)(html, document.offsetAt(position)) ? vscode_languageserver_1.CompletionList.create([]) : this.lang.doComplete(document, position, html);
         const items = this.toCompletionItems(results.items);
         return vscode_languageserver_1.CompletionList.create([...this.toCompletionItems(items), ...this.getLangCompletions(items), ...emmetResults.items], 
         // Emmet completions change on every keystroke, so they are never complete
@@ -104,12 +104,5 @@ class HTMLPlugin {
     isInsideFrontmatter(document, position) {
         return (0, utils_1.isInsideFrontmatter)(document.getText(), document.offsetAt(position));
     }
-    isComponentTag(node) {
-        if (!node.tag) {
-            return false;
-        }
-        const firstChar = node.tag[0];
-        return /[A-Z]/.test(firstChar);
-    }
 }
 exports.HTMLPlugin = HTMLPlugin;

package/dist/plugins/typescript/astro2tsx.js

@@ -1,24 +1,19 @@
 "use strict";
 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) {
-    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.
+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, _c;
+    var _a, _b;
     let result = {
         code: '',
     };
@@ -36,8 +31,9 @@ function default_1(content) {
             .replace(/---/g, '///');
     }
     // Content replacement
+    const htmlBegin = astroDocument.frontmatter.endOffset ? astroDocument.frontmatter.endOffset + 3 : 0;
     let htmlRaw = content
-        .substring((_c = astroDocument.content.firstNonWhitespaceOffset) !== null && _c !== void 0 ? _c : 0)
+        .substring(htmlBegin)
         // Turn comments into JS comments
         .replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => {
         return `{/*${whole}*/}`;
@@ -77,11 +73,10 @@ function default_1(content) {
     });
     result.code =
         frontMatterRaw +
-            '\n' +
             htmlRaw +
             os_1.EOL +
             // Add TypeScript definitions
-            addProps(frontMatterRaw, ASTRO_DEFINITION_STR);
+            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,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.8.9",
+  "version": "0.9.1",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -25,7 +25,7 @@
     "ts-morph": "^12.0.0",
     "typescript": "^4.5.4",
     "vscode-css-languageservice": "^5.1.1",
-    "vscode-emmet-helper": "2.1.2",
+    "@vscode/emmet-helper": "^2.8.4",
     "vscode-html-languageservice": "^3.0.3",
     "vscode-languageserver": "6.1.1",
     "vscode-languageserver-protocol": "^3.16.0",
@@ -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;