@astrojs/language-server 0.13.3 → 0.13.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/language-server
 
+## 0.13.4
+
+### Patch Changes
+
+- 5874655: Add support for Astro 0.26.0 attributes
+
 ## 0.13.3
 
 ### Patch Changes

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

@@ -11,6 +11,7 @@ export interface TagInformation {
         start: number;
         end: number;
     };
+    closed: boolean;
 }
 export declare function walk(node: Node): Generator<Node, void, unknown>;
 export declare function extractStyleTags(source: string, html?: HTMLDocument): TagInformation[];

package/dist/core/documents/utils.js

@@ -48,6 +48,8 @@ function extractTags(text, tag, html) {
             startPos,
             endPos,
             container,
+            // vscode-html-languageservice types does not contain this, despite it existing. Annoying
+            closed: matchedNode.closed,
         };
     }
 }

package/dist/plugins/astro/AstroPlugin.d.ts

@@ -9,7 +9,7 @@ export declare class AstroPlugin implements Plugin {
     private readonly completionProvider;
     constructor(docManager: DocumentManager, configManager: ConfigManager, workspaceUris: string[]);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
-    getFoldingRanges(document: AstroDocument): Promise<FoldingRange[]>;
+    getFoldingRanges(document: AstroDocument): FoldingRange[];
     getDefinitions(document: AstroDocument, position: Position): Promise<DefinitionLink[]>;
     private isInsideFrontmatter;
     private isComponentTag;

package/dist/plugins/astro/AstroPlugin.js

@@ -22,7 +22,7 @@ class AstroPlugin {
         const completions = this.completionProvider.getCompletions(document, position, completionContext);
         return completions;
     }
-    async getFoldingRanges(document) {
+    getFoldingRanges(document) {
         const foldingRanges = [];
         const { frontmatter } = document.astroMeta;
         // Currently editing frontmatter, don't fold

package/dist/plugins/astro/features/CompletionsProvider.d.ts

@@ -1,8 +1,8 @@
-import type { AppCompletionList } from '../../interfaces';
+import type { AppCompletionList, CompletionsProvider } from '../../interfaces';
 import type { AstroDocument, DocumentManager } from '../../../core/documents';
 import { CompletionContext, Position } from 'vscode-languageserver';
 import { LanguageServiceManager as TypeScriptLanguageServiceManager } from '../../typescript/LanguageServiceManager';
-export declare class CompletionsProviderImpl {
+export declare class CompletionsProviderImpl implements CompletionsProvider {
     private readonly docManager;
     private readonly languageServiceManager;
     directivesHTMLLang: import("vscode-html-languageservice").LanguageService;

package/dist/plugins/astro/features/CompletionsProvider.js

@@ -31,19 +31,18 @@ class CompletionsProviderImpl {
             if (frontmatter)
                 items.push(frontmatter);
         }
+        const html = document.html;
         const offset = document.offsetAt(position);
-        if (!(0, utils_1.isInsideFrontmatter)(document.getText(), offset)) {
+        if ((0, utils_1.isInComponentStartTag)(html, offset)) {
             const props = await this.getPropCompletions(document, position, completionContext);
             if (props.length) {
                 items.push(...props);
             }
-        }
-        const html = document.html;
-        if ((0, utils_1.isInComponentStartTag)(html, offset)) {
             const node = html.findNodeAt(offset);
             const isAstro = await this.isAstroComponent(document, node);
             if (!isAstro) {
-                items.push(...(0, utils_4.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items));
+                const directives = (0, utils_4.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
+                items.push(...directives);
             }
         }
         return vscode_languageserver_1.CompletionList.create(items, true);

package/dist/plugins/css/CSSPlugin.js

@@ -25,6 +25,12 @@ class CSSPlugin {
             return null;
         }
         const styleTag = this.getStyleTagForPosition(document, position);
+        // We technically can return results even for open tags, however, a lot of the info returned is not valid
+        // Since most editors will automatically close the tag before the user start working in them, this shouldn't be a problem
+        if (styleTag && !styleTag.closed) {
+            return null;
+        }
+        // If we don't have a style tag at this position, we might be in a style property instead, let's check
         if (!styleTag) {
             const attributeContext = (0, parseHtml_1.getAttributeContextAtPosition)(document, position);
             if (!attributeContext) {
@@ -61,7 +67,9 @@ class CSSPlugin {
             return null;
         }
         const styleTag = this.getStyleTagForPosition(document, position);
-        // If we don't have a style tag at this position, we might be in a style property instead, let's check
+        if (styleTag && !styleTag.closed) {
+            return null;
+        }
         if (!styleTag) {
             const attributeContext = (0, parseHtml_1.getAttributeContextAtPosition)(document, position);
             if (!attributeContext) {

package/dist/plugins/css/features/astro-selectors.js

@@ -4,8 +4,7 @@ exports.pseudoClass = void 0;
 exports.pseudoClass = [
     {
         name: ':global()',
-        description: `[astro] :global modifier
-Apply styles to a selector globally`,
+        description: 'Apply styles to a selector globally',
         references: [
             {
                 name: 'Astro documentation',

package/dist/plugins/html/features/astro-attributes.js

@@ -43,7 +43,7 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                     // The VS Code tag definitions does not provide a description for the deprecated `charset` attribute on script tags
                     // Which mean that since we get no hover info for this, we instead get JSX hover info. So we'll just specify a description ourselves for this specific case
                     name: 'charset',
-                    description: "(Deprecated) It's unnecessary to specify the charset attribute, because documents must use UTF-8, and the script element inherits its character encoding from the document.",
+                    description: "**Deprecated**\n\nIt's unnecessary to specify the charset attribute, because documents must use UTF-8, and the script element inherits its character encoding from the document.",
                 },
                 {
                     name: 'define:vars',
@@ -55,6 +55,28 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                         },
                     ],
                 },
+                {
+                    name: 'hoist',
+                    description: '**Deprecated in Astro >= 0.26.0**\n\nBuilds, optimizes, and bundles your script with the other JavaScript on the page',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/core-concepts/astro-components/#using-hoisted-scripts',
+                        },
+                    ],
+                },
+                {
+                    name: 'is:inline',
+                    description: 'Leave a script tag inline in the page template. No processing will be done on its content',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/migrate/#new-default-script-behavior',
+                        },
+                    ],
+                },
             ],
         },
         {
@@ -70,6 +92,39 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
                         },
                     ],
                 },
+                {
+                    name: 'global',
+                    description: '**Deprecated in favor of `is:global` in >= Astro 0.26.0**\n\nOpts-out of automatic CSS scoping, all contents will be available globally',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/guides/styling/#global-styles',
+                        },
+                    ],
+                },
+                {
+                    name: 'is:global',
+                    description: 'Opts-out of automatic CSS scoping, all contents will be available globally',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/guides/styling/#global-styles',
+                        },
+                    ],
+                },
+                {
+                    name: 'is:inline',
+                    description: 'Leave a style tag inline in the page template. No processing will be done on its content',
+                    valueSet: 'v',
+                    references: [
+                        {
+                            name: 'Astro documentation',
+                            url: 'https://docs.astro.build/en/migrate/#new-default-script-behavior',
+                        },
+                    ],
+                },
             ],
         },
     ],

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

