@owlmeans/web-client 0.1.0 → 0.1.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 OwlMeans Common — Fullstack typescript framework
+Copyright (c) 2026 OwlMeans Common — Fullstack typescript framework
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/components/dispatcher/component.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { DispatcherHOC } from '@owlmeans/client-auth';
 import { useEffect } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router';
 import { useI18nLib } from '@owlmeans/client-i18n';
 import { AUTH_QUERY } from '@owlmeans/auth';
 import { useContext } from '../../context.js';

package/build/components/dispatcher/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/components/dispatcher/component.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IAC3D,MAAM,CAAC,KAAK,CAAC,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAE5B,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAE1C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACnC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAA2B,EAAE,CAAA;YACzC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC3B,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;oBACvB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;gBACrB,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBAC/C,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;oBACvB,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;gBACxC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAK,KAAK,EAAE;YACzC,KAAK,EAAE,MAAM,EAAE,sCAAsC;YACrD,OAAO,EAAE,MAAM,EAAE,yBAAyB;YAC1C,cAAc,EAAE,QAAQ,EAAE,+BAA+B;YACzD,UAAU,EAAE,QAAQ,EAAE,yCAAyC;YAC/D,SAAS,EAAE,QAAQ,EAAE,8BAA8B;YACnD,UAAU,EAAE,MAAM,EAAE,6BAA6B;YACjD,aAAa,EAAE,MAAM,EAAE,6BAA6B;SACrD,YAAG,CAAC,CAAC,SAAS,CAAC,GAAO,CAAC,CAAC,CAAC,SAAS,CAAA;AACrC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/components/dispatcher/component.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;IAC3D,MAAM,CAAC,KAAK,CAAC,GAAG,eAAe,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAE5B,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAE1C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACnC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAA2B,EAAE,CAAA;YACzC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC3B,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;oBACvB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;gBACrB,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBAC/C,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;oBACvB,YAAY,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;gBACxC,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAK,KAAK,EAAE;YACzC,KAAK,EAAE,MAAM,EAAE,sCAAsC;YACrD,OAAO,EAAE,MAAM,EAAE,yBAAyB;YAC1C,cAAc,EAAE,QAAQ,EAAE,+BAA+B;YACzD,UAAU,EAAE,QAAQ,EAAE,yCAAyC;YAC/D,SAAS,EAAE,QAAQ,EAAE,8BAA8B;YACnD,UAAU,EAAE,MAAM,EAAE,6BAA6B;YACjD,aAAa,EAAE,MAAM,EAAE,6BAA6B;SACrD,YAAG,CAAC,CAAC,SAAS,CAAC,GAAO,CAAC,CAAC,CAAC,SAAS,CAAA;AACrC,CAAC,CAAC,CAAA"}

package/build/components/dispatcher/index.d.ts

@@ -1,2 +1,4 @@
+export type * from './types.js';
 export * from './component.js';
+export * from './parametrise.js';
 //# sourceMappingURL=index.d.ts.map

package/build/components/dispatcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/dispatcher/index.ts"],"names":[],"mappings":"AACA,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/dispatcher/index.ts"],"names":[],"mappings":"AACA,mBAAmB,YAAY,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA"}

package/build/components/dispatcher/index.js

@@ -1,2 +1,3 @@
 export * from './component.js';
+export * from './parametrise.js';
 //# sourceMappingURL=index.js.map

package/build/components/dispatcher/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/dispatcher/index.ts"],"names":[],"mappings":"AACA,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/dispatcher/index.ts"],"names":[],"mappings":"AAEA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,kBAAkB,CAAA"}

package/build/components/dispatcher/parametrise.d.ts

@@ -0,0 +1,5 @@
+import type { RoutedComponent } from "@owlmeans/client";
+import type { DispatcherProps } from "@owlmeans/client-auth";
+import { ParametrisedProps } from "./types.js";
+export declare const parametriseDispatcher: (def: Partial<ParametrisedProps>, Com?: RoutedComponent<DispatcherProps>) => (props: ParametrisedProps) => import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=parametrise.d.ts.map

