Merge pull request #43 from floodfx/pubsub

Pubsub
floodfx · Mar 7, 2022 · b2ba0f9 · b2ba0f9
2 parents 4600f2b + aa47593
commit b2ba0f9
Show file tree

Hide file tree

Showing 21 changed files with 1,118 additions and 700 deletions.
diff --git a/coverage/clover.xml b/coverage/clover.xml
diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liveviewjs",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "LiveViewJS brings the power of Phoenix LiveView to Typescript and Javascript developers and applications.",
   "targets": {
     "client": {
@@ -56,6 +56,7 @@
     "phoenix": "^1.6.6",
     "phoenix_html": "^3.2.0",
     "phoenix_live_view": "^0.17.6",
+    "redis": "^4.0.4",
     "ws": "^8.4.2",
     "zod": "^3.11.6"
   },

diff --git a/src/examples/index.ts b/src/examples/index.ts
@@ -1,17 +1,18 @@
 import path from 'path';
 import { LiveViewServer } from '../server';
 import { LiveViewRouter } from '../server/component/types';
+import { configLiveViewHandler } from '../server/live_view_route';
+import { AsyncFetchLiveViewComponent } from './asyncfetch/component';
 import { AutocompleteLiveViewComponent } from './autocomplete/component';
 import { LicenseLiveViewComponent } from './license_liveview';
 import { LightLiveViewComponent } from './light_liveview';
 import { SearchLiveViewComponent } from './live-search/component';
 import { PaginateLiveViewComponent } from './pagination/component';
+import { routeDetails } from './routeDetails';
 import { SalesDashboardLiveViewComponent } from './sales_dashboard_liveview';
 import { ServersLiveViewComponent } from './servers/component';
 import { SortLiveViewComponent } from './sorting/component';
-import { routeDetails } from './routeDetails';
 import { VolunteerComponent } from './volunteers/component';
-import { AsyncFetchLiveViewComponent } from './asyncfetch/component';
 
 const lvServer = new LiveViewServer({
   signingSecret: "MY_VERY_SECRET_KEY",
@@ -51,6 +52,20 @@ lvServer.registerLiveViewRoutes(router)
 // register single route
 // lvServer.registerLiveViewRoute("/volunteers", new VolunteerComponent())
 
+
+lvServer.expressApp.get("/foo/bar", configLiveViewHandler(
+  new LightLiveViewComponent(),
+  "root.html.ejs",
+  "signing-secret-foo",
+  (req) => {
+    return { ...req.session, csrfToken: "csrfToken"}
+  },
+  {
+    title: "Examples",
+  },
+  )
+)
+
 // add your own routes to the express app
 lvServer.expressApp.get("/", (req, res) => {
 

diff --git a/src/examples/pagination/component.ts b/src/examples/pagination/component.ts
@@ -1,10 +1,10 @@
-import { options_for_select } from "../../server/templates/helpers/options_for_select";
-import { live_patch } from "../../server/templates/helpers/live_patch";
-import { html, HtmlSafeString, join } from "../../server/templates";
-import { LiveViewExternalEventListener, LiveViewMountParams, LiveViewSocket, StringPropertyValues } from "../../server/component/types";
-import { almostExpired, Donation, listItems } from "./data";
 import { SessionData } from "express-session";
 import { BaseLiveViewComponent } from "../../server/component/base_component";
+import { LiveViewExternalEventListener, LiveViewMountParams, LiveViewSocket, StringPropertyValues } from "../../server/component/types";
+import { html, HtmlSafeString, join } from "../../server/templates";
+import { live_patch } from "../../server/templates/helpers/live_patch";
+import { options_for_select } from "../../server/templates/helpers/options_for_select";
+import { almostExpired, Donation, listItems } from "./data";
 
 interface Options {
   page: number;
@@ -84,7 +84,7 @@ export class PaginateLiveViewComponent extends BaseLiveViewComponent<PaginateCon
     const page = socket.context.options.page;
     const perPage = Number(params.perPage || 10);
 
-    this.pushPatch(socket, { to: { path: "/paginate", params: { page: String(page), perPage: String(perPage) } } });
+    socket.pushPatch({ to: { path: "/paginate", params: { page: String(page), perPage: String(perPage) } } });
 
     return {
       options: { page, perPage },

diff --git a/src/examples/sorting/component.ts b/src/examples/sorting/component.ts
@@ -1,10 +1,10 @@
-import { options_for_select } from "../../server/templates/helpers/options_for_select";
-import { live_patch } from "../../server/templates/helpers/live_patch";
-import { html, HtmlSafeString, join } from "../../server/templates";
-import { LiveViewExternalEventListener, LiveViewMountParams, LiveViewSocket, StringPropertyValues } from "../../server/component/types";
-import { almostExpired, Donation, listItems, donations } from "./data";
 import { SessionData } from "express-session";
 import { BaseLiveViewComponent } from "../../server/component/base_component";
+import { LiveViewExternalEventListener, LiveViewMountParams, LiveViewSocket, StringPropertyValues } from "../../server/component/types";
+import { html, HtmlSafeString, join } from "../../server/templates";
+import { live_patch } from "../../server/templates/helpers/live_patch";
+import { options_for_select } from "../../server/templates/helpers/options_for_select";
+import { almostExpired, Donation, donations, listItems } from "./data";
 
 export interface PaginateOptions {
   page: number;
@@ -118,7 +118,7 @@ export class SortLiveViewComponent extends BaseLiveViewComponent<SortContext, Pa
     }
 
 
-    this.pushPatch(socket, { to: { path: "/sort", params: { page: String(page), perPage: String(perPage), sortOrder, sort_by } } });
+    socket.pushPatch({ to: { path: "/sort", params: { page: String(page), perPage: String(perPage), sortOrder, sort_by } } });
 
     return {
       options: { page, perPage, sort_by, sortOrder },