@owlmeans/client 0.1.2 → 0.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +43 -641
- package/build/helper.d.ts +2 -2
- package/build/helper.d.ts.map +1 -1
- package/build/helper.js.map +1 -1
- package/build/navigate.d.ts.map +1 -1
- package/build/navigate.js +14 -9
- package/build/navigate.js.map +1 -1
- package/build/types.d.ts +3 -3
- package/build/types.d.ts.map +1 -1
- package/build/utils/route.d.ts +2 -2
- package/build/utils/route.d.ts.map +1 -1
- package/build/utils/route.js +2 -2
- package/build/utils/route.js.map +1 -1
- package/build/utils/router.d.ts +3 -3
- package/build/utils/router.d.ts.map +1 -1
- package/build/utils/router.js +2 -2
- package/build/utils/router.js.map +1 -1
- package/package.json +14 -13
- package/src/helper.tsx +3 -3
- package/src/navigate.ts +14 -10
- package/src/types.ts +3 -3
- package/src/utils/route.tsx +5 -5
- package/src/utils/router.ts +8 -8
- package/tsconfig.json +6 -10
- package/build/components/debug.d.ts +0 -6
- package/build/components/debug.d.ts.map +0 -1
- package/build/components/debug.js +0 -83
- package/build/components/debug.js.map +0 -1
package/build/helper.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { RefedEntrypointHandler } from '@owlmeans/client-entrypoint';
|
|
2
2
|
import { HandledRenderer } from './utils/route.js';
|
|
3
|
-
export declare const handler: <T extends {}>(Component: HandledRenderer<T>, preprender?: boolean) =>
|
|
3
|
+
export declare const handler: <T extends {}>(Component: HandledRenderer<T>, preprender?: boolean) => RefedEntrypointHandler<T>;
|
|
4
4
|
//# sourceMappingURL=helper.d.ts.map
|
package/build/helper.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../src/helper.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAUlD,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,EAAE,EAClC,WAAW,eAAe,CAAC,CAAC,CAAC,EAAE,aAAa,OAAO,KAClD,sBAAsB,CAAC,CAAC,CAiC1B,CAAA"}
|
package/build/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAKjD,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,SAA6B,EAAE,UAAoB,
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAKjD,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,SAA6B,EAAE,UAAoB,EACxB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAGrC,GAAM,EAAE,GAAM,EAAO,EAAE;IACvB,MAAM,QAAQ,GAAG,kBAAkB,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,SAAS,EAAE,CAAA;IACrE,IAAI,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,WAAW,CAAC,kCAAkC,CAAC,CAAA;IAC3D,CAAC;IACD,MAAM,GAAG,GAAG,aAAa,CAAkB,GAAG,CAAC,GAAG,CAAC,GAAc,EAAE,QAAQ,CAAC,CAAA;IAC5E,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,WAAW,CAAC,gCAAgC,CAAC,CAAA;IACzD,CAAC;IACD,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACtB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,SAAoC,CAAA;QACrD,MAAM,OAAO,GAAG,KAAC,QAAQ,OAAK,GAAG,EAAE,OAAO,EAAE,GAAG,GAAI,CAAA;QACnD,GAAG,CAAC,OAAO,CAAC,OAA6B,CAAC,CAAA;QAE1C,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,QAAQ,GAAoB,CAAC,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE;QAC3D,MAAM,QAAQ,GAAG,SAAoC,CAAA;QACrD,OAAO,KAAC,aAAa,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YACzC,KAAC,QAAQ,OAAK,KAAK,YAAG,QAAQ,GAAY,GACnB,CAAA;IAC3B,CAAC,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
|
package/build/navigate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../src/navigate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAK3C,eAAO,MAAM,WAAW,QAAO,
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../src/navigate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAK3C,eAAO,MAAM,WAAW,QAAO,SA+C9B,CAAA"}
|
package/build/navigate.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useMemo } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { EntrypointOutcome } from '@owlmeans/entrypoint';
|
|
3
3
|
import { useContext } from './context.js';
|
|
4
4
|
export const useNavigate = () => {
|
|
5
5
|
const context = useContext();
|
|
@@ -10,16 +10,21 @@ export const useNavigate = () => {
|
|
|
10
10
|
_navigate: navigate,
|
|
11
11
|
navigate: async (module, request) => {
|
|
12
12
|
const [url, ok] = await module.call(request);
|
|
13
|
-
if (ok ===
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
13
|
+
if (ok === EntrypointOutcome.Ok) {
|
|
14
|
+
if (url.startsWith('http')) {
|
|
15
|
+
globalThis.location.href = url;
|
|
16
|
+
}
|
|
17
|
+
else {
|
|
18
|
+
navigate(url, {
|
|
19
|
+
state: {
|
|
20
|
+
...module.route.route, silent: request?.silent
|
|
21
|
+
},
|
|
22
|
+
replace: request?.replace ?? false
|
|
23
|
+
});
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
26
|
},
|
|
22
|
-
go: async (alias, request) => navigator.navigate(context.
|
|
27
|
+
go: async (alias, request) => navigator.navigate(context.entrypoint(alias), request),
|
|
23
28
|
press: (alias, request) => () => {
|
|
24
29
|
void navigator.go(alias, request);
|
|
25
30
|
},
|
package/build/navigate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../src/navigate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../src/navigate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,MAAM,CAAC,MAAM,WAAW,GAAG,GAAc,EAAE;IACzC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAA;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAA;IAC/C,MAAM,SAAS,GAAc,OAAO,CAAC,GAAG,EAAE;QACxC,MAAM,SAAS,GAAc;YAC3B,SAAS,EAAE,QAAQ;YAEnB,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;gBAClC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAE5C,IAAI,EAAE,KAAK,iBAAiB,CAAC,EAAE,EAAE,CAAC;oBAChC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC3B,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAA;oBAChC,CAAC;yBAAM,CAAC;wBACN,QAAQ,CAAC,GAAG,EAAE;4BACZ,KAAK,EAAE;gCACL,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;6BAC/C;4BACD,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,KAAK;yBACnC,CAAC,CAAA;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YAED,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAC3B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAA2B,KAAK,CAAC,EAAE,OAAO,CAAC;YAElF,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE;gBAC9B,KAAK,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;YACnC,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;YACd,CAAC;YAED,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE;gBACpB,KAAK,SAAS,CAAC,IAAI,EAAE,CAAA;YACvB,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAQ;SACzB,CAAA;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA"}
|
package/build/types.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { PropsWithChildren, FC, DependencyList } from 'react';
|
|
2
|
-
import type { AbstractRequest } from '@owlmeans/
|
|
2
|
+
import type { AbstractRequest } from '@owlmeans/entrypoint';
|
|
3
3
|
import type { ClientConfig, ClientContext as BasicClientContext } from '@owlmeans/client-context';
|
|
4
4
|
import type { StateResourceAppend } from '@owlmeans/state';
|
|
5
|
-
import type {
|
|
5
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint';
|
|
6
6
|
import type { DebugServiceAppend, ModalServiceAppend } from './components/types.js';
|
|
7
7
|
import type { ConfigResourceAppend } from '@owlmeans/config';
|
|
8
8
|
import type { ConfigRecord } from '@owlmeans/context';
|
|
@@ -40,7 +40,7 @@ export interface NavRequest<T extends Record<string, any> = Record<string, any>>
|
|
|
40
40
|
}
|
|
41
41
|
export interface Navigator {
|
|
42
42
|
_navigate: NavigateFunction;
|
|
43
|
-
navigate: <R extends NavRequest = NavRequest>(module:
|
|
43
|
+
navigate: <R extends NavRequest = NavRequest>(module: ClientEntrypoint<string, AbstractRequest>, request?: R) => Promise<void>;
|
|
44
44
|
go: <R extends NavRequest = NavRequest>(alias: string, request?: R) => Promise<void>;
|
|
45
45
|
back: () => Promise<void>;
|
|
46
46
|
pressBack: () => () => void;
|
package/build/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,EAAE,EAAE,cAAc,EAAE,MAAM,OAAO,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/build/utils/route.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { FC, PropsWithChildren, ReactElement } from 'react';
|
|
2
2
|
import type { ClientContext } from '../types.js';
|
|
3
|
-
import type {
|
|
3
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint';
|
|
4
4
|
import type { ClientConfig } from '@owlmeans/client-context';
|
|
5
5
|
type Config = ClientConfig;
|
|
6
6
|
interface Context<C extends Config = Config> extends ClientContext<C> {
|
|
@@ -9,7 +9,7 @@ export declare const createRouteRenderer: (params: RendererParams) => FC;
|
|
|
9
9
|
export type HandledRenderer<T extends {}> = FC<PropsWithChildren<T> | T> | ReactElement;
|
|
10
10
|
interface RendererParams {
|
|
11
11
|
context: Context;
|
|
12
|
-
module:
|
|
12
|
+
module: ClientEntrypoint<unknown>;
|
|
13
13
|
hasChildren: boolean;
|
|
14
14
|
}
|
|
15
15
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/utils/route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAChE,OAAO,KAAK,EAAwC,aAAa,EAAE,MAAM,aAAa,CAAA;AAEtF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../src/utils/route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAChE,OAAO,KAAK,EAAwC,aAAa,EAAE,MAAM,aAAa,CAAA;AAEtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAKnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,KAAK,MAAM,GAAG,YAAY,CAAA;AAC1B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;CAAI;AAEzE,eAAO,MAAM,mBAAmB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,EAyD7D,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,CAAA;AAEvF,UAAU,cAAc;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACjC,WAAW,EAAE,OAAO,CAAA;CACrB"}
|
package/build/utils/route.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { isValidElement, memo, useEffect } from 'react';
|
|
3
|
-
import { provideRequest } from '@owlmeans/client-
|
|
4
|
-
import { provideResponse } from '@owlmeans/
|
|
3
|
+
import { provideRequest } from '@owlmeans/client-entrypoint';
|
|
4
|
+
import { provideResponse } from '@owlmeans/entrypoint';
|
|
5
5
|
import { AuthorizationError } from '@owlmeans/auth';
|
|
6
6
|
export const createRouteRenderer = ({ context, module, hasChildren }) => () => {
|
|
7
7
|
const params = context.router().useParams();
|
package/build/utils/route.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/utils/route.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"route.js","sourceRoot":"","sources":["../../src/utils/route.tsx"],"names":[],"mappings":"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"}
|
package/build/utils/router.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint';
|
|
2
2
|
import type { ClientConfig } from '@owlmeans/client-context';
|
|
3
3
|
import type { ClientContext } from '../types.js';
|
|
4
4
|
type Config = ClientConfig;
|
|
@@ -8,9 +8,9 @@ export declare const buildModuleTree: <R, C extends Config = Config, T extends C
|
|
|
8
8
|
export declare const visitModuleTree: <T, R>(tree: ModuleTree<T>, visitor: ModuleTreeVisitor<T, R>) => Promise<R[]>;
|
|
9
9
|
export declare const initializeRouter: (context: Context) => Promise<unknown[]>;
|
|
10
10
|
export interface ModuleTreeVisitor<T, R> {
|
|
11
|
-
(module:
|
|
11
|
+
(module: ClientEntrypoint<T>, children: R[], alone: boolean): Promise<R>;
|
|
12
12
|
}
|
|
13
|
-
interface ModuleTree<T> extends Map<
|
|
13
|
+
interface ModuleTree<T> extends Map<ClientEntrypoint<T>, ModuleTree<T>> {
|
|
14
14
|
}
|
|
15
15
|
export {};
|
|
16
16
|
//# sourceMappingURL=router.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/utils/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/utils/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAGnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,KAAK,MAAM,GAAG,YAAY,CAAA;AAC1B,UAAU,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;CAAI;AAEzE,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,KAAG,UAAU,CAAC,CAAC,CA2BzH,CAAA;AAED,eAAO,MAAM,eAAe,GAAU,CAAC,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,EAAE,SAAS,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,EAAE,CAKpF,CAAA;AAE3B,eAAO,MAAM,gBAAgB,GAAU,SAAS,OAAO,uBAOtD,CAAA;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,EAAE,CAAC;IACrC,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;CACzE;AAED,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CACtE"}
|
package/build/utils/router.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AppType } from '@owlmeans/context';
|
|
2
2
|
import { makeRouterModel } from '../router.js';
|
|
3
3
|
export const buildModuleTree = (context) => {
|
|
4
|
-
const modules = context.
|
|
4
|
+
const modules = context.entrypoints().filter(module => module.route.route.type === AppType.Frontend
|
|
5
5
|
&& (module.sticky || module.route.route.service == null
|
|
6
6
|
|| module.route.route.service === context.cfg.service));
|
|
7
7
|
const flatTree = new Map();
|
|
@@ -12,7 +12,7 @@ export const buildModuleTree = (context) => {
|
|
|
12
12
|
roots.push(module);
|
|
13
13
|
}
|
|
14
14
|
else {
|
|
15
|
-
const parent = context.
|
|
15
|
+
const parent = context.entrypoint(parentAlias);
|
|
16
16
|
const list = flatTree.get(parent) ?? [];
|
|
17
17
|
list.push(module);
|
|
18
18
|
flatTree.set(parent, list);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/utils/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAO9C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAkE,OAAU,EAAiB,EAAE;IAC5H,MAAM,OAAO,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/utils/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAO9C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAkE,OAAU,EAAiB,EAAE;IAC5H,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,EAAuB,CAAC,MAAM,CAC/D,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ;WACjD,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI;eAClD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAC3D,CAAA;IAED,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8C,CAAA;IACtE,MAAM,KAAK,GAA0B,EAAE,CAAA;IAEvC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACvB,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,EAAE,CAAA;QAC3C,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpB,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAsB,WAAW,CAAC,CAAA;YACnE,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACjB,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5B,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,CAAC,OAA8B,EAAiB,EAAE,CAAC,OAAO,CAAC,MAAM,CACrF,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,GAAG,EAAE,CACzF,CAAA;IAED,OAAO,aAAa,CAAC,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAQ,IAAmB,EAAE,OAAgC,EAAgB,EAAE,CACjH,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAC/B,KAAK,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAC3C,GAAG,CAAC,MAAM,MAAM,CAAC;IACjB,MAAM,OAAO,CAAC,MAAM,EAAE,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;CACjF,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;AAE3B,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,CAAA;QAChC,MAAM,OAAO,CAAC,kBAAkB,EAAE,CAAA;IACpC,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,EAAE,CAAA;IAC/B,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;AACrC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@owlmeans/client",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"scripts": {
|
|
@@ -28,17 +28,17 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@owlmeans/auth": "^0.1.
|
|
32
|
-
"@owlmeans/client-context": "^0.1.
|
|
33
|
-
"@owlmeans/client-
|
|
34
|
-
"@owlmeans/client-resource": "^0.1.
|
|
35
|
-
"@owlmeans/config": "^0.1.
|
|
36
|
-
"@owlmeans/context": "^0.1.
|
|
37
|
-
"@owlmeans/error": "^0.1.
|
|
38
|
-
"@owlmeans/
|
|
39
|
-
"@owlmeans/resource": "^0.1.
|
|
40
|
-
"@owlmeans/router": "^0.1.
|
|
41
|
-
"@owlmeans/state": "^0.1.
|
|
31
|
+
"@owlmeans/auth": "^0.1.4",
|
|
32
|
+
"@owlmeans/client-context": "^0.1.4",
|
|
33
|
+
"@owlmeans/client-entrypoint": "^0.1.4",
|
|
34
|
+
"@owlmeans/client-resource": "^0.1.4",
|
|
35
|
+
"@owlmeans/config": "^0.1.4",
|
|
36
|
+
"@owlmeans/context": "^0.1.4",
|
|
37
|
+
"@owlmeans/error": "^0.1.4",
|
|
38
|
+
"@owlmeans/entrypoint": "^0.1.4",
|
|
39
|
+
"@owlmeans/resource": "^0.1.4",
|
|
40
|
+
"@owlmeans/router": "^0.1.4",
|
|
41
|
+
"@owlmeans/state": "^0.1.4"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"@remix-run/router": "*",
|
|
@@ -50,10 +50,11 @@
|
|
|
50
50
|
}
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
+
"@owlmeans/dep-config": "workspace:*",
|
|
53
54
|
"@types/react": "^19.2.7",
|
|
54
55
|
"nodemon": "^3.1.11",
|
|
55
56
|
"npm-check": "^6.0.1",
|
|
56
|
-
"typescript": "^
|
|
57
|
+
"typescript": "^6.0.2"
|
|
57
58
|
},
|
|
58
59
|
"publishConfig": {
|
|
59
60
|
"access": "public"
|
package/src/helper.tsx
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { AbstractRequest, AbstractResponse } from '@owlmeans/
|
|
1
|
+
import type { AbstractRequest, AbstractResponse } from '@owlmeans/entrypoint'
|
|
2
2
|
import type { ModuleContextParams, RoutedComponent, ClientContext } from './types.js'
|
|
3
|
-
import type {
|
|
3
|
+
import type { RefedEntrypointHandler } from '@owlmeans/client-entrypoint'
|
|
4
4
|
import { HandledRenderer } from './utils/route.js'
|
|
5
5
|
import { isValidElement } from 'react'
|
|
6
6
|
import type { PropsWithChildren } from 'react'
|
|
@@ -13,7 +13,7 @@ interface Context<C extends Config = Config> extends ClientContext<C> { }
|
|
|
13
13
|
|
|
14
14
|
export const handler = <T extends {}>(
|
|
15
15
|
Component: HandledRenderer<T>, preprender?: boolean
|
|
16
|
-
):
|
|
16
|
+
): RefedEntrypointHandler<T> => ref => <
|
|
17
17
|
R extends AbstractRequest = AbstractRequest,
|
|
18
18
|
P extends AbstractResponse<HandledRenderer<T>> = AbstractResponse<HandledRenderer<T>>
|
|
19
19
|
>(req: R, res: P): any => {
|
package/src/navigate.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { useMemo } from 'react'
|
|
2
2
|
import type { Navigator } from './types.js'
|
|
3
|
-
import {
|
|
3
|
+
import { EntrypointOutcome } from '@owlmeans/entrypoint'
|
|
4
4
|
import { useContext } from './context.js'
|
|
5
|
-
import type {
|
|
5
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
6
6
|
|
|
7
7
|
export const useNavigate = (): Navigator => {
|
|
8
8
|
const context = useContext()
|
|
@@ -15,18 +15,22 @@ export const useNavigate = (): Navigator => {
|
|
|
15
15
|
navigate: async (module, request) => {
|
|
16
16
|
const [url, ok] = await module.call(request)
|
|
17
17
|
|
|
18
|
-
if (ok ===
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
if (ok === EntrypointOutcome.Ok) {
|
|
19
|
+
if (url.startsWith('http')) {
|
|
20
|
+
globalThis.location.href = url
|
|
21
|
+
} else {
|
|
22
|
+
navigate(url, {
|
|
23
|
+
state: {
|
|
24
|
+
...module.route.route, silent: request?.silent
|
|
25
|
+
},
|
|
26
|
+
replace: request?.replace ?? false
|
|
27
|
+
})
|
|
28
|
+
}
|
|
25
29
|
}
|
|
26
30
|
},
|
|
27
31
|
|
|
28
32
|
go: async (alias, request) =>
|
|
29
|
-
navigator.navigate(context.
|
|
33
|
+
navigator.navigate(context.entrypoint<ClientEntrypoint<string>>(alias), request),
|
|
30
34
|
|
|
31
35
|
press: (alias, request) => () => {
|
|
32
36
|
void navigator.go(alias, request)
|
package/src/types.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { PropsWithChildren, FC, DependencyList } from 'react'
|
|
2
|
-
import type { AbstractRequest } from '@owlmeans/
|
|
2
|
+
import type { AbstractRequest } from '@owlmeans/entrypoint'
|
|
3
3
|
import type { ClientConfig, ClientContext as BasicClientContext } from '@owlmeans/client-context'
|
|
4
4
|
import type { StateResourceAppend } from '@owlmeans/state'
|
|
5
|
-
import type {
|
|
5
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
6
6
|
import type { DebugServiceAppend, ModalServiceAppend } from './components/types.js'
|
|
7
7
|
import type { ConfigResourceAppend } from '@owlmeans/config'
|
|
8
8
|
import type { ConfigRecord } from '@owlmeans/context'
|
|
@@ -55,7 +55,7 @@ export interface NavRequest<T extends Record<string, any> = Record<string, any>>
|
|
|
55
55
|
|
|
56
56
|
export interface Navigator {
|
|
57
57
|
_navigate: NavigateFunction
|
|
58
|
-
navigate: <R extends NavRequest = NavRequest>(module:
|
|
58
|
+
navigate: <R extends NavRequest = NavRequest>(module: ClientEntrypoint<string, AbstractRequest>, request?: R) => Promise<void>
|
|
59
59
|
go: <R extends NavRequest = NavRequest>(alias: string, request?: R) => Promise<void>
|
|
60
60
|
back: () => Promise<void>
|
|
61
61
|
pressBack: () => () => void
|
package/src/utils/route.tsx
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { FC, PropsWithChildren, ReactElement } from 'react'
|
|
2
2
|
import type { ModuleContextParams, RoutedComponent, ClientContext } from '../types.js'
|
|
3
3
|
import { isValidElement, memo, useEffect } from 'react'
|
|
4
|
-
import type {
|
|
5
|
-
import { provideRequest } from '@owlmeans/client-
|
|
6
|
-
import { provideResponse } from '@owlmeans/
|
|
7
|
-
import type { GuardService } from '@owlmeans/
|
|
4
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
5
|
+
import { provideRequest } from '@owlmeans/client-entrypoint'
|
|
6
|
+
import { provideResponse } from '@owlmeans/entrypoint'
|
|
7
|
+
import type { GuardService } from '@owlmeans/entrypoint'
|
|
8
8
|
import { AuthorizationError } from '@owlmeans/auth'
|
|
9
9
|
import type { ClientConfig } from '@owlmeans/client-context'
|
|
10
10
|
|
|
@@ -74,7 +74,7 @@ export type HandledRenderer<T extends {}> = FC<PropsWithChildren<T> | T> | React
|
|
|
74
74
|
|
|
75
75
|
interface RendererParams {
|
|
76
76
|
context: Context,
|
|
77
|
-
module:
|
|
77
|
+
module: ClientEntrypoint<unknown>
|
|
78
78
|
hasChildren: boolean
|
|
79
79
|
}
|
|
80
80
|
|
package/src/utils/router.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
|
|
2
2
|
import { AppType } from '@owlmeans/context'
|
|
3
3
|
import { makeRouterModel } from '../router.js'
|
|
4
4
|
import type { ClientConfig } from '@owlmeans/client-context'
|
|
@@ -8,28 +8,28 @@ type Config = ClientConfig
|
|
|
8
8
|
interface Context<C extends Config = Config> extends ClientContext<C> { }
|
|
9
9
|
|
|
10
10
|
export const buildModuleTree = <R, C extends Config = Config, T extends Context<C> = Context<C>>(context: T): ModuleTree<R> => {
|
|
11
|
-
const modules = context.
|
|
11
|
+
const modules = context.entrypoints<ClientEntrypoint<R>>().filter(
|
|
12
12
|
module => module.route.route.type === AppType.Frontend
|
|
13
13
|
&& (module.sticky || module.route.route.service == null
|
|
14
14
|
|| module.route.route.service === context.cfg.service)
|
|
15
15
|
)
|
|
16
16
|
|
|
17
|
-
const flatTree = new Map<
|
|
18
|
-
const roots:
|
|
17
|
+
const flatTree = new Map<ClientEntrypoint<R>, ClientEntrypoint<R>[]>()
|
|
18
|
+
const roots: ClientEntrypoint<R>[] = []
|
|
19
19
|
|
|
20
20
|
modules.forEach(module => {
|
|
21
21
|
const parentAlias = module.getParentAlias()
|
|
22
22
|
if (parentAlias == null) {
|
|
23
23
|
roots.push(module)
|
|
24
24
|
} else {
|
|
25
|
-
const parent = context.
|
|
25
|
+
const parent = context.entrypoint<ClientEntrypoint<R>>(parentAlias)
|
|
26
26
|
const list = flatTree.get(parent) ?? []
|
|
27
27
|
list.push(module)
|
|
28
28
|
flatTree.set(parent, list)
|
|
29
29
|
}
|
|
30
30
|
})
|
|
31
31
|
|
|
32
|
-
const reduceModules = (modules:
|
|
32
|
+
const reduceModules = (modules: ClientEntrypoint<R>[]): ModuleTree<R> => modules.reduce(
|
|
33
33
|
(tree, module) => tree.set(module, reduceModules(flatTree.get(module) ?? [])), new Map()
|
|
34
34
|
)
|
|
35
35
|
|
|
@@ -53,8 +53,8 @@ export const initializeRouter = async (context: Context) => {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
export interface ModuleTreeVisitor<T, R> {
|
|
56
|
-
(module:
|
|
56
|
+
(module: ClientEntrypoint<T>, children: R[], alone: boolean): Promise<R>
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
interface ModuleTree<T> extends Map<
|
|
59
|
+
interface ModuleTree<T> extends Map<ClientEntrypoint<T>, ModuleTree<T>> {
|
|
60
60
|
}
|
package/tsconfig.json
CHANGED
|
@@ -1,15 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"extends": [
|
|
3
|
-
"
|
|
4
|
-
"
|
|
3
|
+
"@owlmeans/dep-config/tsconfig.base.json",
|
|
4
|
+
"@owlmeans/dep-config/tsconfig.react.json"
|
|
5
5
|
],
|
|
6
6
|
"compilerOptions": {
|
|
7
|
-
"rootDir": "./src/",
|
|
8
|
-
"outDir": "./build/"
|
|
7
|
+
"rootDir": "./src/",
|
|
8
|
+
"outDir": "./build/"
|
|
9
9
|
},
|
|
10
|
-
"exclude": [
|
|
11
|
-
|
|
12
|
-
"./build/**/*",
|
|
13
|
-
"./*.ts"
|
|
14
|
-
]
|
|
15
|
-
}
|
|
10
|
+
"exclude": ["./dist/**/*", "./build/**/*", "./*.ts"]
|
|
11
|
+
}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import type { DebugService, DebugServiceAppend } from '../components/types.js';
|
|
2
|
-
import type { ClientConfig } from '@owlmeans/client-context';
|
|
3
|
-
import type { ClientContext } from '../types.js';
|
|
4
|
-
export declare const createDebugService: (alias?: string) => DebugService;
|
|
5
|
-
export declare const appendDebugService: <C extends ClientConfig, T extends ClientContext<C>>(ctx: T, alias?: string) => T & DebugServiceAppend;
|
|
6
|
-
//# sourceMappingURL=debug.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../src/components/debug.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAqB,MAAM,aAAa,CAAA;AAKnE,eAAO,MAAM,kBAAkB,WAAW,MAAM,KAAqB,YA4EpE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,OAC9E,CAAC,UAAS,MAAM,KACpB,CAAC,GAAG,kBAYN,CAAA"}
|
|
@@ -1,83 +0,0 @@
|
|
|
1
|
-
import { assertContext, createLazyService } from '@owlmeans/context';
|
|
2
|
-
import { DEBUG_CONFIG_KEY, DEBUGGER_FLAG, DEF_DEBUG_ALIAS } from '../consts.js';
|
|
3
|
-
import { DEFAULT_DB_ALIAS } from '@owlmeans/client-resource';
|
|
4
|
-
export const createDebugService = (alias = DEF_DEBUG_ALIAS) => {
|
|
5
|
-
const location = `debug-service:${alias}`;
|
|
6
|
-
const service = createLazyService(alias, {
|
|
7
|
-
items: [
|
|
8
|
-
{
|
|
9
|
-
alias: 'close',
|
|
10
|
-
title: 'Close',
|
|
11
|
-
action: async (modal) => modal.cancel()
|
|
12
|
-
},
|
|
13
|
-
{
|
|
14
|
-
alias: 'reset',
|
|
15
|
-
title: 'Reset app',
|
|
16
|
-
action: async (modal, context) => {
|
|
17
|
-
const service = context.service(DEFAULT_DB_ALIAS);
|
|
18
|
-
await service.erase();
|
|
19
|
-
context.rerender();
|
|
20
|
-
modal.cancel();
|
|
21
|
-
void modal.navigator?._navigate('/');
|
|
22
|
-
return 'Client DB cleanedup!';
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
],
|
|
26
|
-
addItem: item => service.items.push(item),
|
|
27
|
-
erase: async (states) => {
|
|
28
|
-
const context = assertContext(service.ctx, location);
|
|
29
|
-
await Promise.all(states.map(async (state) => {
|
|
30
|
-
await context.resource(state).erase();
|
|
31
|
-
}));
|
|
32
|
-
},
|
|
33
|
-
open: () => {
|
|
34
|
-
const context = assertContext(service.ctx, location);
|
|
35
|
-
void context.modal().request(service.Debug);
|
|
36
|
-
},
|
|
37
|
-
select: alias => {
|
|
38
|
-
const item = service.items.find(item => item.alias === alias);
|
|
39
|
-
if (item != null) {
|
|
40
|
-
const context = assertContext(service.ctx, location);
|
|
41
|
-
if (item.Com != null) {
|
|
42
|
-
void context.modal().request(item.Com)
|
|
43
|
-
.then(result => result != null && alert(result));
|
|
44
|
-
}
|
|
45
|
-
if (item.action != null) {
|
|
46
|
-
void item.action(context.modal(), context).then(result => result != null && alert(result));
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
},
|
|
50
|
-
}, service => async () => {
|
|
51
|
-
service.initialized = true;
|
|
52
|
-
const context = assertContext(service.ctx, location);
|
|
53
|
-
const record = await context.getConfigResource().load(DEBUG_CONFIG_KEY);
|
|
54
|
-
if (record?.states != null) {
|
|
55
|
-
service.addItem({
|
|
56
|
-
alias: 'reset-states',
|
|
57
|
-
title: `Reset states`,
|
|
58
|
-
action: async (modal, context) => {
|
|
59
|
-
const record = await context.getConfigResource().load(DEBUG_CONFIG_KEY);
|
|
60
|
-
if (record?.states != null) {
|
|
61
|
-
await service.erase(record.states);
|
|
62
|
-
context.rerender();
|
|
63
|
-
modal.cancel();
|
|
64
|
-
return `States erased`;
|
|
65
|
-
}
|
|
66
|
-
return 'No states to erase';
|
|
67
|
-
}
|
|
68
|
-
});
|
|
69
|
-
}
|
|
70
|
-
});
|
|
71
|
-
return service;
|
|
72
|
-
};
|
|
73
|
-
export const appendDebugService = (ctx, alias = DEF_DEBUG_ALIAS) => {
|
|
74
|
-
const _ctx = ctx;
|
|
75
|
-
const debuggable = _ctx.cfg.debug.all === true || _ctx.cfg.debug[DEBUGGER_FLAG] === true;
|
|
76
|
-
if (debuggable) {
|
|
77
|
-
const service = createDebugService(alias);
|
|
78
|
-
_ctx.registerService(service);
|
|
79
|
-
}
|
|
80
|
-
_ctx.debug = () => debuggable ? _ctx.service(alias) : undefined;
|
|
81
|
-
return _ctx;
|
|
82
|
-
};
|
|
83
|
-
//# sourceMappingURL=debug.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/components/debug.ts"],"names":[],"mappings":"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"}
|