package/build/components/dispatcher/parametrise.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parametrise.d.ts","sourceRoot":"","sources":["../../../src/components/dispatcher/parametrise.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAE9C,eAAO,MAAM,qBAAqB,GAAI,KAAK,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,eAAe,CAAC,eAAe,CAAC,MAEnG,OAAO,iBAAiB,4CAiBjC,CAAA"}

package/build/components/dispatcher/parametrise.js

@@ -0,0 +1,24 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo } from "react";
+import { Dispatcher } from "./component.js";
+export const parametriseDispatcher = (def, Com) => {
+    console.log('Parametrising dispatcher with', def);
+    return (props) => {
+        console.log('Rendering parametrised dispatcher with', props);
+        const _props = useMemo(() => {
+            let payload = undefined;
+            if (def.payload != null) {
+                payload = def.payload;
+            }
+            if (props.payload != null) {
+                payload ??= {};
+                Object.assign(payload, props.payload);
+            }
+            return { ...def, ...props, payload };
+        }, [props]);
+        console.log('Computed dispatcher props', _props);
+        Com ??= Dispatcher;
+        return _jsx(Com, { ..._props });
+    };
+};
+//# sourceMappingURL=parametrise.js.map

package/build/components/dispatcher/parametrise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parametrise.js","sourceRoot":"","sources":["../../../src/components/dispatcher/parametrise.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAA+B,EAAE,GAAsC,EAAG,EAAE;IAChH,OAAO,CAAC,GAAG,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;IACjD,OAAO,CAAC,KAAwB,EAAE,EAAE;QAClC,OAAO,CAAC,GAAG,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;QAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;YAC1B,IAAI,OAAO,GAA4B,SAAS,CAAA;YAChD,IAAI,GAAG,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;gBACxB,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;YACvB,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;gBAC1B,OAAO,KAAK,EAAE,CAAA;gBACd,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;YACvC,CAAC;YACD,OAAO,EAAE,GAAG,GAAG,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAA;QACtC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;QACX,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAA;QAChD,GAAG,KAAK,UAAU,CAAA;QAClB,OAAO,KAAC,GAAG,OAAK,MAAM,GAAI,CAAA;IAC5B,CAAC,CAAA;AACH,CAAC,CAAA"}

package/build/components/dispatcher/simplified.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=simplified.d.ts.map

package/build/components/dispatcher/simplified.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simplified.d.ts","sourceRoot":"","sources":["../../../src/components/dispatcher/simplified.tsx"],"names":[],"mappings":""}

package/build/components/dispatcher/simplified.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=simplified.js.map

package/build/components/dispatcher/simplified.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simplified.js","sourceRoot":"","sources":["../../../src/components/dispatcher/simplified.tsx"],"names":[],"mappings":""}

package/build/components/dispatcher/types.d.ts

@@ -0,0 +1,6 @@
+import type { ModuleContextParams } from "@owlmeans/client";
+import type { DispatcherProps } from "@owlmeans/client-auth";
+import type { PropsWithChildren } from "react";
+export interface ParametrisedProps extends PropsWithChildren<ModuleContextParams & DispatcherProps> {
+}
+//# sourceMappingURL=types.d.ts.map

package/build/components/dispatcher/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/components/dispatcher/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAE9C,MAAM,WAAW,iBAAkB,SAAQ,iBAAiB,CAAC,mBAAmB,GAAG,eAAe,CAAC;CAClG"}

package/build/components/dispatcher/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/components/dispatcher/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/components/dispatcher/types.ts"],"names":[],"mappings":""}

package/build/components/index.d.ts

@@ -1,3 +1,4 @@
 export * from './dispatcher/index.js';
 export * from './uploader/index.js';
+export * from './web-app/index.js';
 //# sourceMappingURL=index.d.ts.map

package/build/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AACA,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AACA,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA"}

package/build/components/index.js

@@ -1,3 +1,4 @@
 export * from './dispatcher/index.js';
 export * from './uploader/index.js';
+export * from './web-app/index.js';
 //# sourceMappingURL=index.js.map

package/build/components/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AACA,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AACA,cAAc,uBAAuB,CAAA;AACrC,cAAc,qBAAqB,CAAA;AACnC,cAAc,oBAAoB,CAAA"}

package/build/components/web-app/component.d.ts

