@torpor/build 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @torpor/build
 
+## 0.1.4
+
+### Patch Changes
+
+- 20ddf6c: Fix: better/less console.logging
+
+## 0.1.3
+
+### Patch Changes
+
+- 4b86717: Refactor: separate adapters into packages
+
 ## 0.1.2
 
 ### Patch Changes

package/dist/{Server-CB99REgs.d.cts → Site-Df1k0TuQ.d.cts}

@@ -1,3 +1,4 @@
+import { Plugin } from 'vite';
 import { SerializeOptions } from 'cookie';
 
 declare class CookieHelper {
@@ -71,4 +72,29 @@ declare class RouteHandler {
     constructor(path: string, fn: ServerFunction);
 }
 
-export { CookieHelper as C, HeaderHelper as H, Server as S };
+type Adapter = {
+    prebuild?: (site: Site) => Promise<void> | void;
+    postbuild?: (site: Site) => Promise<void> | void;
+    serve: (server: Server, site: Site) => void;
+};
+
+/**
+ * The Site class contains the information necessary to setup a @torpor/build
+ * site, including routes, plugins, and options.
+ */
+declare class Site {
+    #private;
+    root: string;
+    routes: {
+        path: string;
+        file: string;
+        type: number;
+    }[];
+    plugins: Plugin[];
+    adapter: Adapter;
+    constructor();
+    addRouteFolder(folder: string): Promise<void>;
+    addRouteFile(path: string, file: string): void;
+}
+
+export { type Adapter as A, CookieHelper as C, HeaderHelper as H, Site as S, Server as a };

package/dist/{Server-CB99REgs.d.ts → Site-Df1k0TuQ.d.ts}

@@ -1,3 +1,4 @@
+import { Plugin } from 'vite';
 import { SerializeOptions } from 'cookie';
 
 declare class CookieHelper {
@@ -71,4 +72,29 @@ declare class RouteHandler {
     constructor(path: string, fn: ServerFunction);
 }
 
-export { CookieHelper as C, HeaderHelper as H, Server as S };
+type Adapter = {
+    prebuild?: (site: Site) => Promise<void> | void;
+    postbuild?: (site: Site) => Promise<void> | void;
+    serve: (server: Server, site: Site) => void;
+};
+
+/**
+ * The Site class contains the information necessary to setup a @torpor/build
+ * site, including routes, plugins, and options.
+ */
+declare class Site {
+    #private;
+    root: string;
+    routes: {
+        path: string;
+        file: string;
+        type: number;
+    }[];
+    plugins: Plugin[];
+    adapter: Adapter;
+    constructor();
+    addRouteFolder(folder: string): Promise<void>;
+    addRouteFile(path: string, file: string): void;
+}
+
+export { type Adapter as A, CookieHelper as C, HeaderHelper as H, Site as S, Server as a };

package/dist/bin/index.cjs

@@ -137,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_url = 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;
@@ -495,6 +333,167 @@ var RouteHandler = class {
   }
 };
 
+// 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+/);
@@ -511,8 +510,6 @@ function regexIndexOf(string, regex, position) {
 }
 
 // src/site/runDev.ts
-var import_meta = {};
-var __dirname = import_node_path3.default.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
 async function runDev(site) {
   const server = new Server();
   const vite = await (0, import_vite4.createServer)({
@@ -528,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(__dirname, "../../src/site/clientEntry.ts");
-  const serverScript = import_node_path3.default.resolve(__dirname, "../../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) => {