@aerobuilt/core 0.2.9 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aerobuilt/core",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "type": "module",
   "license": "MIT",
   "author": "Jamie Wilson",
@@ -11,43 +11,48 @@
   },
   "homepage": "https://github.com/aerobuilt/aero",
   "private": false,
-  "types": "./dist/entry-dev.d.ts",
+  "types": "./dist/entry-dev.d.mts",
   "files": [
     "dist"
   ],
   "exports": {
     ".": {
-      "types": "./dist/entry-dev.d.ts",
-      "default": "./dist/entry-dev.js"
+      "types": "./dist/entry-dev.d.mts",
+      "default": "./dist/entry-dev.mjs"
     },
     "./entry-prod": {
-      "types": "./dist/entry-prod.d.ts",
-      "default": "./dist/entry-prod.js"
+      "types": "./dist/entry-prod.d.mts",
+      "default": "./dist/entry-prod.mjs"
     },
     "./vite": {
-      "types": "./dist/vite/index.d.ts",
-      "default": "./dist/vite/index.js"
+      "types": "./dist/vite/index.d.mts",
+      "default": "./dist/vite/index.mjs"
     },
     "./runtime": {
-      "types": "./dist/runtime/index.d.ts",
-      "default": "./dist/runtime/index.js"
+      "types": "./dist/runtime/index.d.mts",
+      "default": "./dist/runtime/index.mjs"
     },
     "./runtime/instance": {
-      "types": "./dist/runtime/instance.d.ts",
-      "default": "./dist/runtime/instance.js"
+      "types": "./dist/runtime/instance.d.mts",
+      "default": "./dist/runtime/instance.mjs"
+    },
+    "./types": "./dist/types.d.mts",
+    "./utils/aliases": {
+      "types": "./dist/utils/aliases.d.mts",
+      "default": "./dist/utils/aliases.mjs"
     },
-    "./types": "./dist/types.d.ts",
     "./utils/redirects": {
-      "types": "./dist/utils/redirects.d.ts",
-      "default": "./dist/utils/redirects.js"
+      "types": "./dist/utils/redirects.d.mts",
+      "default": "./dist/utils/redirects.mjs"
     },
     "./editor": {
-      "types": "./dist/entry-editor.d.ts",
-      "default": "./dist/entry-editor.js"
+      "types": "./dist/entry-editor.d.mts",
+      "default": "./dist/entry-editor.mjs"
     }
   },
   "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",
@@ -55,7 +60,7 @@
     "sharp": "^0.34.5",
     "svgo": "^4.0.0",
     "vite-plugin-image-optimizer": "^2.0.3",
-    "@aerobuilt/interpolation": "0.2.9"
+    "@aerobuilt/interpolation": "0.3.0"
   },
   "peerDependencies": {
     "vite": "^8.0.0-0"
@@ -67,12 +72,12 @@
   },
   "devDependencies": {
     "@types/node": "^25.3.0",
-    "tsup": "^8.5.1",
+    "tsdown": "^0.21.0-beta.2",
     "typescript": "^5.9.3",
     "vitest": "^4.0.18"
   },
   "scripts": {
-    "build": "tsup src/entry-dev.ts src/entry-prod.ts src/entry-editor.ts src/types.ts src/vite/index.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 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",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
   }

package/dist/chunk-4DAK56WB.js

@@ -1,36 +0,0 @@
-import {
-  Aero
-} from "./chunk-5ZNUGZOW.js";
-
-// src/runtime/instance.ts
-var instance = globalThis.__AERO_INSTANCE__ || new Aero();
-var listeners = globalThis.__AERO_LISTENERS__ || /* @__PURE__ */ new Set();
-var aero = instance;
-var onUpdate = (cb) => {
-  listeners.add(cb);
-  return () => listeners.delete(cb);
-};
-var notify = () => {
-  listeners.forEach((cb) => cb());
-};
-if (!globalThis.__AERO_INSTANCE__) {
-  globalThis.__AERO_INSTANCE__ = instance;
-}
-if (!globalThis.__AERO_LISTENERS__) {
-  globalThis.__AERO_LISTENERS__ = listeners;
-}
-var components = import.meta.glob("@components/**/*.html", { eager: true });
-var layouts = import.meta.glob("@layouts/*.html", { eager: true });
-var pages = import.meta.glob("@pages/**/*.html", { eager: true });
-aero.registerPages(components);
-aero.registerPages(layouts);
-aero.registerPages(pages);
-notify();
-if (import.meta.hot) {
-  import.meta.hot.accept();
-}
-
-export {
-  aero,
-  onUpdate
-};

package/dist/chunk-5ZNUGZOW.js

