@aerobuilt/core 0.2.4 → 0.2.6

package/README.md

@@ -65,7 +65,7 @@ const html = await aero.render('index', { props: { title: 'Home' } })
 
 ### Vite plugin
 
-- **Plugin** from `aerobuilt/vite`: `aero(options?)`. Options: `nitro`, `apiPrefix`, `dirs`, `site` (canonical URL; exposed as `import.meta.env.SITE` and `Aero.site`; when set, generates `dist/sitemap.xml` after build).
+- **Plugin** from `aerobuilt/vite`: `aero(options?)`. Options: `server`, `apiPrefix`, `dirs`, `site` (canonical URL; exposed as `import.meta.env.SITE` and `Aero.site`; when set, generates `dist/sitemap.xml` after build).
 - Sub-plugins: config resolution, virtual client modules (`\0`-prefixed), HTML transform, SSR middleware, HMR.
 - Build: page discovery, static render, optional Nitro build, optional image optimizer (sharp/svgo).
 
@@ -74,7 +74,7 @@ const html = await aero.render('index', { props: { title: 'Home' } })
 ```js
 import { aero } from 'aerobuilt/vite'
 export default {
-	plugins: [aero({ nitro: true })],
+	plugins: [aero({ server: true })],
 }
 ```
 

package/dist/types.d.ts

