@aerobuilt/core 0.3.2 → 0.3.3

package/dist/{build-script-analysis-Bll0Ujh4.mjs → build-script-analysis-1t1wROdQ.mjs}

@@ -34,6 +34,8 @@ function isDirectiveAttr(attrName, config = defaultConfig) {
 * @remarks
 * Attribute names are used with optional `data-` prefix (e.g. `data-each`). Script taxonomy uses
 * `is:build`, `is:inline`, `is:blocking`; default scripts are treated as client (virtual module).
+* When changing script taxonomy (is:build, is:inline, etc.), update all consumers per
+* _reference/script-taxonomy-sync.md.
 */
 /** Prefix for data attributes (e.g. `data-each` → ATTR_PREFIX + ATTR_EACH). */
 const ATTR_PREFIX = "data-";
@@ -187,6 +189,92 @@ function analyzeBuildScript(script) {
 	};
 }
 /**
+* Extract the props type name from a build script that uses `Aero.props as TypeName`
+* or `const { ... } = Aero.props as TypeName`.
+*
+* @param script - Raw build script content (JS or TS).
+* @returns The type name and whether it was from destructuring, or null if not found.
+*/
+function getPropsTypeFromBuildScript(script) {
+	if (!script.trim()) return null;
+	const result = parseSync(BUILD_SCRIPT_FILENAME, script, {
+		sourceType: "module",
+		range: true,
+		lang: "ts"
+	});
+	if (result.errors.length > 0) return null;
+	const body = result.program.body;
+	if (!body) return null;
+	for (const stmt of body) {
+		const found = findPropsTypeInNode(stmt);
+		if (found) return found;
+	}
+	return null;
+}
+function findPropsTypeInNode(node) {
+	if (!node || typeof node !== "object") return null;
+	const n = node;
+	if (n.type === "TSAsExpression") {
+		const expr = n.expression;
+		const typeAnnotation = n.typeAnnotation;
+		if (isAeroProps(expr)) {
+			const typeName = getTypeNameFromAnnotation(typeAnnotation);
+			if (typeName) return {
+				typeName,
+				isFromDestructuring: false
+			};
+		}
+		return null;
+	}
+	if (n.type === "VariableDeclaration") {
+		const declarations = n.declarations;
+		for (const decl of declarations ?? []) {
+			const d = decl;
+			const init = d.init;
+			const id = d.id;
+			const isDestructuring = id && typeof id === "object" && id.type === "ObjectPattern";
+			const found = findPropsTypeInNode(init);
+			if (found) return {
+				...found,
+				isFromDestructuring: !!isDestructuring
+			};
+		}
+		return null;
+	}
+	for (const key of [
+		"init",
+		"expression",
+		"argument",
+		"body",
+		"consequent",
+		"alternate"
+	]) {
+		const child = n[key];
+		if (Array.isArray(child)) for (const c of child) {
+			const found = findPropsTypeInNode(c);
+			if (found) return found;
+		}
+		else if (child) {
+			const found = findPropsTypeInNode(child);
+			if (found) return found;
+		}
+	}
+	return null;
+}
+function isAeroProps(expr) {
+	if (expr?.type !== "MemberExpression") return false;
+	const obj = expr.object;
+	const prop = expr.property;
+	const objName = obj?.type === "Identifier" ? obj.name : obj?.name;
+	const propName = prop?.type === "Identifier" ? prop.name : prop?.name;
+	return objName === "Aero" && propName === "props";
+}
+function getTypeNameFromAnnotation(annotation) {
+	if (!annotation) return null;
+	if (annotation.type === "TSTypeReference") return annotation.typeName?.name;
+	return null;
+}
+/**
 * Analyze build script for editor use: same as analyzeBuildScript but returns imports with
 * source ranges (full statement and per-binding) so the extension can map to vscode.Range.
 *
@@ -249,4 +337,4 @@ function analyzeBuildScriptForEditor(script) {
 }
 
 //#endregion
-export { DEFAULT_DIRECTIVE_PREFIXES as C, tokenizeCurlyInterpolation as E, VOID_TAGS as S, compileInterpolationFromSegments as T, EACH_REGEX as _, ATTR_ELSE_IF as a, SLOT_NAME_DEFAULT as b, ATTR_IS_BUILD as c, ATTR_PASS_DATA as d, ATTR_PREFIX as f, COMPONENT_SUFFIX_REGEX as g, ATTR_SRC as h, ATTR_ELSE as i, ATTR_IS_INLINE as l, ATTR_SLOT as m, analyzeBuildScriptForEditor as n, ATTR_IF as o, ATTR_PROPS as p, ATTR_EACH as r, ATTR_IS_BLOCKING as s, analyzeBuildScript as t, ATTR_NAME as u, SELF_CLOSING_TAG_REGEX as v, isDirectiveAttr as w, TAG_SLOT as x, SELF_CLOSING_TAIL_REGEX as y };
+export { VOID_TAGS as C, tokenizeCurlyInterpolation as D, compileInterpolationFromSegments as E, TAG_SLOT as S, isDirectiveAttr as T, COMPONENT_SUFFIX_REGEX as _, ATTR_ELSE as a, SELF_CLOSING_TAIL_REGEX as b, ATTR_IS_BLOCKING as c, ATTR_NAME as d, ATTR_PASS_DATA as f, ATTR_SRC as g, ATTR_SLOT as h, ATTR_EACH as i, ATTR_IS_BUILD as l, ATTR_PROPS as m, analyzeBuildScriptForEditor as n, ATTR_ELSE_IF as o, ATTR_PREFIX as p, getPropsTypeFromBuildScript as r, ATTR_IF as s, analyzeBuildScript as t, ATTR_IS_INLINE as u, EACH_REGEX as v, DEFAULT_DIRECTIVE_PREFIXES as w, SLOT_NAME_DEFAULT as x, SELF_CLOSING_TAG_REGEX as y };

package/dist/entry-editor.d.mts

@@ -65,6 +65,19 @@ interface BuildScriptImportForEditor extends BuildScriptImport {
 interface BuildScriptAnalysisForEditorResult {
   imports: BuildScriptImportForEditor[];
 }
+/** Result of getPropsTypeFromBuildScript: the type name used in `Aero.props as TypeName`. */
+interface PropsTypeResult {
+  typeName: string;
+  isFromDestructuring: boolean;
+}
+/**
+ * Extract the props type name from a build script that uses `Aero.props as TypeName`
+ * or `const { ... } = Aero.props as TypeName`.
+ *
+ * @param script - Raw build script content (JS or TS).
+ * @returns The type name and whether it was from destructuring, or null if not found.
+ */
+declare function getPropsTypeFromBuildScript(script: string): PropsTypeResult | null;
 /**
  * Analyze build script for editor use: same as analyzeBuildScript but returns imports with
  * source ranges (full statement and per-binding) so the extension can map to vscode.Range.
@@ -74,4 +87,4 @@ interface BuildScriptAnalysisForEditorResult {
  */
 declare function analyzeBuildScriptForEditor(script: string): BuildScriptAnalysisForEditorResult;
 //#endregion
