@hyperspan/framework 1.0.0-alpha.4 → 1.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "Hyperspan Web Framework",
   "main": "src/server.ts",
   "types": "src/server.ts",
@@ -80,7 +80,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@hyperspan/html": "0.2.0",
+    "@hyperspan/html": "^1.0.0-alpha",
     "zod": "^4.1.12"
   }
 }

package/src/actions.ts

@@ -2,7 +2,7 @@ import { html, HSHtml } from '@hyperspan/html';
 import { createRoute, returnHTMLResponse } from './server';
 import * as z from 'zod/v4';
 import type { Hyperspan as HS } from './types';
-import { assetHash } from './utils';
+import { assetHash, formDataToJSON } from './utils';
 import * as actionsClient from './client/_hs/hyperspan-actions.client';
 import { renderClientJS } from './client/js';
 
@@ -115,73 +115,4 @@ export function createAction<T extends z.ZodTypeAny>(params: { name: string; sch
   };
 
   return api;
-}
-
-/**
- * Return JSON data structure for a given FormData object
- * Accounts for array fields (e.g. name="options[]" or <select multiple>)
- *
- * @link https://stackoverflow.com/a/75406413
- */
-export function formDataToJSON(formData: FormData): Record<string, string | string[]> {
-  let object = {};
-
-  /**
-   * Parses FormData key xxx`[x][x][x]` fields into array
-   */
-  const parseKey = (key: string) => {
-    const subKeyIdx = key.indexOf('[');
-
-    if (subKeyIdx !== -1) {
-      const keys = [key.substring(0, subKeyIdx)];
-      key = key.substring(subKeyIdx);
-
-      for (const match of key.matchAll(/\[(?<key>.*?)]/gm)) {
-        if (match.groups) {
-          keys.push(match.groups.key);
-        }
-      }
-      return keys;
-    } else {
-      return [key];
-    }
-  };
-
-  /**
-   * Recursively iterates over keys and assigns key/values to object
-   */
-  const assign = (keys: string[], value: FormDataEntryValue, object: any): void => {
-    const key = keys.shift();
-
-    // When last key in the iterations
-    if (key === '' || key === undefined) {
-      return object.push(value);
-    }
-
-    if (Reflect.has(object, key)) {
-      // If key has been found, but final pass - convert the value to array
-      if (keys.length === 0) {
-        if (!Array.isArray(object[key])) {
-          object[key] = [object[key], value];
-          return;
-        }
-      }
-      // Recurse again with found object
-      return assign(keys, value, object[key]);
-    }
-
-    // Create empty object for key, if next key is '' do array instead, otherwise set value
-    if (keys.length >= 1) {
-      object[key] = keys[0] === '' ? [] : {};
-      return assign(keys, value, object[key]);
-    } else {
-      object[key] = value;
-    }
-  };
-
-  for (const pair of formData.entries()) {
-    assign(parseKey(pair[0]), pair[1], object);
-  }
-
-  return object;
 }

package/src/server.ts

@@ -49,7 +49,10 @@ export function createContext(req: Request, route?: HS.Route): HS.Context {
       method,
       headers,
       query,
-      body: req.body,
+      async text() { return req.text() },
+      async json<T = unknown>() { return await req.json() as T },
+      async formData<T = unknown>() { return await req.formData() as T },
+      async urlencoded() { return new URLSearchParams(await req.text()) },
     },
     res: {
       headers: new Headers(),

package/src/types.ts

@@ -42,7 +42,10 @@ export namespace Hyperspan {
       method: string; // Always uppercase
       headers: Headers; // Case-insensitive
       query: URLSearchParams;
-      body: any;
+      text: () => Promise<string>;
+      json<T = unknown>(): Promise<T>;
+      formData<T = unknown>(): Promise<T>;
+      urlencoded(): Promise<URLSearchParams>;
     };
     res: {
       headers: Headers; // Headers to merge with final outgoing response

package/src/utils.ts

@@ -6,4 +6,73 @@ export function assetHash(content: string): string {
 
 export function randomHash(): string {
   return createHash('md5').update(randomBytes(32).toString('hex')).digest('hex');
+}
+
+/**
+ * Return JSON data structure for a given FormData or URLSearchParams object
+ * Accounts for array fields (e.g. name="options[]" or <select multiple>)
+ *
+ * @link https://stackoverflow.com/a/75406413
+ */
+export function formDataToJSON(formData: FormData | URLSearchParams): Record<string, string | string[]> {
+  let object = {};
+
+  /**
+   * Parses FormData key xxx`[x][x][x]` fields into array
+   */
+  const parseKey = (key: string) => {
+    const subKeyIdx = key.indexOf('[');
+
+    if (subKeyIdx !== -1) {
+      const keys = [key.substring(0, subKeyIdx)];
+      key = key.substring(subKeyIdx);
+
+      for (const match of key.matchAll(/\[(?<key>.*?)]/gm)) {
+        if (match.groups) {
+          keys.push(match.groups.key);
+        }
+      }
+      return keys;
+    } else {
+      return [key];
+    }
+  };
+
+  /**
+   * Recursively iterates over keys and assigns key/values to object
+   */
+  const assign = (keys: string[], value: FormDataEntryValue, object: any): void => {
+    const key = keys.shift();
+
+    // When last key in the iterations
+    if (key === '' || key === undefined) {
+      return object.push(value);
+    }
+
+    if (Reflect.has(object, key)) {
+      // If key has been found, but final pass - convert the value to array
+      if (keys.length === 0) {
+        if (!Array.isArray(object[key])) {
+          object[key] = [object[key], value];
+          return;
+        }
+      }
+      // Recurse again with found object
+      return assign(keys, value, object[key]);
+    }
+
+    // Create empty object for key, if next key is '' do array instead, otherwise set value
+    if (keys.length >= 1) {
+      object[key] = keys[0] === '' ? [] : {};
+      return assign(keys, value, object[key]);
+    } else {
+      object[key] = value;
+    }
+  };
+
+  for (const pair of formData.entries()) {
+    assign(parseKey(pair[0]), pair[1], object);
+  }
+
+  return object;
 }