@aerobuilt/core 0.3.0 → 0.3.1

package/dist/runtime/instance.mjs

@@ -31,10 +31,14 @@ const notify = () => {
 };
 if (!globalThis.__AERO_INSTANCE__) globalThis.__AERO_INSTANCE__ = instance;
 if (!globalThis.__AERO_LISTENERS__) globalThis.__AERO_LISTENERS__ = listeners;
-/** Eager globs so pages, layouts, and components are available synchronously for SSR/build. */
-const components = import.meta.glob("@components/**/*.html", { eager: true });
-const layouts = import.meta.glob("@layouts/*.html", { eager: true });
-const pages = import.meta.glob("@pages/**/*.html", { eager: true });
+/**
+* Eager globs so pages, layouts, and components are available synchronously for SSR/build.
+* Patterns use default client dir (./client/...) so Vite's import-glob accepts them; apps with
+* custom dirs rely on path aliases mapping @components/@layouts/@pages to the same structure.
+*/
+const components = /* @__PURE__ */ Object.assign({});
+const layouts = /* @__PURE__ */ Object.assign({});
+const pages = /* @__PURE__ */ Object.assign({});
 aero.registerPages(components);
 aero.registerPages(layouts);
 aero.registerPages(pages);

package/dist/vite/index.mjs

@@ -648,31 +648,20 @@ var Lowerer = class {
 	}
 	/** Gets the condition value from if/else-if attribute */
 	getCondition(node, attr) {
+		const tagName = node?.tagName?.toLowerCase?.() || "element";
 		const plainValue = node.getAttribute(attr);
-		if (plainValue !== null) return this.requireBracedExpression(plainValue, attr, node);
+		if (plainValue !== null) return stripBraces(validateSingleBracedExpression(plainValue, {
+			directive: attr,
+			tagName
+		}));
 		const dataAttr = ATTR_PREFIX + attr;
 		const dataValue = node.getAttribute(dataAttr);
-		if (dataValue !== null) return this.requireBracedExpression(dataValue, dataAttr, node);
+		if (dataValue !== null) return stripBraces(validateSingleBracedExpression(dataValue, {
+			directive: dataAttr,
+			tagName
+		}));
 		return null;
 	}
-	/**
-	* Require directive value to be a braced expression; optionally strip outer braces.
-	*
-	* @param value - Raw attribute value.
-	* @param directive - Attribute name for error message (e.g. `each`, `pass:data`).
-	* @param node - DOM node for error message (tag name).
-	* @param options - `strip: true` (default) returns inner expression; `strip: false` returns trimmed value including braces (e.g. for pass:data).
-	* @returns Trimmed value, with or without outer braces per options.
-	*/
-	requireBracedExpression(value, directive, node, options) {
-		const strip = options?.strip !== false;
-		const trimmed = value.trim();
-		if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) {
-			const tagName = node?.tagName?.toLowerCase?.() || "element";
-			throw new Error(`Directive \`${directive}\` on <${tagName}> must use a braced expression, e.g. ${directive}="{ expression }".`);
-		}
-		return strip ? stripBraces(trimmed) : trimmed;
-	}
 	isSingleWrappedExpression(value) {
 		const trimmed = value.trim();
 		if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) return false;
