- update to use matchRoute for server adaptor

- add named route example
floodfx · Oct 2, 2022 · 504ebd1 · 504ebd1
1 parent cc82780
commit 504ebd1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/packages/deno/import_map.json b/packages/deno/import_map.json
@@ -4,6 +4,7 @@
     "crypto": "https://deno.land/[email protected]/node/crypto.ts",
     "events": "https://deno.land/[email protected]/node/events.ts",
     "nanoid": "https://deno.land/x/[email protected]/mod.ts",
+    "path-to-regexp": "https://deno.land/x/[email protected]/index.ts",
     "liveviewjs": "../core/dist/liveview.mjs",
     "@liveviewjs/examples": "../examples/dist/liveviewjs-examples.mjs"
   }

diff --git a/packages/deno/src/deno/server.ts b/packages/deno/src/deno/server.ts
@@ -10,6 +10,7 @@ import {
   LiveViewRouter,
   LiveViewServerAdaptor,
   LiveViewWrapperTemplate,
+  matchRoute,
   nanoid,
   PubSub,
   SerDe,
@@ -109,13 +110,14 @@ export class DenoOakLiveViewServer implements LiveViewServerAdaptor<DenoMiddlewa
         const { getRequestPath } = adaptor;
 
         // look up LiveView for route
-        const liveview = this.router[getRequestPath()];
-        if (!liveview) {
+        const matchResult = matchRoute(this.router, getRequestPath());
+        if (!matchResult) {
           // no LiveView found for route so call next() to
           // let a possible downstream route handle the request
           await next();
           return;
         }
+        const [liveview, mr] = matchResult;
 
         // defer to liveviewjs to handle the request
         const rootViewHtml = await handleHttpLiveView(
@@ -124,6 +126,7 @@ export class DenoOakLiveViewServer implements LiveViewServerAdaptor<DenoMiddlewa
           liveview,
           adaptor,
           this.liveHtmlTemplate,
+          mr.params,
           this.liveTitleOptions,
           this.wrapperTemplate
         );

diff --git a/packages/deno/src/deps.ts b/packages/deno/src/deps.ts
@@ -5,6 +5,7 @@ export {
   counterLiveView,
   dashboardLiveView,
   decarbLiveView,
+  helloNameLiveView,
   helloToggleEmojiLiveView,
   jsCmdsLiveView,
   paginateLiveView,
@@ -34,6 +35,7 @@ export {
   handleHttpLiveView,
   html,
   live_title_tag,
+  matchRoute,
   safe,
   SessionFlashAdaptor,
   SingleProcessPubSub,

diff --git a/packages/deno/src/example/index.ts b/packages/deno/src/example/index.ts
@@ -6,6 +6,7 @@ import {
   counterLiveView,
   dashboardLiveView,
   decarbLiveView,
+  helloNameLiveView,
   helloToggleEmojiLiveView,
   jsCmdsLiveView,
   LiveViewRouter,
@@ -44,6 +45,7 @@ const lvRouter: LiveViewRouter = {
   "/rtcounter": rtCounterLiveView,
   "/books": booksLiveView,
   "/helloToggle": helloToggleEmojiLiveView,
+  "/hi/:name": helloNameLiveView,
 };
 
 // configure your oak app