mobx-route 0.0.21 → 0.0.23
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/core/route/route.d.ts.map +1 -1
- package/core/route/route.js +3 -1
- package/core/virtual-route/virtual-route.d.ts +3 -3
- package/core/virtual-route/virtual-route.d.ts.map +1 -1
- package/core/virtual-route/virtual-route.js +4 -7
- package/core/virtual-route/virtual-route.types.d.ts +6 -3
- package/core/virtual-route/virtual-route.types.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAkB,SAAS,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,KAAK,CAChB,KAAK,SAAS,MAAM,EACpB,YAAY,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;IAiBzC,IAAI,EAAE,KAAK;IAClB,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC;IAhBpD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B,KAAK,EAAE,YAAY,CAAC;IAEpB,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,SAAS,CAAC,CAA6B;IAE/C,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,QAAQ,EAAE,CAAM;gBAGjB,IAAI,EAAE,KAAK,EACR,MAAM,GAAE,kBAAkB,CAAC,YAAY,CAAM;IAsBzD,SAAS,KAAK,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CA0BnD;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAE/B;IAED,IAAI,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CAE3C;IAED,IAAI,QAAQ,YAEX;IAED,MAAM,CAAC,WAAW,SAAS,MAAM,EAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../src/core/route/route.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,YAAY,EACZ,aAAa,EACb,YAAY,EACb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAkB,SAAS,EAAS,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EACL,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,KAAK,CAChB,KAAK,SAAS,MAAM,EACpB,YAAY,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI;IAiBzC,IAAI,EAAE,KAAK;IAClB,SAAS,CAAC,MAAM,EAAE,kBAAkB,CAAC,YAAY,CAAC;IAhBpD,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC;IAChC,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC;IAClC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAE1B,KAAK,EAAE,YAAY,CAAC;IAEpB,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,SAAS,CAAC,CAA6B;IAE/C,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,QAAQ,EAAE,CAAM;gBAGjB,IAAI,EAAE,KAAK,EACR,MAAM,GAAE,kBAAkB,CAAC,YAAY,CAAM;IAsBzD,SAAS,KAAK,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CA0BnD;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,IAAI,CAE/B;IAED,IAAI,MAAM,IAAI,gBAAgB,CAAC,KAAK,CAAC,GAAG,IAAI,CAE3C;IAED,IAAI,QAAQ,YAEX;IAED,MAAM,CAAC,WAAW,SAAS,MAAM,EAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC;IAqBlD,WAAW,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE;IAIjC,cAAc,CAAC,GAAG,MAAM,EAAE,QAAQ,EAAE;IAIpC,IAAI,iBAAiB,YAEpB;IAED,SAAS,CAAC,aAAa,CACrB,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS,GACnD,SAAS,GAAG,SAAS;IAWxB,SAAS,CACP,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC7D,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC;IAiB3D,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,GACjE;QACE,MAAM,CAAC,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,SAAS;QACpD,cAAc,CAAC,EAAE,mBAAmB;KACrC,GACD,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,EAAE,mBAAmB,CAAC,GAC3E,IAAI;IAEP,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,mBAAmB,GAAG,IAAI;IAc7D,SAAS,KAAK,SAAS,cAKtB;CACF"}
|
package/core/route/route.js
CHANGED
|
@@ -62,8 +62,10 @@ export class Route {
|
|
|
62
62
|
return this.data !== null;
|
|
63
63
|
}
|
|
64
64
|
extend(path, config) {
|
|
65
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
66
|
+
const { index, ...configFromCurrentRoute } = this.config;
|
|
65
67
|
const extendedChild = new Route(`${this.path}${path}`, {
|
|
66
|
-
...
|
|
68
|
+
...configFromCurrentRoute,
|
|
67
69
|
...config,
|
|
68
70
|
parent: this,
|
|
69
71
|
});
|
|
@@ -3,11 +3,11 @@ import { FnValue } from 'yummies/common';
|
|
|
3
3
|
import { AllPropertiesOptional, AnyObject, EmptyObject, Maybe } from 'yummies/utils/types';
|
|
4
4
|
import { VirtualRouteConfiguration } from './virtual-route.types.js';
|
|
5
5
|
export declare class VirtualRoute<TParams extends AnyObject | EmptyObject = EmptyObject> {
|
|
6
|
-
protected config: VirtualRouteConfiguration
|
|
6
|
+
protected config: VirtualRouteConfiguration<TParams>;
|
|
7
7
|
query: IQueryParams;
|
|
8
|
-
params: TParams;
|
|
8
|
+
params: TParams | null;
|
|
9
9
|
private checkOpened;
|
|
10
|
-
constructor(config?: VirtualRouteConfiguration);
|
|
10
|
+
constructor(config?: VirtualRouteConfiguration<TParams>);
|
|
11
11
|
get isOpened(): boolean;
|
|
12
12
|
setResolver(checkOpened: FnValue<boolean>): void;
|
|
13
13
|
open(...args: AllPropertiesOptional<TParams> extends true ? [params?: Maybe<TParams>, query?: AnyObject] : [params: TParams, query?: AnyObject]): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"virtual-route.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/virtual-route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAkB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,qBAAa,YAAY,CACvB,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAOzC,SAAS,CAAC,MAAM,EAAE,yBAAyB;
|
|
1
|
+
{"version":3,"file":"virtual-route.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/virtual-route.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAkB,MAAM,gBAAgB,CAAC;AACzD,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,qBAAa,YAAY,CACvB,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAOzC,SAAS,CAAC,MAAM,EAAE,yBAAyB,CAAC,OAAO,CAAC;IALhE,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAEvB,OAAO,CAAC,WAAW,CAAkC;gBAE/B,MAAM,GAAE,yBAAyB,CAAC,OAAO,CAAM;IAarE,IAAI,QAAQ,YAEX;IAED,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC;IAIzC,IAAI,CACF,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS,IAAI,GAChD,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAC5C,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GACvC,IAAI;IAcP,KAAK;CAQN"}
|
|
@@ -9,7 +9,7 @@ export class VirtualRoute {
|
|
|
9
9
|
constructor(config = {}) {
|
|
10
10
|
this.config = config;
|
|
11
11
|
this.query = config.queryParams ?? routeConfig.get().queryParams;
|
|
12
|
-
this.params =
|
|
12
|
+
this.params = config.initialParams ?? null;
|
|
13
13
|
this.checkOpened = config.checkOpened;
|
|
14
14
|
observable(this, 'params');
|
|
15
15
|
observable.ref(this, 'checkOpened');
|
|
@@ -19,8 +19,7 @@ export class VirtualRoute {
|
|
|
19
19
|
makeObservable(this);
|
|
20
20
|
}
|
|
21
21
|
get isOpened() {
|
|
22
|
-
return
|
|
23
|
-
resolveFnValue(this.checkOpened, this.query.data));
|
|
22
|
+
return this.checkOpened != null && resolveFnValue(this.checkOpened, this);
|
|
24
23
|
}
|
|
25
24
|
setResolver(checkOpened) {
|
|
26
25
|
this.checkOpened = checkOpened;
|
|
@@ -34,14 +33,12 @@ export class VirtualRoute {
|
|
|
34
33
|
this.checkOpened = true;
|
|
35
34
|
}
|
|
36
35
|
else {
|
|
37
|
-
|
|
38
|
-
// @ts-ignore
|
|
39
|
-
this.checkOpened = this.config.open(...args);
|
|
36
|
+
this.checkOpened = this.config.open(this.params, this);
|
|
40
37
|
}
|
|
41
38
|
}
|
|
42
39
|
close() {
|
|
43
40
|
if (this.config.close != null) {
|
|
44
|
-
this.checkOpened = this.config.close(this
|
|
41
|
+
this.checkOpened = this.config.close(this);
|
|
45
42
|
return;
|
|
46
43
|
}
|
|
47
44
|
this.checkOpened = false;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { IQueryParams } from 'mobx-location-history';
|
|
2
2
|
import { FnValue } from 'yummies/common';
|
|
3
3
|
import { AllPropertiesOptional, AnyObject, EmptyObject, Maybe } from 'yummies/utils/types';
|
|
4
|
+
import type { VirtualRoute } from './virtual-route.js';
|
|
5
|
+
export type AnyVirtualRoute = VirtualRoute<AnyObject>;
|
|
4
6
|
export interface VirtualRouteConfiguration<TParams extends AnyObject | EmptyObject = EmptyObject> {
|
|
5
7
|
queryParams?: IQueryParams;
|
|
6
|
-
checkOpened?: FnValue<boolean, [
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
checkOpened?: FnValue<boolean, [route: VirtualRoute<TParams>]>;
|
|
9
|
+
initialParams?: Maybe<TParams>;
|
|
10
|
+
open?: (...args: AllPropertiesOptional<TParams> extends true ? [params: Maybe<TParams>, route: VirtualRoute<TParams>] : [params: TParams, route: VirtualRoute<TParams>]) => boolean;
|
|
11
|
+
close?: (route: VirtualRoute<TParams>) => boolean;
|
|
9
12
|
}
|
|
10
13
|
//# sourceMappingURL=virtual-route.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"virtual-route.types.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/virtual-route.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,yBAAyB,CACxC,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAErD,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"virtual-route.types.d.ts","sourceRoot":"","sources":["../../../src/core/virtual-route/virtual-route.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,WAAW,EACX,KAAK,EACN,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;AAEtD,MAAM,WAAW,yBAAyB,CACxC,OAAO,SAAS,SAAS,GAAG,WAAW,GAAG,WAAW;IAErD,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/D,aAAa,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAI/B,IAAI,CAAC,EAAE,CACL,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,SAAS,IAAI,GAChD,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,GACtD,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,KAChD,OAAO,CAAC;IAGb,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC;CACnD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mobx-route",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.23",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"mobx",
|
|
6
6
|
"react",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"mobx-location-history": "^2.1.0",
|
|
26
26
|
"path-to-regexp": "^8.2.0",
|
|
27
27
|
"react-simple-loadable": "^2.1.0",
|
|
28
|
-
"yummies": "^3.1.
|
|
28
|
+
"yummies": "^3.1.10"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
31
31
|
"mobx": "^6.12.4",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@types/node": "^20.17.30",
|
|
51
51
|
"@types/react": "^18.3.20",
|
|
52
52
|
"@vitejs/plugin-react-swc": "^3.9.0",
|
|
53
|
-
"@vitest/coverage-istanbul": "^
|
|
53
|
+
"@vitest/coverage-istanbul": "^3.1.2",
|
|
54
54
|
"eslint": "^8.57.1",
|
|
55
55
|
"js2me-eslint-config": "^1.0.7",
|
|
56
56
|
"js2me-exports-post-build-script": "^2.0.18",
|