@@ -1,238 +0,0 @@
-import {
-  pagePathToKey,
-  resolvePageTarget
-} from "./chunk-JAMYN2VX.js";
-
-// src/runtime/index.ts
-var Aero = class {
-  /** Global values merged into template context (e.g. from content modules). */
-  globals = {};
-  /** Map from page name (or path) to module. Keys include both canonical name and full path for lookup. */
-  pagesMap = {};
-  /** Set by client entry when running in the browser; used to attach the app to a DOM root. */
-  mount;
-  /**
-   * Register a global value available in all templates as `name`.
-   *
-   * @param name - Key used in templates (e.g. `site`).
-   * @param value - Any value (object, string, etc.).
-   */
-  global(name, value) {
-    this.globals[name] = value;
-  }
-  /**
-   * Register page/layout modules from a Vite glob (e.g. `import.meta.glob('@pages/**\/*.html')`).
-   * Derives a lookup key from each path via pagePathToKey; also stores by full path for resolution.
-   *
-   * @param pages - Record of resolved path → module (default export is the render function).
-   */
-  registerPages(pages) {
-    for (const [path, mod] of Object.entries(pages)) {
-      const key = pagePathToKey(path);
-      this.pagesMap[key] = mod;
-      this.pagesMap[path] = mod;
-    }
-  }
-  /** Type guard: true if value looks like an `AeroRenderInput` (has at least one of props, slots, request, url, params, routePath). */
-  isRenderInput(value) {
-    if (!value || typeof value !== "object") return false;
-    return ["props", "slots", "request", "url", "params", "routePath"].some(
-      (key) => key in value
-    );
-  }
-  /** Coerce various call signatures into a single `AeroRenderInput` (e.g. plain object → `{ props }`). */
-  normalizeRenderInput(input) {
-    if (!input) return {};
-    if (this.isRenderInput(input)) return input;
-    if (typeof input === "object") return { props: input };
-    return { props: {} };
-  }
-  /** Convert a page name to a route path (e.g. `index` → `'/'`, `about` → `'/about'`). */
-  toRoutePath(pageName = "index") {
-    if (!pageName || pageName === "index" || pageName === "home") return "/";
-    if (pageName.endsWith("/index")) {
-      return "/" + pageName.slice(0, -"/index".length);
-    }
-    return pageName.startsWith("/") ? pageName : "/" + pageName;
-  }
-  /** Build a URL from route path and optional raw URL. Uses `http://localhost` as base when only a path is given. */
-  toURL(routePath, rawUrl) {
-    if (rawUrl instanceof URL) return rawUrl;
-    if (typeof rawUrl === "string" && rawUrl.length > 0) {
-      return new URL(rawUrl, "http://localhost");
-    }
-    return new URL(routePath, "http://localhost");
-  }
-  /** Build template context: globals, props, slots, request, url, params, site, and `renderComponent` / `nextPassDataId`. */
-  createContext(input) {
-    const routePath = input.routePath || "/";
-    const url = this.toURL(routePath, input.url);
-    const request = input.request || new Request(url.toString(), { method: "GET" });
-    let _passDataId = 0;
-    const context = {
-      ...this.globals,
-      props: input.props || {},
-      slots: input.slots || {},
-      request,
-      url,
-      params: input.params || {},
-      site: input.site ?? "",
-      styles: input.styles,
-      scripts: input.scripts,
-      headScripts: input.headScripts,
-      nextPassDataId: () => `__aero_${_passDataId++}`,
-      renderComponent: this.renderComponent.bind(this)
-    };
-    return context;
-  }
-  /** True if entry params and request params have the same keys and stringified values. */
-  paramsMatch(entryParams, requestParams) {
-    const entryKeys = Object.keys(entryParams);
-    if (entryKeys.length !== Object.keys(requestParams).length) return false;
-    for (const key of entryKeys) {
-      if (String(entryParams[key]) !== String(requestParams[key])) return false;
-    }
-    return true;
-  }
-  /**
-   * Render a page or layout to HTML.
-   *
-   * @remarks
-   * Resolves `component` (page name string or module) via `pagesMap`, with fallbacks: directory index
-   * (`foo` → `foo/index`), `index` → `home`, dynamic routes, and trailing-slash stripping. If the module
-   * exports `getStaticPaths` and no props are provided, finds the matching static path and uses its props.
-   * For root-level renders, injects accumulated styles and scripts into the document and fixes content
-   * that ends up after `</html>` when using layouts (moves it into `</body>`).
-   *
-   * @param component - Page name (e.g. `'index'`, `'about'`) or the module object.
-   * @param input - Render input (props, request, url, params, etc.). Can be a plain object (treated as props).
-   * @returns HTML string, or `null` if the page is not found or no static path match.
-   */
-  async render(component, input = {}) {
-    const renderInput = this.normalizeRenderInput(input);
-    const isRootRender = !renderInput.styles;
-    if (isRootRender) {
-      renderInput.styles = /* @__PURE__ */ new Set();
-      renderInput.scripts = /* @__PURE__ */ new Set();
-      renderInput.headScripts = /* @__PURE__ */ new Set();
-    }
-    const resolved = resolvePageTarget(component, this.pagesMap);
-    if (!resolved) return null;
-    let target = resolved.module;
-    const matchedPageName = resolved.pageName;
-    const dynamicParams = resolved.params;
-    if (typeof target === "function" && target.length === 0) {
-      target = await target();
-    }
-    if (typeof target.getStaticPaths === "function" && Object.keys(renderInput.props || {}).length === 0) {
-      const staticPaths = await target.getStaticPaths();
-      const combinedParams = { ...dynamicParams, ...renderInput.params || {} };
-      const match = staticPaths.find((entry) => this.paramsMatch(entry.params, combinedParams));
-      if (!match) {
-        console.warn(
-          `[aero] 404: Route params ${JSON.stringify(combinedParams)} not found in getStaticPaths for ${matchedPageName}`
-        );
-        return null;
-      }
-      if (match.props) {
-        renderInput.props = match.props;
-      }
-    }
-    const routePath = renderInput.routePath || this.toRoutePath(matchedPageName);
-    const context = this.createContext({
-      props: renderInput.props || {},
-      slots: renderInput.slots || {},
-      request: renderInput.request,
-      url: renderInput.url,
-      params: { ...dynamicParams, ...renderInput.params || {} },
-      routePath,
-      site: renderInput.site,
-      styles: renderInput.styles,
-      scripts: renderInput.scripts,
-      headScripts: renderInput.headScripts
-    });
-    let renderFn = target;
-    if (target.default) renderFn = target.default;
-    if (typeof renderFn === "function") {
-      let html = await renderFn(context);
-      if (isRootRender) {
-        if (html.includes("</html>")) {
-          const afterHtml = html.split("</html>")[1]?.trim();
-          if (afterHtml && html.includes("</body>")) {
-            html = html.split("</html>")[0] + "</html>";
-            html = html.replace("</body>", `
-${afterHtml}
-</body>`);
-          }
-        }
-        let headInjections = "";
-        if (context.styles && context.styles.size > 0) {
-          headInjections += Array.from(context.styles).join("\n") + "\n";
-        }
-        if (context.headScripts && context.headScripts.size > 0) {
-          headInjections += Array.from(context.headScripts).join("\n") + "\n";
-        }
-        if (headInjections) {
-          if (html.includes("</head>")) {
-            html = html.replace("</head>", `
-${headInjections}</head>`);
-          } else if (html.includes("<body")) {
-            html = html.replace(/(<body[^>]*>)/i, `<head>
-${headInjections}</head>
-$1`);
-          } else {
-            html = `${headInjections}${html}`;
-          }
-        }
-        if (context.scripts && context.scripts.size > 0) {
-          const scriptsHtml = Array.from(context.scripts).join("\n");
-          if (html.includes("</body>")) {
-            html = html.replace("</body>", `
-${scriptsHtml}
-</body>`);
-          } else {
-            html = `${html}
-${scriptsHtml}`;
-          }
-        }
-      }
-      return html;
-    }
-    return "";
-  }
-  /**
-   * Render a child component (layout or component) with the given props and slots.
-   * Used by compiled templates via context.renderComponent.
-   *
-   * @param component - Render function or module with `default` render function.
-   * @param props - Props object for the component.
-   * @param slots - Named slot content (key → HTML string).
-   * @param input - Optional request/url/params for context; `headScripts` is not passed through.
-   * @returns HTML string from the component's render function, or empty string if not invokable.
-   */
-  async renderComponent(component, props = {}, slots = {}, input = {}) {
-    const context = this.createContext({
-      props,
-      slots,
-      request: input.request,
-      url: input.url,
-      params: input.params,
-      routePath: input.routePath || "/",
-      site: input.site,
-      styles: input.styles,
-      scripts: input.scripts,
-      headScripts: input.headScripts
-    });
-    if (typeof component === "function") {
-      return await component(context);
-    }
-    if (component && typeof component.default === "function") {
-      return await component.default(context);
-    }
-    return "";
-  }
-};
-
-export {
-  Aero
-};