-export { type BuildScriptAnalysisForEditorResult, type BuildScriptImportForEditor, COMPONENT_SUFFIX_REGEX, DEFAULT_DIRECTIVE_PREFIXES, type DirectiveAttrConfig, type InterpolationSegment, type LiteralSegment, type Segment, type TokenizeOptions, analyzeBuildScriptForEditor, compileInterpolationFromSegments, isDirectiveAttr, tokenizeCurlyInterpolation };
+export { type BuildScriptAnalysisForEditorResult, type BuildScriptImportForEditor, COMPONENT_SUFFIX_REGEX, DEFAULT_DIRECTIVE_PREFIXES, type DirectiveAttrConfig, type InterpolationSegment, type LiteralSegment, type PropsTypeResult, type Segment, type TokenizeOptions, analyzeBuildScriptForEditor, compileInterpolationFromSegments, getPropsTypeFromBuildScript, isDirectiveAttr, tokenizeCurlyInterpolation };

package/dist/entry-editor.mjs

@@ -1,3 +1,3 @@
-import { C as DEFAULT_DIRECTIVE_PREFIXES, E as tokenizeCurlyInterpolation, T as compileInterpolationFromSegments, g as COMPONENT_SUFFIX_REGEX, n as analyzeBuildScriptForEditor, w as isDirectiveAttr } from "./build-script-analysis-Bll0Ujh4.mjs";
+import { D as tokenizeCurlyInterpolation, E as compileInterpolationFromSegments, T as isDirectiveAttr, _ as COMPONENT_SUFFIX_REGEX, n as analyzeBuildScriptForEditor, r as getPropsTypeFromBuildScript, w as DEFAULT_DIRECTIVE_PREFIXES } from "./build-script-analysis-1t1wROdQ.mjs";
 
