elegance-js 2.1.9 → 2.1.11

package/dist/server/server.mjs

@@ -1,1219 +1,8 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
-};
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-// src/shared/serverElements.ts
-var createBuildableElement, createChildrenlessBuildableElement, childrenlessElementTags, elementTags, elements, childrenlessElements, allElements;
-var init_serverElements = __esm({
-  "src/shared/serverElements.ts"() {
-    "use strict";
-    createBuildableElement = (tag) => {
-      return (options3, ...children) => ({
-        tag,
-        options: options3 || {},
-        children
-      });
-    };
-    createChildrenlessBuildableElement = (tag) => {
-      return (options3) => ({
-        tag,
-        options: options3 || {},
-        children: null
-      });
-    };
-    childrenlessElementTags = [
-      "area",
-      "base",
-      "br",
-      "col",
-      "embed",
-      "hr",
-      "img",
-      "input",
-      "link",
-      "meta",
-      "source",
-      "track",
-      "path",
-      "rect"
-    ];
-    elementTags = [
-      "a",
-      "address",
-      "article",
-      "aside",
-      "audio",
-      "blockquote",
-      "body",
-      "button",
-      "canvas",
-      "caption",
-      "colgroup",
-      "data",
-      "datalist",
-      "dd",
-      "del",
-      "details",
-      "dialog",
-      "div",
-      "dl",
-      "dt",
-      "fieldset",
-      "figcaption",
-      "figure",
-      "footer",
-      "form",
-      "h1",
-      "h2",
-      "h3",
-      "h4",
-      "h5",
-      "h6",
-      "head",
-      "header",
-      "hgroup",
-      "html",
-      "iframe",
-      "ins",
-      "label",
-      "legend",
-      "li",
-      "main",
-      "map",
-      "meter",
-      "nav",
-      "noscript",
-      "object",
-      "ol",
-      "optgroup",
-      "option",
-      "output",
-      "p",
-      "picture",
-      "pre",
-      "progress",
-      "q",
-      "section",
-      "select",
-      "summary",
-      "table",
-      "tbody",
-      "td",
-      "template",
-      "textarea",
-      "tfoot",
-      "th",
-      "thead",
-      "time",
-      "tr",
-      "ul",
-      "video",
-      "span",
-      "script",
-      "abbr",
-      "b",
-      "bdi",
-      "bdo",
-      "cite",
-      "code",
-      "dfn",
-      "em",
-      "i",
-      "kbd",
-      "mark",
-      "rp",
-      "rt",
-      "ruby",
-      "s",
-      "samp",
-      "small",
-      "strong",
-      "sub",
-      "sup",
-      "u",
-      "wbr",
-      "title",
-      "svg"
-    ];
-    elements = {};
-    childrenlessElements = {};
-    for (const element of elementTags) {
-      elements[element] = createBuildableElement(element);
-    }
-    for (const element of childrenlessElementTags) {
-      childrenlessElements[element] = createChildrenlessBuildableElement(element);
-    }
-    allElements = {
-      ...elements,
-      ...childrenlessElements
-    };
-  }
-});
-
-// src/shared/bindServerElements.ts
-var init_bindServerElements = __esm({
-  "src/shared/bindServerElements.ts"() {
-    "use strict";
-    init_serverElements();
-    Object.assign(globalThis, elements);
-    Object.assign(globalThis, childrenlessElements);
-  }
-});
-
-// src/server/render.ts
-var renderRecursively, serverSideRenderPage;
-var init_render = __esm({
-  "src/server/render.ts"() {
-    "use strict";
-    init_bindServerElements();
-    renderRecursively = (element) => {
-      let returnString = "";
-      if (typeof element === "boolean") return returnString;
-      else if (typeof element === "number" || typeof element === "string") {
-        return returnString + element;
-      } else if (Array.isArray(element)) {
-        return returnString + element.join(", ");
-      }
-      returnString += `<${element.tag}`;
-      if (typeof element.options === "object") {
-        const {
-          tag: elementTag,
-          options: elementOptions,
-          children: elementChildren
-        } = element.options;
-        if (elementTag !== void 0 && elementOptions !== void 0 && elementChildren !== void 0) {
-          const children = element.children;
-          element.children = [
-            element.options,
-            ...children
-          ];
-          element.options = {};
-        } else {
-          for (const [attrName, attrValue] of Object.entries(element.options)) {
-            if (typeof attrValue === "object") {
-              throw `Attr ${attrName}, for element ${element.tag} has obj type. Got: ${JSON.stringify(element, null, 2)}`;
-            }
-            returnString += ` ${attrName.toLowerCase()}="${attrValue}"`;
-          }
-        }
-      } else if (typeof element.options !== "object" && element.options !== void 0) {
-        element.children = [element.options, ...element.children || []];
-      }
-      if (element.children === null) {
-        returnString += "/>";
-        return returnString;
-      }
-      returnString += ">";
-      for (const child of element.children) {
-        returnString += renderRecursively(child);
-      }
-      returnString += `</${element.tag}>`;
-      return returnString;
-    };
-    serverSideRenderPage = async (page, pathname) => {
-      if (!page) {
-        throw `No Page Provided.`;
-      }
-      if (typeof page === "function") {
-        throw `Unbuilt page provided to ssr page.`;
-      }
-      const bodyHTML = renderRecursively(page);
-      return {
-        bodyHTML
-      };
-    };
-  }
-});
-
-// src/server/generateHTMLTemplate.ts
-var generateHTMLTemplate;
-var init_generateHTMLTemplate = __esm({
-  "src/server/generateHTMLTemplate.ts"() {
-    "use strict";
-    init_render();
-    generateHTMLTemplate = async ({
-      pageURL,
-      head: head2,
-      serverData = null,
-      addPageScriptTag = true,
-      name,
-      requiredClientModules = {},
-      environment
-    }) => {
-      let StartTemplate = `<meta name="viewport" content="width=device-width, initial-scale=1.0">`;
-      if (environment === "production") {
-        StartTemplate += `<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">`;
-      }
-      StartTemplate += '<meta charset="UTF-8">';
-      for (const [globalName] of Object.entries(requiredClientModules)) {
-        StartTemplate += `<script data-module="true" src="/shipped/${globalName}.js" defer="true"></script>`;
-      }
-      if (addPageScriptTag === true) {
-        const sanitized = pageURL === "" ? "/" : `/${pageURL}`;
-        StartTemplate += `<script data-page="true" type="module" data-pathname="${sanitized}" src="${sanitized.endsWith("/") ? sanitized : sanitized + "/"}${name}_data.js" defer="true"></script>`;
-      }
-      StartTemplate += `<script type="module" src="/client.js" defer="true"></script>`;
-      let builtHead;
-      if (head2.constructor.name === "AsyncFunction") {
-        builtHead = await head2();
-      } else {
-        builtHead = head2();
-      }
-      let HTMLTemplate = renderRecursively(builtHead);
-      if (serverData) {
-        HTMLTemplate += serverData;
-      }
-      return {
-        internals: StartTemplate,
-        builtMetadata: HTMLTemplate
-      };
-    };
-  }
-});
-
-// src/helpers/ObjectAttributeType.ts
-var init_ObjectAttributeType = __esm({
-  "src/helpers/ObjectAttributeType.ts"() {
-    "use strict";
-  }
-});
-
-// src/internal/deprecate.ts
-var init_deprecate = __esm({
-  "src/internal/deprecate.ts"() {
-    "use strict";
-  }
-});
-
-// src/server/loadHook.ts
-var resetLoadHooks, getLoadHooks;
-var init_loadHook = __esm({
-  "src/server/loadHook.ts"() {
-    "use strict";
-    init_deprecate();
-    resetLoadHooks = () => globalThis.__SERVER_CURRENT_LOADHOOKS__ = [];
-    getLoadHooks = () => globalThis.__SERVER_CURRENT_LOADHOOKS__;
-  }
-});
-
-// src/server/state.ts
-var initializeState, getState, initializeObjectAttributes, getObjectAttributes;
-var init_state = __esm({
-  "src/server/state.ts"() {
-    "use strict";
-    init_ObjectAttributeType();
-    init_loadHook();
-    if (!globalThis.__SERVER_CURRENT_STATE_ID__) {
-      globalThis.__SERVER_CURRENT_STATE_ID__ = 1;
-    }
-    initializeState = () => globalThis.__SERVER_CURRENT_STATE__ = [];
-    getState = () => {
-      return globalThis.__SERVER_CURRENT_STATE__;
-    };
-    initializeObjectAttributes = () => globalThis.__SERVER_CURRENT_OBJECT_ATTRIBUTES__ = [];
-    getObjectAttributes = () => {
-      return globalThis.__SERVER_CURRENT_OBJECT_ATTRIBUTES__;
-    };
-  }
-});
-
-// src/server/layout.ts
-var resetLayouts;
-var init_layout = __esm({
-  "src/server/layout.ts"() {
-    "use strict";
-    resetLayouts = () => globalThis.__SERVER_CURRENT_LAYOUTS__ = /* @__PURE__ */ new Map();
-    if (!globalThis.__SERVER_CURRENT_LAYOUT_ID__) globalThis.__SERVER_CURRENT_LAYOUT_ID__ = 1;
-  }
-});
-
-// src/page_compiler.ts
-var page_compiler_exports = {};
-__export(page_compiler_exports, {
-  buildDynamicPage: () => buildDynamicPage,
-  processPageElements: () => processPageElements
-});
-import fs from "fs";
-import path2 from "path";
-import { registerLoader, setArcTsConfig } from "ts-arc";
-import esbuild from "esbuild";
-import { fileURLToPath as fileURLToPath2 } from "url";
-function buildTrace(stack, indent = 4) {
-  try {
-    if (!stack || stack.length === 0) return "[]";
-    let traceObj = stack[stack.length - 1] && typeof stack[stack.length - 1] === "object" ? JSON.parse(JSON.stringify(stack[stack.length - 1])) : { value: stack[stack.length - 1] };
-    traceObj._error = "This is the element where the error occurred";
-    for (let i = stack.length - 2; i >= 0; i--) {
-      const parent = stack[i];
-      const child = stack[i + 1];
-      if (!parent || typeof parent !== "object") {
-        traceObj = { value: parent, _errorChild: traceObj };
-        continue;
-      }
-      let parentClone;
-      try {
-        parentClone = JSON.parse(JSON.stringify(parent));
-      } catch {
-        parentClone = { value: parent };
-      }
-      let index = -1;
-      if (Array.isArray(parentClone.children)) {
-        index = parentClone.children.findIndex((c) => c === child);
-      }
-      if (index !== -1 && parentClone.children) {
-        parentClone.children = parentClone.children.slice(0, index + 1);
-        parentClone.children[index] = traceObj;
-      } else {
-        parentClone._errorChild = traceObj;
-      }
-      traceObj = parentClone;
-    }
-    return JSON.stringify(traceObj, null, indent).replace(/^/gm, " ".repeat(indent));
-  } catch {
-    return "Could not build stack-trace.";
-  }
-}
-var __filename2, __dirname2, packageDir2, clientPath, watcherPath, shippedModules, modulesToShip, yellow, black, bgYellow, bold, underline, white, log2, options2, DIST_DIR, PAGE_MAP2, LAYOUT_MAP, getAllSubdirectories, buildClient, elementKey, processOptionAsObjectAttribute, processPageElements, pageToHTML, generateClientPageData, generateLayout, builtLayouts, buildLayouts, buildLayout, fetchPageLayoutHTML, buildPages, buildPage, buildDynamicPage, shipModules, build;
-var init_page_compiler = __esm({
-  "src/page_compiler.ts"() {
-    "use strict";
-    init_generateHTMLTemplate();
-    init_ObjectAttributeType();
-    init_render();
-    init_state();
-    init_loadHook();
-    init_layout();
-    init_render();
-    __filename2 = fileURLToPath2(import.meta.url);
-    __dirname2 = path2.dirname(__filename2);
-    setArcTsConfig(__dirname2);
-    registerLoader();
-    packageDir2 = process.env.PACKAGE_PATH;
-    if (packageDir2 === void 0) {
-      packageDir2 = path2.resolve(__dirname2, "..");
-    }
-    clientPath = path2.resolve(packageDir2, "./dist/client/client.mjs");
-    watcherPath = path2.resolve(packageDir2, "./dist/client/watcher.mjs");
-    shippedModules = /* @__PURE__ */ new Map();
-    modulesToShip = [];
-    yellow = (text) => {
-      return `\x1B[38;2;238;184;68m${text}`;
-    };
-    black = (text) => {
-      return `\x1B[38;2;0;0;0m${text}`;
-    };
-    bgYellow = (text) => {
-      return `\x1B[48;2;238;184;68m${text}`;
-    };
-    bold = (text) => {
-      return `\x1B[1m${text}`;
-    };
-    underline = (text) => {
-      return `\x1B[4m${text}`;
-    };
-    white = (text) => {
-      return `\x1B[38;2;255;247;229m${text}`;
-    };
-    log2 = (...text) => {
-      if (options2.quiet) return;
-      return console.log(text.map((text2) => `${text2}\x1B[0m`).join(""));
-    };
-    options2 = JSON.parse(process.env.OPTIONS || "{}");
-    console.log(options2);
-    DIST_DIR = process.env.DIST_DIR;
-    PAGE_MAP2 = /* @__PURE__ */ new Map();
-    LAYOUT_MAP = /* @__PURE__ */ new Map();
-    getAllSubdirectories = (dir, baseDir = dir) => {
-      let directories = [];
-      const items = fs.readdirSync(dir, { withFileTypes: true });
-      for (const item of items) {
-        if (item.isDirectory()) {
-          const fullPath = path2.join(dir, item.name);
-          const relativePath = path2.relative(baseDir, fullPath);
-          directories.push(relativePath);
-          directories = directories.concat(getAllSubdirectories(fullPath, baseDir));
-        }
-      }
-      return directories;
-    };
-    buildClient = async (DIST_DIR2) => {
-      let clientString = "window.__name = (func) => func; ";
-      clientString += fs.readFileSync(clientPath, "utf-8");
-      if (options2.hotReload !== void 0) {
-        clientString += `const watchServerPort = ${options2.hotReload.port}`;
-        clientString += fs.readFileSync(watcherPath, "utf-8");
-      }
-      const transformedClient = await esbuild.transform(clientString, {
-        minify: options2.environment === "production",
-        drop: options2.environment === "production" ? ["console", "debugger"] : void 0,
-        keepNames: false,
-        format: "iife",
-        platform: "node",
-        loader: "ts"
-      });
-      fs.writeFileSync(
-        path2.join(DIST_DIR2, "/client.js"),
-        transformedClient.code
-      );
-    };
-    elementKey = 0;
-    processOptionAsObjectAttribute = (element, optionName, optionValue, objectAttributes) => {
-      const lcOptionName = optionName.toLowerCase();
-      const options3 = element.options;
-      let key = options3.key;
-      if (key == void 0) {
-        key = elementKey += 1;
-        options3.key = key;
-      }
-      if (!optionValue.type) {
-        throw `ObjectAttributeType is missing from object attribute. ${element.tag}: ${optionName}/${optionValue}`;
-      }
-      let optionFinal = lcOptionName;
-      switch (optionValue.type) {
-        case 1 /* STATE */:
-          const SOA = optionValue;
-          if (typeof SOA.value === "function") {
-            delete options3[optionName];
-            break;
-          }
-          if (lcOptionName === "innertext" || lcOptionName === "innerhtml") {
-            element.children = [SOA.value];
-            delete options3[optionName];
-          } else {
-            delete options3[optionName];
-            options3[lcOptionName] = SOA.value;
-          }
-          break;
-        case 2 /* OBSERVER */:
-          const OOA = optionValue;
-          const firstValue = OOA.update(...OOA.initialValues);
-          if (lcOptionName === "innertext" || lcOptionName === "innerhtml") {
-            element.children = [firstValue];
-            delete options3[optionName];
-          } else {
-            delete options3[optionName];
-            options3[lcOptionName] = firstValue;
-          }
-          optionFinal = optionName;
-          break;
-        case 4 /* REFERENCE */:
-          options3["ref"] = optionValue.value;
-          break;
-      }
-      objectAttributes.push({ ...optionValue, key, attribute: optionFinal });
-    };
-    processPageElements = (element, objectAttributes, recursionLevel, stack = []) => {
-      stack.push(element);
-      try {
-        if (typeof element === "boolean" || typeof element === "number" || Array.isArray(element)) {
-          stack.pop();
-          return element;
-        }
-        if (typeof element === "string") {
-          stack.pop();
-          return element;
-        }
-        const processElementOptionsAsChildAndReturn = () => {
-          try {
-            const children = element.children;
-            element.children = [
-              element.options,
-              ...children
-            ];
-            element.options = {};
-            for (let i = 0; i < children.length + 1; i++) {
-              const child = element.children[i];
-              const processedChild = processPageElements(child, objectAttributes, recursionLevel + 1, stack);
-              element.children[i] = processedChild;
-            }
-            return {
-              ...element,
-              options: {}
-            };
-          } catch (e) {
-            const errorString = `Could not process element options as a child. ${e}.`;
-            throw new Error(errorString);
-          }
-        };
-        if (typeof element.options !== "object") {
-          const result = processElementOptionsAsChildAndReturn();
-          stack.pop();
-          return result;
-        }
-        const {
-          tag: elementTag,
-          options: elementOptions,
-          children: elementChildren
-        } = element.options;
-        if (elementTag && elementOptions && elementChildren) {
-          const result = processElementOptionsAsChildAndReturn();
-          stack.pop();
-          return result;
-        }
-        const options3 = element.options;
-        for (const [optionName, optionValue] of Object.entries(options3)) {
-          const lcOptionName = optionName.toLowerCase();
-          if (typeof optionValue !== "object") {
-            if (lcOptionName === "innertext") {
-              delete options3[optionName];
-              if (element.children === null) {
-                throw `Cannot use innerText or innerHTML on childrenless elements.`;
-              }
-              element.children = [optionValue, ...element.children];
-              continue;
-            } else if (lcOptionName === "innerhtml") {
-              if (element.children === null) {
-                throw `Cannot use innerText or innerHTML on childrenless elements.`;
-              }
-              delete options3[optionName];
-              element.children = [optionValue];
-              continue;
-            }
-            continue;
-          }
-          ;
-          processOptionAsObjectAttribute(element, optionName, optionValue, objectAttributes);
-        }
-        if (element.children) {
-          for (let i = 0; i < element.children.length; i++) {
-            const child = element.children[i];
-            const processedChild = processPageElements(child, objectAttributes, recursionLevel + 1, stack);
-            element.children[i] = processedChild;
-          }
-        }
-        stack.pop();
-        return element;
-      } catch (e) {
-        const trace = buildTrace(stack);
-        if (recursionLevel === 0) {
-          throw new Error(`${e}
-
-Trace:
-${trace}`);
-        } else {
-          throw e;
-        }
-      }
-    };
-    pageToHTML = async (pageLocation, pageElements, metadata, DIST_DIR2, pageName, doWrite = true, requiredClientModules = {}, layout, pathname = "") => {
-      if (typeof pageElements === "string" || typeof pageElements === "boolean" || typeof pageElements === "number" || Array.isArray(pageElements)) {
-        throw new Error(`The root element of a page / layout must be a built element, not just a Child. Received: ${typeof pageElements}.`);
-      }
-      const objectAttributes = [];
-      const stack = [];
-      const processedPageElements = processPageElements(pageElements, objectAttributes, 0, stack);
-      const renderedPage = await serverSideRenderPage(
-        processedPageElements,
-        pageLocation
-      );
-      const { internals, builtMetadata } = await generateHTMLTemplate({
-        pageURL: pathname,
-        head: metadata,
-        addPageScriptTag: doWrite,
-        name: pageName,
-        requiredClientModules,
-        environment: options2.environment
-      });
-      let extraBodyHTML = "";
-      if (doWrite === false) {
-        const state = getState();
-        const pageLoadHooks = getLoadHooks();
-        const userObjectAttributes = getObjectAttributes();
-        const {
-          result
-        } = await generateClientPageData(
-          pathname,
-          state || {},
-          [...objectAttributes, ...userObjectAttributes],
-          pageLoadHooks || [],
-          DIST_DIR2,
-          "page",
-          "pd",
-          false
-        );
-        const sanitized = pathname === "" ? "/" : `/${pathname}`;
-        extraBodyHTML = `<script data-hook="true" data-pathname="${sanitized}" type="text/plain">${result}</script>`;
-        extraBodyHTML += `<script>
-            const text = document.querySelector('[data-hook="true"][data-pathname="${sanitized}"][type="text/plain"').textContent;
-            const blob = new Blob([text], { type: 'text/javascript' });
-            const url = URL.createObjectURL(blob);
-            
-            const script = document.createElement("script");
-            script.src = url;
-            script.type = "module";
-            script.setAttribute("data-page", "true");
-            script.setAttribute("data-pathname", "${sanitized}");
-            
-            document.head.appendChild(script);
-            
-            document.currentScript.remove();
-        </script>`;
-        extraBodyHTML = extraBodyHTML.replace(/\s+/g, " ").replace(/\s*([{}();,:])\s*/g, "$1").trim();
-      }
-      const headHTML = `<!DOCTYPE html>${layout.metadata.startHTML}${layout.scriptTag}${internals}${builtMetadata}${layout.metadata.endHTML}`;
-      const bodyHTML = `${layout.pageContent.startHTML}${renderedPage.bodyHTML}${extraBodyHTML}${layout.pageContent.endHTML}`;
-      const resultHTML = `${headHTML}${bodyHTML}`;
-      const htmlLocation = path2.join(pageLocation, (pageName === "page" ? "index" : pageName) + ".html");
-      if (doWrite) {
-        const dirname2 = path2.dirname(htmlLocation);
-        if (fs.existsSync(dirname2) === false) {
-          fs.mkdirSync(dirname2, { recursive: true });
-        }
-        fs.writeFileSync(
-          htmlLocation,
-          resultHTML,
-          {
-            encoding: "utf-8",
-            flag: "w"
-          }
-        );
-        return objectAttributes;
-      }
-      return resultHTML;
-    };
-    generateClientPageData = async (pageLocation, state, objectAttributes, pageLoadHooks, DIST_DIR2, pageName, globalVariableName = "pd", write = true) => {
-      let clientPageJSText = "";
-      {
-        clientPageJSText += `${globalThis.__SERVER_PAGE_DATA_BANNER__}`;
-      }
-      {
-        clientPageJSText += `export const data = {`;
-        if (state) {
-          clientPageJSText += `state:[`;
-          for (const subject of state) {
-            if (typeof subject.value === "string") {
-              const stringified = JSON.stringify(subject.value);
-              clientPageJSText += `{id:${subject.id},value:${stringified}},`;
-            } else if (typeof subject.value === "function") {
-              clientPageJSText += `{id:${subject.id},value:${subject.value.toString()}},`;
-            } else {
-              clientPageJSText += `{id:${subject.id},value:${JSON.stringify(subject.value)}},`;
-            }
-          }
-          clientPageJSText += `],`;
-        }
-        const stateObjectAttributes = objectAttributes.filter((oa) => oa.type === 1 /* STATE */);
-        if (stateObjectAttributes.length > 0) {
-          const processed = [...stateObjectAttributes].map((soa) => {
-            delete soa.type;
-            return soa;
-          });
-          clientPageJSText += `soa:${JSON.stringify(processed)},`;
-        }
-        const observerObjectAttributes = objectAttributes.filter((oa) => oa.type === 2 /* OBSERVER */);
-        if (observerObjectAttributes.length > 0) {
-          let observerObjectAttributeString = "ooa:[";
-          for (const observerObjectAttribute of observerObjectAttributes) {
-            const ooa = observerObjectAttribute;
-            observerObjectAttributeString += `{key:${ooa.key},attribute:"${ooa.attribute}",update:${ooa.update.toString()},`;
-            observerObjectAttributeString += `refs:[`;
-            for (const ref of ooa.refs) {
-              observerObjectAttributeString += `{id:${ref.id}},`;
-            }
-            observerObjectAttributeString += "]},";
-          }
-          observerObjectAttributeString += "],";
-          clientPageJSText += observerObjectAttributeString;
-        }
-        if (pageLoadHooks.length > 0) {
-          clientPageJSText += "lh:[";
-          for (const loadHook2 of pageLoadHooks) {
-            clientPageJSText += `{fn:${loadHook2.fn}},`;
-          }
-          clientPageJSText += "],";
-        }
-        clientPageJSText += `};`;
-      }
-      const pageDataPath = path2.join(DIST_DIR2, pageLocation, `${pageName}_data.js`);
-      let sendHardReloadInstruction = false;
-      const transformedResult = await esbuild.transform(clientPageJSText, { minify: options2.environment === "production" }).catch((error) => {
-        console.error("Failed to transform client page js!", error);
-      });
-      if (!transformedResult) return { sendHardReloadInstruction };
-      if (fs.existsSync(pageDataPath)) {
-        const content = fs.readFileSync(pageDataPath).toString();
-        if (content !== transformedResult.code) {
-          sendHardReloadInstruction = true;
-        }
-      }
-      if (write) fs.writeFileSync(pageDataPath, transformedResult.code, "utf-8");
-      return { sendHardReloadInstruction, result: transformedResult.code };
-    };
-    generateLayout = async (DIST_DIR2, filePath, directory, childIndicator, generateDynamic = false) => {
-      initializeState();
-      initializeObjectAttributes();
-      resetLoadHooks();
-      globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
-      let layoutElements;
-      let metadataElements;
-      let modules = [];
-      let isDynamicLayout = false;
-      try {
-        const {
-          layout,
-          metadata,
-          isDynamic,
-          shippedModules: shippedModules2
-        } = await import("file://" + filePath);
-        if (shippedModules2 !== void 0) {
-          modules = shippedModules2;
-        }
-        layoutElements = layout;
-        metadataElements = metadata;
-        if (isDynamic === true) {
-          isDynamicLayout = isDynamic;
-        }
-      } catch (e) {
-        throw new Error(`Error in Page: ${directory === "" ? "/" : directory}layout.ts - ${e}`);
-      }
-      LAYOUT_MAP.set(directory === "" ? "/" : `/${directory}`, {
-        isDynamic: isDynamicLayout,
-        filePath
-      });
-      if (isDynamicLayout === true && generateDynamic === false) return false;
-      {
-        if (!layoutElements) {
-          throw new Error(`WARNING: ${filePath} should export a const layout, which is of type Layout: (child: Child) => AnyBuiltElement.`);
-        }
-        if (typeof layoutElements === "function") {
-          if (layoutElements.constructor.name === "AsyncFunction") {
-            layoutElements = await layoutElements(childIndicator);
-          } else {
-            layoutElements = layoutElements(childIndicator);
-          }
-        }
-      }
-      {
-        if (!metadataElements) {
-          throw new Error(`WARNING: ${filePath} should export a const metadata, which is of type LayoutMetadata: (child: Child) => AnyBuiltElement.`);
-        }
-        if (typeof metadataElements === "function") {
-          if (metadataElements.constructor.name === "AsyncFunction") {
-            metadataElements = await metadataElements(childIndicator);
-          } else {
-            metadataElements = metadataElements(childIndicator);
-          }
-        }
-      }
-      const state = getState();
-      const pageLoadHooks = getLoadHooks();
-      const objectAttributes = getObjectAttributes();
-      if (typeof layoutElements === "string" || typeof layoutElements === "boolean" || typeof layoutElements === "number" || Array.isArray(layoutElements)) {
-        throw new Error(`The root element of a page / layout must be a built element, not just a Child. Received: ${typeof layoutElements}.`);
-      }
-      const foundObjectAttributes = [];
-      const stack = [];
-      const processedPageElements = processPageElements(layoutElements, foundObjectAttributes, 0, stack);
-      const renderedPage = await serverSideRenderPage(
-        processedPageElements,
-        directory
-      );
-      const metadataHTML = metadataElements ? renderRecursively(metadataElements) : "";
-      await generateClientPageData(
-        directory,
-        state || {},
-        [...objectAttributes, ...foundObjectAttributes],
-        pageLoadHooks || [],
-        DIST_DIR2,
-        "layout",
-        "ld"
-      );
-      return { pageContentHTML: renderedPage.bodyHTML, metadataHTML };
-    };
-    builtLayouts = /* @__PURE__ */ new Map();
-    buildLayouts = async () => {
-      const pagesDirectory = path2.resolve(options2.pagesDirectory);
-      const subdirectories = [...getAllSubdirectories(pagesDirectory), ""];
-      let shouldClientHardReload = false;
-      for (const directory of subdirectories) {
-        const abs = path2.resolve(path2.join(pagesDirectory, directory));
-        const files = fs.readdirSync(abs, { withFileTypes: true }).filter((f) => f.name.endsWith(".ts"));
-        for (const file of files) {
-          const filePath = path2.join(file.parentPath, file.name);
-          const name = file.name.slice(0, file.name.length - 3);
-          const isLayout = name === "layout";
-          if (isLayout == false) {
-            continue;
-          }
-          try {
-            const builtLayout = await buildLayout(filePath, directory);
-            if (!builtLayout) return { shouldClientHardReload: false };
-            builtLayouts.set(filePath, builtLayout);
-          } catch (e) {
-            console.error(e);
-            continue;
-          }
-        }
-      }
-      return { shouldClientHardReload };
-    };
-    buildLayout = async (filePath, directory, generateDynamic = false) => {
-      const id = globalThis.__SERVER_CURRENT_STATE_ID__ += 1;
-      const childIndicator = `<template layout-id="${id}"></template>`;
-      const result = await generateLayout(
-        DIST_DIR,
-        filePath,
-        directory,
-        childIndicator,
-        generateDynamic
-      );
-      if (result === false) return false;
-      const { pageContentHTML, metadataHTML } = result;
-      const splitAround = (str, sub) => {
-        const i = str.indexOf(sub);
-        if (i === -1) throw new Error("substring does not exist in parent string");
-        return {
-          startHTML: str.substring(0, i),
-          endHTML: str.substring(i + sub.length)
-        };
-      };
-      const splitAt = (str, sub) => {
-        const i = str.indexOf(sub) + sub.length;
-        if (i === -1) throw new Error("substring does not exist in parent string");
-        return {
-          startHTML: str.substring(0, i),
-          endHTML: str.substring(i)
-        };
-      };
-      const pathname = directory === "" ? "/" : directory;
-      return {
-        pageContent: splitAt(pageContentHTML, childIndicator),
-        metadata: splitAround(metadataHTML, childIndicator),
-        scriptTag: `<script data-layout="true" type="module" src="${pathname}layout_data.js" data-pathname="${pathname}" defer="true"></script>`
-      };
-    };
-    fetchPageLayoutHTML = async (dirname2) => {
-      const relative2 = path2.relative(options2.pagesDirectory, dirname2);
-      let split = relative2.split(path2.sep).filter(Boolean);
-      split.push("/");
-      split.reverse();
-      let layouts = [];
-      for (const dir of split) {
-        if (LAYOUT_MAP.has(dir)) {
-          const filePath = path2.join(path2.resolve(options2.pagesDirectory), dir, "layout.ts");
-          const layout = LAYOUT_MAP.get(dir);
-          if (layout.isDynamic) {
-            const builtLayout = await buildLayout(layout.filePath, dir, true);
-            if (!builtLayout) continue;
-            layouts.push(builtLayout);
-          } else {
-            layouts.push(builtLayouts.get(filePath));
-          }
-        }
-      }
-      const pageContent = {
-        startHTML: "",
-        endHTML: ""
-      };
-      const metadata = {
-        startHTML: "",
-        endHTML: ""
-      };
-      let scriptTags = "";
-      for (const layout of layouts) {
-        pageContent.startHTML += layout.pageContent.startHTML;
-        metadata.startHTML += layout.metadata.startHTML;
-        scriptTags += layout.scriptTag;
-        pageContent.endHTML += layout.pageContent.endHTML;
-        metadata.endHTML += layout.metadata.endHTML;
-      }
-      return { pageContent, metadata, scriptTag: scriptTags };
-    };
-    buildPages = async (DIST_DIR2) => {
-      resetLayouts();
-      const pagesDirectory = path2.resolve(options2.pagesDirectory);
-      const subdirectories = [...getAllSubdirectories(pagesDirectory), ""];
-      let shouldClientHardReload = false;
-      for (const directory of subdirectories) {
-        const abs = path2.resolve(path2.join(pagesDirectory, directory));
-        const files = fs.readdirSync(abs, { withFileTypes: true }).filter((f) => f.name.endsWith(".ts"));
-        for (const file of files) {
-          const filePath = path2.join(file.parentPath, file.name);
-          const name = file.name.slice(0, file.name.length - 3);
-          const isPage = name === "page";
-          if (isPage == false) {
-            continue;
-          }
-          try {
-            const hardReloadForPage = await buildPage(DIST_DIR2, directory, filePath, name);
-            if (hardReloadForPage) {
-              shouldClientHardReload = true;
-            }
-          } catch (e) {
-            console.error(e);
-            continue;
-          }
-        }
-      }
-      return {
-        shouldClientHardReload
-      };
-    };
-    buildPage = async (DIST_DIR2, directory, filePath, name) => {
-      initializeState();
-      initializeObjectAttributes();
-      resetLoadHooks();
-      globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
-      let pageElements;
-      let metadata;
-      let modules = {};
-      let pageIgnoresLayout = false;
-      let isDynamicPage = false;
-      try {
-        const {
-          page,
-          metadata: pageMetadata,
-          isDynamic,
-          shippedModules: shippedModules2,
-          ignoreLayout
-        } = await import("file://" + filePath);
-        if (shippedModules2 !== void 0) {
-          modules = shippedModules2;
-        }
-        if (ignoreLayout) {
-          pageIgnoresLayout = true;
-        }
-        pageElements = page;
-        metadata = pageMetadata;
-        if (isDynamic === true) {
-          isDynamicPage = isDynamic;
-        }
-      } catch (e) {
-        throw new Error(`Error in Page: ${directory}/${name}.ts - ${e}`);
-      }
-      PAGE_MAP2.set(directory === "" ? "/" : `/${directory}`, {
-        isDynamic: isDynamicPage,
-        filePath
-      });
-      if (isDynamicPage) return false;
-      if (modules !== void 0) {
-        for (const [globalName, path3] of Object.entries(modules)) {
-          modulesToShip.push({ globalName, path: path3 });
-        }
-      }
-      if (!metadata || metadata && typeof metadata !== "function") {
-        console.warn(`WARNING: ${filePath} does not export a metadata function.`);
-      }
-      if (!pageElements) {
-        console.warn(`WARNING: ${filePath} should export a const page, which is of type () => BuiltElement<"body">.`);
-      }
-      const pageProps = {
-        pageName: directory,
-        middlewareData: {}
-      };
-      if (typeof pageElements === "function") {
-        if (pageElements.constructor.name === "AsyncFunction") {
-          pageElements = await pageElements(pageProps);
-        } else {
-          pageElements = pageElements(pageProps);
-        }
-      }
-      const state = getState();
-      const pageLoadHooks = getLoadHooks();
-      const objectAttributes = getObjectAttributes();
-      const layout = await fetchPageLayoutHTML(path2.dirname(filePath));
-      const foundObjectAttributes = await pageToHTML(
-        path2.join(DIST_DIR2, directory),
-        pageElements || body(),
-        metadata ?? (() => head()),
-        DIST_DIR2,
-        name,
-        true,
-        modules,
-        layout,
-        directory
-      );
-      const {
-        sendHardReloadInstruction
-      } = await generateClientPageData(
-        directory,
-        state || {},
-        [...objectAttributes, ...foundObjectAttributes],
-        pageLoadHooks || [],
-        DIST_DIR2,
-        name
-      );
-      return sendHardReloadInstruction === true;
-    };
-    buildDynamicPage = async (DIST_DIR2, directory, pageInfo, req, res, middlewareData) => {
-      directory = directory === "/" ? "" : directory;
-      const filePath = pageInfo.filePath;
-      initializeState();
-      initializeObjectAttributes();
-      resetLoadHooks();
-      globalThis.__SERVER_PAGE_DATA_BANNER__ = "";
-      let pageElements = async (props) => body();
-      let metadata = async (props) => html();
-      let modules = {};
-      let pageIgnoresLayout = false;
-      try {
-        const {
-          page,
-          metadata: pageMetadata,
-          shippedModules: shippedModules2,
-          ignoreLayout,
-          requestHook
-        } = await import("file://" + filePath);
-        if (requestHook) {
-          const hook = requestHook;
-          const doContinue = await hook(req, res);
-          if (!doContinue) {
-            return false;
-          }
-        }
-        if (shippedModules2 !== void 0) {
-          modules = shippedModules2;
-        }
-        if (ignoreLayout) {
-          pageIgnoresLayout = true;
-        }
-        pageElements = page;
-        metadata = pageMetadata;
-      } catch (e) {
-        throw new Error(`Error in Page: ${directory}/page.ts - ${e}`);
-      }
-      if (modules !== void 0) {
-        for (const [globalName, path3] of Object.entries(modules)) {
-          modulesToShip.push({ globalName, path: path3 });
-        }
-      }
-      if (!metadata || metadata && typeof metadata !== "function") {
-        console.warn(`WARNING: ${filePath} does not export a metadata function.`);
-      }
-      if (!pageElements) {
-        console.warn(`WARNING: ${filePath} should export a const page, which is of type () => BuiltElement<"body">.`);
-      }
-      const pageProps = {
-        pageName: directory,
-        middlewareData
-      };
-      if (typeof pageElements === "function") {
-        if (pageElements.constructor.name === "AsyncFunction") {
-          pageElements = await pageElements(pageProps);
-        } else {
-          pageElements = pageElements(pageProps);
-        }
-      }
-      const layout = await fetchPageLayoutHTML(path2.dirname(filePath));
-      const resultHTML = await pageToHTML(
-        path2.join(DIST_DIR2, directory),
-        pageElements,
-        metadata,
-        DIST_DIR2,
-        "page",
-        false,
-        modules,
-        layout,
-        directory
-      );
-      await shipModules();
-      return { resultHTML };
-    };
-    shipModules = async () => {
-      for (const plugin of modulesToShip) {
-        {
-          if (shippedModules.has(plugin.globalName)) continue;
-          shippedModules.set(plugin.globalName, true);
-        }
-        esbuild.build({
-          entryPoints: [plugin.path],
-          bundle: true,
-          outfile: path2.join(DIST_DIR, "shipped", plugin.globalName + ".js"),
-          format: "iife",
-          platform: "browser",
-          globalName: plugin.globalName,
-          minify: true,
-          treeShaking: true
-        });
-      }
-      modulesToShip = [];
-    };
-    build = async () => {
-      if (options2.quiet === true) {
-        console.log = function() {
-        };
-        console.error = function() {
-        };
-        console.warn = function() {
-        };
-      }
-      try {
-        {
-          log2(bold(yellow(" -- Elegance.JS -- ")));
-          if (options2.environment === "production") {
-            log2(
-              " - ",
-              bgYellow(bold(black(" NOTE "))),
-              " : ",
-              white("In production mode, no "),
-              underline("console.log() "),
-              white("statements will be shown on the client, and all code will be minified.")
-            );
-            log2("");
-          }
-        }
-        if (options2.preCompile) {
-          options2.preCompile();
-        }
-        const start = performance.now();
-        let shouldClientHardReload;
-        {
-          const { shouldClientHardReload: doReload } = await buildLayouts();
-          if (doReload) shouldClientHardReload = true;
-        }
-        {
-          const { shouldClientHardReload: doReload } = await buildPages(path2.resolve(DIST_DIR));
-          if (doReload) shouldClientHardReload = true;
-        }
-        await shipModules();
-        const pagesBuilt = performance.now();
-        await buildClient(DIST_DIR);
-        const end = performance.now();
-        if (options2.publicDirectory) {
-          log2("Recursively copying public directory.. this may take a while.");
-          const src = path2.relative(process.cwd(), options2.publicDirectory.path);
-          if (fs.existsSync(src) === false) {
-            console.warn("WARNING: Public directory not found, an attempt will be made create it..");
-            fs.mkdirSync(src, { recursive: true });
-          }
-          await fs.promises.cp(src, path2.join(DIST_DIR), { recursive: true });
-        }
-        {
-          log2(`Took ${Math.round(pagesBuilt - start)}ms to Build Pages.`);
-          log2(`Took ${Math.round(end - pagesBuilt)}ms to Build Client.`);
-        }
-        process.send?.({ event: "message", data: "set-pages-and-layouts", content: JSON.stringify({ pageMap: Array.from(PAGE_MAP2), layoutMap: Array.from(LAYOUT_MAP) }) });
-        process.send?.({ event: "message", data: "compile-finish" });
-        if (shouldClientHardReload) {
-          process.send({ event: "message", data: "hard-reload" });
-        } else {
-          process.send({ event: "message", data: "soft-reload" });
-        }
-      } catch (e) {
-        console.error("Build Failed! Received Error:");
-        console.error(e);
-        return false;
-      }
-      return true;
-    };
-    (async () => {
-      if (process.env.DO_BUILD === "true") await build();
-    })();
-  }
-});
-
-// src/server/server.ts
 import {
   createServer as createHttpServer
 } from "http";
 import {
-  promises as fs2
+  promises as fs
 } from "fs";
 import {
   join,
@@ -1224,41 +13,9 @@ import {
 import {
   pathToFileURL
 } from "url";
-
-// src/log.ts
-var quiet = false;
-function getTimestamp() {
-  const now = /* @__PURE__ */ new Date();
-  return now.toLocaleString(void 0, {
-    year: "2-digit",
-    month: "2-digit",
-    day: "2-digit",
-    hour: "2-digit",
-    minute: "2-digit",
-    second: "2-digit"
-  });
-}
-function color(text, code) {
-  return `\x1B[${code}m${text}\x1B[0m`;
-}
-function logInfo(...args) {
-  if (quiet) return;
-  console.info(`Elegance.JS: ${getTimestamp()} ${color("[INFO]:", 34)}`, ...args);
-}
-function logWarn(...args) {
-  if (quiet) return;
-  console.warn(`Elegance.JS: ${getTimestamp()} ${color("[WARN]:", 33)}`, ...args);
-}
-function logError(...args) {
-  console.error(`Elegance.JS: ${getTimestamp()} ${color("[ERROR]:", 31)}`, ...args);
-}
-var log = {
-  info: logInfo,
-  warn: logWarn,
-  error: logError
-};
-
-// src/server/server.ts
+import {
+  log
+} from "../log";
 import {
   gzip,
   deflate
@@ -1266,21 +23,12 @@ import {
 import {
   promisify
 } from "util";
-
-// src/build.ts
-import path from "path";
-import { fileURLToPath } from "url";
-var __filename = fileURLToPath(import.meta.url);
-var __dirname = path.dirname(__filename);
-var packageDir = path.resolve(__dirname, "..");
-var builderPath = path.resolve(packageDir, "./dist/page_compiler.mjs");
-var PAGE_MAP = /* @__PURE__ */ new Map();
-var options = process.env.OPTIONS;
-
-// src/server/server.ts
-var gzipAsync = promisify(gzip);
-var deflateAsync = promisify(deflate);
-var MIME_TYPES = {
+import {
+  PAGE_MAP
+} from "../build";
+const gzipAsync = promisify(gzip);
+const deflateAsync = promisify(deflate);
+const MIME_TYPES = {
   ".html": "text/html; charset=utf-8",
   ".css": "text/css; charset=utf-8",
   ".js": "application/javascript; charset=utf-8",
@@ -1299,7 +47,7 @@ function startServer({
   port = 3e3,
   host = "localhost",
   environment = "production",
-  DIST_DIR: DIST_DIR2
+  DIST_DIR
 }) {
   if (!root) throw new Error("Root directory must be specified.");
   if (!pagesDirectory) throw new Error("Pages directory must be specified.");
@@ -1328,9 +76,9 @@ function startServer({
       if (url.pathname.startsWith("/api/")) {
         await handleApiRequest(pagesDirectory, url.pathname, req, res);
       } else if (PAGE_MAP.has(url.pathname)) {
-        await handlePageRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR2, PAGE_MAP.get(url.pathname));
+        await handlePageRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR, PAGE_MAP.get(url.pathname));
       } else {
-        await handleStaticRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR2);
+        await handleStaticRequest(root, pagesDirectory, url.pathname, req, res, DIST_DIR);
       }
       if (environment === "development") {
         log.info(req.method, "::", req.url, "-", res.statusCode);
@@ -1366,7 +114,7 @@ async function getTargetInfo(root, pathname) {
   }
   let stats;
   try {
-    stats = await fs2.stat(filePath);
+    stats = await fs.stat(filePath);
   } catch {
   }
   let targetDir;
@@ -1397,7 +145,7 @@ async function collectMiddlewares(dirs) {
     const mwPath = join(dir, "middleware.ts");
     let mwModule;
     try {
-      await fs2.access(mwPath);
+      await fs.access(mwPath);
       const url = pathToFileURL(mwPath).href;
       mwModule = await import(url);
     } catch {
@@ -1413,7 +161,7 @@ async function collectMiddlewares(dirs) {
   }
   return middlewares;
 }
-async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_DIR2, pageInfo) {
+async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_DIR, pageInfo) {
   try {
     const {
       filePath,
@@ -1429,7 +177,7 @@ async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_
     const handlerPath = isDynamic ? pageInfo.filePath : join(filePath, "index.html");
     let hasHandler = false;
     try {
-      await fs2.access(handlerPath);
+      await fs.access(handlerPath);
       hasHandler = true;
     } catch {
     }
@@ -1441,10 +189,10 @@ async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_
       if (isDynamic) {
         try {
           const {
-            buildDynamicPage: buildDynamicPage2
-          } = await Promise.resolve().then(() => (init_page_compiler(), page_compiler_exports));
-          const result = await buildDynamicPage2(
-            DIST_DIR2,
+            buildDynamicPage
+          } = await import("../page_compiler");
+          const result = await buildDynamicPage(
+            DIST_DIR,
             pathname,
             pageInfo,
             req2,
@@ -1469,7 +217,7 @@ async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_
       } else {
         const ext = extname(handlerPath).toLowerCase();
         const contentType = MIME_TYPES[ext] || "application/octet-stream";
-        const fileData = await fs2.readFile(handlerPath);
+        const fileData = await fs.readFile(handlerPath);
         await sendResponse(req2, res2, 200, {
           "Content-Type": contentType
         }, fileData);
@@ -1492,7 +240,7 @@ async function handlePageRequest(root, pagesDirectory, pathname, req, res, DIST_
     }
   }
 }
-async function handleStaticRequest(root, pagesDirectory, pathname, req, res, DIST_DIR2) {
+async function handleStaticRequest(root, pagesDirectory, pathname, req, res, DIST_DIR) {
   try {
     const {
       filePath,
@@ -1509,7 +257,7 @@ async function handleStaticRequest(root, pagesDirectory, pathname, req, res, DIS
     }
     let hasHandler = false;
     try {
-      await fs2.access(handlerPath);
+      await fs.access(handlerPath);
       hasHandler = true;
     } catch {
     }
@@ -1520,7 +268,7 @@ async function handleStaticRequest(root, pagesDirectory, pathname, req, res, DIS
       }
       const ext = extname(handlerPath).toLowerCase();
       const contentType = MIME_TYPES[ext] || "application/octet-stream";
-      const fileData = await fs2.readFile(handlerPath);
+      const fileData = await fs.readFile(handlerPath);
       await sendResponse(req2, res2, 200, {
         "Content-Type": contentType
       }, fileData);
@@ -1550,7 +298,7 @@ async function handleApiRequest(pagesDirectory, pathname, req, res) {
   const routePath = join(routeDir, "route.ts");
   let hasRoute = false;
   try {
-    await fs2.access(routePath);
+    await fs.access(routePath);
     hasRoute = true;
   } catch {
   }
@@ -1580,15 +328,15 @@ async function handleApiRequest(pagesDirectory, pathname, req, res) {
   });
   await composed(req, res);
 }
-function composeMiddlewares(mws, final, options3) {
+function composeMiddlewares(mws, final, options) {
   return async function(req, res) {
     let index = 0;
     async function dispatch(err) {
       if (err) {
-        if (options3.isApi) {
+        if (options.isApi) {
           return respondWithJsonError(req, res, 500, err.message || "Internal Server Error");
         } else {
-          return await respondWithErrorPage(options3.root, options3.pathname, 500, req, res);
+          return await respondWithErrorPage(options.root, options.pathname, 500, req, res);
         }
       }
       if (index >= mws.length) {
@@ -1608,7 +356,7 @@ function composeMiddlewares(mws, final, options3) {
         };
       };
       try {
-        await thisMw(req, res, onceNext(next), options3.data || {});
+        await thisMw(req, res, onceNext(next), options.data || {});
       } catch (error) {
         await dispatch(error);
       }
@@ -1617,12 +365,12 @@ function composeMiddlewares(mws, final, options3) {
   };
 }
 async function respondWithJsonError(req, res, code, message) {
-  const body2 = JSON.stringify({
+  const body = JSON.stringify({
     error: message
   });
   await sendResponse(req, res, code, {
     "Content-Type": "application/json; charset=utf-8"
-  }, body2);
+  }, body);
 }
 async function respondWithErrorPage(root, pathname, code, req, res) {
   let currentPath = normalize(join(root, decodeURIComponent(pathname)));
@@ -1632,7 +380,7 @@ async function respondWithErrorPage(root, pathname, code, req, res) {
     const candidate = join(currentPath, `${code}.html`);
     if (!tried.has(candidate)) {
       try {
-        await fs2.access(candidate);
+        await fs.access(candidate);
         errorFilePath = candidate;
         break;
       } catch {
@@ -1646,17 +394,17 @@ async function respondWithErrorPage(root, pathname, code, req, res) {
   if (!errorFilePath) {
     const fallback = join(root, `${code}.html`);
     try {
-      await fs2.access(fallback);
+      await fs.access(fallback);
       errorFilePath = fallback;
     } catch {
     }
   }
   if (errorFilePath) {
     try {
-      const html2 = await fs2.readFile(errorFilePath, "utf8");
+      const html = await fs.readFile(errorFilePath, "utf8");
       await sendResponse(req, res, code, {
         "Content-Type": "text/html; charset=utf-8"
-      }, html2);
+      }, html);
       return;
     } catch {
     }
@@ -1669,8 +417,8 @@ function isCompressible(contentType) {
   if (!contentType) return false;
   return /text\/|javascript|json|xml|svg/.test(contentType);
 }
-async function sendResponse(req, res, status, headers, body2) {
-  let bufferBody = typeof body2 === "string" ? Buffer.from(body2) : body2;
+async function sendResponse(req, res, status, headers, body) {
+  let bufferBody = typeof body === "string" ? Buffer.from(body) : body;
   const accept = req.headers["accept-encoding"] || "";
   let encoding = null;
   if (accept.match(/\bgzip\b/)) {