@@ -0,0 +1,4 @@
+import type { AppProps } from "@owlmeans/client";
+import type { FC } from "react";
+export declare const WebApp: FC<AppProps>;
+//# sourceMappingURL=component.d.ts.map

package/build/components/web-app/component.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../../src/components/web-app/component.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAGhD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAE/B,eAAO,MAAM,MAAM,EAAE,EAAE,CAAC,QAAQ,CAM/B,CAAA"}

package/build/components/web-app/component.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { I18nContext } from "@owlmeans/client-i18n";
+import { App } from '@owlmeans/client';
+export const WebApp = ({ context, provide, children }) => {
+    return _jsx(I18nContext, { config: context.cfg, children: _jsx(App, { context: context, provide: provide, children: children }) });
+};
+//# sourceMappingURL=component.js.map

package/build/components/web-app/component.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../src/components/web-app/component.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAGtC,MAAM,CAAC,MAAM,MAAM,GAAiB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;IACrE,OAAO,KAAC,WAAW,IAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YACrC,KAAC,GAAG,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,YACpC,QAAQ,GACL,GACM,CAAA;AAChB,CAAC,CAAA"}

package/build/components/web-app/index.d.ts

@@ -0,0 +1,2 @@
+export * from './component.js';
+//# sourceMappingURL=index.d.ts.map

package/build/components/web-app/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/web-app/index.ts"],"names":[],"mappings":"AACA,cAAc,gBAAgB,CAAA"}

package/build/components/web-app/index.js

@@ -0,0 +1,2 @@
+export * from './component.js';
+//# sourceMappingURL=index.js.map

package/build/components/web-app/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/web-app/index.ts"],"names":[],"mappings":"AACA,cAAc,gBAAgB,CAAA"}

package/build/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAQlD,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,cAAc,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,uBAC7E,CAAC,KACL,CAWF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,SAAS,cAAa,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,wBACnE,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AASlD,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAClG,KAAK,CAAC,KACL,CAYF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,SAAS,GAAG,SAAS,EAAC,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,QACnF,CAAA"}

package/build/context.js

@@ -5,12 +5,14 @@ import { appendClientResource } from '@owlmeans/client-resource';
 import { useContext as useCtx } from '@owlmeans/client';
 import { extractPrimaryHost } from './helper.js';
 import { appendWebAuthService } from './service.js';
+import { appendWebRouter } from '@owlmeans/web-router';
 export const makeContext = (cfg) => {
     const context = makeClientContext(cfg);
     extractPrimaryHost(context);
     appendWebAuthService(context);
     appendWebDbService(context);
     appendClientResource(context, AUTH_RESOURCE);
+    appendWebRouter(context);
     context.makeContext = makeContext;
     return context;
 };

package/build/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAEnD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,GAAM,EACH,EAAE;IACL,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAM,CAAA;IAC3C,kBAAkB,CAAO,OAAO,CAAC,CAAA;IAEjC,oBAAoB,CAAO,OAAO,CAAC,CAAA;IACnC,kBAAkB,CAAO,OAAO,CAAC,CAAA;IACjC,oBAAoB,CAAO,OAAO,EAAE,aAAa,CAAC,CAAA;IAElD,OAAO,CAAC,WAAW,GAAG,WAAyC,CAAA;IAE/D,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,GAA4E,EAAE,CACtG,MAAM,EAAO,CAAA"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAChE,OAAO,EAAE,UAAU,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,GAAM,EACH,EAAE;IACL,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAM,CAAA;IAC3C,kBAAkB,CAAO,OAAO,CAAC,CAAA;IAEjC,oBAAoB,CAAO,OAAO,CAAC,CAAA;IACnC,kBAAkB,CAAO,OAAO,CAAC,CAAA;IACjC,oBAAoB,CAAO,OAAO,EAAE,aAAa,CAAC,CAAA;IAClD,eAAe,CAAO,OAAO,CAAC,CAAA;IAE9B,OAAO,CAAC,WAAW,GAAG,WAAyC,CAAA;IAE/D,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,GAA4E,EAAE,CACtG,MAAM,EAAO,CAAA"}

package/build/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvD,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,SAAS,cAAc,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,2BAA2B,CAAC,SAKtH,CAAA"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAEvD,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,SAAS,GAAG,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,SAKtH,CAAA"}