-export { COMPONENT_SUFFIX_REGEX, DEFAULT_DIRECTIVE_PREFIXES, analyzeBuildScriptForEditor, compileInterpolationFromSegments, isDirectiveAttr, tokenizeCurlyInterpolation };
+export { COMPONENT_SUFFIX_REGEX, DEFAULT_DIRECTIVE_PREFIXES, analyzeBuildScriptForEditor, compileInterpolationFromSegments, getPropsTypeFromBuildScript, isDirectiveAttr, tokenizeCurlyInterpolation };

package/dist/vite/index.mjs

@@ -1,5 +1,5 @@
 import { a as isDynamicRoutePattern, i as expandRoutePattern, n as resolvePageName, o as toPosix, s as toPosixRelative, t as pagePathToKey } from "../routing-Bai79LCq.mjs";
-import { E as tokenizeCurlyInterpolation, S as VOID_TAGS, T as compileInterpolationFromSegments, _ as EACH_REGEX, a as ATTR_ELSE_IF, b as SLOT_NAME_DEFAULT, c as ATTR_IS_BUILD, d as ATTR_PASS_DATA, f as ATTR_PREFIX, g as COMPONENT_SUFFIX_REGEX, h as ATTR_SRC, i as ATTR_ELSE, l as ATTR_IS_INLINE, m as ATTR_SLOT, o as ATTR_IF, p as ATTR_PROPS, r as ATTR_EACH, s as ATTR_IS_BLOCKING, t as analyzeBuildScript, u as ATTR_NAME, v as SELF_CLOSING_TAG_REGEX, w as isDirectiveAttr, x as TAG_SLOT, y as SELF_CLOSING_TAIL_REGEX } from "../build-script-analysis-Bll0Ujh4.mjs";
+import { C as VOID_TAGS, D as tokenizeCurlyInterpolation, E as compileInterpolationFromSegments, S as TAG_SLOT, T as isDirectiveAttr, _ as COMPONENT_SUFFIX_REGEX, a as ATTR_ELSE, b as SELF_CLOSING_TAIL_REGEX, c as ATTR_IS_BLOCKING, d as ATTR_NAME, f as ATTR_PASS_DATA, g as ATTR_SRC, h as ATTR_SLOT, i as ATTR_EACH, l as ATTR_IS_BUILD, m as ATTR_PROPS, o as ATTR_ELSE_IF, p as ATTR_PREFIX, s as ATTR_IF, t as analyzeBuildScript, u as ATTR_IS_INLINE, v as EACH_REGEX, x as SLOT_NAME_DEFAULT, y as SELF_CLOSING_TAG_REGEX } from "../build-script-analysis-1t1wROdQ.mjs";
 import { loadTsconfigAliases, mergeWithDefaultAliases } from "../utils/aliases.mjs";
 import { redirectsToRouteRules } from "../utils/redirects.mjs";
 import { createRequire } from "node:module";
