reactive-route 0.0.1-alpha.3 → 0.0.1-alpha.30
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/adapters/kr-observable-preact.cjs +39 -0
- package/adapters/kr-observable-preact.d.ts +3 -0
- package/adapters/kr-observable-preact.d.ts.map +1 -0
- package/adapters/kr-observable-preact.mjs +18 -0
- package/adapters/kr-observable-react.cjs +39 -0
- package/adapters/kr-observable-react.d.ts +3 -0
- package/adapters/kr-observable-react.d.ts.map +1 -0
- package/adapters/kr-observable-react.mjs +18 -0
- package/adapters/kr-observable-solid.cjs +37 -0
- package/adapters/kr-observable-solid.d.ts +3 -0
- package/adapters/kr-observable-solid.d.ts.map +1 -0
- package/adapters/kr-observable-solid.mjs +16 -0
- package/adapters/mobx-preact.cjs +43 -0
- package/adapters/mobx-preact.d.ts +3 -0
- package/adapters/mobx-preact.d.ts.map +1 -0
- package/adapters/mobx-preact.mjs +22 -0
- package/adapters/mobx-react.cjs +43 -0
- package/adapters/mobx-react.d.ts +3 -0
- package/adapters/mobx-react.d.ts.map +1 -0
- package/adapters/mobx-react.mjs +22 -0
- package/adapters/mobx-solid.cjs +42 -0
- package/adapters/mobx-solid.d.ts +3 -0
- package/adapters/mobx-solid.d.ts.map +1 -0
- package/adapters/mobx-solid.mjs +21 -0
- package/adapters/solid.cjs +45 -0
- package/adapters/solid.d.ts +3 -0
- package/adapters/solid.d.ts.map +1 -0
- package/adapters/solid.mjs +24 -0
- package/adapters/vue.cjs +40 -0
- package/adapters/vue.d.ts +3 -0
- package/adapters/vue.d.ts.map +1 -0
- package/adapters/vue.mjs +19 -0
- package/core/createRouter.d.ts +9 -0
- package/core/createRouter.d.ts.map +1 -0
- package/{dist/types/core/createRouterConfig.d.ts → core/createRoutes.d.ts} +4 -4
- package/core/createRoutes.d.ts.map +1 -0
- package/core/index.d.ts +13 -0
- package/core/index.d.ts.map +1 -0
- package/core/types/TypeAdapters.d.ts +9 -0
- package/core/types/TypeAdapters.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeCurrentRoute.d.ts +1 -1
- package/core/types/TypeCurrentRoute.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeLifecycleConfig.d.ts +2 -0
- package/core/types/TypeLifecycleConfig.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypePropsRouter.d.ts +2 -3
- package/core/types/TypePropsRouter.d.ts.map +1 -0
- package/{dist/types/core/types/TypeRedirectToParams.d.ts → core/types/TypeRedirectParams.d.ts} +6 -10
- package/core/types/TypeRedirectParams.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeRoute.d.ts +0 -1
- package/core/types/TypeRoute.d.ts.map +1 -0
- package/{dist/types/core → core}/types/TypeRouteRaw.d.ts +1 -0
- package/core/types/TypeRouteRaw.d.ts.map +1 -0
- package/core/types/TypeRouter.d.ts +22 -0
- package/core/types/TypeRouter.d.ts.map +1 -0
- package/core/types/TypeValidator.d.ts.map +1 -0
- package/core/utils/PreventError.d.ts +4 -0
- package/core/utils/PreventError.d.ts.map +1 -0
- package/core/utils/RedirectError.d.ts +4 -0
- package/core/utils/RedirectError.d.ts.map +1 -0
- package/core/utils/addNames.d.ts.map +1 -0
- package/{dist/types/core → core}/utils/constants.d.ts +0 -2
- package/core/utils/constants.d.ts.map +1 -0
- package/core/utils/dynamic.d.ts.map +1 -0
- package/core/utils/findRouteByPathname.d.ts.map +1 -0
- package/core/utils/getDynamicValues.d.ts.map +1 -0
- package/core/utils/getInitialRoute.d.ts +7 -0
- package/core/utils/getInitialRoute.d.ts.map +1 -0
- package/core/utils/getQueryValues.d.ts.map +1 -0
- package/core/utils/getTypedEntries.d.ts.map +1 -0
- package/core/utils/history.d.ts.map +1 -0
- package/core/utils/loadComponentToConfig.d.ts.map +1 -0
- package/core/utils/queryString.d.ts +8 -0
- package/core/utils/queryString.d.ts.map +1 -0
- package/{dist/types/core → core}/utils/replaceDynamicValues.d.ts +1 -2
- package/core/utils/replaceDynamicValues.d.ts.map +1 -0
- package/{dist/cjs/index.js → index.cjs} +198 -200
- package/index.mjs +356 -0
- package/package.json +66 -56
- package/preact/Router.d.ts +3 -0
- package/preact/Router.d.ts.map +1 -0
- package/preact/index.cjs +102 -0
- package/preact/index.d.ts.map +1 -0
- package/preact/index.mjs +79 -0
- package/react/Router.d.ts +5 -0
- package/react/Router.d.ts.map +1 -0
- package/react/index.cjs +101 -0
- package/react/index.d.ts.map +1 -0
- package/react/index.mjs +78 -0
- package/solid/Router.d.ts.map +1 -0
- package/solid/index.cjs +113 -0
- package/solid/index.d.ts +2 -0
- package/solid/index.d.ts.map +1 -0
- package/solid/index.mjs +90 -0
- package/vue/index.cjs +0 -0
- package/vue/index.d.ts +2 -0
- package/vue/index.d.ts.map +1 -0
- package/vue/index.mjs +0 -0
- package/LICENSE +0 -21
- package/README.md +0 -10
- package/dist/cjs/package.json +0 -1
- package/dist/cjs/react/index.js +0 -149
- package/dist/cjs/react/package.json +0 -1
- package/dist/cjs/solid/index.js +0 -130
- package/dist/cjs/solid/package.json +0 -1
- package/dist/esm/index.js +0 -348
- package/dist/esm/package.json +0 -1
- package/dist/esm/react/index.js +0 -126
- package/dist/esm/react/package.json +0 -1
- package/dist/esm/solid/index.js +0 -107
- package/dist/esm/solid/package.json +0 -1
- package/dist/types/core/createRouterConfig.d.ts.map +0 -1
- package/dist/types/core/createRouterStore.d.ts +0 -4
- package/dist/types/core/createRouterStore.d.ts.map +0 -1
- package/dist/types/core/index.d.ts +0 -14
- package/dist/types/core/index.d.ts.map +0 -1
- package/dist/types/core/types/InterfaceRouterStore.d.ts +0 -24
- package/dist/types/core/types/InterfaceRouterStore.d.ts.map +0 -1
- package/dist/types/core/types/TypeCurrentRoute.d.ts.map +0 -1
- package/dist/types/core/types/TypeLifecycleConfig.d.ts.map +0 -1
- package/dist/types/core/types/TypePropsRouter.d.ts.map +0 -1
- package/dist/types/core/types/TypeRedirectToParams.d.ts.map +0 -1
- package/dist/types/core/types/TypeRoute.d.ts.map +0 -1
- package/dist/types/core/types/TypeRouteRaw.d.ts.map +0 -1
- package/dist/types/core/types/TypeRouteWithParams.d.ts +0 -6
- package/dist/types/core/types/TypeRouteWithParams.d.ts.map +0 -1
- package/dist/types/core/types/TypeValidator.d.ts.map +0 -1
- package/dist/types/core/utils/addNames.d.ts.map +0 -1
- package/dist/types/core/utils/constants.d.ts.map +0 -1
- package/dist/types/core/utils/dynamic.d.ts.map +0 -1
- package/dist/types/core/utils/findRouteByPathname.d.ts.map +0 -1
- package/dist/types/core/utils/getDynamicValues.d.ts.map +0 -1
- package/dist/types/core/utils/getInitialRoute.d.ts +0 -8
- package/dist/types/core/utils/getInitialRoute.d.ts.map +0 -1
- package/dist/types/core/utils/getQueryValues.d.ts.map +0 -1
- package/dist/types/core/utils/getTypedEntries.d.ts.map +0 -1
- package/dist/types/core/utils/history.d.ts.map +0 -1
- package/dist/types/core/utils/loadComponentToConfig.d.ts.map +0 -1
- package/dist/types/core/utils/replaceDynamicValues.d.ts.map +0 -1
- package/dist/types/react/Router.d.ts +0 -5
- package/dist/types/react/Router.d.ts.map +0 -1
- package/dist/types/react/index.d.ts.map +0 -1
- package/dist/types/react/useStore.d.ts +0 -8
- package/dist/types/react/useStore.d.ts.map +0 -1
- package/dist/types/solid/Router.d.ts.map +0 -1
- package/dist/types/solid/index.d.ts.map +0 -1
- package/dist/types/solid/useStore.d.ts +0 -7
- package/dist/types/solid/useStore.d.ts.map +0 -1
- package/dist/types/tsconfig.types.tsbuildinfo +0 -1
- /package/{dist/types/core → core}/types/TypeValidator.d.ts +0 -0
- /package/{dist/types/core → core}/utils/addNames.d.ts +0 -0
- /package/{dist/types/core → core}/utils/dynamic.d.ts +0 -0
- /package/{dist/types/core → core}/utils/findRouteByPathname.d.ts +0 -0
- /package/{dist/types/core → core}/utils/getDynamicValues.d.ts +0 -0
- /package/{dist/types/core → core}/utils/getQueryValues.d.ts +0 -0
- /package/{dist/types/core → core}/utils/getTypedEntries.d.ts +0 -0
- /package/{dist/types/core → core}/utils/history.d.ts +0 -0
- /package/{dist/types/core → core}/utils/loadComponentToConfig.d.ts +0 -0
- /package/{dist/types/react → preact}/index.d.ts +0 -0
- /package/{dist/types/solid → react}/index.d.ts +0 -0
- /package/{dist/types/solid → solid}/Router.d.ts +0 -0
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { TypePropsRouter, TypeRoute } from 'reactive-route';
|
|
2
|
+
declare function RouterWrapper<TRoutes extends Record<string, TypeRoute>>(props: TypePropsRouter<TRoutes>): any;
|
|
3
|
+
export declare const Router: typeof RouterWrapper;
|
|
4
|
+
export {};
|
|
5
|
+
//# sourceMappingURL=Router.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/react/Router.tsx"],"names":[],"mappings":"AACA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAgGrE,iBAAS,aAAa,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,GAK1D,GAAG,CACzC;AAED,eAAO,MAAM,MAAM,EAA0B,OAAO,aAAa,CAAC"}
|
package/react/index.cjs
ADDED
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
|
|
20
|
+
// packages/react/index.ts
|
|
21
|
+
var react_exports = {};
|
|
22
|
+
__export(react_exports, {
|
|
23
|
+
Router: () => Router
|
|
24
|
+
});
|
|
25
|
+
module.exports = __toCommonJS(react_exports);
|
|
26
|
+
|
|
27
|
+
// packages/react/Router.tsx
|
|
28
|
+
var import_react = require("react");
|
|
29
|
+
var import_reactive_route = require("reactive-route");
|
|
30
|
+
var import_jsx_runtime = require("react/jsx-runtime");
|
|
31
|
+
function RouterInner(props) {
|
|
32
|
+
const disposerRef = (0, import_react.useRef)(null);
|
|
33
|
+
const redirectOnHistoryPop = (0, import_react.useCallback)(() => {
|
|
34
|
+
if (!import_reactive_route.history) return;
|
|
35
|
+
import_reactive_route.history.listen((params) => {
|
|
36
|
+
if (params.action !== "POP") return;
|
|
37
|
+
const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
|
|
38
|
+
if (previousRoutePathname === params.location.pathname) {
|
|
39
|
+
props.router.adapters.batch(() => props.router.routesHistory.pop());
|
|
40
|
+
}
|
|
41
|
+
void props.router.restoreFromURL({
|
|
42
|
+
pathname: import_reactive_route.history.location.pathname,
|
|
43
|
+
replace: true
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
}, []);
|
|
47
|
+
const [config] = (0, import_react.useState)(
|
|
48
|
+
() => props.router.adapters.makeObservable({
|
|
49
|
+
loadedComponentName: void 0,
|
|
50
|
+
loadedComponentPage: void 0,
|
|
51
|
+
currentProps: {}
|
|
52
|
+
})
|
|
53
|
+
);
|
|
54
|
+
const setLoadedComponent = (0, import_react.useCallback)(() => {
|
|
55
|
+
const { loadedComponentName, loadedComponentPage } = config;
|
|
56
|
+
const { currentRoute, isRedirecting } = props.router;
|
|
57
|
+
const componentConfig = props.router.routes[currentRoute.name];
|
|
58
|
+
let preventRedirect = false;
|
|
59
|
+
if (isRedirecting) preventRedirect = true;
|
|
60
|
+
else if (loadedComponentName === currentRoute.name) preventRedirect = true;
|
|
61
|
+
else if (loadedComponentPage != null && currentRoute.name != null) {
|
|
62
|
+
if (loadedComponentPage === currentRoute.pageId) {
|
|
63
|
+
props.router.adapters.batch(() => {
|
|
64
|
+
config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
65
|
+
});
|
|
66
|
+
preventRedirect = true;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (preventRedirect) return;
|
|
70
|
+
props.router.adapters.batch(() => {
|
|
71
|
+
if (loadedComponentName) props.beforeUpdatePageComponent?.();
|
|
72
|
+
props.beforeSetPageComponent?.(componentConfig);
|
|
73
|
+
config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
74
|
+
config.loadedComponentName = currentRoute.name;
|
|
75
|
+
config.loadedComponentPage = componentConfig.pageId;
|
|
76
|
+
});
|
|
77
|
+
}, []);
|
|
78
|
+
(0, import_react.useState)(() => {
|
|
79
|
+
props.router.adapters.batch(() => {
|
|
80
|
+
props.beforeMount?.();
|
|
81
|
+
redirectOnHistoryPop();
|
|
82
|
+
setLoadedComponent();
|
|
83
|
+
disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
(0, import_react.useEffect)(() => {
|
|
87
|
+
return () => {
|
|
88
|
+
disposerRef.current?.();
|
|
89
|
+
};
|
|
90
|
+
}, []);
|
|
91
|
+
if (!config.loadedComponentName) return null;
|
|
92
|
+
const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
|
|
93
|
+
if (LoadedComponent)
|
|
94
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...config.currentProps, router: props.router });
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
function RouterWrapper(props) {
|
|
98
|
+
const Component = props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner;
|
|
99
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props });
|
|
100
|
+
}
|
|
101
|
+
var Router = (0, import_react.memo)(RouterWrapper);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/react/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}
|
package/react/index.mjs
ADDED
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
// packages/react/Router.tsx
|
|
2
|
+
import { memo, useCallback, useEffect, useRef, useState } from "react";
|
|
3
|
+
import { history } from "reactive-route";
|
|
4
|
+
import { jsx } from "react/jsx-runtime";
|
|
5
|
+
function RouterInner(props) {
|
|
6
|
+
const disposerRef = useRef(null);
|
|
7
|
+
const redirectOnHistoryPop = useCallback(() => {
|
|
8
|
+
if (!history) return;
|
|
9
|
+
history.listen((params) => {
|
|
10
|
+
if (params.action !== "POP") return;
|
|
11
|
+
const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
|
|
12
|
+
if (previousRoutePathname === params.location.pathname) {
|
|
13
|
+
props.router.adapters.batch(() => props.router.routesHistory.pop());
|
|
14
|
+
}
|
|
15
|
+
void props.router.restoreFromURL({
|
|
16
|
+
pathname: history.location.pathname,
|
|
17
|
+
replace: true
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
}, []);
|
|
21
|
+
const [config] = useState(
|
|
22
|
+
() => props.router.adapters.makeObservable({
|
|
23
|
+
loadedComponentName: void 0,
|
|
24
|
+
loadedComponentPage: void 0,
|
|
25
|
+
currentProps: {}
|
|
26
|
+
})
|
|
27
|
+
);
|
|
28
|
+
const setLoadedComponent = useCallback(() => {
|
|
29
|
+
const { loadedComponentName, loadedComponentPage } = config;
|
|
30
|
+
const { currentRoute, isRedirecting } = props.router;
|
|
31
|
+
const componentConfig = props.router.routes[currentRoute.name];
|
|
32
|
+
let preventRedirect = false;
|
|
33
|
+
if (isRedirecting) preventRedirect = true;
|
|
34
|
+
else if (loadedComponentName === currentRoute.name) preventRedirect = true;
|
|
35
|
+
else if (loadedComponentPage != null && currentRoute.name != null) {
|
|
36
|
+
if (loadedComponentPage === currentRoute.pageId) {
|
|
37
|
+
props.router.adapters.batch(() => {
|
|
38
|
+
config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
39
|
+
});
|
|
40
|
+
preventRedirect = true;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (preventRedirect) return;
|
|
44
|
+
props.router.adapters.batch(() => {
|
|
45
|
+
if (loadedComponentName) props.beforeUpdatePageComponent?.();
|
|
46
|
+
props.beforeSetPageComponent?.(componentConfig);
|
|
47
|
+
config.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
48
|
+
config.loadedComponentName = currentRoute.name;
|
|
49
|
+
config.loadedComponentPage = componentConfig.pageId;
|
|
50
|
+
});
|
|
51
|
+
}, []);
|
|
52
|
+
useState(() => {
|
|
53
|
+
props.router.adapters.batch(() => {
|
|
54
|
+
props.beforeMount?.();
|
|
55
|
+
redirectOnHistoryPop();
|
|
56
|
+
setLoadedComponent();
|
|
57
|
+
disposerRef.current = props.router.adapters.autorun(setLoadedComponent);
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
useEffect(() => {
|
|
61
|
+
return () => {
|
|
62
|
+
disposerRef.current?.();
|
|
63
|
+
};
|
|
64
|
+
}, []);
|
|
65
|
+
if (!config.loadedComponentName) return null;
|
|
66
|
+
const LoadedComponent = props.router.routes[config.loadedComponentName]?.component || null;
|
|
67
|
+
if (LoadedComponent)
|
|
68
|
+
return /* @__PURE__ */ jsx(LoadedComponent, { ...config.currentProps, router: props.router });
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
function RouterWrapper(props) {
|
|
72
|
+
const Component = props.router.adapters.observer ? props.router.adapters.observer(RouterInner) : RouterInner;
|
|
73
|
+
return /* @__PURE__ */ jsx(Component, { ...props });
|
|
74
|
+
}
|
|
75
|
+
var Router = memo(RouterWrapper);
|
|
76
|
+
export {
|
|
77
|
+
Router
|
|
78
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Router.d.ts","sourceRoot":"","sources":["../../packages/solid/Router.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIrE,wBAAgB,MAAM,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,kCAwGhG"}
|
package/solid/index.cjs
ADDED
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
|
|
20
|
+
// packages/solid/index.ts
|
|
21
|
+
var solid_exports = {};
|
|
22
|
+
__export(solid_exports, {
|
|
23
|
+
Router: () => Router
|
|
24
|
+
});
|
|
25
|
+
module.exports = __toCommonJS(solid_exports);
|
|
26
|
+
|
|
27
|
+
// packages/solid/Router.tsx
|
|
28
|
+
var import_web = require("solid-js/web");
|
|
29
|
+
var import_web2 = require("solid-js/web");
|
|
30
|
+
var import_reactive_route = require("reactive-route");
|
|
31
|
+
var import_solid_js = require("solid-js");
|
|
32
|
+
var import_web3 = require("solid-js/web");
|
|
33
|
+
function Router(props) {
|
|
34
|
+
const config = props.router.adapters.makeObservable({
|
|
35
|
+
loadedComponentName: void 0,
|
|
36
|
+
loadedComponentPage: void 0,
|
|
37
|
+
currentProps: {}
|
|
38
|
+
});
|
|
39
|
+
let currentProps = {};
|
|
40
|
+
function redirectOnHistoryPop() {
|
|
41
|
+
if (!import_reactive_route.history) return;
|
|
42
|
+
import_reactive_route.history.listen((params) => {
|
|
43
|
+
if (params.action !== "POP") return;
|
|
44
|
+
const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
|
|
45
|
+
if (previousRoutePathname === params.location.pathname) {
|
|
46
|
+
props.router.routesHistory.pop();
|
|
47
|
+
}
|
|
48
|
+
void props.router.restoreFromURL({
|
|
49
|
+
pathname: import_reactive_route.history.location.pathname,
|
|
50
|
+
replace: true
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
function setLoadedComponent() {
|
|
55
|
+
const currentRouteName = props.router.currentRoute.name;
|
|
56
|
+
const currentRoutePage = props.router.currentRoute.pageId;
|
|
57
|
+
const componentConfig = props.router.routes[currentRouteName];
|
|
58
|
+
let preventRedirect = false;
|
|
59
|
+
if (props.router.isRedirecting) preventRedirect = true;
|
|
60
|
+
else if (config.loadedComponentName === currentRouteName) {
|
|
61
|
+
preventRedirect = true;
|
|
62
|
+
} else if (config.loadedComponentPage != null && currentRouteName != null) {
|
|
63
|
+
if (config.loadedComponentPage === currentRoutePage) {
|
|
64
|
+
props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
|
|
65
|
+
currentProps = "props" in componentConfig ? componentConfig.props : {};
|
|
66
|
+
preventRedirect = true;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (preventRedirect) return;
|
|
70
|
+
props.router.adapters.batch(() => {
|
|
71
|
+
if (config.loadedComponentName) {
|
|
72
|
+
props.beforeUpdatePageComponent?.();
|
|
73
|
+
}
|
|
74
|
+
props.beforeSetPageComponent?.(componentConfig);
|
|
75
|
+
props.router.adapters.batch(() => {
|
|
76
|
+
props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
|
|
77
|
+
currentProps = "props" in componentConfig ? componentConfig.props : {};
|
|
78
|
+
config.loadedComponentName = currentRouteName;
|
|
79
|
+
config.loadedComponentPage = componentConfig.pageId;
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
props.beforeMount?.();
|
|
84
|
+
redirectOnHistoryPop();
|
|
85
|
+
if (props.router.adapters.immediateSetComponent) {
|
|
86
|
+
props.router.adapters.batch(() => {
|
|
87
|
+
setLoadedComponent();
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
props.router.adapters.autorun(() => setLoadedComponent());
|
|
91
|
+
return (
|
|
92
|
+
// @ts-ignore
|
|
93
|
+
(0, import_web.createComponent)(import_solid_js.Show, {
|
|
94
|
+
get when() {
|
|
95
|
+
return config.loadedComponentName;
|
|
96
|
+
},
|
|
97
|
+
get children() {
|
|
98
|
+
return (0, import_web.createComponent)(import_web3.Dynamic, (0, import_web2.mergeProps)({
|
|
99
|
+
get component() {
|
|
100
|
+
return props.router.routes[config.loadedComponentName]?.component || void 0;
|
|
101
|
+
}
|
|
102
|
+
}, () => Object.keys(config.currentProps).reduce((acc, key) => {
|
|
103
|
+
acc[key] = currentProps[key];
|
|
104
|
+
return acc;
|
|
105
|
+
}, {}), {
|
|
106
|
+
get router() {
|
|
107
|
+
return props.router;
|
|
108
|
+
}
|
|
109
|
+
}));
|
|
110
|
+
}
|
|
111
|
+
})
|
|
112
|
+
);
|
|
113
|
+
}
|
package/solid/index.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/solid/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}
|
package/solid/index.mjs
ADDED
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
// packages/solid/Router.tsx
|
|
2
|
+
import { createComponent as _$createComponent } from "solid-js/web";
|
|
3
|
+
import { mergeProps as _$mergeProps } from "solid-js/web";
|
|
4
|
+
import { history } from "reactive-route";
|
|
5
|
+
import { Show } from "solid-js";
|
|
6
|
+
import { Dynamic } from "solid-js/web";
|
|
7
|
+
function Router(props) {
|
|
8
|
+
const config = props.router.adapters.makeObservable({
|
|
9
|
+
loadedComponentName: void 0,
|
|
10
|
+
loadedComponentPage: void 0,
|
|
11
|
+
currentProps: {}
|
|
12
|
+
});
|
|
13
|
+
let currentProps = {};
|
|
14
|
+
function redirectOnHistoryPop() {
|
|
15
|
+
if (!history) return;
|
|
16
|
+
history.listen((params) => {
|
|
17
|
+
if (params.action !== "POP") return;
|
|
18
|
+
const previousRoutePathname = props.router.routesHistory[props.router.routesHistory.length - 2];
|
|
19
|
+
if (previousRoutePathname === params.location.pathname) {
|
|
20
|
+
props.router.routesHistory.pop();
|
|
21
|
+
}
|
|
22
|
+
void props.router.restoreFromURL({
|
|
23
|
+
pathname: history.location.pathname,
|
|
24
|
+
replace: true
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
function setLoadedComponent() {
|
|
29
|
+
const currentRouteName = props.router.currentRoute.name;
|
|
30
|
+
const currentRoutePage = props.router.currentRoute.pageId;
|
|
31
|
+
const componentConfig = props.router.routes[currentRouteName];
|
|
32
|
+
let preventRedirect = false;
|
|
33
|
+
if (props.router.isRedirecting) preventRedirect = true;
|
|
34
|
+
else if (config.loadedComponentName === currentRouteName) {
|
|
35
|
+
preventRedirect = true;
|
|
36
|
+
} else if (config.loadedComponentPage != null && currentRouteName != null) {
|
|
37
|
+
if (config.loadedComponentPage === currentRoutePage) {
|
|
38
|
+
props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
|
|
39
|
+
currentProps = "props" in componentConfig ? componentConfig.props : {};
|
|
40
|
+
preventRedirect = true;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (preventRedirect) return;
|
|
44
|
+
props.router.adapters.batch(() => {
|
|
45
|
+
if (config.loadedComponentName) {
|
|
46
|
+
props.beforeUpdatePageComponent?.();
|
|
47
|
+
}
|
|
48
|
+
props.beforeSetPageComponent?.(componentConfig);
|
|
49
|
+
props.router.adapters.batch(() => {
|
|
50
|
+
props.router.adapters.replaceObject(config.currentProps, "props" in componentConfig ? componentConfig.props : {});
|
|
51
|
+
currentProps = "props" in componentConfig ? componentConfig.props : {};
|
|
52
|
+
config.loadedComponentName = currentRouteName;
|
|
53
|
+
config.loadedComponentPage = componentConfig.pageId;
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
props.beforeMount?.();
|
|
58
|
+
redirectOnHistoryPop();
|
|
59
|
+
if (props.router.adapters.immediateSetComponent) {
|
|
60
|
+
props.router.adapters.batch(() => {
|
|
61
|
+
setLoadedComponent();
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
props.router.adapters.autorun(() => setLoadedComponent());
|
|
65
|
+
return (
|
|
66
|
+
// @ts-ignore
|
|
67
|
+
_$createComponent(Show, {
|
|
68
|
+
get when() {
|
|
69
|
+
return config.loadedComponentName;
|
|
70
|
+
},
|
|
71
|
+
get children() {
|
|
72
|
+
return _$createComponent(Dynamic, _$mergeProps({
|
|
73
|
+
get component() {
|
|
74
|
+
return props.router.routes[config.loadedComponentName]?.component || void 0;
|
|
75
|
+
}
|
|
76
|
+
}, () => Object.keys(config.currentProps).reduce((acc, key) => {
|
|
77
|
+
acc[key] = currentProps[key];
|
|
78
|
+
return acc;
|
|
79
|
+
}, {}), {
|
|
80
|
+
get router() {
|
|
81
|
+
return props.router;
|
|
82
|
+
}
|
|
83
|
+
}));
|
|
84
|
+
}
|
|
85
|
+
})
|
|
86
|
+
);
|
|
87
|
+
}
|
|
88
|
+
export {
|
|
89
|
+
Router
|
|
90
|
+
};
|
package/vue/index.cjs
ADDED
|
Binary file
|
package/vue/index.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/vue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,cAAc,CAAC"}
|
package/vue/index.mjs
ADDED
|
Binary file
|
package/LICENSE
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2025 Dmitry
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
package/README.md
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
## Config-based routing
|
|
2
|
-
|
|
3
|
-

|
|
4
|
-
[](https://www.npmjs.com/package/reactive-route)
|
|
5
|
-

|
|
6
|
-

|
|
7
|
-

|
|
8
|
-
|
|
9
|
-
> [!WARNING]
|
|
10
|
-
> Work in progress
|
package/dist/cjs/package.json
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"type": "commonjs"}
|
package/dist/cjs/react/index.js
DELETED
|
@@ -1,149 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __defProp = Object.defineProperty;
|
|
3
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
-
var __export = (target, all) => {
|
|
7
|
-
for (var name in all)
|
|
8
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
-
};
|
|
10
|
-
var __copyProps = (to, from, except, desc) => {
|
|
11
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
-
for (let key of __getOwnPropNames(from))
|
|
13
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
-
}
|
|
16
|
-
return to;
|
|
17
|
-
};
|
|
18
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
-
|
|
20
|
-
// packages/react/index.ts
|
|
21
|
-
var react_exports = {};
|
|
22
|
-
__export(react_exports, {
|
|
23
|
-
Router: () => Router
|
|
24
|
-
});
|
|
25
|
-
module.exports = __toCommonJS(react_exports);
|
|
26
|
-
|
|
27
|
-
// packages/react/Router.tsx
|
|
28
|
-
var import_mobx2 = require("mobx");
|
|
29
|
-
var import_mobx_react_lite = require("mobx-react-lite");
|
|
30
|
-
var import_reactive_route = require("reactive-route");
|
|
31
|
-
|
|
32
|
-
// packages/react/useStore.ts
|
|
33
|
-
var import_mobx = require("mobx");
|
|
34
|
-
var import_react = require("react");
|
|
35
|
-
function useStore(ViewModel, props) {
|
|
36
|
-
const isFirstRenderRef = (0, import_react.useRef)(true);
|
|
37
|
-
const [vm] = (0, import_react.useState)(() => {
|
|
38
|
-
const instance = new ViewModel(props || {});
|
|
39
|
-
(0, import_mobx.runInAction)(() => {
|
|
40
|
-
instance.beforeMount?.();
|
|
41
|
-
});
|
|
42
|
-
return instance;
|
|
43
|
-
});
|
|
44
|
-
(0, import_react.useEffect)(() => {
|
|
45
|
-
if (isFirstRenderRef.current) {
|
|
46
|
-
isFirstRenderRef.current = false;
|
|
47
|
-
} else if (props) {
|
|
48
|
-
(0, import_mobx.runInAction)(() => {
|
|
49
|
-
vm.props = props || {};
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
|
-
}, [props]);
|
|
53
|
-
(0, import_react.useEffect)(() => {
|
|
54
|
-
vm.afterMount?.();
|
|
55
|
-
return () => {
|
|
56
|
-
vm.autorunDisposers?.forEach((disposer) => disposer());
|
|
57
|
-
};
|
|
58
|
-
}, []);
|
|
59
|
-
return vm;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
// packages/react/Router.tsx
|
|
63
|
-
var import_jsx_runtime = require("react/jsx-runtime");
|
|
64
|
-
var VM = class {
|
|
65
|
-
constructor(props) {
|
|
66
|
-
this.props = props;
|
|
67
|
-
(0, import_mobx2.makeAutoObservable)(
|
|
68
|
-
this,
|
|
69
|
-
{ loadedComponent: false, setLoadedComponent: false, props: false },
|
|
70
|
-
{ autoBind: true }
|
|
71
|
-
);
|
|
72
|
-
}
|
|
73
|
-
autorunDisposers = [];
|
|
74
|
-
loadedComponentName = void 0;
|
|
75
|
-
loadedComponentPage = void 0;
|
|
76
|
-
loadedComponent;
|
|
77
|
-
currentProps = {};
|
|
78
|
-
get utils() {
|
|
79
|
-
return this.props.routerStore.utils;
|
|
80
|
-
}
|
|
81
|
-
beforeMount() {
|
|
82
|
-
this.props.beforeMount?.();
|
|
83
|
-
this.redirectOnHistoryPop();
|
|
84
|
-
this.setLoadedComponent();
|
|
85
|
-
this.autorunDisposers.push(this.utils.autorun(this.setLoadedComponent));
|
|
86
|
-
}
|
|
87
|
-
redirectOnHistoryPop() {
|
|
88
|
-
if (!import_reactive_route.history) return;
|
|
89
|
-
import_reactive_route.history.listen((params) => {
|
|
90
|
-
if (params.action !== "POP") return;
|
|
91
|
-
const previousRoutePathname = this.props.routerStore.routesHistory[this.props.routerStore.routesHistory.length - 2];
|
|
92
|
-
if (previousRoutePathname === params.location.pathname) {
|
|
93
|
-
this.utils.batch(() => this.props.routerStore.routesHistory.pop());
|
|
94
|
-
}
|
|
95
|
-
void this.props.routerStore.redirectTo({
|
|
96
|
-
noHistoryPush: true,
|
|
97
|
-
...(0, import_reactive_route.getInitialRoute)({
|
|
98
|
-
routes: this.props.routes,
|
|
99
|
-
pathname: import_reactive_route.history.location.pathname,
|
|
100
|
-
fallback: "error404"
|
|
101
|
-
})
|
|
102
|
-
});
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
|
-
setLoadedComponent = () => {
|
|
106
|
-
const { loadedComponentName, loadedComponentPage } = this;
|
|
107
|
-
const { currentRoute, isRedirecting } = this.props.routerStore;
|
|
108
|
-
const currentRouteName = currentRoute.name;
|
|
109
|
-
const currentRoutePage = currentRoute.pageName;
|
|
110
|
-
let preventRedirect = false;
|
|
111
|
-
if (isRedirecting) preventRedirect = true;
|
|
112
|
-
else if (loadedComponentName === currentRouteName) preventRedirect = true;
|
|
113
|
-
else if (loadedComponentPage != null && currentRouteName != null) {
|
|
114
|
-
if (loadedComponentPage === currentRoutePage) {
|
|
115
|
-
const componentConfig = this.props.routes[currentRouteName];
|
|
116
|
-
this.utils.batch(() => {
|
|
117
|
-
this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
118
|
-
});
|
|
119
|
-
preventRedirect = true;
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
if (preventRedirect) return;
|
|
123
|
-
this.utils.batch(() => {
|
|
124
|
-
if (!loadedComponentName) {
|
|
125
|
-
this.setComponent(currentRouteName);
|
|
126
|
-
} else {
|
|
127
|
-
this.props.beforeUpdatePageComponent?.();
|
|
128
|
-
this.setComponent(currentRouteName);
|
|
129
|
-
}
|
|
130
|
-
});
|
|
131
|
-
};
|
|
132
|
-
setComponent(currentRouteName) {
|
|
133
|
-
const componentConfig = this.props.routes[currentRouteName];
|
|
134
|
-
const RouteComponent = componentConfig.component;
|
|
135
|
-
this.props.beforeSetPageComponent?.(componentConfig);
|
|
136
|
-
this.currentProps = "props" in componentConfig ? componentConfig.props || {} : {};
|
|
137
|
-
this.loadedComponentName = currentRouteName;
|
|
138
|
-
this.loadedComponentPage = componentConfig.pageName;
|
|
139
|
-
this.loadedComponent = RouteComponent;
|
|
140
|
-
}
|
|
141
|
-
};
|
|
142
|
-
var Router = (0, import_mobx_react_lite.observer)(
|
|
143
|
-
(props) => {
|
|
144
|
-
const vm = useStore(VM, props);
|
|
145
|
-
const LoadedComponent = vm.loadedComponentName ? vm.loadedComponent : null;
|
|
146
|
-
if (LoadedComponent) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LoadedComponent, { ...vm.currentProps });
|
|
147
|
-
return null;
|
|
148
|
-
}
|
|
149
|
-
);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"type": "commonjs"}
|