@@ -702,7 +691,13 @@ var Lowerer = class {
 			if (isAttr(attr.name, ATTR_PROPS, ATTR_PREFIX)) {
 				const value = attr.value?.trim() || "";
 				if (!value) dataPropsExpression = "...props";
-				else dataPropsExpression = this.requireBracedExpression(value, attr.name, node);
+				else {
+					const tagName = node?.tagName?.toLowerCase?.() || "element";
+					dataPropsExpression = stripBraces(validateSingleBracedExpression(value, {
+						directive: attr.name,
+						tagName
+					}));
+				}
 				continue;
 			}
 			const rawValue = attr.value ?? "";
@@ -725,7 +720,11 @@ var Lowerer = class {
 		if (node.attributes) for (let i = 0; i < node.attributes.length; i++) {
 			const attr = node.attributes[i];
 			if (isAttr(attr.name, ATTR_EACH, ATTR_PREFIX)) {
-				const match = this.requireBracedExpression(attr.value || "", attr.name, node).match(EACH_REGEX);
+				const tagName = node?.tagName?.toLowerCase?.() || "element";
+				const match = stripBraces(validateSingleBracedExpression(attr.value || "", {
+					directive: attr.name,
+					tagName
+				})).match(EACH_REGEX);
 				if (!match) {
 					const tagName = node?.tagName?.toLowerCase?.() || "element";
 					throw new Error(`Directive \`${attr.name}\` on <${tagName}> must match "{ item in items }".`);
@@ -1493,12 +1492,15 @@ function createBuildConfig(options = {}, root = process.cwd()) {
 const require = createRequire(import.meta.url);
 const AERO_DIR = ".aero";
 const NITRO_CONFIG_FILENAME = "nitro.config.mjs";
+/** Filename for the generated runtime instance (uses app dirs for globs); written under .aero so Vite treats it as a real module. */
+const RUNTIME_INSTANCE_FILENAME = "runtime-instance.mjs";
 /**
 * Generate Nitro config from Aero options and write to <projectRoot>/.aero/nitro.config.mjs.
 * root is the app/site directory (Vite config.root), e.g. examples/kitchen-sink or a create-aerobuilt project folder.
+* distDir is the configured output dir (e.g. 'build') so the catch-all route serves from the same path at preview time.
 * Returns the absolute path to .aero (Nitro cwd so it loads this file).
 */
-function writeGeneratedNitroConfig(root, serverDir, redirects) {
+function writeGeneratedNitroConfig(root, serverDir, redirects, distDir) {
 	const aeroDir = path.join(root, AERO_DIR);
 	mkdirSync(aeroDir, { recursive: true });
 	const routeRules = redirectsToRouteRules(redirects ?? []);
@@ -1507,7 +1509,8 @@ function writeGeneratedNitroConfig(root, serverDir, redirects) {
 		output: { dir: path.join(root, ".output") },
 		scanDirs: [path.join(root, serverDir)],
 		routeRules,
-		noPublicDir: true
+		noPublicDir: true,
+		replace: { "process.env.AERO_DIST": JSON.stringify(distDir) }
 	};
 	const content = `// Generated by Aero — do not edit
 export default ${JSON.stringify(nitroConfig, null, 2)}
@@ -1540,9 +1543,7 @@ function createAeroConfigPlugin(state) {
 		enforce: "pre",
 		config(userConfig, env) {
 			const root = userConfig.root || process.cwd();
-			const rawAliases = loadTsconfigAliases(root);
-			state.aliasResult = mergeWithDefaultAliases(rawAliases, root, state.dirs);
-			if (state.dirs.client !== DEFAULT_DIRS.client && rawAliases.projectRoot != null) console.warn("[aero] Custom dirs.client is set; ensure tsconfig paths for @pages, @layouts, @components match (e.g. @pages → \"" + state.dirs.client + "/pages\").");
+			state.aliasResult = mergeWithDefaultAliases(loadTsconfigAliases(root), root, state.dirs);
 			const site = state.options.site ?? "";
 			return {
 				base: "./",
@@ -1559,6 +1560,13 @@ function createAeroConfigPlugin(state) {
 		},
 		configResolved(resolvedConfig) {
 			state.config = resolvedConfig;
+			const dir = path.join(resolvedConfig.root, AERO_DIR);
+			mkdirSync(dir, { recursive: true });
+			const filePath = path.join(dir, RUNTIME_INSTANCE_FILENAME);
+			const runtimeIndexPath = path.join(path.dirname(state.runtimeInstancePath), "index.mjs");
+			const runtimeImportPath = path.relative(dir, runtimeIndexPath).replace(/\\/g, "/");
+			writeFileSync(filePath, getRuntimeInstanceVirtualSource(state.dirs.client, runtimeImportPath.startsWith(".") ? runtimeImportPath : "./" + runtimeImportPath), "utf-8");
+			state.generatedRuntimeInstancePath = filePath;
 		}
 	};
 }
@@ -1570,6 +1578,56 @@ function isAeroTemplateHtml(filePath, root, dirs) {
 	const sep = path.sep;
 	return rel.startsWith("pages" + sep) || rel.startsWith("components" + sep) || rel.startsWith("layouts" + sep);
 }
+/**
+* Prefix for import.meta.glob patterns. In virtual modules Vite requires globs to start with '/'
+* (absolute from project root). Uses app-configured client dir so custom dirs (e.g. frontend/) resolve correctly.
+*/
+function clientGlobPrefix(clientDir) {
+	const normalized = clientDir.replace(/\\/g, "/").replace(/^\.\/+/, "");
+	return normalized ? `/${normalized}` : "/client";
+}
+/**
+* Virtual module source for the runtime instance with glob patterns using the app's client dir.
+* 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") {
+	const prefix = clientGlobPrefix(clientDir);
+	const componentsPattern = `${prefix}/components/**/*.html`;
+	const layoutsPattern = `${prefix}/layouts/*.html`;
+	const pagesPattern = `${prefix}/pages/**/*.html`;
+	return `import { Aero } from ${JSON.stringify(runtimeImportPath)}
+
+const instance = globalThis.__AERO_INSTANCE__ || new Aero()
+const listeners = globalThis.__AERO_LISTENERS__ || new Set()
+const aero = instance
+
+const onUpdate = (cb) => {
+	listeners.add(cb)
+	return () => listeners.delete(cb)
+}
+const notify = () => {
+	listeners.forEach((cb) => cb())
+}
+
+if (!globalThis.__AERO_INSTANCE__) globalThis.__AERO_INSTANCE__ = instance
+if (!globalThis.__AERO_LISTENERS__) globalThis.__AERO_LISTENERS__ = listeners
+
+const components = import.meta.glob(${JSON.stringify(componentsPattern)}, { eager: true })
+const layouts = import.meta.glob(${JSON.stringify(layoutsPattern)}, { eager: true })
+const pages = import.meta.glob(${JSON.stringify(pagesPattern)}, { eager: true })
+
+aero.registerPages(components)
+aero.registerPages(layouts)
+aero.registerPages(pages)
+
+notify()
+
+if (import.meta.hot) import.meta.hot.accept()
+
+export { aero, onUpdate }
+`;
+}
 function createAeroVirtualsPlugin(state) {
 	return {
 		name: "vite-plugin-aero-virtuals",
@@ -1579,7 +1637,7 @@ 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 RESOLVED_RUNTIME_INSTANCE_MODULE_ID;
+			if (id === RUNTIME_INSTANCE_MODULE_ID) return state.generatedRuntimeInstancePath ?? 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;
@@ -1600,7 +1658,7 @@ function createAeroVirtualsPlugin(state) {
 			return null;
 		},
 		load(id) {
-			if (id === RESOLVED_RUNTIME_INSTANCE_MODULE_ID) return `export { aero, onUpdate } from ${JSON.stringify(state.runtimeInstancePath)}`;
+			if (id === RESOLVED_RUNTIME_INSTANCE_MODULE_ID) return getRuntimeInstanceVirtualSource(state.dirs.client);
 			if (id.startsWith(AERO_EMPTY_INLINE_CSS_PREFIX)) return "/* aero: no inline styles */";
 			if (id.startsWith(AERO_HTML_VIRTUAL_PREFIX)) {
 				const filePath = id.slice(AERO_HTML_VIRTUAL_PREFIX.length).replace(/\.aero$/i, ".html");
@@ -1796,6 +1854,7 @@ function aero(options = {}) {
 		aliasResult: null,
 		clientScripts: /* @__PURE__ */ new Map(),
 		runtimeInstancePath,
+		generatedRuntimeInstancePath: null,
 		dirs,
 		apiPrefix,
 		options
@@ -1833,7 +1892,7 @@ function aero(options = {}) {
 					site: options.site,
 					redirects: options.redirects
 				}, outDir);
-				if (enableNitro) await runNitroBuild(root, writeGeneratedNitroConfig(root, dirs.server, options.redirects));
+				if (enableNitro) await runNitroBuild(root, writeGeneratedNitroConfig(root, dirs.server, options.redirects, dirs.dist));
 			}
 		},
 		ViteImageOptimizer({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aerobuilt/core",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "license": "MIT",
   "author": "Jamie Wilson",
@@ -60,7 +60,7 @@
     "sharp": "^0.34.5",
     "svgo": "^4.0.0",
     "vite-plugin-image-optimizer": "^2.0.3",
-    "@aerobuilt/interpolation": "0.3.0"
+    "@aerobuilt/interpolation": "0.3.1"
   },
   "peerDependencies": {
     "vite": "^8.0.0-0"
@@ -77,7 +77,7 @@
     "vitest": "^4.0.18"
   },
   "scripts": {
-    "build": "tsdown src/entry-dev.ts src/entry-prod.ts src/entry-editor.ts src/types.ts src/vite/index.ts src/utils/aliases.ts src/utils/redirects.ts src/runtime/index.ts src/runtime/instance.ts --format esm --dts --clean --out-dir dist --external @content/site",
+    "build": "tsdown",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
   }