@astrojs/language-server 0.13.2 → 0.14.0

package/dist/server.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startLanguageServer = void 0;
 const vscode = __importStar(require("vscode-languageserver"));
+const vscode_languageserver_1 = require("vscode-languageserver");
 const ConfigManager_1 = require("./core/config/ConfigManager");
 const DocumentManager_1 = require("./core/documents/DocumentManager");
 const DiagnosticsManager_1 = require("./core/DiagnosticsManager");
@@ -32,8 +33,9 @@ const AstroPlugin_1 = require("./plugins/astro/AstroPlugin");
 const CSSPlugin_1 = require("./plugins/css/CSSPlugin");
 const HTMLPlugin_1 = require("./plugins/html/HTMLPlugin");
 const PluginHost_1 = require("./plugins/PluginHost");
-const TypeScriptPlugin_1 = require("./plugins/typescript/TypeScriptPlugin");
+const plugins_1 = require("./plugins");
 const utils_1 = require("./utils");
+const utils_2 = require("./plugins/typescript/utils");
 const TagCloseRequest = new vscode.RequestType('html/tag');
 // Start the language server
 function startLanguageServer(connection) {
@@ -44,6 +46,22 @@ function startLanguageServer(connection) {
     connection.onInitialize((params) => {
         var _a, _b, _c, _d, _e, _f;
         const workspaceUris = (_b = (_a = params.workspaceFolders) === null || _a === void 0 ? void 0 : _a.map((folder) => folder.uri.toString())) !== null && _b !== void 0 ? _b : [(_c = params.rootUri) !== null && _c !== void 0 ? _c : ''];
+        workspaceUris.forEach((uri) => {
+            uri = (0, utils_1.urlToPath)(uri);
+            const astroVersion = (0, utils_1.getUserAstroVersion)(uri);
+            if (astroVersion.exist === false) {
+                connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
+                    message: `Couldn't find Astro in workspace "${uri}". Experience might be degraded. For the best experience, please make sure Astro is installed and then restart the language server`,
+                    type: vscode_languageserver_1.MessageType.Warning,
+                });
+            }
+            if (astroVersion.exist && astroVersion.major === 0 && astroVersion.minor < 24 && astroVersion.patch < 5) {
+                connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
+                    message: `The version of Astro you're using (${astroVersion.full}) is not supported by this version of the Astro language server. Please upgrade Astro to any version higher than 0.23.4 or if using the VS Code extension, downgrade the extension to 0.8.10`,
+                    type: vscode_languageserver_1.MessageType.Error,
+                });
+            }
+        });
         pluginHost.initialize({
             filterIncompleteCompletions: !((_d = params.initializationOptions) === null || _d === void 0 ? void 0 : _d.dontFilterIncompleteCompletions),
             definitionLinkSupport: !!((_f = (_e = params.capabilities.textDocument) === null || _e === void 0 ? void 0 : _e.definition) === null || _f === void 0 ? void 0 : _f.linkSupport),
@@ -54,7 +72,7 @@ function startLanguageServer(connection) {
         // We don't currently support running the TypeScript and Astro plugin in the browser
         if (params.initializationOptions.environment !== 'browser') {
             pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
-            pluginHost.registerPlugin(new TypeScriptPlugin_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
+            pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
         }
         // Update language-server config with what the user supplied to us at launch
         configManager.updateConfig(params.initializationOptions.configuration.astro);
@@ -97,6 +115,11 @@ function startLanguageServer(connection) {
                 colorProvider: true,
                 hoverProvider: true,
                 documentSymbolProvider: true,
+                semanticTokensProvider: {
+                    legend: (0, utils_2.getSemanticTokenLegend)(),
+                    range: true,
+                    full: true,
+                },
                 signatureHelpProvider: {
                     triggerCharacters: ['(', ',', '<'],
                     retriggerCharacters: [')'],
@@ -146,6 +169,8 @@ function startLanguageServer(connection) {
         return pluginHost.resolveCompletion(data, completionItem);
     });
     connection.onDocumentSymbol((params, cancellationToken) => pluginHost.getDocumentSymbols(params.textDocument, cancellationToken));
+    connection.onRequest(vscode_languageserver_1.SemanticTokensRequest.type, (evt, cancellationToken) => pluginHost.getSemanticTokens(evt.textDocument, undefined, cancellationToken));
+    connection.onRequest(vscode_languageserver_1.SemanticTokensRangeRequest.type, (evt, cancellationToken) => pluginHost.getSemanticTokens(evt.textDocument, evt.range, cancellationToken));
     connection.onDocumentColor((params) => pluginHost.getDocumentColors(params.textDocument));
     connection.onColorPresentation((params) => pluginHost.getColorPresentations(params.textDocument, params.range, params.color));
     connection.onRequest(TagCloseRequest, (evt) => pluginHost.doTagComplete(evt.textDocument, evt.position));

package/dist/utils.d.ts

@@ -21,11 +21,6 @@ export declare function getLastPartOfPath(path: string): string;
  * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
  */
 export declare function isPossibleComponent(node: Node): boolean;
-/**
- * Return true if a specific node could be a component with a client directive on it.
- * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
- */
-export declare function isPossibleClientComponent(node: Node): boolean;
 /** Flattens an array */
 export declare function flatten<T>(arr: T[][]): T[];
 /** Clamps a number between min and max */
@@ -51,3 +46,11 @@ export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPre
  * @param milliseconds Number of milliseconds to debounce/throttle
  */
 export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, milliseconds: number): T;
+export interface AstroVersion {
+    full: string;
+    major: number;
+    minor: number;
+    patch: number;
+    exist: boolean;
+}
+export declare function getUserAstroVersion(basePath: string): AstroVersion;

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleClientComponent = exports.isPossibleComponent = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
+exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleComponent = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
 const vscode_uri_1 = require("vscode-uri");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
@@ -46,21 +46,6 @@ function isPossibleComponent(node) {
     return !!((_a = node.tag) === null || _a === void 0 ? void 0 : _a[0].match(/[A-Z]/)) || !!((_b = node.tag) === null || _b === void 0 ? void 0 : _b.match(/.+[.][A-Z]/));
 }
 exports.isPossibleComponent = isPossibleComponent;
-/**
- * Return true if a specific node could be a component with a client directive on it.
- * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
- */
-function isPossibleClientComponent(node) {
-    if (isPossibleComponent(node) && node.attributes) {
-        for (let [name] of Object.entries(node.attributes)) {
-            if (name.startsWith('client:')) {
-                return true;
-            }
-        }
-    }
-    return false;
-}
-exports.isPossibleClientComponent = isPossibleClientComponent;
 /** Flattens an array */
 function flatten(arr) {
     return arr.reduce((all, item) => [...all, ...item], []);
@@ -132,3 +117,36 @@ function debounceThrottle(fn, milliseconds) {
     return maybeCall;
 }
 exports.debounceThrottle = debounceThrottle;
+function getUserAstroVersion(basePath) {
+    let version = '0.0.0';
+    let exist = true;
+    try {
+        const astroPackageJson = require.resolve('astro/package.json', { paths: [basePath] });
+        version = require(astroPackageJson).version;
+    }
+    catch {
+        // If we couldn't find it inside the workspace's node_modules, it might means we're in the monorepo
+        try {
+            const monorepoPackageJson = require.resolve('./packages/astro/package.json', { paths: [basePath] });
+            version = require(monorepoPackageJson).version;
+        }
+        catch (e) {
+            // If we still couldn't find it, it probably just doesn't exist
+            exist = false;
+            console.error(e);
+        }
+    }
+    let [major, minor, patch] = version.split('.');
+    if (patch.includes('-')) {
+        const patchParts = patch.split('-');
+        patch = patchParts[0];
+    }
+    return {
+        full: version,
+        major: Number(major),
+        minor: Number(minor),
+        patch: Number(patch),
+        exist,
+    };
+}
+exports.getUserAstroVersion = getUserAstroVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.13.2",
+  "version": "0.14.0",
   "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",
@@ -37,7 +37,7 @@
     "@types/lodash": "^4.14.179",
     "@types/mocha": "^9.1.0",
     "@types/sinon": "^10.0.11",
-    "astro": "^0.23.7",
+    "astro": "^1.0.0-beta.1",
     "astro-scripts": "0.0.1",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",

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>;