@hyperspan/framework 0.1.0 → 0.1.1

package/package.json

@@ -1,13 +1,22 @@
 {
   "name": "@hyperspan/framework",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Hyperspan Web Framework",
-  "type": "module",
-  "module": "src/server.ts",
+  "main": "dist/index.js",
   "public": true,
   "publishConfig": {
     "access": "public"
   },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./assets": {
+      "types": "./dist/assets.d.ts",
+      "default": "./dist/assets.js"
+    }
+  },
   "author": "Vance Lucas <vance@vancelucas.com>",
   "license": "BSD-3-Clause",
   "keywords": [
@@ -23,18 +32,22 @@
   "homepage": "https://www.hyperspan.dev",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vlucas/hyperspan-framework"
+    "url": "git+https://github.com/vlucas/hyperspan.git"
   },
   "bugs": {
-    "url": "https://github.com/vlucas/hyperspan-framework/issues"
+    "url": "https://github.com/vlucas/hyperspan/issues"
   },
   "scripts": {
-    "test": "bun test"
+    "build": "bun ./build.ts",
+    "clean": "rm -rf dist",
+    "test": "bun test",
+    "prepack": "npm run clean && npm run build"
   },
   "devDependencies": {
     "@types/bun": "^1.1.9",
     "@types/node": "^22.5.5",
     "@types/react": "^19.1.0",
+    "bun-plugin-dts": "^0.3.0",
     "bun-types": "latest",
     "prettier": "^3.2.5"
   },
@@ -42,10 +55,10 @@
     "typescript": "^5.0.0"
   },
   "dependencies": {
-    "@hyperspan/html": "^0.1.0",
+    "@hyperspan/html": "^0.1.1",
     "@preact/compat": "^18.3.1",
     "hono": "^4.7.4",
     "isbot": "^5.1.25",
-    "valibot": "^1.0.0-rc.3"
+    "zod": "^4.0.0-beta.20250415T232143"
   }
 }

package/src/assets.ts

@@ -3,7 +3,7 @@ import { md5 } from './clientjs/md5';
 import { readdir } from 'node:fs/promises';
 import { resolve } from 'node:path';
 
-export const IS_PROD = process.env.NODE_ENV === 'production';
+const IS_PROD = process.env.NODE_ENV === 'production';
 const PWD = import.meta.dir;
 
 /**

package/src/index.ts

@@ -0,0 +1 @@
+export * from './server';

package/src/server.ts

@@ -1,86 +1,16 @@
-import { readdir } from 'node:fs/promises';
-import { basename, extname, join } from 'node:path';
-import { TmplHtml, html, renderStream, renderAsync, render } from '@hyperspan/html';
-import { isbot } from 'isbot';
-import { buildClientJS, buildClientCSS } from './assets';
-import { Hono } from 'hono';
-import { serveStatic } from 'hono/bun';
-import type { Context, Handler } from 'hono';
-
-import * as v from 'valibot';
-import type {
-  AnySchema,
-  ArraySchema,
-  BigintSchema,
-  BooleanSchema,
-  DateSchema,
-  EnumSchema,
-  GenericIssue,
-  IntersectSchema,
-  LazySchema,
-  LiteralSchema,
-  NullSchema,
-  NullableSchema,
-  NullishSchema,
-  NumberSchema,
-  ObjectSchema,
-  ObjectWithRestSchema,
-  OptionalSchema,
-  PicklistSchema,
-  PipeItem,
-  RecordSchema,
-  SchemaWithPipe,
-  StrictObjectSchema,
-  StrictTupleSchema,
-  StringSchema,
-  TupleSchema,
-  TupleWithRestSchema,
-  UndefinedSchema,
-  UnionSchema,
-  VariantSchema,
-} from 'valibot';
+import {readdir} from 'node:fs/promises';
+import {basename, extname, join} from 'node:path';
+import {TmplHtml, html, renderStream, renderAsync, render} from '@hyperspan/html';
+import {isbot} from 'isbot';
+import {buildClientJS, buildClientCSS} from './assets';
+import {Hono} from 'hono';
+import {serveStatic} from 'hono/bun';
+import * as z from 'zod';
+import type {Context, Handler} from 'hono';
 
 export const IS_PROD = process.env.NODE_ENV === 'production';
-const PWD = import.meta.dir;
 const CWD = process.cwd();
 
-type NonPipeSchemas =
-  | AnySchema
-  | LiteralSchema<any, any>
-  | NullSchema<any>
-  | NumberSchema<any>
-  | BigintSchema<any>
-  | StringSchema<any>
-  | BooleanSchema<any>
-  | NullableSchema<any, any>
-  | StrictObjectSchema<any, any>
-  | ObjectSchema<any, any>
-  | ObjectWithRestSchema<any, any, any>
-  | RecordSchema<any, any, any>
-  | ArraySchema<any, any>
-  | TupleSchema<any, any>
-  | StrictTupleSchema<any, any>
-  | TupleWithRestSchema<readonly any[], any, any>
-  | IntersectSchema<any, any>
-  | UnionSchema<any, any>
-  | VariantSchema<any, any, any>
-  | PicklistSchema<any, any>
-  | EnumSchema<any, any>
-  | LazySchema<any>
-  | DateSchema<any>
-  | NullishSchema<any, any>
-  | OptionalSchema<any, any>
-  | UndefinedSchema<any>;
-
-type PipeSchema = SchemaWithPipe<[NonPipeSchemas, ...PipeItem<any, any, GenericIssue<any>>[]]>;
-// Type inference for valibot taken from:
-// @link https://github.com/gcornut/valibot-json-schema/blob/main/src/toJSONSchema/schemas.ts
-export type TSupportedSchema = NonPipeSchemas | PipeSchema;
-
-/**
- * ===========================================================================
- */
-
 /**
  * Route
  * Define a route that can handle a direct HTTP request
@@ -114,7 +44,7 @@ export function createComponent(render: () => THSComponentReturn | Promise<THSCo
  */
 export function createForm(
   renderForm: (data?: any) => THSResponseTypes,
-  schema?: TSupportedSchema | null
+  schema?: z.ZodSchema | null
 ): HSFormRoute {
   return new HSFormRoute(renderForm, schema);
 }
