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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperspan/framework",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.7",
   "description": "Hyperspan Web Framework",
   "main": "src/server.ts",
   "types": "src/server.ts",
@@ -21,10 +21,6 @@
       "types": "./src/middleware.ts",
       "default": "./src/middleware.ts"
     },
-    "./middleware/zod": {
-      "types": "./src/middleware/zod.ts",
-      "default": "./src/middleware/zod.ts"
-    },
     "./utils": {
       "types": "./src/utils.ts",
       "default": "./src/utils.ts"

package/src/index.ts

@@ -1,2 +1,2 @@
-export { createConfig, createContext, createRoute, createServer, getRunnableRoute, StreamResponse } from './server';
+export { createConfig, createContext, createRoute, createServer, getRunnableRoute, StreamResponse, IS_PROD } from './server';
 export type { Hyperspan } from './types';

package/src/server.ts

@@ -2,6 +2,7 @@ import { HSHtml, html, isHSHtml, renderStream, renderAsync, render } from '@hype
 import { executeMiddleware } from './middleware';
 import type { Hyperspan as HS } from './types';
 import { clientJSPlugin } from './plugins';
+import { parsePath } from './utils';
 export type { HS as Hyperspan };
 
 export const IS_PROD = process.env.NODE_ENV === 'production';
@@ -368,16 +369,6 @@ export function isRunnableRoute(route: unknown): boolean {
   return typeof obj?._kind === 'string' && 'fetch' in obj;
 }
 
-/**
- * Is valid route path to add to server?
- */
-export function isValidRoutePath(path: string): boolean {
-  const isHiddenRoute = path.includes('/__');
-  const isTestFile = path.includes('.test') || path.includes('.spec');
-
-  return !isHiddenRoute && !isTestFile && Boolean(path);
-}
-
 /**
  * Basic error handling
  * @TODO: Should check for and load user-customizeable template with special name (app/__error.ts ?)
@@ -473,53 +464,3 @@ export function createReadableStreamFromAsyncGenerator(output: AsyncGenerator) {
     },
   });
 }
-
-/**
- * Normalize URL path
- * Removes trailing slash and lowercases path
- */
-const ROUTE_SEGMENT_REGEX = /(\[[a-zA-Z_\.]+\])/g;
-export function parsePath(urlPath: string): { path: string, params: string[] } {
-  const params: string[] = [];
-  urlPath = urlPath.replace('index', '').replace('.ts', '').replace('.js', '');
-
-  if (urlPath.startsWith('/')) {
-    urlPath = urlPath.substring(1);
-  }
-
-  if (urlPath.endsWith('/')) {
-    urlPath = urlPath.substring(0, urlPath.length - 1);
-  }
-
-  if (!urlPath) {
-    return { path: '/', params: [] };
-  }
-
-  // Dynamic params
-  if (ROUTE_SEGMENT_REGEX.test(urlPath)) {
-    urlPath = urlPath.replace(ROUTE_SEGMENT_REGEX, (match: string) => {
-      const paramName = match.replace(/[^a-zA-Z_\.]+/g, '');
-      params.push(paramName);
-
-      if (match.includes('...')) {
-        return '*';
-      } else {
-        return ':' + paramName;
-      }
-    });
-  }
-
-  // Only lowercase non-param segments (do not lowercase after ':')
-  return {
-    path: (
-      '/' +
-      urlPath
-        .split('/')
-        .map((segment) =>
-          segment.startsWith(':') || segment === '*' ? segment : segment.toLowerCase()
-        )
-        .join('/')
-    ),
-    params,
-  };
-}

package/src/utils.ts

@@ -8,6 +8,67 @@ export function randomHash(): string {
   return createHash('md5').update(randomBytes(32).toString('hex')).digest('hex');
 }
 
+
+/**
+ * Normalize URL path
+ * Removes trailing slash and lowercases path
+ */
+const ROUTE_SEGMENT_REGEX = /(\[[a-zA-Z_\.]+\])/g;
+export function parsePath(urlPath: string): { path: string, params: string[] } {
+  const params: string[] = [];
+  urlPath = urlPath.replace('index', '').replace('.ts', '').replace('.js', '');
+
+  if (urlPath.startsWith('/')) {
+    urlPath = urlPath.substring(1);
+  }
+
+  if (urlPath.endsWith('/')) {
+    urlPath = urlPath.substring(0, urlPath.length - 1);
+  }
+
+  if (!urlPath) {
+    return { path: '/', params: [] };
+  }
+
+  // Dynamic params
+  if (ROUTE_SEGMENT_REGEX.test(urlPath)) {
+    urlPath = urlPath.replace(ROUTE_SEGMENT_REGEX, (match: string) => {
+      const paramName = match.replace(/[^a-zA-Z_\.]+/g, '');
+      params.push(paramName);
+
+      if (match.includes('...')) {
+        return '*';
+      } else {
+        return ':' + paramName;
+      }
+    });
+  }
+
+  // Only lowercase non-param segments (do not lowercase after ':')
+  return {
+    path: (
+      '/' +
+      urlPath
+        .split('/')
+        .map((segment) =>
+          segment.startsWith(':') || segment === '*' ? segment : segment.toLowerCase()
+        )
+        .join('/')
+    ),
+    params,
+  };
+}
+
+/**
+ * Is valid route path to add to server?
+ */
+export function isValidRoutePath(path: string): boolean {
+  const isHiddenRoute = path.includes('/__');
+  const isTestFile = path.includes('.test') || path.includes('.spec');
+
+  return !isHiddenRoute && !isTestFile && Boolean(path);
+}
+
 /**
  * Return JSON data structure for a given FormData or URLSearchParams object
  * Accounts for array fields (e.g. name="options[]" or <select multiple>)