@@ -7,6 +7,7 @@ import { ViteImageOptimizer } from "vite-plugin-image-optimizer";
 import { nitro } from "nitro/vite";
 import { parseHTML } from "linkedom";
 import path from "path";
+import { transformSync } from "oxc-transform";
 import path$1 from "node:path";
 import { minify } from "html-minifier-next";
 import fs, { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -64,17 +65,18 @@ function extractKeyFromEntry(entry) {
 /** Virtual URL prefix for extracted client scripts (e.g. `/@aero/client/client/pages/home.js`). Root-relative; no filesystem path. */
 const CLIENT_SCRIPT_PREFIX = "/@aero/client/";
 /**
-* Virtual URL for one client script. Single script uses `.js`, multiple use `.0.js`, `.1.js`, etc.
+* Virtual URL for one client script.
+* Single script uses `.ts`, multiple use `.0.ts`, `.1.ts`, etc.
 * Use this in the Vite transform and static build so URL generation is consistent.
 */
 function getClientScriptVirtualUrl(baseName, index, total) {
-	const suffix = total === 1 ? ".js" : `.${index}.js`;
+	const suffix = total === 1 ? ".ts" : `.${index}.ts`;
 	return CLIENT_SCRIPT_PREFIX + baseName + suffix;
 }
 /** Virtual module ID requested by the app; resolved to `RESOLVED_*` so `load()` can re-export from the real runtime instance. */
-const RUNTIME_INSTANCE_MODULE_ID = "virtual:aero/runtime-instance";
+const RUNTIME_INSTANCE_MODULE_ID = "virtual:aero/runtime-instance.ts";
 /** Resolved ID (with `\0` prefix) so Vite treats it as an internal module. */
-const RESOLVED_RUNTIME_INSTANCE_MODULE_ID = "\0virtual:aero/runtime-instance";
+const RESOLVED_RUNTIME_INSTANCE_MODULE_ID = "\0virtual:aero/runtime-instance.ts";
 /** Prefix for virtual empty-CSS modules used when Vite requests .html?html-proxy&inline-css (Aero .html are JS, not HTML with styles). */
 const AERO_EMPTY_INLINE_CSS_PREFIX = "\0aero:empty-inline-css:";
 /** Prefix for virtual HTML template modules. Resolving .html to this id returns compiled JS so vite:build-html never sees raw/compiled HTML. */
@@ -568,6 +570,11 @@ var Resolver = class {
 
 //#endregion
 //#region src/compiler/codegen.ts
+/** Strip TypeScript syntax from a script string, returning plain JavaScript. */
+function stripTypes(code, filename = "script.ts") {
+	if (!code.trim()) return code;
+	return transformSync(filename, code, { typescript: { onlyRemoveTypeImports: true } }).code.replace(/(?:^|\n)\s*export\s*\{\s*\}\s*;?/g, "");
+}
 /** Internal lowerer: walks DOM nodes and builds IR; used by compile(). */
 var Lowerer = class {
 	resolver;
@@ -953,7 +960,7 @@ function compile(parsed, options) {
 	const lowerer = new Lowerer(resolver);
 	let script = parsed.buildScript ? parsed.buildScript.content : "";
 	const analysis = analyzeBuildScript(script);
-	script = analysis.scriptWithoutImportsAndGetStaticPaths;
+	script = stripTypes(analysis.scriptWithoutImportsAndGetStaticPaths);
 	const getStaticPathsFn = analysis.getStaticPathsFn;
 	const importsLines = [];
 	const quote = "\"";
@@ -1008,15 +1015,18 @@ function compile(parsed, options) {
 		} else if (isHead) headScripts.push(tagExpr);
 		else rootScripts.push(`scripts?.add(${tagExpr});`);
 	}
-	if (options.blockingScripts) for (const blockingScript of options.blockingScripts) if (blockingScript.passDataExpr) {
-		const jsMapExpr = `Object.entries(${validateSingleBracedExpression(blockingScript.passDataExpr, {
-			directive: "pass:data",
-			tagName: "script"
-		})}).map(([k, v]) => "\\nconst " + k + " = " + JSON.stringify(v) + ";").join("")`;
-		headScripts.push(`\`<script${blockingScript.attrs ? " " + blockingScript.attrs : ""}>\${${jsMapExpr}}${blockingScript.content.replace(/`/g, "\\`")}<\/script>\``);
-	} else {
-		const escapedContent = blockingScript.content.replace(/'/g, "\\'");
-		headScripts.push(`'<script${blockingScript.attrs ? " " + blockingScript.attrs : ""}>${escapedContent}<\/script>'`);
+	if (options.blockingScripts) for (const blockingScript of options.blockingScripts) {
+		const strippedContent = stripTypes(blockingScript.content, "blocking.ts");
+		if (blockingScript.passDataExpr) {
+			const jsMapExpr = `Object.entries(${validateSingleBracedExpression(blockingScript.passDataExpr, {
+				directive: "pass:data",
+				tagName: "script"
+			})}).map(([k, v]) => "\\nconst " + k + " = " + JSON.stringify(v) + ";").join("")`;
+			headScripts.push(`\`<script${blockingScript.attrs ? " " + blockingScript.attrs : ""}>\${${jsMapExpr}}${strippedContent.replace(/`/g, "\\`")}<\/script>\``);
+		} else {
+			const escapedContent = strippedContent.replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+			headScripts.push(`\`<script${blockingScript.attrs ? " " + blockingScript.attrs : ""}>${escapedContent}<\/script>\``);
+		}
 	}
 	const renderFn = emitRenderFunction(script, bodyCode, {
 		getStaticPathsFn: getStaticPathsFn || void 0,
@@ -1556,7 +1566,7 @@ function clientGlobPrefix(clientDir) {
 * Ensures template resolution works for custom dirs (e.g. dirs.client === 'frontend').
 * runtimeImportPath: path that resolves to @aerobuilt/core/runtime from the generated file (e.g. relative to .aero/ for SSR).
 */
-function getRuntimeInstanceVirtualSource(clientDir, runtimeImportPath = "@aerobuilt/core/runtime") {
+function getRuntimeInstanceVirtualSource(clientDir, runtimeImportPath = "aerobuilt/runtime") {
 	const prefix = clientGlobPrefix(clientDir);
 	const componentsPattern = `${prefix}/components/**/*.html`;
 	const layoutsPattern = `${prefix}/layouts/*.html`;
@@ -1602,7 +1612,10 @@ function createAeroVirtualsPlugin(state) {
 			discoverClientScriptContentMap(state.config.root, state.dirs.client).forEach((entry, url) => state.clientScripts.set(url, entry));
 		},
 		async resolveId(id, importer) {
-			if (id === RUNTIME_INSTANCE_MODULE_ID) return state.generatedRuntimeInstancePath ?? RESOLVED_RUNTIME_INSTANCE_MODULE_ID;
+			if (id === RUNTIME_INSTANCE_MODULE_ID) {
+				if (state.config?.command === "build" && state.generatedRuntimeInstancePath) return state.generatedRuntimeInstancePath;
+				return RESOLVED_RUNTIME_INSTANCE_MODULE_ID;
+			}
 			if (id.startsWith(CLIENT_SCRIPT_PREFIX)) return "\0" + id;
 			if (id.startsWith("\0" + CLIENT_SCRIPT_PREFIX)) return id;
 			if (id.startsWith(AERO_HTML_VIRTUAL_PREFIX)) return id;

package/env.d.ts

@@ -0,0 +1,66 @@
+/**
+ * Ambient type declarations for Aero templates.
+ *
+ * Include in your project by adding `"types": ["@aerobuilt/core/env"]` to tsconfig.json,
+ * or via a triple-slash directive: `/// <reference types="@aerobuilt/core/env" />`
+ *
+ * These declarations type the globals available inside `<script is:build>` blocks.
+ *
+ * Single source of truth: the language server generates its preamble from this file.
+ * When changing globals (Aero, renderComponent, *.html, aero:content), run:
+ *   pnpm --dir packages/language-server exec npm run prebuild
+ */
+
+/**
+ * The `Aero` context object available in build scripts. Provides access to
+ * component props, request data, and rendering utilities.
+ *
+ * Use `Aero.props` (capital A). The lowercase `aero` is not defined at runtime.
+ */
+declare const Aero: {
+	/** Props passed to the current component or page. */
+	props: Record<string, any>
+	/** Named slot content (key to HTML string). */
+	slots: Record<string, string>
+	/** The incoming request (available during SSR). */
+	request: Request
+	/** The request URL. */
+	url: URL
+	/** Dynamic route parameters (e.g. `{ id: '42' }` for `/posts/[id]`). */
+	params: Record<string, string>
+	/** Canonical site URL from `aero.config` (e.g. `'https://example.com'`). */
+	site?: string
+}
+
+/**
+ * Render a child component and return its HTML.
+ *
+ * @param component - The imported component (default import from an `.html` file).
+ * @param props - Props to pass to the component.
+ * @param slots - Named slot content.
+ * @returns The rendered HTML string.
+ */
+declare function renderComponent(
+	component: any,
+	props?: Record<string, any>,
+	slots?: Record<string, string>,
+): Promise<string>
+
+/** Allows importing `.html` component files in build scripts. */
+declare module '*.html' {
+	const component: string
+	export default component
+}
+
+/** Content collections: getCollection, render. Used by the language server for IntelliSense. */
+declare module 'aero:content' {
+	interface CollectionEntry {
+		id: string
+		data: Record<string, any>
+		body?: string
+	}
+	export function getCollection(name: string): Promise<CollectionEntry[]>
+	export function render(
+		entry: CollectionEntry | Record<string, any>,
+	): Promise<{ html: string }>
+}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@aerobuilt/core",
-  "version": "0.3.2",
-  "type": "module",
+  "version": "0.3.3",
+  "private": false,
+  "homepage": "https://github.com/aerobuilt/aero",
   "license": "MIT",
   "author": "Jamie Wilson",
   "repository": {
@@ -9,12 +10,12 @@
     "url": "https://github.com/aerobuilt/aero.git",
     "directory": "packages/core"
   },
-  "homepage": "https://github.com/aerobuilt/aero",
-  "private": false,
-  "types": "./dist/entry-dev.d.mts",
   "files": [
-    "dist"
+    "dist",
+    "env.d.ts"
   ],
+  "type": "module",
+  "types": "./dist/entry-dev.d.mts",
   "exports": {
     ".": {
       "types": "./dist/entry-dev.d.mts",
@@ -48,19 +49,27 @@
     "./editor": {
       "types": "./dist/entry-editor.d.mts",
       "default": "./dist/entry-editor.mjs"
-    }
+    },
+    "./env": "./env.d.ts"
   },
   "dependencies": {
     "get-tsconfig": "^4.13.6",
-    "oxc-resolver": "^11.19.0",
     "html-minifier-next": "^5.1.1",
     "linkedom": "^0.18.12",
     "nitro": "^3.0.1-alpha.2",
     "oxc-parser": "^0.115.0",
+    "oxc-resolver": "^11.19.0",
+    "oxc-transform": "^0.116.0",
     "sharp": "^0.34.5",
     "svgo": "^4.0.0",
     "vite-plugin-image-optimizer": "^2.0.3",
-    "@aerobuilt/interpolation": "0.3.2"
+    "@aerobuilt/interpolation": "0.3.3"
+  },
+  "devDependencies": {
+    "@types/node": "^25.3.0",
+    "tsdown": "^0.21.0-beta.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "vite": "^8.0.0-0"
@@ -70,12 +79,6 @@
       "optional": true
     }
   },
-  "devDependencies": {
-    "@types/node": "^25.3.0",
-    "tsdown": "^0.21.0-beta.2",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
-  },
   "scripts": {
     "build": "tsdown",
     "typecheck": "tsc --noEmit",