@@ -165,12 +95,12 @@ export class HSFormRoute {
   _handlers: Record<string, Handler> = {};
   _form: THSFormRenderer;
   _methods: null | string[] = null;
-  _schema: null | TSupportedSchema = null;
+  _schema: null | z.ZodSchema = null;
 
-  constructor(renderForm: THSFormRenderer, schema: TSupportedSchema | null = null) {
+  constructor(renderForm: THSFormRenderer, schema: z.ZodSchema | null = null) {
     // Haz schema?
     if (schema) {
-      type TSchema = v.InferInput<typeof schema>;
+      type TSchema = z.infer<typeof schema>;
       this._form = renderForm as (data: TSchema) => THSResponseTypes;
       this._schema = schema;
     } else {
@@ -178,7 +108,7 @@ export class HSFormRoute {
     }
 
     // GET request is render form by default
-    this._handlers.GET = (ctx: Context) => renderForm(this.getDefaultData());
+    this._handlers.GET = () => renderForm(this.getDefaultData());
   }
 
   // Form data
@@ -187,8 +117,8 @@ export class HSFormRoute {
       return {};
     }
 
-    type TSchema = v.InferInput<typeof this._schema>;
-    const data = v.parse(this._schema, {});
+    type TSchema = z.infer<typeof this._schema>;
+    const data = z.parse(this._schema, {});
     return data as TSchema;
   }
 
@@ -263,7 +193,7 @@ export async function runFileRoute(RouteModule: any, context: Context): Promise<
       if (!routeMethodHandler) {
         return new Response('Method Not Allowed', {
           status: 405,
-          headers: { 'content-type': 'text/plain' },
+          headers: {'content-type': 'text/plain'},
         });
       }
 
@@ -305,13 +235,13 @@ async function runAPIRoute(routeFn: any, context: Context, middlewareResult?: an
 
     return context.json(
       {
-        meta: { success: false },
+        meta: {success: false},
         data: {
           message: e.message,
           stack: IS_PROD ? undefined : e.stack?.split('\n'),
         },
       },
-      { status: 500 }
+      {status: 500}
     );
   }
 }
@@ -337,7 +267,7 @@ async function showErrorReponse(context: Context, err: Error) {
 export type THSServerConfig = {
   appDir: string;
   staticFileRoot: string;
-  rewrites?: Array<{ source: string; destination: string }>;
+  rewrites?: Array<{source: string; destination: string}>;
   // For customizing the routes and adding your own...
   beforeRoutesAdded?: (app: Hono) => void;
   afterRoutesAdded?: (app: Hono) => void;
@@ -357,7 +287,7 @@ export async function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[
   // Walk all pages and add them as routes
   const routesDir = join(config.appDir, 'routes');
   console.log(routesDir);
-  const files = await readdir(routesDir, { recursive: true });
+  const files = await readdir(routesDir, {recursive: true});
   const routes: THSRouteMap[] = [];
 
   for (const file of files) {
@@ -379,7 +309,7 @@ export async function buildRoutes(config: THSServerConfig): Promise<THSRouteMap[
 
     if (dynamicPaths) {
       params = [];
-      route = route.replace(ROUTE_SEGMENT, (match: string, p1: string, offset: number) => {
+      route = route.replace(ROUTE_SEGMENT, (match: string) => {
         const paramName = match.replace(/[^a-zA-Z_\.]+/g, '');
 
         if (match.includes('...')) {
@@ -423,7 +353,7 @@ export async function createServer(config: THSServerConfig): Promise<Hono> {
     const fullRouteFile = join(CWD, route.file);
     const routePattern = normalizePath(route.route);
 
-    routeMap.push({ route: routePattern, file: route.file });
+    routeMap.push({route: routePattern, file: route.file});
 
     // Import route
     const routeModule = await import(fullRouteFile);
@@ -443,7 +373,7 @@ export async function createServer(config: THSServerConfig): Promise<Hono> {
     app.get('/', (context) => {
       return context.text(
         'No routes found. Add routes to app/routes. Example: `app/routes/index.ts`',
-        { status: 404 }
+        {status: 404}
       );
     });
   }
@@ -466,7 +396,7 @@ export async function createServer(config: THSServerConfig): Promise<Hono> {
   );
 
   app.notFound((context) => {
-    return context.text('Not... found?', { status: 404 });
+    return context.text('Not... found?', {status: 404});
   });
 
   return app;
@@ -501,7 +431,7 @@ export function createReadableStreamFromAsyncGenerator(output: AsyncGenerator) {
   return new ReadableStream({
     async start(controller) {
       while (true) {
-        const { done, value } = await output.next();
+        const {done, value} = await output.next();
 
         if (done) {
           controller.close();