package/build/main.d.ts

@@ -1,4 +1,5 @@
 import type { ReactNode } from 'react';
-import type { RenderOptions } from './types.js';
+import type { AppConfig, AppContext, RenderOptions } from './types.js';
 export declare const render: (node: ReactNode, opts?: RenderOptions) => void;
+export declare const renderApp: <C extends AppConfig, T extends AppContext<C>>(context: T, opts?: RenderOptions) => void;
 //# sourceMappingURL=main.d.ts.map

package/build/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,eAAO,MAAM,MAAM,SAAU,SAAS,SAAS,aAAa,SAkB3D,CAAA"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAItE,eAAO,MAAM,MAAM,GAAI,MAAM,SAAS,EAAE,OAAO,aAAa,SAkB3D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,OAAO,aAAa,SAC1C,CAAA"}

package/build/main.js

@@ -1,5 +1,8 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import { createRoot, hydrateRoot } from 'react-dom/client';
 import { DEFAULT_ROOT } from './consts.js';
+import { WebApp } from './components/index.js';
+import { provide } from './router.js';
 export const render = (node, opts) => {
     const _callback = () => {
         const key = opts?.domId ?? DEFAULT_ROOT;
@@ -19,4 +22,5 @@ export const render = (node, opts) => {
     };
     opts?.onReady ?? true ? window.addEventListener('DOMContentLoaded', _callback) : _callback();
 };
+export const renderApp = (context, opts) => render(_jsx(WebApp, { context: context, provide: provide }), opts);
 //# sourceMappingURL=main.js.map

package/build/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1C,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAe,EAAE,IAAoB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,GAAG,GAAG,IAAI,EAAE,KAAK,IAAI,YAAY,CAAA;QACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAA;QAC3D,CAAC;QACD,IAAI,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAC3B,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAA;IAED,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;AAC9F,CAAC,CAAA"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAErC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAe,EAAE,IAAoB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,GAAG,GAAG,IAAI,EAAE,KAAK,IAAI,YAAY,CAAA;QACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAA;QAC3D,CAAC;QACD,IAAI,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAC3B,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAA;IAED,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;AAC9F,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAA+C,OAAU,EAAE,IAAoB,EAAE,EAAE,CAC1G,MAAM,CAAC,KAAC,MAAM,IAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAI,EAAE,IAAI,CAAC,CAAA"}

package/build/middleware.d.ts

@@ -0,0 +1,3 @@
+import type { Middleware } from '@owlmeans/context';
+export declare const logoutMiddleware: Middleware;
+//# sourceMappingURL=middleware.d.ts.map

package/build/middleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAQnD,eAAO,MAAM,gBAAgB,EAAE,UAsC9B,CAAA"}

package/build/middleware.js

@@ -0,0 +1,44 @@
+import { MiddlewareType, MiddlewareStage, AppType } from '@owlmeans/context';
+import { AuthUnknown } from '@owlmeans/auth';
+import { ResilientError } from '@owlmeans/error';
+import { DEFAULT_ALIAS } from '@owlmeans/client-auth';
+export const logoutMiddleware = {
+    type: MiddlewareType.Context,
+    stage: MiddlewareStage.Loading,
+    apply: async (context) => {
+        context.modules().forEach(module => {
+            if (module.route.route.type === AppType.Backend && module.call != null) {
+                const guards = module.getGuards();
+                if (guards.length > 0) {
+                    if (module._auth_web_middleware_applied === true) {
+                        return;
+                    }
+                    module._auth_web_middleware_applied = true;
+                    // const auth = context.service<GuardService>(service)
+                    const call = module.call;
+                    module.call = async (req, res) => {
+                        try {
+                            return await call(req, res);
+                        }
+                        catch (e) {
+                            if (e instanceof Error) {
+                                const err = ResilientError.ensure(e);
+                                if (err instanceof AuthUnknown) {
+                                    if (err.message.endsWith(':invalid')) {
+                                        if (typeof window !== 'undefined') {
+                                            const auth = context.service(DEFAULT_ALIAS);
+                                            await auth.update(undefined);
+                                            throw err;
+                                        }
+                                    }
+                                }
+                            }
+                            throw e;
+                        }
+                    };
+                }
+            }
+        });
+    }
+};
+//# sourceMappingURL=middleware.js.map

