htmx-router 0.0.2 → 0.0.3

package/bin/cli/index.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const dynamic_1 = require("./dynamic");
+const static_1 = require("./static");
+const isDynamic = process.argv.includes('--dynamic');
+const cwd = process.argv[2] || "./";
+console.log(`Building ${isDynamic ? "dynamic" : "static"} routes`);
+if (isDynamic) {
+    (0, dynamic_1.BuildDynamic)(cwd);
+}
+else {
+    (0, static_1.BuildStatic)(cwd);
+}

package/bin/index.d.ts

@@ -1,4 +1,4 @@
-import { RouteTree } from "./router";
+import { RouteTree, IsAllowedExt } from "./router";
 import { ErrorResponse, Redirect, Outlet, Override, RenderArgs } from "./shared";
 import { StyleCSS } from "./helper";
-export { RouteTree, ErrorResponse, Redirect, Override, RenderArgs, Outlet, StyleCSS };
+export { IsAllowedExt, RouteTree, ErrorResponse, Redirect, Override, RenderArgs, Outlet, StyleCSS };

package/bin/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyleCSS = exports.RenderArgs = exports.Override = exports.Redirect = exports.ErrorResponse = exports.RouteTree = void 0;
+exports.StyleCSS = exports.RenderArgs = exports.Override = exports.Redirect = exports.ErrorResponse = exports.RouteTree = exports.IsAllowedExt = void 0;
 const router_1 = require("./router");
 Object.defineProperty(exports, "RouteTree", { enumerable: true, get: function () { return router_1.RouteTree; } });
+Object.defineProperty(exports, "IsAllowedExt", { enumerable: true, get: function () { return router_1.IsAllowedExt; } });
 const shared_1 = require("./shared");
 Object.defineProperty(exports, "ErrorResponse", { enumerable: true, get: function () { return shared_1.ErrorResponse; } });
 Object.defineProperty(exports, "Redirect", { enumerable: true, get: function () { return shared_1.Redirect; } });

package/bin/router.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import type http from "node:http";
-import { Outlet, RenderArgs, RouteModule } from "./shared";
+import { Outlet, Override, Redirect, RenderArgs, RouteModule } from "./shared";
 export declare function IsAllowedExt(ext: string): boolean;
 declare class RouteLeaf {
     module: RouteModule;
@@ -17,7 +17,7 @@ export declare class RouteTree {
     constructor();
     assignRoot(module: RouteModule): void;
     ingest(path: string | string[], module: RouteModule, override: boolean[]): void;
-    render(req: http.IncomingMessage, res: http.ServerResponse, url: URL): Promise<string> | "";
+    render(req: http.IncomingMessage, res: http.ServerResponse, url: URL): Promise<string | Redirect | Override>;
     private _recursiveRender;
 }
 export {};

package/bin/router.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouteTree = exports.IsAllowedExt = void 0;
 const shared_1 = require("./shared");
 function IsAllowedExt(ext) {
+    if (ext[0] !== ".")
+        return false;
     // js, jsx, tsx, ts
-    if (ext[1] !== "s")
+    if (ext[2] !== "s")
         return false;
-    if (ext[0] !== "j" && ext[0] !== "t")
+    if (ext[1] !== "j" && ext[1] !== "t")
         return false;
-    if (ext.length == 2)
+    if (ext.length == 3)
         return true;
-    if (ext.length != 3)
+    if (ext.length != 4)
         return false;
-    if (ext[2] !== "x")
+    if (ext[3] !== "x")
         return false;
     return true;
 }
@@ -100,7 +102,7 @@ class RouteTree {
         path.splice(0, 1);
         next.ingest(path, module, override);
     }
-    render(req, res, url) {
+    async render(req, res, url) {
         const args = new shared_1.RenderArgs(req, res, url);
         if (!this.default || !this.default.module.Render) {
             return "";
@@ -109,7 +111,18 @@ class RouteTree {
         if (frags.length === 1 && frags[0] === "") {
             frags.splice(0, 1);
         }
-        return this._recursiveRender(args, frags).outlet();
+        try {
+            const out = await this._recursiveRender(args, frags).outlet();
+            return out;
+        }
+        catch (e) {
+            if (e instanceof shared_1.Redirect)
+                return e;
+            if (e instanceof shared_1.Override)
+                return e;
+            throw new Error(`Unhandled boil up type ${typeof (e)}: ${e}`);
+        }
+        ;
     }
     _recursiveRender(args, frags) {
         var _a;

package/bin/shared.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type http from "node:http";
 export type Outlet = () => Promise<string>;
 export type RenderFunction = (args: RenderArgs, Outlet: Outlet) => Promise<string>;
@@ -19,8 +20,8 @@ export declare class Redirect {
     run(res: http.ServerResponse): http.ServerResponse<http.IncomingMessage>;
 }
 export declare class Override {
-    data: BufferSource;
-    constructor(data: BufferSource);
+    data: string | Buffer | Uint8Array;
+    constructor(data: string | Buffer | Uint8Array);
 }
 type MetaHTML = {
     [key: string]: string;

package/bin/shared.js

@@ -26,7 +26,7 @@ class Override {
     }
 }
 exports.Override = Override;
-const attrRegex = /[A-z]+/;
+const attrRegex = /^[A-z][A-z\-0-9]+$/;
 function ValidateMetaHTML(val) {
     for (const key in val) {
         if (!attrRegex.test(key))

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "htmx-router",
-	"version": "0.0.2",
+	"version": "0.0.3",
 	"description": "A remix.js style file path router for htmX websites",
 	"main": "./bin/index.js",
 	"scripts": {
 		"build": "tsc"
 	},
 	"bin": {
-		"htmx-router": "bin/cli.js"
+		"htmx-router": "bin/cli/index.js"
 	},
 	"repository": {
 		"type": "git",
@@ -25,7 +25,6 @@
 		"typescript": "^5.1.6"
 	},
 	"dependencies": {
-		"csstype": "^3.1.2",
-		"import": "^0.0.6"
+		"csstype": "^3.1.2"
 	}
 }