@torpor/build 0.1.1 → 0.1.3

package/dist/bin/index.cjs

@@ -23,16 +23,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/bin/index.ts
-var import_node_fs4 = __toESM(require("fs"), 1);
-var import_node_path4 = __toESM(require("path"), 1);
+// src/site/run.ts
+var import_node_fs5 = __toESM(require("fs"), 1);
+var import_node_path5 = __toESM(require("path"), 1);
 var import_vite5 = require("vite");
 
 // src/site/runBuild.ts
 var import_vite = __toESM(require("@torpor/unplugin/vite"), 1);
 var import_node_fs2 = require("fs");
 var import_node_path2 = __toESM(require("path"), 1);
-var import_node_url = require("url");
 var import_vite2 = require("vite");
 
 // src/site/manifest.ts
@@ -73,8 +72,6 @@ export default {
 }
 
 // src/site/runBuild.ts
-var import_meta = {};
-var __dirname = import_node_path2.default.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
 async function runBuild(site) {
   const distFolder = import_node_path2.default.resolve(site.root, "dist");
   if ((0, import_node_fs2.existsSync)(distFolder)) {
@@ -86,8 +83,9 @@ async function runBuild(site) {
     await site.adapter.prebuild(site);
   }
   let siteHtml = import_node_path2.default.resolve(site.root, "src/site.html");
-  let clientScript = import_node_path2.default.resolve(__dirname, "../../src/site/clientEntry.ts");
-  let serverScript = import_node_path2.default.resolve(__dirname, "../../src/site/serverEntry.ts");
+  const siteFolder = import_node_path2.default.resolve(site.root, "./node_modules/@torpor/build/src/site/");
+  let clientScript = import_node_path2.default.join(siteFolder, "clientEntry.ts");
+  let serverScript = import_node_path2.default.join(siteFolder, "serverEntry.ts");
   await (0, import_vite2.build)(
     (0, import_vite2.defineConfig)({
       plugins: [
@@ -139,170 +137,8 @@ var import_vite3 = __toESM(require("@torpor/unplugin/vite"), 1);
 var import_dotenv = require("dotenv");
 var import_node_fs3 = require("fs");
 var import_node_path3 = __toESM(require("path"), 1);
-var import_node_url2 = require("url");
 var import_vite4 = require("vite");
 
-// src/adapters/node/flattenHeaders.ts
-function flattenHeaders(headers) {
-  const flatHeaders = new Headers();
-  for (const [key, value] of Object.entries(headers)) {
-    if (value === void 0 || value === null) {
-      continue;
-    } else if (Array.isArray(value)) {
-      for (const v of value) {
-        if (v !== void 0 && v !== null) {
-          value.forEach((v2) => flatHeaders.append(key, v2));
-        }
-      }
-    } else {
-      flatHeaders.set(key, String(value));
-    }
-  }
-  return flatHeaders;
-}
-
-// src/adapters/node/nodeMessageToNodeResponse.ts
-var import_node_http = require("http");
-var import_node_stream = require("stream");
-function nodeMessageToNodeResponse(incomingMessage) {
-  const res = new import_node_http.ServerResponse(incomingMessage);
-  const passThrough = new import_node_stream.PassThrough();
-  let handled = false;
-  const onReadable = (cb) => {
-    const handleReadable = () => {
-      if (handled) return;
-      handled = true;
-      cb({
-        readable: import_node_stream.Readable.from(passThrough),
-        headers: res.getHeaders(),
-        status: res.statusCode
-      });
-    };
-    passThrough.once("readable", handleReadable);
-    passThrough.once("end", handleReadable);
-  };
-  passThrough.once("finish", () => {
-    res.emit("finish");
-  });
-  passThrough.once("close", () => {
-    res.destroy();
-    res.emit("close");
-  });
-  passThrough.on("drain", () => {
-    res.emit("drain");
-  });
-  res.write = passThrough.write.bind(passThrough);
-  res.end = passThrough.end.bind(passThrough);
-  res.writeHead = function writeHead(statusCode, statusMessage, headers) {
-    res.statusCode = statusCode;
-    if (typeof statusMessage === "object") {
-      headers = statusMessage;
-      statusMessage = void 0;
-    }
-    if (headers) {
-      for (const [key, value] of Object.entries(headers)) {
-        if (value !== void 0) {
-          res.setHeader(key, value);
-        }
-      }
-    }
-    return res;
-  };
-  return {
-    res,
-    onReadable
-  };
-}
-
-// src/adapters/node/readableToBuffer.ts
-function readableToBuffer(req) {
-  return new Promise((resolve, reject) => {
-    const chunks = [];
-    req.on("data", (chunk) => {
-      chunks.push(chunk);
-    });
-    req.on("end", () => {
-      resolve(Buffer.concat(chunks));
-    });
-    req.on("error", (err) => {
-      reject(err);
-    });
-  });
-}
-
-// src/adapters/node/requestToNodeMessage.ts
-var import_node_stream2 = require("stream");
-var DUMMY_BASE_URL = "http://localhost";
-function requestToNodeMessage(request) {
-  const parsedUrl = new URL(request.url, DUMMY_BASE_URL);
-  const pathAndQuery = (parsedUrl.pathname || "") + (parsedUrl.search || "");
-  const body = (
-    /*request.body ? Readable.fromWeb(request.body as any) :*/
-    import_node_stream2.Readable.from([])
-  );
-  return Object.assign(body, {
-    url: pathAndQuery,
-    method: request.method,
-    headers: Object.fromEntries(request.headers)
-  });
-}
-
-// src/adapters/node/createMiddlewareHandler.ts
-function createMiddlewareHandler(handler) {
-  return async (ev, next) => {
-    const req = requestToNodeMessage(ev.request);
-    const { res, onReadable } = nodeMessageToNodeResponse(req);
-    return new Promise(async (resolve, reject) => {
-      onReadable(async ({ readable, headers, status }) => {
-        const responseBody = statusCodesWithoutBody.includes(status) ? null : (
-          //(Readable.toWeb(readable) as ReadableStream);
-          // HACK: Chunked bodies are not being
-          // read correctly somewhere...
-          await readableToBuffer(readable)
-        );
-        ev.response = new Response(responseBody, {
-          status,
-          headers: flattenHeaders(headers)
-        });
-        resolve();
-      });
-      const cnext = async (error) => {
-        if (error) {
-          reject(error instanceof Error ? error : new Error(String(error)));
-        } else {
-          await next();
-          resolve();
-        }
-      };
-      try {
-        const handled = await handler(req, res, cnext);
-        if (handled === false) {
-          res.destroy();
-          resolve();
-        }
-      } catch (e) {
-        cnext(e);
-      }
-    });
-  };
-}
-var statusCodesWithoutBody = [
-  100,
-  // Continue
-  101,
-  // Switching Protocols
-  102,
-  // Processing (WebDAV)
-  103,
-  // Early Hints
-  204,
-  // No Content
-  205,
-  // Reset Content
-  304
-  // Not Modified
-];
-
 // src/response/response.ts
 function response(status, body) {
   let headers = void 0;
@@ -326,8 +162,8 @@ function serverError(body) {
 }
 
 // src/site/pathToRegex.ts
-function pathToRegex(path5) {
-  const pattern = path5.split("/").map((p) => {
+function pathToRegex(path6) {
+  const pattern = path6.split("/").map((p) => {
     return p.replace(/\[([^\/]+?)\]/, "(?<$1>[^\\/]+?)");
   }).join("\\/").replaceAll("*", ".*");
   return new RegExp(`^${pattern}$`);
@@ -463,13 +299,13 @@ var Server = class {
    * @param fn The function to call when the pattern is matched.
    * @returns
    */
-  add(path5, fn) {
-    this.routes.push(new RouteHandler(path5, fn));
+  add(path6, fn) {
+    this.routes.push(new RouteHandler(path6, fn));
     return this;
   }
-  match(path5) {
+  match(path6) {
     for (let handler of this.routes) {
-      let match = path5.match(handler.regex);
+      let match = path6.match(handler.regex);
       if (match) {
         return {
           fn: handler.fn,
@@ -477,7 +313,7 @@ var Server = class {
         };
       }
     }
-    console.log(`Server path not found: ${path5}`);
+    console.log(`Server path not found: ${path6}`);
   }
   // TODO:
   //use(path: string, ...fn: MiddlewareFunction[])
@@ -490,13 +326,174 @@ var RouteHandler = class {
   path;
   regex;
   fn;
-  constructor(path5, fn) {
-    this.path = path5;
-    this.regex = pathToRegex(path5);
+  constructor(path6, fn) {
+    this.path = path6;
+    this.regex = pathToRegex(path6);
     this.fn = fn;
   }
 };
 
+// src/server/connect/flattenHeaders.ts
+function flattenHeaders(headers) {
+  const flatHeaders = new Headers();
+  for (const [key, value] of Object.entries(headers)) {
+    if (value === void 0 || value === null) {
+      continue;
+    } else if (Array.isArray(value)) {
+      for (const v of value) {
+        if (v !== void 0 && v !== null) {
+          value.forEach((v2) => flatHeaders.append(key, v2));
+        }
+      }
+    } else {
+      flatHeaders.set(key, String(value));
+    }
+  }
+  return flatHeaders;
+}
+
+// src/server/connect/nodeMessageToNodeResponse.ts
+var import_node_http = require("http");
+var import_node_stream = require("stream");
+function nodeMessageToNodeResponse(incomingMessage) {
+  const res = new import_node_http.ServerResponse(incomingMessage);
+  const passThrough = new import_node_stream.PassThrough();
+  let handled = false;
+  const onReadable = (cb) => {
+    const handleReadable = () => {
+      if (handled) return;
+      handled = true;
+      cb({
+        readable: import_node_stream.Readable.from(passThrough),
+        headers: res.getHeaders(),
+        status: res.statusCode
+      });
+    };
+    passThrough.once("readable", handleReadable);
+    passThrough.once("end", handleReadable);
+  };
+  passThrough.once("finish", () => {
+    res.emit("finish");
+  });
+  passThrough.once("close", () => {
+    res.destroy();
+    res.emit("close");
+  });
+  passThrough.on("drain", () => {
+    res.emit("drain");
+  });
+  res.write = passThrough.write.bind(passThrough);
+  res.end = passThrough.end.bind(passThrough);
+  res.writeHead = function writeHead(statusCode, statusMessage, headers) {
+    res.statusCode = statusCode;
+    if (typeof statusMessage === "object") {
+      headers = statusMessage;
+      statusMessage = void 0;
+    }
+    if (headers) {
+      for (const [key, value] of Object.entries(headers)) {
+        if (value !== void 0) {
+          res.setHeader(key, value);
+        }
+      }
+    }
+    return res;
+  };
+  return {
+    res,
+    onReadable
+  };
+}
+
+// src/server/connect/readableToBuffer.ts
+function readableToBuffer(req) {
+  return new Promise((resolve, reject) => {
+    const chunks = [];
+    req.on("data", (chunk) => {
+      chunks.push(chunk);
+    });
+    req.on("end", () => {
+      resolve(Buffer.concat(chunks));
+    });
+    req.on("error", (err) => {
+      reject(err);
+    });
+  });
+}
+
+// src/server/connect/requestToNodeMessage.ts
+var import_node_stream2 = require("stream");
+var DUMMY_BASE_URL = "http://localhost";
+function requestToNodeMessage(request) {
+  const parsedUrl = new URL(request.url, DUMMY_BASE_URL);
+  const pathAndQuery = (parsedUrl.pathname || "") + (parsedUrl.search || "");
+  const body = (
+    /*request.body ? Readable.fromWeb(request.body as any) :*/
+    import_node_stream2.Readable.from([])
+  );
+  return Object.assign(body, {
+    url: pathAndQuery,
+    method: request.method,
+    headers: Object.fromEntries(request.headers)
+  });
+}
+
+// src/server/connect/createMiddlewareHandler.ts
+function createMiddlewareHandler(handler) {
+  return async (ev, next) => {
+    const req = requestToNodeMessage(ev.request);
+    const { res, onReadable } = nodeMessageToNodeResponse(req);
+    return new Promise(async (resolve, reject) => {
+      onReadable(async ({ readable, headers, status }) => {
+        const responseBody = statusCodesWithoutBody.includes(status) ? null : (
+          //(Readable.toWeb(readable) as ReadableStream);
+          // HACK: Chunked bodies are not being
+          // read correctly somewhere...
+          await readableToBuffer(readable)
+        );
+        ev.response = new Response(responseBody, {
+          status,
+          headers: flattenHeaders(headers)
+        });
+        resolve();
+      });
+      const cnext = async (error) => {
+        if (error) {
+          reject(error instanceof Error ? error : new Error(String(error)));
+        } else {
+          await next();
+          resolve();
+        }
+      };
+      try {
+        const handled = await handler(req, res, cnext);
+        if (handled === false) {
+          res.destroy();
+          resolve();
+        }
+      } catch (e) {
+        cnext(e);
+      }
+    });
+  };
+}
+var statusCodesWithoutBody = [
+  100,
+  // Continue
+  101,
+  // Switching Protocols
+  102,
+  // Processing (WebDAV)
+  103,
+  // Early Hints
+  204,
+  // No Content
+  205,
+  // Reset Content
+  304
+  // Not Modified
+];
+
 // src/site/prepareTemplate.ts
 function prepareTemplate(template, clientScript) {
   let contentStart = regexIndexOf(template, /\<div\s+id=("app"|'app'|app)\s+/);
@@ -513,8 +510,6 @@ function regexIndexOf(string, regex, position) {
 }
 
 // src/site/runDev.ts
-var import_meta2 = {};
-var __dirname2 = import_node_path3.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url));
 async function runDev(site) {
   const server = new Server();
   const vite = await (0, import_vite4.createServer)({
@@ -530,8 +525,9 @@ async function runDev(site) {
   const templateFile = import_node_path3.default.resolve(site.root, "src/site.html");
   let template = await import_node_fs3.promises.readFile(templateFile, "utf-8");
   template = await vite.transformIndexHtml("", template);
-  const clientScript = import_node_path3.default.resolve(__dirname2, "../../src/site/clientEntry.ts");
-  const serverScript = import_node_path3.default.resolve(__dirname2, "../../src/site/serverEntry.ts");
+  const siteFolder = import_node_path3.default.resolve(site.root, "./node_modules/@torpor/build/src/site/");
+  let clientScript = import_node_path3.default.join(siteFolder, "clientEntry.ts");
+  let serverScript = import_node_path3.default.join(siteFolder, "serverEntry.ts");
   template = prepareTemplate(template, clientScript);
   server.use(createMiddlewareHandler(vite.middlewares));
   server.add("*", async (ev) => {
@@ -550,22 +546,158 @@ async function runDev(site) {
   site.adapter.serve(server, site);
 }
 
-// src/bin/index.ts
-run();
-async function run() {
-  const workingDir = process.cwd();
+// src/site/runPreview.ts
+var import_dotenv2 = require("dotenv");
+var import_node_fs4 = require("fs");
+var import_node_path4 = __toESM(require("path"), 1);
+
+// src/server/contentType.ts
+function contentType(extension) {
+  return types[extension] || "application/octet-stream";
+}
+var types = {
+  ".aac": "audio/aac",
+  ".abw": "application/x-abiword",
+  ".apng": "image/apng",
+  ".arc": "application/x-freearc",
+  ".avif": "image/avif",
+  ".avi": "video/x-msvideo",
+  ".azw": "application/vnd.amazon.ebook",
+  ".bin": "application/octet-stream",
+  ".bmp": "image/bmp",
+  ".bz": "application/x-bzip",
+  ".bz2": "application/x-bzip2",
+  ".cda": "application/x-cdf",
+  ".csh": "application/x-csh",
+  ".css": "text/css",
+  ".csv": "text/csv",
+  ".doc": "application/msword",
+  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".eot": "application/vnd.ms-fontobject",
+  ".epub": "application/epub+zip",
+  ".gz": "application/gzip",
+  ".gif": "image/gif",
+  ".htm": "text/html",
+  ".html": "text/html",
+  ".ico": "image/vnd.microsoft.icon",
+  ".ics": "text/calendar",
+  ".jar": "application/java-archive",
+  ".jpeg": "image/jpeg",
+  ".jpg": "image/jpeg",
+  ".js": "text/javascript",
+  ".json": "application/json",
+  ".jsonld": "application/ld+json",
+  ".mid": "audio/midi",
+  ".midi": "audio/midi",
+  ".mjs": "text/javascript",
+  ".mp3": "audio/mpeg",
+  ".mp4": "video/mp4",
+  ".mpeg": "video/mpeg",
+  ".mpkg": "application/vnd.apple.installer+xml",
+  ".odp": "application/vnd.oasis.opendocument.presentation",
+  ".ods": "application/vnd.oasis.opendocument.spreadsheet",
+  ".odt": "application/vnd.oasis.opendocument.text",
+  ".oga": "audio/ogg",
+  ".ogv": "video/ogg",
+  ".ogx": "application/ogg",
+  ".opus": "audio/ogg",
+  ".otf": "font/otf",
+  ".png": "image/png",
+  ".pdf": "application/pdf",
+  ".php": "application/x-httpd-php",
+  ".ppt": "application/vnd.ms-powerpoint",
+  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  ".rar": "application/vnd.rar",
+  ".rtf": "application/rtf",
+  ".sh": "application/x-sh",
+  ".svg": "image/svg+xml",
+  ".tar": "application/x-tar",
+  ".tif": "image/tiff",
+  ".tiff": "image/tiff",
+  ".ts": "video/mp2t",
+  ".ttf": "font/ttf",
+  ".txt": "text/plain",
+  ".vsd": "application/vnd.visio",
+  ".wav": "audio/wav",
+  ".weba": "audio/webm",
+  ".webm": "video/webm",
+  ".webp": "image/webp",
+  ".woff": "font/woff",
+  ".woff2": "font/woff2",
+  ".xhtml": "application/xhtml+xml",
+  ".xls": "application/vnd.ms-excel",
+  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".xml": "application/xml",
+  ".xul": "application/vnd.mozilla.xul+xml",
+  ".zip": "application/zip",
+  ".3gp": "video/3gpp",
+  ".3g2": "video/3gpp2",
+  ".7z": "application/x-7z-compressed"
+};
+
+// src/site/runPreview.ts
+async function runPreview(site) {
+  await runBuild(site);
+  const distFolder = import_node_path4.default.resolve(site.root, "dist");
+  const clientFolder = import_node_path4.default.join(distFolder, "client");
+  const serverFolder = import_node_path4.default.join(distFolder, "server");
+  let clientScript = (await import_node_fs4.promises.readdir(import_node_path4.default.join(clientFolder, "assets"))).find(
+    (f) => f.startsWith("clientEntry-")
+  );
+  if (!clientScript) {
+    throw new Error("clientEntry.js not found");
+  }
+  clientScript = `/assets/${clientScript}`;
+  let siteHtml = import_node_path4.default.join(clientFolder, "site.html");
+  let template = await import_node_fs4.promises.readFile(siteHtml, "utf-8");
+  template = prepareTemplate(template, clientScript);
+  const server = new Server();
+  server.add("/assets/*", async (ev) => {
+    try {
+      const url = new URL(ev.request.url);
+      const file = import_node_path4.default.join(site.root, "dist", "client", url.pathname);
+      if ((0, import_node_fs4.existsSync)(file)) {
+        return new Response(await import_node_fs4.promises.readFile(file), {
+          status: 200,
+          headers: {
+            "Content-Type": contentType(import_node_path4.default.extname(file))
+          }
+        });
+      }
+    } catch (e) {
+      return serverError(e);
+    }
+  });
+  const serverScript = import_node_path4.default.resolve(serverFolder, "serverEntry.js");
+  server.add("*", async (ev) => {
+    try {
+      const { load } = await import(serverScript);
+      return await load(ev, template);
+    } catch (e) {
+      return serverError(e);
+    }
+  });
+  (0, import_dotenv2.configDotenv)();
+  process.env.PROTOCOL ??= "http:";
+  process.env.HOST ??= "localhost";
+  process.env.PORT ??= "7059";
+  site.adapter.serve(server, site);
+}
+
+// src/site/run.ts
+async function run(folder, mode) {
   let configFile = "";
   let deleteConfigFile = false;
-  const jsConfigFile = import_node_path4.default.join(workingDir, "site.config.js");
-  const tsConfigFile = import_node_path4.default.join(workingDir, "site.config.ts");
-  if (import_node_fs4.default.existsSync(jsConfigFile)) {
+  const jsConfigFile = import_node_path5.default.join(folder, "site.config.js");
+  const tsConfigFile = import_node_path5.default.join(folder, "site.config.ts");
+  if (import_node_fs5.default.existsSync(jsConfigFile)) {
     configFile = jsConfigFile;
-  } else if (import_node_fs4.default.existsSync(tsConfigFile)) {
-    configFile = import_node_path4.default.join(workingDir, "site.config.temp.js");
-    let source = (await (0, import_vite5.transformWithEsbuild)(import_node_fs4.default.readFileSync(tsConfigFile, "utf-8"), tsConfigFile, {
+  } else if (import_node_fs5.default.existsSync(tsConfigFile)) {
+    configFile = import_node_path5.default.join(folder, "site.config.temp.js");
+    let source = (await (0, import_vite5.transformWithEsbuild)(import_node_fs5.default.readFileSync(tsConfigFile, "utf-8"), tsConfigFile, {
       loader: "ts"
     })).code;
-    import_node_fs4.default.writeFileSync(configFile, source);
+    import_node_fs5.default.writeFileSync(configFile, source);
     deleteConfigFile = true;
   } else {
     throw new Error("site.config file not found");
@@ -575,12 +707,38 @@ async function run() {
     throw new Error("Invalid site in config file");
   }
   if (deleteConfigFile) {
-    import_node_fs4.default.rmSync(configFile);
+    import_node_fs5.default.rmSync(configFile);
+  }
+  switch (mode) {
+    case "dev": {
+      await runDev(site);
+      break;
+    }
+    case "build": {
+      await runBuild(site);
+      break;
+    }
+    case "preview": {
+      await runPreview(site);
+      break;
+    }
+    default: {
+      console.log("No mode passed, running in dev");
+      await runDev(site);
+      break;
+    }
   }
+}
+
+// src/bin/index.ts
+(async () => {
+  const workingDir = process.cwd();
   if (process.argv.includes("--dev")) {
-    await runDev(site);
+    await run(workingDir, "dev");
   } else if (process.argv.includes("--build")) {
-    await runBuild(site);
+    await run(workingDir, "build");
+  } else if (process.argv.includes("--preview")) {
+    await run(workingDir, "preview");
   }
-}
+})();
 //# sourceMappingURL=index.cjs.map