package/build/middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAGrD,MAAM,CAAC,MAAM,gBAAgB,GAAe;IAC1C,IAAI,EAAE,cAAc,CAAC,OAAO;IAC5B,KAAK,EAAE,eAAe,CAAC,OAAO;IAC9B,KAAK,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;QACrB,OAAO,CAAC,OAAO,EAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBACvE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;gBACjC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACtB,IAAI,MAAM,CAAC,4BAA4B,KAAK,IAAI,EAAE,CAAC;wBACjD,OAAM;oBACR,CAAC;oBACD,MAAM,CAAC,4BAA4B,GAAG,IAAI,CAAA;oBAC1C,sDAAsD;oBACtD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;oBACxB,MAAM,CAAC,IAAI,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;wBAC/B,IAAI,CAAC;4BACH,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;wBAC7B,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gCACvB,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gCACpC,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;oCAC/B,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wCACrC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;4CAClC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,aAAa,CAAC,CAAA;4CACxD,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;4CAC5B,MAAM,GAAG,CAAA;wCACX,CAAC;oCACH,CAAC;gCACH,CAAC;4BACH,CAAC;4BACD,MAAM,CAAC,CAAA;wBACT,CAAC;oBACH,CAAC,CAAA;gBAEH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}

package/build/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAGtD,eAAO,MAAM,OAAO,EAAE,cAErB,CAAA"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAItD,eAAO,MAAM,OAAO,EAAE,cAErB,CAAA"}

package/build/router.js

@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router';
 export const provide = (routes) => {
     return createBrowserRouter(routes);
 };

package/build/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAEtD,MAAM,CAAC,MAAM,OAAO,GAAmB,CAAC,MAAM,EAAE,EAAE;IAChD,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAA;AACpC,CAAC,CAAA"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,MAAM,CAAC,MAAM,OAAO,GAAmB,CAAC,MAAM,EAAE,EAAE;IAChD,OAAO,mBAAmB,CAAC,MAAuB,CAAQ,CAAA;AAC5D,CAAC,CAAA"}

package/build/service.d.ts

@@ -1,5 +1,5 @@
-import type { AuthServiceAppend } from '@owlmeans/client-auth';
 import type { AuthService } from '@owlmeans/auth-common';
+import type { AuthServiceAppend } from '@owlmeans/client-auth';
 import type { ClientConfig, ClientContext } from '@owlmeans/client-context';
 export declare const makeAuthWebService: (alias?: string) => AuthService;
 export declare const appendWebAuthService: <C extends ClientConfig, T extends ClientContext<C>>(ctx: T, alias?: string) => T & AuthServiceAppend;

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAG3E,eAAO,MAAM,kBAAkB,WAAW,MAAM,KAAmB,WAclE,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,OAChF,CAAC,UAAS,MAAM,KACpB,CAAC,GAAG,iBAYN,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAI3E,eAAO,MAAM,kBAAkB,GAAI,QAAO,MAAsB,KAAG,WAclE,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EACrF,KAAK,CAAC,EAAE,QAAO,MAAsB,KACpC,CAAC,GAAG,iBAaN,CAAA"}

package/build/service.js

@@ -1,7 +1,7 @@
-import { DEFAULT_ALIAS } from '@owlmeans/client-auth';
-import { makeAuthService } from '@owlmeans/client-auth';
 import { DISPATCHER } from '@owlmeans/auth';
 import { authMiddleware } from '@owlmeans/auth-common';