@@ -22,7 +22,7 @@ interface RedirectRule {
 }
 interface AeroOptions {
     /** Enable Nitro server integration (default: `false`). */
-    nitro?: boolean;
+    server?: boolean;
     /** API route prefix (default: `'/api'`). */
     apiPrefix?: string;
     /** Directory overrides. */

package/dist/vite/index.d.ts

@@ -15,7 +15,7 @@ import { PluginOption } from 'vite';
  * HMR for templates and content is handled by Vite's dependency graph when the app uses a single
  * client entry that imports @aerobuilt/core and calls aero.mount().
  *
- * @param options - AeroOptions (nitro, apiPrefix, dirs). Nitro can be disabled at runtime via AERO_NITRO=false.
+ * @param options - AeroOptions (server, apiPrefix, dirs). Server can be disabled at runtime via AERO_SERVER=false.
  * @returns PluginOption[] to pass to Vite's plugins array.
  */
 declare function aero(options?: AeroOptions): PluginOption[];

package/dist/vite/index.js

@@ -283,6 +283,19 @@ function parse(html) {
 }
 
 // src/compiler/helpers.ts
+function validateSingleBracedExpression(value, options = {}) {
+  const trimmed = value.trim();
+  const segments = tokenizeCurlyInterpolation(trimmed, { attributeMode: true });
+  const ok = segments.length === 1 && segments[0].kind === "interpolation" && segments[0].start === 0 && segments[0].end === trimmed.length;
+  if (!ok) {
+    const directive = options.directive ?? "directive";
+    const tagName = options.tagName ?? "element";
+    throw new Error(
+      `Directive \`${directive}\` on <${tagName}> must use a braced expression, e.g. ${directive}="{ expression }".`
+    );
+  }
+  return trimmed;
+}
 function compileInterpolation(text) {
   if (!text) return "";
   const segments = tokenizeCurlyInterpolation(text, { attributeMode: false });
@@ -592,7 +605,17 @@ var Lowerer = class {
     }
     return null;
   }
-  requireBracedExpression(value, directive, node) {
+  /**
+   * 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";
@@ -600,7 +623,7 @@ var Lowerer = class {
         `Directive \`${directive}\` on <${tagName}> must use a braced expression, e.g. ${directive}="{ expression }".`
       );
     }
-    return stripBraces(trimmed);
+    return strip ? stripBraces(trimmed) : trimmed;
   }
   isSingleWrappedExpression(value) {
     const trimmed = value.trim();
@@ -680,7 +703,10 @@ var Lowerer = class {
         if (isAttr(attr.name, ATTR_ELSE_IF, ATTR_PREFIX)) continue;
         if (isAttr(attr.name, ATTR_ELSE, ATTR_PREFIX)) continue;
         if (isAttr(attr.name, ATTR_PASS_DATA, ATTR_PREFIX)) {
-          passDataExpr = this.requireBracedExpression(attr.value || "", attr.name, node);
+          passDataExpr = validateSingleBracedExpression(attr.value || "", {
+            directive: attr.name,
+            tagName: node?.tagName?.toLowerCase?.() || "element"
+          });
           continue;
         }
         if (attr.name === ATTR_IS_INLINE) {
@@ -1009,7 +1035,7 @@ function compile(parsed, options) {
       const tagExpr = `'<script ${baseAttrsEscaped} src="'+${urlExpr}+'"></script>'`;
       const isHead = clientScript.injectInHead;
       if (clientScript.passDataExpr) {
-        const jsonExpr = `JSON.stringify(${stripBraces(clientScript.passDataExpr)})`;
+        const jsonExpr = `JSON.stringify(${clientScript.passDataExpr})`;
         if (isHead) {
           headScripts.push(
             `(function(){const __pid=Aero.nextPassDataId();\`<\`+'script type="application/json" id="'+__pid+'" class="__aero_data">'+${jsonExpr}+'</'+'script>';window.__aero_data_next=JSON.parse(document.getElementById("'+__pid+'").textContent);})();${tagExpr}`
@@ -1031,13 +1057,11 @@ function compile(parsed, options) {
   if (options.blockingScripts) {
     for (const blockingScript of options.blockingScripts) {
       if (blockingScript.passDataExpr) {
-        const trimmed = blockingScript.passDataExpr.trim();
-        if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) {
-          throw new Error(
-            `Directive \`pass:data\` on <script> must use a braced expression, e.g. pass:data="{ { expression } }".`
-          );
-        }
-        const jsMapExpr = `Object.entries(${stripBraces(blockingScript.passDataExpr)}).map(([k, v]) => "\\nconst " + k + " = " + JSON.stringify(v) + ";").join("")`;
+        const passDataExpr = validateSingleBracedExpression(blockingScript.passDataExpr, {
+          directive: "pass:data",
+          tagName: "script"
+        });
+        const jsMapExpr = `Object.entries(${passDataExpr}).map(([k, v]) => "\\nconst " + k + " = " + JSON.stringify(v) + ";").join("")`;
         headScripts.push(
           `\`<script${blockingScript.attrs ? " " + blockingScript.attrs : ""}>\${${jsMapExpr}}${blockingScript.content.replace(/`/g, "\\`")}</script>\``
         );
@@ -1381,8 +1405,8 @@ async function renderStaticPages(options, outDir) {
   const discoveredPages = discoverPages(root, path3.join(dirs.client, "pages"));
   const distDir = path3.resolve(root, outDir);
   const manifest = readManifest(distDir);
-  const previousAeroNitro = process.env.AERO_NITRO;
-  process.env.AERO_NITRO = "false";
+  const previousAeroServer = process.env.AERO_SERVER;
+  process.env.AERO_SERVER = "false";
   const staticCacheDir = path3.join(root, ".aero", "vite-ssr");
   const server = await createServer({
     configFile: false,
@@ -1481,10 +1505,10 @@ async function renderStaticPages(options, outDir) {
     }
   } finally {
     await server.close();
-    if (previousAeroNitro === void 0) {
-      delete process.env.AERO_NITRO;
+    if (previousAeroServer === void 0) {
+      delete process.env.AERO_SERVER;
     } else {
-      process.env.AERO_NITRO = previousAeroNitro;
+      process.env.AERO_SERVER = previousAeroServer;
     }
   }
 }
@@ -1852,7 +1876,7 @@ function createAeroSsrPlugin(state) {
 function aero(options = {}) {
   const dirs = resolveDirs(options.dirs);
   const apiPrefix = options.apiPrefix || DEFAULT_API_PREFIX;
-  const enableNitro = options.nitro === true && process.env.AERO_NITRO !== "false";
+  const enableNitro = options.server === true && process.env.AERO_SERVER !== "false";
   const runtimeInstanceJsPath = fileURLToPath(
     new URL("../runtime/instance.js", import.meta.url)
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aerobuilt/core",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "type": "module",
   "license": "MIT",
   "author": "Jamie Wilson",
@@ -55,7 +55,7 @@
     "sharp": "^0.34.5",
     "svgo": "^4.0.0",
     "vite-plugin-image-optimizer": "^2.0.3",
-    "@aerobuilt/interpolation": "0.2.4"
+    "@aerobuilt/interpolation": "0.2.6"
   },
   "peerDependencies": {
     "vite": "^8.0.0-0"