htmx-router 0.0.3 → 0.0.5

package/bin/cli/dynamic.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export declare function BuildDynamic(cwd: string): void;

package/bin/cli/dynamic.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BuildDynamic = void 0;
+const fs_1 = require("fs");
+function BuildDynamic(cwd) {
+    const rootMatcher = new RegExp(/^root\.(j|t)sx?$/);
+    const root = (0, fs_1.readdirSync)(cwd)
+        .filter(x => rootMatcher.test(x))[0];
+    if (!root) {
+        console.log(`Missing root.jsx/tsx`);
+        process.exit(1);
+    }
+    let script = `import { RouteTree, IsAllowedExt } from "htmx-router";\n`;
+    script +=
+        `import { readdirSync } from "fs";
+import { extname, join, relative, resolve } from "path";
+
+function readDirRecursively(dir: string) {
+	const files = readdirSync(dir, { withFileTypes: true });
+
+	let filePaths: string[] = [];
+	for (const file of files) {
+		if (file.isDirectory()) {
+			filePaths = [...filePaths, ...readDirRecursively(join(dir, file.name))];
+		} else {
+			filePaths.push(join(dir, file.name));
+		}
+	}
+
+	return filePaths;
+}\n`;
+    script += `\nexport const Router = new RouteTree();\n`;
+    script += `import * as RootRoute from "./root";\n`;
+    script += `Router.assignRoot(RootRoute);\n\n`;
+    script += "const ctx = resolve(`${__dirname}/routes`);\n";
+    script += "const files = readDirRecursively(ctx);\n";
+    script += "for (const file of files){\n";
+    script += "\tconst ext = extname(file);\n";
+    script += "\tif (!IsAllowedExt(ext)) continue;\n";
+    script += "\tconst url = relative(ctx, file.slice(0, file.lastIndexOf(\".\")).replace(/\\\\/g, \"/\"));\n";
+    script += `\timport(file).then((mod) => Router.ingest(url, mod, []));\n`;
+    script += "}\n";
+    (0, fs_1.writeFileSync)(`${cwd}/router.ts`, script);
+    console.log(`Finished Building`);
+}
+exports.BuildDynamic = BuildDynamic;

package/bin/cli/static.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export declare function BuildStatic(cwd: string): void;

package/bin/cli/static.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BuildStatic = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const router_1 = require("../router");
+function readDirRecursively(dir) {
+    const files = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
+    let filePaths = [];
+    for (const file of files) {
+        if (file.isDirectory()) {
+            filePaths = [...filePaths, ...readDirRecursively((0, path_1.join)(dir, file.name))];
+        }
+        else {
+            filePaths.push((0, path_1.join)(dir, file.name));
+        }
+    }
+    return filePaths;
+}
+function BuildStatic(cwd) {
+    const rootMatcher = new RegExp(/^root\.(j|t)sx?$/);
+    const root = (0, fs_1.readdirSync)(cwd)
+        .filter(x => rootMatcher.test(x))[0];
+    if (!root) {
+        console.log(`Missing root.jsx/tsx`);
+        process.exit(1);
+    }
+    const DIR = './routes';
+    const files = readDirRecursively(`${cwd}/routes`)
+        .filter(x => (0, router_1.IsAllowedExt)((0, path_1.extname)(x)))
+        .map(x => (0, path_1.relative)(cwd, x.slice(0, x.lastIndexOf("."))).replace(/\\/g, "/"))
+        .sort();
+    let script = `import { RouteTree } from "htmx-router";\n`;
+    for (let i = 0; i < files.length; i++) {
+        const file = files[i];
+        script += `import * as Route${i} from "./${file}";\n`;
+    }
+    script += `import * as RootRoute from "./root";\n`;
+    script += `\nexport const Router = new RouteTree();\n`;
+    for (let i = 0; i < files.length; i++) {
+        const file = files[i];
+        script += `Router.ingest("${file.slice(DIR.length - 1)}", Route${i}, []);\n`;
+    }
+    script += `Router.assignRoot(RootRoute);\n`;
+    (0, fs_1.writeFileSync)(`${cwd}/router.ts`, script);
+    console.log(`Build with routes;\n` + files.map(x => `  - ${x}`).join("\n"));
+}
+exports.BuildStatic = BuildStatic;

package/bin/router.d.ts