+import { DEFAULT_ALIAS, makeAuthService } from '@owlmeans/client-auth';
+import { logoutMiddleware } from './middleware.js';
 export const makeAuthWebService = (alias = DEFAULT_ALIAS) => {
     const service = makeAuthService(alias);
     const update = service.update;
@@ -20,6 +20,7 @@ export const appendWebAuthService = (ctx, alias = DEFAULT_ALIAS) => {
     const context = ctx;
     context.registerService(service);
     context.registerMiddleware(authMiddleware);
+    context.registerMiddleware(logoutMiddleware);
     context.auth = () => ctx.service(service.alias);
     return context;
 };

package/build/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAgB,aAAa,EAAe,EAAE;IAC/E,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,OAAO,CAAC,MAAM,GAAG,KAAK,EAAC,KAAK,EAAC,EAAE;QAC7B,MAAM,MAAM,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAuB,UAAU,CAAC,CAAA;YAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACjC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAA;QAC9B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAM,EAAE,QAAgB,aAAa,EACd,EAAE;IACzB,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAEzC,MAAM,OAAO,GAAG,GAA4B,CAAA;IAE5C,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAEhC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;IAE1C,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE/C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAgB,aAAa,EAAe,EAAE;IAC/E,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,OAAO,CAAC,MAAM,GAAG,KAAK,EAAC,KAAK,EAAC,EAAE;QAC7B,MAAM,MAAM,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAuB,UAAU,CAAC,CAAA;YAC3E,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACjC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAA;QAC9B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAM,EAAE,QAAgB,aAAa,EACd,EAAE;IACzB,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAEzC,MAAM,OAAO,GAAG,GAA4B,CAAA;IAE5C,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAEhC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;IAC1C,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;IAE5C,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE/C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@owlmeans/web-client",
-  "version": "0.1.0",
+  "version": "0.1.2",
+  "license": "MIT",
   "type": "module",
   "scripts": {
     "build": "tsc -b",
@@ -20,38 +21,37 @@
     }
   },
   "dependencies": {
-    "@owlmeans/auth": "^0.1.0",
-    "@owlmeans/auth-common": "^0.1.0",
-    "@owlmeans/client": "^0.1.0",
-    "@owlmeans/client-auth": "^0.1.0",
-    "@owlmeans/client-context": "^0.1.0",
-    "@owlmeans/client-i18n": "^0.1.0",
-    "@owlmeans/client-module": "^0.1.0",
-    "@owlmeans/client-resource": "^0.1.0",
-    "@owlmeans/client-route": "^0.1.0",
-    "@owlmeans/config": "^0.1.0",
-    "@owlmeans/context": "^0.1.0",
-    "@owlmeans/error": "^0.1.0",
-    "@owlmeans/i18n": "^0.1.0",
-    "@owlmeans/route": "^0.1.0",
-    "@owlmeans/web-db": "^0.1.0",
+    "@owlmeans/auth": "^0.1.2",
+    "@owlmeans/auth-common": "^0.1.2",
+    "@owlmeans/client": "^0.1.2",
+    "@owlmeans/client-auth": "^0.1.2",
+    "@owlmeans/client-context": "^0.1.2",
+    "@owlmeans/client-i18n": "^0.1.2",
+    "@owlmeans/client-module": "^0.1.2",
+    "@owlmeans/client-resource": "^0.1.2",
+    "@owlmeans/client-route": "^0.1.2",
+    "@owlmeans/config": "^0.1.2",
+    "@owlmeans/context": "^0.1.2",
+    "@owlmeans/error": "^0.1.2",
+    "@owlmeans/i18n": "^0.1.2",
+    "@owlmeans/route": "^0.1.2",
+    "@owlmeans/web-db": "^0.1.2",
+    "@owlmeans/web-router": "^0.1.2",
     "react-dropzone": "^14.3.5"
   },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*",
-    "react-router-dom": "*"
+    "react-router": "^7.*"
   },
   "devDependencies": {
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
-    "nodemon": "^3.1.7",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
+    "nodemon": "^3.1.11",
     "npm-check": "^6.0.1",
-    "react-router-dom": "^6.26.2",
-    "typescript": "^5.6.3"
+    "typescript": "^5.8.3"
   },
-  "private": false,
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/components/dispatcher/component.tsx

@@ -1,6 +1,6 @@
 import { DispatcherHOC } from '@owlmeans/client-auth'
 import { useEffect } from 'react'
-import { useSearchParams } from 'react-router-dom'
+import { useSearchParams } from 'react-router'
 import { useI18nLib } from '@owlmeans/client-i18n'
 import { AUTH_QUERY } from '@owlmeans/auth'
 import { useContext } from '../../context.js'

package/src/components/dispatcher/index.ts

@@ -1,2 +1,4 @@
 
+export type * from './types.js'
 export * from './component.js'
+export * from './parametrise.js'