package/dist/chunk-F7MXQXLM.js

@@ -1,15 +0,0 @@
-// src/utils/redirects.ts
-function redirectsToRouteRules(redirects) {
-  const out = {};
-  for (const rule of redirects) {
-    const status = rule.status ?? 302;
-    out[rule.from] = {
-      redirect: status === 307 ? rule.to : { to: rule.to, statusCode: status }
-    };
-  }
-  return out;
-}
-
-export {
-  redirectsToRouteRules
-};

package/dist/chunk-JAMYN2VX.js

@@ -1,133 +0,0 @@
-// src/utils/path.ts
-function toPosix(value) {
-  return value.replace(/\\/g, "/");
-}
-function toPosixRelative(value, root) {
-  const valuePosix = toPosix(value);
-  const rootPosix = toPosix(root);
-  if (valuePosix.startsWith(rootPosix + "/")) {
-    return valuePosix.slice(rootPosix.length + 1);
-  }
-  return valuePosix;
-}
-
-// src/utils/route-pattern.ts
-var PARAM_SEGMENT_REGEX = /^\[([^.\]\[]+)\]$/;
-function parseRoutePattern(pattern) {
-  const rawSegments = pattern.split("/").filter(Boolean);
-  const segments = rawSegments.map((seg) => {
-    const paramMatch = seg.match(PARAM_SEGMENT_REGEX);
-    if (paramMatch) {
-      return { type: "param", name: paramMatch[1] };
-    }
-    return { type: "static", value: seg };
-  });
-  return { segments };
-}
-function isDynamicRoutePattern(pattern) {
-  const { segments } = parseRoutePattern(pattern);
-  return segments.some((s) => s.type === "param");
-}
-function matchRoutePattern(pattern, pageName) {
-  const { segments } = parseRoutePattern(pattern);
-  const requestedSegments = pageName.split("/").filter(Boolean);
-  if (segments.length !== requestedSegments.length) return null;
-  const params = {};
-  for (let i = 0; i < segments.length; i++) {
-    const seg = segments[i];
-    const requestSeg = requestedSegments[i];
-    if (seg.type === "param") {
-      params[seg.name] = decodeURIComponent(requestSeg);
-    } else if (seg.value !== requestSeg) {
-      return null;
-    }
-  }
-  return params;
-}
-function expandRoutePattern(pattern, params) {
-  const { segments } = parseRoutePattern(pattern);
-  const parts = [];
-  for (const seg of segments) {
-    if (seg.type === "param") {
-      if (!(seg.name in params)) {
-        throw new Error(
-          `[aero] getStaticPaths: missing param "${seg.name}" for pattern "${pattern}". Provided params: ${JSON.stringify(params)}`
-        );
-      }
-      parts.push(params[seg.name]);
-    } else {
-      parts.push(seg.value);
-    }
-  }
-  return parts.join("/");
-}
-
-// src/utils/routing.ts
-function pagePathToKey(path) {
-  const withoutExt = toPosix(path).replace(/\.html$/i, "");
-  if (withoutExt.includes("pages/")) {
-    return withoutExt.split("pages/").pop();
-  }
-  const segments = withoutExt.split("/").filter(Boolean);
-  if (segments.length > 1) {
-    return segments.join("/");
-  }
-  return segments.pop() || path;
-}
-function resolvePageName(url) {
-  const [pathPart] = url.split("?");
-  let clean = pathPart || "/";
-  if (clean === "/" || clean === "") return "index";
-  if (clean.endsWith("/")) {
-    clean = clean + "index";
-  }
-  clean = clean.replace(/^\//, "");
-  clean = clean.replace(/\.html$/, "");
-  return clean || "index";
-}
-function resolveDynamicPage(pageName, pagesMap) {
-  for (const [key, mod] of Object.entries(pagesMap)) {
-    if (!key.includes("[") || !key.includes("]") || key.includes(".")) continue;
-    const params = matchRoutePattern(key, pageName);
-    if (params != null) {
-      return { module: mod, pageName: key, params };
-    }
-  }
-  return null;
-}
-function resolvePageTarget(component, pagesMap) {
-  if (typeof component !== "string") {
-    return component != null ? { module: component, pageName: "index", params: {} } : null;
-  }
-  const pageName = component;
-  let target = pagesMap[pageName];
-  if (!target) {
-    target = pagesMap[`${pageName}/index`];
-  }
-  if (!target && pageName === "index") {
-    target = pagesMap["home"];
-  }
-  if (!target) {
-    const dynamicMatch = resolveDynamicPage(pageName, pagesMap) ?? resolveDynamicPage(`${pageName}/index`, pagesMap);
-    if (dynamicMatch) return dynamicMatch;
-  }
-  if (!target && pageName.endsWith("/index")) {
-    const stripped = pageName.slice(0, -"/index".length);
-    target = pagesMap[stripped];
-    if (target) return { module: target, pageName: stripped, params: {} };
-    const dynamicMatch = resolveDynamicPage(stripped, pagesMap);
-    if (dynamicMatch) return dynamicMatch;
-  }
-  if (!target) return null;
-  return { module: target, pageName, params: {} };
-}
-
-export {
-  toPosix,
-  toPosixRelative,
-  isDynamicRoutePattern,
-  expandRoutePattern,
-  pagePathToKey,
-  resolvePageName,
-  resolvePageTarget
-};