@@ -6,7 +6,7 @@ declare class RouteLeaf {
     module: RouteModule;
     mask: boolean[];
     constructor(module: RouteModule, mask: boolean[]);
-    makeOutlet(args: RenderArgs, outlet: Outlet): Outlet;
+    makeOutlet(args: RenderArgs, outlet: Outlet, depth: number): Outlet;
 }
 export declare class RouteTree {
     nested: Map<string, RouteTree>;

package/bin/router.js

@@ -27,11 +27,12 @@ class RouteLeaf {
         this.module = module;
         this.mask = mask;
     }
-    makeOutlet(args, outlet) {
+    makeOutlet(args, outlet, depth) {
         const renderer = this.module.Render || blankOutlet;
         const catcher = this.module.CatchError;
         return async () => {
             try {
+                args.depth = depth;
                 return await renderer(args, outlet);
             }
             catch (e) {
@@ -39,8 +40,10 @@ class RouteLeaf {
                     throw e;
                 const err = (e instanceof shared_1.ErrorResponse) ? e :
                     new shared_1.ErrorResponse(500, "Runtime Error", e);
-                if (catcher)
+                if (catcher) {
+                    args.depth = depth;
                     return await catcher(args, err);
+                }
                 throw err;
             }
         };
@@ -137,8 +140,8 @@ class RouteTree {
                 };
             }
             else if ((_a = this.default) === null || _a === void 0 ? void 0 : _a.module.Render) {
-                out.outlet = this.default.makeOutlet(args, out.outlet);
                 out.mask = [...this.default.mask];
+                out.outlet = this.default.makeOutlet(args, out.outlet, out.mask.length);
             }
         }
         else {
@@ -160,7 +163,7 @@ class RouteTree {
         // Is this route masked out?
         const ignored = out.mask.splice(0, 1)[0] === true;
         if (!ignored && this.route) {
-            out.outlet = this.route.makeOutlet(args, out.outlet);
+            out.outlet = this.route.makeOutlet(args, out.outlet, out.mask.length);
         }
         return out;
     }

package/bin/shared.d.ts

@@ -30,6 +30,7 @@ export declare class RenderArgs {
     req: http.IncomingMessage;
     res: http.ServerResponse;
     params: MetaHTML;
+    depth: number;
     url: URL;
     links: MetaHTML[];
     meta: MetaHTML[];

package/bin/shared.js

@@ -47,6 +47,7 @@ class RenderArgs {
         this.res = res;
         this.url = url;
         this.params = {};
+        this.depth = -1;
         this.links = [];
         this.meta = [];
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "htmx-router",
-	"version": "0.0.3",
+	"version": "0.0.5",
 	"description": "A remix.js style file path router for htmX websites",
 	"main": "./bin/index.js",
 	"scripts": {

package/bin/cli.js

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const path_1 = require("path");
-const router_1 = require("./router");
-const cwd = process.argv[2] || "./";
-const rootMatcher = new RegExp(/^root\.(j|t)sx?$/);
-const root = (0, fs_1.readdirSync)(cwd)
-    .filter(x => rootMatcher.test(x))[0];
-if (!root) {
-    console.log(`Missing root.jsx/tsx`);
-    process.exit(1);
-}
-function readDirRecursively(dir) {
-    const files = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
-    let filePaths = [];
-    for (const file of files) {
-        if (file.isDirectory()) {
-            filePaths = [...filePaths, ...readDirRecursively((0, path_1.join)(dir, file.name))];
-        }
-        else {
-            filePaths.push((0, path_1.join)(dir, file.name));
-        }
-    }
-    return filePaths;
-}
-const DIR = './routes';
-const files = readDirRecursively(`${cwd}/routes`)
-    .filter(x => (0, router_1.IsAllowedExt)((0, path_1.extname)(x).slice(1)))
-    .map(x => (0, path_1.relative)(cwd, x.slice(0, x.lastIndexOf("."))).replace(/\\/g, "/"))
-    .sort();
-let script = `import { RouteTree } from "htmx-router";\n`;
-for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    script += `import * as Route${i} from "./${file}";\n`;
-}
-script += `import * as RootRoute from "./root";\n`;
-script += `\nexport const Router = new RouteTree;\n`;
-for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    script += `Router.ingest("${file.slice(DIR.length - 1)}", Route${i}, []);\n`;
-}
-script += `Router.assignRoot(RootRoute);\n`;
-(0, fs_1.writeFileSync)(`${cwd}/router.ts`, script);
-console.log(`Build with routes;\n` + files.map(x => `  - ${x}`).join("\n"));