package/src/components/dispatcher/parametrise.tsx

@@ -0,0 +1,28 @@
+import type { RoutedComponent } from "@owlmeans/client"
+import type { DispatcherProps } from "@owlmeans/client-auth"
+import type { FlowPayload } from "@owlmeans/flow"
+import { useMemo } from "react"
+import { Dispatcher } from "./component.js"
+import { ParametrisedProps } from "./types.js"
+
+export const parametriseDispatcher = (def: Partial<ParametrisedProps>, Com?: RoutedComponent<DispatcherProps> ) => {
+  console.log('Parametrising dispatcher with', def)
+  return (props: ParametrisedProps) => {
+    console.log('Rendering parametrised dispatcher with', props)
+    const _props = useMemo(() => {
+      let payload: FlowPayload | undefined = undefined
+      if (def.payload != null) {
+        payload = def.payload
+      }
+      if (props.payload != null) {
+        payload ??= {}
+        Object.assign(payload, props.payload)
+      }
+      return { ...def, ...props, payload }
+    }, [props])
+    console.log('Computed dispatcher props', _props)
+    Com ??= Dispatcher
+    return <Com {..._props} />
+  }
+}
+

package/src/components/dispatcher/types.ts

@@ -0,0 +1,6 @@
+import type { ModuleContextParams } from "@owlmeans/client"
+import type { DispatcherProps } from "@owlmeans/client-auth"
+import type { PropsWithChildren } from "react"
+
+export interface ParametrisedProps extends PropsWithChildren<ModuleContextParams & DispatcherProps> {
+}

package/src/components/index.ts

@@ -1,3 +1,4 @@
 
 export * from './dispatcher/index.js'
 export * from './uploader/index.js'
+export * from './web-app/index.js'

package/src/components/web-app/component.tsx

@@ -0,0 +1,12 @@
+import type { AppProps } from "@owlmeans/client"
+import { I18nContext } from "@owlmeans/client-i18n"
+import { App } from '@owlmeans/client'
+import type { FC } from "react"
+
+export const WebApp: FC<AppProps> = ({ context, provide, children }) => {
+  return <I18nContext config={context.cfg}>
+    <App context={context} provide={provide}>
+      {children}
+    </App>
+  </I18nContext>
+}

package/src/components/web-app/index.ts

@@ -0,0 +1,2 @@
+
+export * from './component.js'

package/src/context.ts

@@ -7,6 +7,7 @@ import { appendClientResource } from '@owlmeans/client-resource'
 import { useContext as useCtx } from '@owlmeans/client'
 import { extractPrimaryHost } from './helper.js'
 import { appendWebAuthService } from './service.js'