@@ -1,6 +1,6 @@
 import { CompletionItem } from 'vscode-languageserver-types';
 /**
  * The VS Code HTML language service provides a completion for data attributes that is independent from
- * data providers, which mean that you can't disable it, so this function removes them from a completionList
+ * data providers, which mean that you can't disable it, so this function removes them from completions
  */
 export declare function removeDataAttrCompletion(items: CompletionItem[]): CompletionItem[];

package/dist/plugins/html/utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeDataAttrCompletion = void 0;
 /**
  * The VS Code HTML language service provides a completion for data attributes that is independent from
- * data providers, which mean that you can't disable it, so this function removes them from a completionList
+ * data providers, which mean that you can't disable it, so this function removes them from completions
  */
 function removeDataAttrCompletion(items) {
     return items.filter((item) => !item.label.startsWith('data-'));

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -79,6 +79,9 @@ class TypeScriptPlugin {
         return edit;
     }
     async getSemanticTokens(textDocument, range, cancellationToken) {
+        if (!this.featureEnabled('semanticTokens')) {
+            return null;
+        }
         return this.semanticTokensProvider.getSemanticTokens(textDocument, range, cancellationToken);
     }
     async getDocumentSymbols(document) {

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

@@ -20,17 +20,20 @@ class DocumentSymbolsProviderImpl {
         }
         const symbols = [];
         this.collectSymbols(navTree, fragment, undefined, (symbol) => symbols.push(symbol));
+        const originalContainerName = symbols[0].name;
         const result = [];
         // Add a "Frontmatter" namespace for the frontmatter if we have a closed one
         if (document.astroMeta.frontmatter.state === 'closed') {
-            result.push(vscode_languageserver_types_1.SymbolInformation.create('Frontmatter', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.startOffset), document.positionAt(document.astroMeta.frontmatter.endOffset))));
+            result.push(vscode_languageserver_types_1.SymbolInformation.create('Frontmatter', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.startOffset), document.positionAt(document.astroMeta.frontmatter.endOffset)), document.getURL()));
         }
         // Add a "Template" namespace for everything under the frontmatter
