@server/next 0.21.7 → 0.21.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.21.7",
+  "version": "0.21.9",
   "description": "A fully-fledged web server with routing, file uploads, sessions, static files, schema validation, websockets, testing, etc.",
   "homepage": "https://server-js.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/src/helpers/jsx.js

@@ -13,6 +13,9 @@ const altAttrs = {
   classname: "class",
 };
 
+// "" and 0 are valid children, false and null and undefined are not
+const isValidChild = (child) => child || child === "" || child === 0;
+
 const minifyCss = (str) =>
   str
     .replace(/\s+/g, " ")
@@ -44,7 +47,8 @@ export const jsx = (tag, { children, ...props }) => {
   }
   if (props.dangerouslySetInnerHTML)
     children = () => props.dangerouslySetInnerHTML.__html;
-  if (!children) children = [];
+
+  if (!isValidChild(children)) children = [];
   if (typeof children === "string") children = [children];
   children = (Array.isArray(children) ? children : [children])
     .flat()

package/src/index.js

@@ -11,7 +11,7 @@ import {
   parseHeaders,
 } from "./helpers/index.js";
 
-import { assets, auth } from "./middle/index.js";
+import { assets, auth, timer } from "./middle/index.js";
 
 // Export the reply helpers
 export * from "./reply.js";
@@ -74,6 +74,7 @@ export default function server(options = {}) {
     this.node();
   }
 
+  this.use(timer);
   this.use(assets);
   if (this.opts.auth) {
     this.use(auth({ options: this.opts, app: this }));

package/src/middle/index.js

@@ -1,5 +1,6 @@
 import authMod from "../auth/index.js";
 import assets from "./assets.js";
+import timer from "./timer.js";
 
 const auth = authMod.middle;
-export { assets, auth };
+export { assets, auth, timer };

package/src/middle/timer.js

@@ -0,0 +1,5 @@
+export default function timer(ctx) {
+  const times = [["init", performance.now()]];
+  ctx.time = (name) => times.push([name, performance.now()]);
+  ctx.time.times = times;
+}

package/src/parseResponse.js

@@ -46,6 +46,18 @@ export default async function parseResponse(out, ctx) {
     out.headers.set("Access-Control-Allow-Methods", methods);
   }
 
+  // Only attach the headers if the user is using the timing API
+  // 1 item is the `init` so it doesn't count
+  if (ctx.time.times.length > 1) {
+    const r = (t) => Math.round(t);
+    const times = ctx.time.times;
+    const timing = times
+      .slice(1)
+      .map(([name, time], i) => `${name};dur=${r(time - times[i][1])}`)
+      .join(", ");
+    out.headers.set("Server-Timing", timing);
+  }
+
   // If we have a session, we need to persist it into a cookie
   if (Object.keys(ctx.session || {}).length) {
     if (!ctx.options.session?.store) {

package/src/router.test.js

@@ -15,7 +15,7 @@ describe("can route properly", () => {
   // INTERNAL - so this might change in the future
   it("has the correct structure", () => {
     const registeredPaths = app.handlers.get.map((h) => h[1]);
-    expect(registeredPaths).toEqual(["*", "/hello", "/api/hello", "/"]);
+    expect(registeredPaths).toEqual(["*", "*", "/hello", "/api/hello", "/"]);
   });
 
   it("can get fallback when nothing matches", async () => {