+import { appendWebRouter } from '@owlmeans/web-router'
 
 export const makeContext = <C extends AppConfig = AppConfig, T extends AppContext<C> = AppContext<C>>(
   cfg: C
@@ -17,6 +18,7 @@ export const makeContext = <C extends AppConfig = AppConfig, T extends AppContex
   appendWebAuthService<C, T>(context)
   appendWebDbService<C, T>(context)
   appendClientResource<C, T>(context, AUTH_RESOURCE)
+  appendWebRouter<C, T>(context)
 
   context.makeContext = makeContext as typeof context.makeContext
 

package/src/main.tsx

@@ -2,7 +2,9 @@
 import type { ReactNode } from 'react'
 import { createRoot, hydrateRoot } from 'react-dom/client'
 import { DEFAULT_ROOT } from './consts.js'
-import type { RenderOptions } from './types.js'
+import type { AppConfig, AppContext, RenderOptions } from './types.js'
+import { WebApp } from './components/index.js'
+import { provide } from './router.js'
 
 export const render = (node: ReactNode, opts?: RenderOptions) => {
   const _callback = () => {
@@ -23,3 +25,6 @@ export const render = (node: ReactNode, opts?: RenderOptions) => {
 
   opts?.onReady ?? true ? window.addEventListener('DOMContentLoaded', _callback) : _callback()
 }
+
+export const renderApp = <C extends AppConfig, T extends AppContext<C>>(context: T, opts?: RenderOptions) =>
+  render(<WebApp context={context} provide={provide} />, opts)

package/src/middleware.ts

@@ -0,0 +1,51 @@
+import type { Middleware } from '@owlmeans/context'
+import { MiddlewareType, MiddlewareStage, AppType } from '@owlmeans/context'
+import type { ClientModule } from '@owlmeans/client-module'
+import { AuthUnknown } from '@owlmeans/auth'
+import { ResilientError } from '@owlmeans/error'
+import { DEFAULT_ALIAS } from '@owlmeans/client-auth'
+import { AuthService } from '@owlmeans/auth-common'
+
+export const logoutMiddleware: Middleware = {
+  type: MiddlewareType.Context,
+  stage: MiddlewareStage.Loading,
+  apply: async context => {
+    context.modules<Perked>().forEach(module => {
+      if (module.route.route.type === AppType.Backend && module.call != null) {
+        const guards = module.getGuards()
+        if (guards.length > 0) {
+          if (module._auth_web_middleware_applied === true) {
+            return
+          }
+          module._auth_web_middleware_applied = true
+          // const auth = context.service<GuardService>(service)
+          const call = module.call
+          module.call = async (req, res) => {
+            try {
+              return await call(req, res)
+            } catch (e) {
+              if (e instanceof Error) {
+                const err = ResilientError.ensure(e)
+                if (err instanceof AuthUnknown) {
+                  if (err.message.endsWith(':invalid')) {
+                    if (typeof window !== 'undefined') {
+                      const auth = context.service<AuthService>(DEFAULT_ALIAS)
+                      await auth.update(undefined)
+                      throw err
+                    }
+                  }
+                }
+              }
+              throw e
+            }
+          }
+
+        }
+      }
+    })
+  }
+}
+
+interface Perked extends ClientModule<unknown> {
+  _auth_web_middleware_applied?: boolean
+}

package/src/router.ts

@@ -1,7 +1,8 @@
 
 import type { RouterProvider } from '@owlmeans/client'
-import { createBrowserRouter } from 'react-router-dom'
+import type { RouteObject } from 'react-router'
+import { createBrowserRouter } from 'react-router'
 
 export const provide: RouterProvider = (routes) => {
-  return createBrowserRouter(routes)
+  return createBrowserRouter(routes as RouteObject[]) as any
 }

package/src/service.ts

@@ -1,12 +1,12 @@
 
-import { DEFAULT_ALIAS } from '@owlmeans/client-auth'
-import type { AuthServiceAppend } from '@owlmeans/client-auth'
-import type { AuthService } from '@owlmeans/auth-common'
-import { makeAuthService } from '@owlmeans/client-auth'
-import type { ClientModule } from '@owlmeans/client-module'
 import { DISPATCHER } from '@owlmeans/auth'
-import type { ClientConfig, ClientContext } from '@owlmeans/client-context'
+import type { AuthService } from '@owlmeans/auth-common'
 import { authMiddleware } from '@owlmeans/auth-common'
+import type { AuthServiceAppend } from '@owlmeans/client-auth'
+import { DEFAULT_ALIAS, makeAuthService } from '@owlmeans/client-auth'
+import type { ClientConfig, ClientContext } from '@owlmeans/client-context'
+import type { ClientModule } from '@owlmeans/client-module'
+import { logoutMiddleware } from './middleware.js'
 
 export const makeAuthWebService = (alias: string = DEFAULT_ALIAS): AuthService => {
   const service = makeAuthService(alias)
@@ -34,6 +34,7 @@ export const appendWebAuthService = <C extends ClientConfig, T extends ClientCon
   context.registerService(service)
 
   context.registerMiddleware(authMiddleware)
+  context.registerMiddleware(logoutMiddleware)
 
   context.auth = () => ctx.service(service.alias)
 

package/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["./src/consts.ts","./src/context.ts","./src/errors.ts","./src/exports.ts","./src/helper.ts","./src/i18n.ts","./src/index.ts","./src/main.tsx","./src/modules.ts","./src/router.ts","./src/service.ts","./src/types.ts","./src/components/index.ts","./src/components/dispatcher/component.tsx","./src/components/dispatcher/index.ts","./src/components/uploader/component.tsx","./src/components/uploader/image.tsx","./src/components/uploader/index.ts","./src/components/uploader/types.ts"],"version":"5.6.3"}