-        result.push(vscode_languageserver_types_1.SymbolInformation.create('Template', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt((_a = document.astroMeta.frontmatter.endOffset) !== null && _a !== void 0 ? _a : 0), document.positionAt(document.getTextLength()))));
+        result.push(vscode_languageserver_types_1.SymbolInformation.create('Template', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt((_a = document.astroMeta.frontmatter.endOffset) !== null && _a !== void 0 ? _a : 0), document.positionAt(document.getTextLength())), document.getURL()));
         for (let symbol of symbols.splice(1)) {
             symbol = (0, documents_1.mapSymbolInformationToOriginal)(fragment, symbol);
             if (document.offsetAt(symbol.location.range.end) >= ((_b = document.astroMeta.content.firstNonWhitespaceOffset) !== null && _b !== void 0 ? _b : 0)) {
-                symbol.containerName = 'Template';
+                if (symbol.containerName === originalContainerName) {
+                    symbol.containerName = 'Template';
+                }
                 // For some reason, it seems like TypeScript thinks that the "class" attribute is a real class, weird
                 if (symbol.kind === vscode_languageserver_types_1.SymbolKind.Class && symbol.name === '<class>') {
                     const node = document.html.findNodeAt(document.offsetAt(symbol.location.range.start));

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

@@ -22,7 +22,10 @@ class SemanticTokensProviderImpl {
         const start = range ? fragment.offsetAt(fragment.getGeneratedPosition(range.start)) : 0;
         const { spans } = lang.getEncodedSemanticClassifications(filePath, {
             start,
-            length: range ? fragment.offsetAt(fragment.getGeneratedPosition(range.end)) - start : fragment.text.length,
+            length: range
+                ? fragment.offsetAt(fragment.getGeneratedPosition(range.end)) - start
+                : // We don't want tokens for things added by astro2tsx
+                    fragment.text.lastIndexOf('export default function (_props:') || fragment.text.length,
         }, typescript_1.default.SemanticClassificationFormat.TwentyTwenty);
         const tokens = [];
         let i = 0;

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

@@ -64,7 +64,7 @@ async function getLanguageServiceForTsconfig(tsconfigPath, docContext) {
 }
 exports.getLanguageServiceForTsconfig = getLanguageServiceForTsconfig;
 async function createLanguageService(tsconfigPath, docContext) {
-    const workspaceRoot = tsconfigPath ? (0, path_1.dirname)(tsconfigPath) : process.cwd();
+    const workspaceRoot = tsconfigPath ? (0, path_1.dirname)(tsconfigPath) : '';
     // `raw` here represent the tsconfig merged with any extended config
     const { compilerOptions, fileNames: files, raw: fullConfig } = getParsedTSConfig();
     let projectVersion = 0;

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

@@ -185,7 +185,8 @@ class SnapshotManager {
         if (date.getTime() - this.lastLogged.getTime() > 60000) {
             this.lastLogged = date;
             const projectFiles = this.getProjectFileNames();
-            const allFiles = Array.from(new Set([...projectFiles, ...this.getFileNames()]));
+            let allFiles = Array.from(new Set([...projectFiles, ...this.getFileNames()]));
+            allFiles = allFiles.map((file) => (0, utils_2.ensureRealFilePath)(file));
             console.log('SnapshotManager File Statistics:\n' +
                 `Project files: ${projectFiles.length}\n` +
                 `Astro files: ${allFiles.filter((name) => name.endsWith('.astro')).length}\n` +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.13.3",
+  "version": "0.13.4",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -16,7 +16,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
+    "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --timeout 20000 --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
     "@astrojs/svelte-language-integration": "^0.1.2",

package/types/astro-jsx.d.ts

@@ -43,6 +43,19 @@ declare namespace astroHTML.JSX {
 		'define:vars'?: any;
 	}
 
+	// Usable exclusively on style tags
+	interface AstroStyle {
+		global?: boolean;
+		'is:global'?: boolean;
+		'is:inline'?: boolean;
+	}
+
+	// Usable exclusively on script tags
+	interface AstroScript {
+		hoist?: boolean;
+		'is:inline'?: boolean;
+	}
+
 	type Element = HTMLElement;
 
 	//
@@ -68,155 +81,141 @@ declare namespace astroHTML.JSX {
 	type TransitionEventHandler<T extends EventTarget> = EventHandler<TransitionEvent, T>;
 	type MessageEventHandler<T extends EventTarget> = EventHandler<MessageEvent, T>;
 
-	// See CSS 3 CSS-wide keywords https://www.w3.org/TR/css3-values/#common-keywords
-	// See CSS 3 Explicit Defaulting https://www.w3.org/TR/css-cascade-3/#defaulting-keywords
-	// "all CSS properties can accept these values"
-	type CSSWideKeyword = 'initial' | 'inherit' | 'unset';
-
-	// See CSS 3 <percentage> type https://drafts.csswg.org/css-values-3/#percentages
-	type CSSPercentage = string;
-
-	// See CSS 3 <length> type https://drafts.csswg.org/css-values-3/#lengths
-	type CSSLength = number | string;
-
-	// This interface is not complete. Only properties accepting
-	// unit-less numbers are listed here (see CSSProperty.js in React)
-
 	interface DOMAttributes<T extends EventTarget> {
 		children?: Children;
 
 		// Clipboard Events
-		oncopy?: ClipboardEventHandler<T> | undefined | null;
-		oncut?: ClipboardEventHandler<T> | undefined | null;
-		onpaste?: ClipboardEventHandler<T> | undefined | null;
+		oncopy?: ClipboardEventHandler<T> | string | undefined | null;
+		oncut?: ClipboardEventHandler<T> | string | undefined | null;
+		onpaste?: ClipboardEventHandler<T> | string | undefined | null;
 
 		// Composition Events
-		oncompositionend?: CompositionEventHandler<T> | undefined | null;
-		oncompositionstart?: CompositionEventHandler<T> | undefined | null;
-		oncompositionupdate?: CompositionEventHandler<T> | undefined | null;
+		oncompositionend?: CompositionEventHandler<T> | string | undefined | null;
+		oncompositionstart?: CompositionEventHandler<T> | string | undefined | null;
+		oncompositionupdate?: CompositionEventHandler<T> | string | undefined | null;
 
 		// Focus Events
-		onfocus?: FocusEventHandler<T> | undefined | null;
-		onfocusin?: FocusEventHandler<T> | undefined | null;
-		onfocusout?: FocusEventHandler<T> | undefined | null;
-		onblur?: FocusEventHandler<T> | undefined | null;
+		onfocus?: FocusEventHandler<T> | string | undefined | null;
+		onfocusin?: FocusEventHandler<T> | string | undefined | null;
+		onfocusout?: FocusEventHandler<T> | string | undefined | null;
+		onblur?: FocusEventHandler<T> | string | undefined | null;
 
 		// Form Events
-		onchange?: FormEventHandler<T> | undefined | null;
-		oninput?: FormEventHandler<T> | undefined | null;
-		onreset?: FormEventHandler<T> | undefined | null;
-		onsubmit?: EventHandler<SubmitEvent, T> | undefined | null;
-		oninvalid?: EventHandler<Event, T> | undefined | null;
-		onbeforeinput?: EventHandler<InputEvent, T> | undefined | null;
+		onchange?: FormEventHandler<T> | string | undefined | null;
+		oninput?: FormEventHandler<T> | string | undefined | null;
+		onreset?: FormEventHandler<T> | string | undefined | null;
+		onsubmit?: EventHandler<SubmitEvent, T> | string | undefined | null;
+		oninvalid?: EventHandler<Event, T> | string | undefined | null;
+		onbeforeinput?: EventHandler<InputEvent, T> | string | undefined | null;
 
 		// Image Events
-		onload?: EventHandler | undefined | null;
-		onerror?: EventHandler | undefined | null; // also a Media Event
+		onload?: EventHandler | string | undefined | null;
+		onerror?: EventHandler | string | undefined | null; // also a Media Event
 
 		// Detail Events
-		ontoggle?: EventHandler<Event, T> | undefined | null;
+		ontoggle?: EventHandler<Event, T> | string | undefined | null;
 
 		// Keyboard Events
-		onkeydown?: KeyboardEventHandler<T> | undefined | null;
-		onkeypress?: KeyboardEventHandler<T> | undefined | null;
-		onkeyup?: KeyboardEventHandler<T> | undefined | null;
+		onkeydown?: KeyboardEventHandler<T> | string | undefined | null;
+		onkeypress?: KeyboardEventHandler<T> | string | undefined | null;
+		onkeyup?: KeyboardEventHandler<T> | string | undefined | null;
 
 		// Media Events
-		onabort?: EventHandler<Event, T> | undefined | null;
-		oncanplay?: EventHandler<Event, T> | undefined | null;
-		oncanplaythrough?: EventHandler<Event, T> | undefined | null;
-		oncuechange?: EventHandler<Event, T> | undefined | null;
-		ondurationchange?: EventHandler<Event, T> | undefined | null;
-		onemptied?: EventHandler<Event, T> | undefined | null;
-		onencrypted?: EventHandler<Event, T> | undefined | null;
-		onended?: EventHandler<Event, T> | undefined | null;
-		onloadeddata?: EventHandler<Event, T> | undefined | null;
-		onloadedmetadata?: EventHandler<Event, T> | undefined | null;
-		onloadstart?: EventHandler<Event, T> | undefined | null;
-		onpause?: EventHandler<Event, T> | undefined | null;
-		onplay?: EventHandler<Event, T> | undefined | null;
-		onplaying?: EventHandler<Event, T> | undefined | null;
-		onprogress?: EventHandler<Event, T> | undefined | null;
-		onratechange?: EventHandler<Event, T> | undefined | null;
-		onseeked?: EventHandler<Event, T> | undefined | null;
-		onseeking?: EventHandler<Event, T> | undefined | null;
-		onstalled?: EventHandler<Event, T> | undefined | null;
-		onsuspend?: EventHandler<Event, T> | undefined | null;
-		ontimeupdate?: EventHandler<Event, T> | undefined | null;
-		onvolumechange?: EventHandler<Event, T> | undefined | null;
-		onwaiting?: EventHandler<Event, T> | undefined | null;
+		onabort?: EventHandler<Event, T> | string | undefined | null;
+		oncanplay?: EventHandler<Event, T> | string | undefined | null;
+		oncanplaythrough?: EventHandler<Event, T> | string | undefined | null;
+		oncuechange?: EventHandler<Event, T> | string | undefined | null;
+		ondurationchange?: EventHandler<Event, T> | string | undefined | null;
+		onemptied?: EventHandler<Event, T> | string | undefined | null;
+		onencrypted?: EventHandler<Event, T> | string | undefined | null;
+		onended?: EventHandler<Event, T> | string | undefined | null;
+		onloadeddata?: EventHandler<Event, T> | string | undefined | null;
+		onloadedmetadata?: EventHandler<Event, T> | string | undefined | null;
+		onloadstart?: EventHandler<Event, T> | string | undefined | null;
+		onpause?: EventHandler<Event, T> | string | undefined | null;
+		onplay?: EventHandler<Event, T> | string | undefined | null;
+		onplaying?: EventHandler<Event, T> | string | undefined | null;
+		onprogress?: EventHandler<Event, T> | string | undefined | null;
+		onratechange?: EventHandler<Event, T> | string | undefined | null;
+		onseeked?: EventHandler<Event, T> | string | undefined | null;
+		onseeking?: EventHandler<Event, T> | string | undefined | null;
+		onstalled?: EventHandler<Event, T> | string | undefined | null;
+		onsuspend?: EventHandler<Event, T> | string | undefined | null;
+		ontimeupdate?: EventHandler<Event, T> | string | undefined | null;
+		onvolumechange?: EventHandler<Event, T> | string | undefined | null;
+		onwaiting?: EventHandler<Event, T> | string | undefined | null;
 
 		// MouseEvents
-		onauxclick?: MouseEventHandler<T> | undefined | null;
-		onclick?: MouseEventHandler<T> | undefined | null;
-		oncontextmenu?: MouseEventHandler<T> | undefined | null;
-		ondblclick?: MouseEventHandler<T> | undefined | null;
-		ondrag?: DragEventHandler<T> | undefined | null;
-		ondragend?: DragEventHandler<T> | undefined | null;
-		ondragenter?: DragEventHandler<T> | undefined | null;
-		ondragexit?: DragEventHandler<T> | undefined | null;
-		ondragleave?: DragEventHandler<T> | undefined | null;
-		ondragover?: DragEventHandler<T> | undefined | null;
-		ondragstart?: DragEventHandler<T> | undefined | null;
-		ondrop?: DragEventHandler<T> | undefined | null;
-		onmousedown?: MouseEventHandler<T> | undefined | null;
-		onmouseenter?: MouseEventHandler<T> | undefined | null;
-		onmouseleave?: MouseEventHandler<T> | undefined | null;
-		onmousemove?: MouseEventHandler<T> | undefined | null;
-		onmouseout?: MouseEventHandler<T> | undefined | null;
-		onmouseover?: MouseEventHandler<T> | undefined | null;
-		onmouseup?: MouseEventHandler<T> | undefined | null;
+		onauxclick?: MouseEventHandler<T> | string | undefined | null;
+		onclick?: MouseEventHandler<T> | string | undefined | null;
+		oncontextmenu?: MouseEventHandler<T> | string | undefined | null;
+		ondblclick?: MouseEventHandler<T> | string | undefined | null;
+		ondrag?: DragEventHandler<T> | string | undefined | null;
+		ondragend?: DragEventHandler<T> | string | undefined | null;
+		ondragenter?: DragEventHandler<T> | string | undefined | null;
+		ondragexit?: DragEventHandler<T> | string | undefined | null;
+		ondragleave?: DragEventHandler<T> | string | undefined | null;
+		ondragover?: DragEventHandler<T> | string | undefined | null;
+		ondragstart?: DragEventHandler<T> | string | undefined | null;
+		ondrop?: DragEventHandler<T> | string | undefined | null;
+		onmousedown?: MouseEventHandler<T> | string | undefined | null;
+		onmouseenter?: MouseEventHandler<T> | string | undefined | null;
+		onmouseleave?: MouseEventHandler<T> | string | undefined | null;
+		onmousemove?: MouseEventHandler<T> | string | undefined | null;
+		onmouseout?: MouseEventHandler<T> | string | undefined | null;
+		onmouseover?: MouseEventHandler<T> | string | undefined | null;
+		onmouseup?: MouseEventHandler<T> | string | undefined | null;
 
 		// Selection Events
-		onselect?: EventHandler<Event, T> | undefined | null;
-		onselectionchange?: EventHandler<Event, T> | undefined | null;
-		onselectstart?: EventHandler<Event, T> | undefined | null;
+		onselect?: EventHandler<Event, T> | string | undefined | null;
+		onselectionchange?: EventHandler<Event, T> | string | undefined | null;
+		onselectstart?: EventHandler<Event, T> | string | undefined | null;
 
 		// Touch Events
-		ontouchcancel?: TouchEventHandler<T> | undefined | null;
-		ontouchend?: TouchEventHandler<T> | undefined | null;
-		ontouchmove?: TouchEventHandler<T> | undefined | null;
-		ontouchstart?: TouchEventHandler<T> | undefined | null;
+		ontouchcancel?: TouchEventHandler<T> | string | undefined | null;
+		ontouchend?: TouchEventHandler<T> | string | undefined | null;
+		ontouchmove?: TouchEventHandler<T> | string | undefined | null;
+		ontouchstart?: TouchEventHandler<T> | string | undefined | null;
 
 		// Pointer Events
-		ongotpointercapture?: PointerEventHandler<T> | undefined | null;
-		onpointercancel?: PointerEventHandler<T> | undefined | null;
-		onpointerdown?: PointerEventHandler<T> | undefined | null;
-		onpointerenter?: PointerEventHandler<T> | undefined | null;
-		onpointerleave?: PointerEventHandler<T> | undefined | null;
-		onpointermove?: PointerEventHandler<T> | undefined | null;
-		onpointerout?: PointerEventHandler<T> | undefined | null;
-		onpointerover?: PointerEventHandler<T> | undefined | null;
-		onpointerup?: PointerEventHandler<T> | undefined | null;
-		onlostpointercapture?: PointerEventHandler<T> | undefined | null;
+		ongotpointercapture?: PointerEventHandler<T> | string | undefined | null;
+		onpointercancel?: PointerEventHandler<T> | string | undefined | null;
+		onpointerdown?: PointerEventHandler<T> | string | undefined | null;
+		onpointerenter?: PointerEventHandler<T> | string | undefined | null;
+		onpointerleave?: PointerEventHandler<T> | string | undefined | null;
+		onpointermove?: PointerEventHandler<T> | string | undefined | null;
+		onpointerout?: PointerEventHandler<T> | string | undefined | null;
+		onpointerover?: PointerEventHandler<T> | string | undefined | null;
+		onpointerup?: PointerEventHandler<T> | string | undefined | null;
+		onlostpointercapture?: PointerEventHandler<T> | string | undefined | null;
 
 		// UI Events
-		onscroll?: UIEventHandler<T> | undefined | null;
-		onresize?: UIEventHandler<T> | undefined | null;
+		onscroll?: UIEventHandler<T> | string | undefined | null;
+		onresize?: UIEventHandler<T> | string | undefined | null;
 
 		// Wheel Events
-		onwheel?: WheelEventHandler<T> | undefined | null;
+		onwheel?: WheelEventHandler<T> | string | undefined | null;
 
 		// Animation Events
-		onanimationstart?: AnimationEventHandler<T> | undefined | null;
-		onanimationend?: AnimationEventHandler<T> | undefined | null;
-		onanimationiteration?: AnimationEventHandler<T> | undefined | null;
+		onanimationstart?: AnimationEventHandler<T> | string | undefined | null;
+		onanimationend?: AnimationEventHandler<T> | string | undefined | null;
+		onanimationiteration?: AnimationEventHandler<T> | string | undefined | null;
 
 		// Transition Events
-		ontransitionstart?: TransitionEventHandler<T> | undefined | null;
-		ontransitionrun?: TransitionEventHandler<T> | undefined | null;
-		ontransitionend?: TransitionEventHandler<T> | undefined | null;
-		ontransitioncancel?: TransitionEventHandler<T> | undefined | null;
+		ontransitionstart?: TransitionEventHandler<T> | string | undefined | null;
+		ontransitionrun?: TransitionEventHandler<T> | string | undefined | null;
+		ontransitionend?: TransitionEventHandler<T> | string | undefined | null;
+		ontransitioncancel?: TransitionEventHandler<T> | string | undefined | null;
 
 		// Message Events
-		onmessage?: MessageEventHandler<T> | undefined | null;
-		onmessageerror?: MessageEventHandler<T> | undefined | null;
+		onmessage?: MessageEventHandler<T> | string | undefined | null;
+		onmessageerror?: MessageEventHandler<T> | string | undefined | null;
 
 		// Global Events
-		oncancel?: EventHandler<Event, T> | undefined | null;
-		onclose?: EventHandler<Event, T> | undefined | null;
-		onfullscreenchange?: EventHandler<Event, T> | undefined | null;
-		onfullscreenerror?: EventHandler<Event, T> | undefined | null;
+		oncancel?: EventHandler<Event, T> | string | undefined | null;
+		onclose?: EventHandler<Event, T> | string | undefined | null;
+		onfullscreenchange?: EventHandler<Event, T> | string | undefined | null;
+		onfullscreenerror?: EventHandler<Event, T> | string | undefined | null;
 	}
 
 	// All the WAI-ARIA 1.1 attributes from https://www.w3.org/TR/wai-aria-1.1/
@@ -988,14 +987,14 @@ declare namespace astroHTML.JSX {
 		ruby: HTMLProps<HTMLElement>;
 		s: HTMLProps<HTMLElement>;
 		samp: HTMLProps<HTMLElement>;
-		script: HTMLProps<HTMLElement> & AstroDefineVars;
+		script: HTMLProps<HTMLElement> & AstroDefineVars & AstroScript;
 		section: HTMLProps<HTMLElement>;
 		select: HTMLProps<HTMLSelectElement>;
 		small: HTMLProps<HTMLElement>;
 		source: HTMLProps<HTMLSourceElement>;
 		span: HTMLProps<HTMLSpanElement>;
 		strong: HTMLProps<HTMLElement>;
-		style: HTMLProps<HTMLStyleElement> & AstroDefineVars;
+		style: HTMLProps<HTMLStyleElement> & AstroDefineVars & AstroStyle;
 		sub: HTMLProps<HTMLElement>;
 		summary: HTMLProps<HTMLElement>;
 		sup: HTMLProps<HTMLElement>;