@kasperrt/smolter 0.0.1 → 0.3.0
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/{src/internal → .generated}/client/index.ts +1 -0
- package/.generated/core/environment.ts +43 -0
- package/{src/internal → .generated}/core/errors.ts +1 -1
- package/{src/internal → .generated}/core/index.ts +2 -0
- package/.generated/core/navigation-router.ts +107 -0
- package/.generated/core/navigation.ts +147 -0
- package/.generated/core/presentation.ts +108 -0
- package/.generated/core/resource-types.ts +44 -0
- package/.generated/core/resources.ts +444 -0
- package/.generated/core/responses.ts +86 -0
- package/{src/internal → .generated}/core/router.ts +136 -63
- package/.generated/core/serialize.ts +20 -0
- package/.generated/core/store.ts +25 -0
- package/.generated/core/submission.ts +116 -0
- package/{src/internal → .generated}/core/types.ts +18 -1
- package/.generated/core/url.ts +29 -0
- package/.generated/core/utils.ts +5 -0
- package/.generated/preact/await.tsx +41 -0
- package/.generated/preact/client.tsx +93 -0
- package/.generated/preact/context.ts +59 -0
- package/.generated/preact/document.tsx +198 -0
- package/{src/internal → .generated}/preact/fetcher.ts +43 -23
- package/.generated/preact/form.ts +58 -0
- package/{src/internal → .generated}/preact/hooks.ts +25 -28
- package/.generated/preact/index.ts +34 -0
- package/.generated/preact/lazy-route.ts +100 -0
- package/.generated/preact/navigation-state.ts +9 -0
- package/.generated/preact/navigation.tsx +147 -0
- package/.generated/preact/root-context.ts +21 -0
- package/.generated/preact/root-data.ts +45 -0
- package/.generated/preact/route-hooks.tsx +170 -0
- package/.generated/preact/route-types.ts +76 -0
- package/.generated/preact/router.tsx +107 -0
- package/{src/internal → .generated}/preact/routes.ts +17 -9
- package/.generated/react/context.ts +59 -0
- package/.generated/react/data.ts +25 -0
- package/{src/internal → .generated}/react/fetcher.ts +13 -11
- package/.generated/react/form.ts +58 -0
- package/{src/internal → .generated}/react/hooks.ts +9 -14
- package/{src/internal/preact → .generated/react}/index.ts +5 -1
- package/{src/internal → .generated}/react/link.ts +13 -21
- package/.generated/react/resources/components.tsx +404 -0
- package/{src/internal → .generated}/react/routes.ts +17 -9
- package/.generated/server/application.tsx +185 -0
- package/.generated/server/assets.ts +19 -0
- package/.generated/server/handler.ts +69 -0
- package/.generated/server/http.ts +55 -0
- package/{src/internal → .generated}/server/index.ts +4 -17
- package/.generated/server/node.ts +4 -0
- package/.generated/server/preact.ts +7 -0
- package/.generated/vite/application/browser-boundary.ts +42 -0
- package/.generated/vite/application/lazy-files.ts +136 -0
- package/.generated/vite/application/vite.ts +144 -0
- package/{src/internal → .generated}/vite/index.ts +4 -2
- package/.generated/vite/preact.ts +24 -0
- package/.generated/vite/react.ts +18 -0
- package/{src/internal → .generated}/vite/transport.ts +2 -1
- package/CHANGELOG.md +54 -0
- package/README.md +269 -55
- package/dist/client/deserialize.js +10 -0
- package/dist/{internal/client → client}/index.d.ts +1 -0
- package/dist/client/index.js +46 -0
- package/dist/core/environment.d.ts +12 -0
- package/dist/core/environment.js +23 -0
- package/dist/core/errors.js +7 -0
- package/dist/{internal/core → core}/index.d.ts +2 -0
- package/dist/core/match.js +33 -0
- package/dist/core/navigation-router.d.ts +15 -0
- package/dist/core/navigation-router.js +64 -0
- package/dist/core/navigation.d.ts +15 -0
- package/dist/core/navigation.js +92 -0
- package/dist/core/presentation.d.ts +5 -0
- package/dist/core/presentation.js +69 -0
- package/dist/core/resource-types.d.ts +37 -0
- package/dist/core/resources.d.ts +19 -0
- package/dist/core/resources.js +345 -0
- package/dist/core/responses.d.ts +15 -0
- package/dist/core/responses.js +48 -0
- package/dist/{internal/core → core}/router.d.ts +1 -1
- package/dist/core/router.js +204 -0
- package/dist/core/serialize.d.ts +5 -0
- package/dist/core/serialize.js +17 -0
- package/dist/core/store.d.ts +6 -0
- package/dist/core/store.js +21 -0
- package/dist/core/submission.d.ts +30 -0
- package/dist/core/submission.js +41 -0
- package/dist/{internal/core → core}/types.d.ts +16 -1
- package/dist/core/url.d.ts +7 -0
- package/dist/core/url.js +12 -0
- package/dist/core/utils.d.ts +5 -0
- package/dist/core/utils.js +5 -0
- package/dist/files/index.js +64 -0
- package/dist/preact/await.d.ts +7 -0
- package/dist/preact/await.js +19 -0
- package/dist/preact/client.d.ts +7 -0
- package/dist/preact/client.js +67 -0
- package/dist/preact/context.d.ts +18 -0
- package/dist/preact/context.js +23 -0
- package/dist/preact/document.d.ts +15 -0
- package/dist/preact/document.js +155 -0
- package/dist/{internal/preact → preact}/fetcher.d.ts +9 -5
- package/dist/preact/fetcher.js +45 -0
- package/dist/{internal/preact → preact}/form.d.ts +5 -6
- package/dist/preact/form.js +21 -0
- package/dist/{internal/preact → preact}/hooks.d.ts +7 -6
- package/dist/preact/hooks.js +25 -0
- package/dist/preact/index.d.ts +18 -0
- package/dist/preact/index.js +15 -0
- package/dist/preact/lazy-route.d.ts +19 -0
- package/dist/preact/lazy-route.js +51 -0
- package/dist/preact/navigation-state.d.ts +2 -0
- package/dist/preact/navigation-state.js +9 -0
- package/dist/preact/navigation.d.ts +28 -0
- package/dist/preact/navigation.js +60 -0
- package/dist/preact/root-context.d.ts +13 -0
- package/dist/preact/root-context.js +9 -0
- package/dist/preact/root-data.d.ts +8 -0
- package/dist/preact/root-data.js +28 -0
- package/dist/preact/route-hooks.d.ts +32 -0
- package/dist/preact/route-hooks.js +94 -0
- package/dist/preact/route-types.d.ts +54 -0
- package/dist/preact/router.d.ts +16 -0
- package/dist/preact/router.js +63 -0
- package/dist/{internal/preact → preact}/routes.d.ts +1 -1
- package/dist/preact/routes.js +12 -0
- package/dist/{internal/preact → preact}/runtime.js +1 -1
- package/dist/react/context.d.ts +18 -0
- package/dist/react/context.js +23 -0
- package/dist/react/data.d.ts +5 -0
- package/dist/react/data.js +3 -0
- package/dist/{internal/react → react}/fetcher.d.ts +2 -2
- package/dist/react/fetcher.js +34 -0
- package/dist/{internal/react → react}/form.d.ts +5 -6
- package/dist/react/form.js +21 -0
- package/dist/react/hooks.js +25 -0
- package/dist/{internal/react → react}/index.d.ts +1 -1
- package/dist/react/index.js +10 -0
- package/dist/{internal/react → react}/link.d.ts +2 -2
- package/dist/react/link.js +27 -0
- package/dist/react/resources/components.d.ts +64 -0
- package/dist/react/resources/components.js +239 -0
- package/dist/{internal/react → react}/routes.d.ts +1 -1
- package/dist/react/routes.js +12 -0
- package/dist/react/runtime.js +1 -0
- package/dist/server/application.d.ts +4 -0
- package/dist/server/application.js +119 -0
- package/dist/server/assets.d.ts +5 -0
- package/dist/server/assets.js +7 -0
- package/dist/server/handler.d.ts +19 -0
- package/dist/server/handler.js +22 -0
- package/dist/server/http.d.ts +4 -0
- package/dist/server/http.js +27 -0
- package/dist/{internal/server → server}/index.d.ts +2 -3
- package/dist/server/index.js +76 -0
- package/dist/server/node.d.ts +3 -0
- package/dist/server/node.js +3 -0
- package/dist/server/preact.d.ts +3 -0
- package/dist/server/preact.js +4 -0
- package/dist/vite/application/browser-boundary.d.ts +3 -0
- package/dist/vite/application/browser-boundary.js +35 -0
- package/dist/vite/application/lazy-files.d.ts +2 -0
- package/dist/vite/application/lazy-files.js +87 -0
- package/dist/vite/application/vite.d.ts +9 -0
- package/dist/vite/application/vite.js +101 -0
- package/dist/{internal/vite → vite}/index.d.ts +2 -1
- package/dist/vite/index.js +104 -0
- package/dist/vite/preact.d.ts +11 -0
- package/dist/vite/preact.js +15 -0
- package/dist/vite/react.d.ts +9 -0
- package/dist/vite/react.js +14 -0
- package/dist/{internal/vite → vite}/transport.d.ts +1 -1
- package/dist/vite/transport.js +35 -0
- package/jsr.json +28 -11
- package/package.json +119 -38
- package/dist/client.d.ts +0 -2
- package/dist/client.js +0 -2
- package/dist/core.d.ts +0 -2
- package/dist/core.js +0 -2
- package/dist/files.d.ts +0 -2
- package/dist/files.js +0 -2
- package/dist/internal/client/deserialize.js +0 -11
- package/dist/internal/client/index.js +0 -44
- package/dist/internal/core/errors.js +0 -6
- package/dist/internal/core/index.js +0 -6
- package/dist/internal/core/match.js +0 -27
- package/dist/internal/core/router.js +0 -189
- package/dist/internal/core/types.js +0 -5
- package/dist/internal/core/url.d.ts +0 -2
- package/dist/internal/core/url.js +0 -6
- package/dist/internal/files/index.js +0 -77
- package/dist/internal/preact/context.d.ts +0 -18
- package/dist/internal/preact/context.js +0 -20
- package/dist/internal/preact/fetcher.js +0 -28
- package/dist/internal/preact/form.js +0 -41
- package/dist/internal/preact/hooks.js +0 -35
- package/dist/internal/preact/index.d.ts +0 -9
- package/dist/internal/preact/index.js +0 -7
- package/dist/internal/preact/link.d.ts +0 -12
- package/dist/internal/preact/link.js +0 -28
- package/dist/internal/preact/routes.js +0 -22
- package/dist/internal/react/context.d.ts +0 -18
- package/dist/internal/react/context.js +0 -20
- package/dist/internal/react/fetcher.js +0 -28
- package/dist/internal/react/form.js +0 -41
- package/dist/internal/react/hooks.js +0 -35
- package/dist/internal/react/index.js +0 -7
- package/dist/internal/react/link.js +0 -28
- package/dist/internal/react/routes.js +0 -22
- package/dist/internal/react/runtime.js +0 -2
- package/dist/internal/server/index.js +0 -81
- package/dist/internal/vite/index.js +0 -132
- package/dist/internal/vite/transport.js +0 -42
- package/dist/preact.d.ts +0 -2
- package/dist/preact.js +0 -2
- package/dist/react.d.ts +0 -2
- package/dist/react.js +0 -2
- package/dist/server.d.ts +0 -2
- package/dist/server.js +0 -2
- package/dist/vite.d.ts +0 -2
- package/dist/vite.js +0 -2
- package/src/client.ts +0 -2
- package/src/core.ts +0 -2
- package/src/files.ts +0 -2
- package/src/internal/core/url.ts +0 -6
- package/src/internal/preact/context.ts +0 -46
- package/src/internal/preact/form.ts +0 -79
- package/src/internal/preact/link.ts +0 -46
- package/src/internal/react/context.ts +0 -46
- package/src/internal/react/form.ts +0 -79
- package/src/internal/react/index.ts +0 -13
- package/src/preact.ts +0 -2
- package/src/react.ts +0 -2
- package/src/server.ts +0 -2
- package/src/vite.ts +0 -2
- /package/{src/internal → .generated}/client/deserialize.ts +0 -0
- /package/{src/internal → .generated}/core/match.ts +0 -0
- /package/{src/internal → .generated}/files/index.ts +0 -0
- /package/{src/internal → .generated}/preact/runtime.ts +0 -0
- /package/{src/internal → .generated}/react/runtime.ts +0 -0
- /package/dist/{internal/client → client}/deserialize.d.ts +0 -0
- /package/dist/{internal/core → core}/errors.d.ts +0 -0
- /package/dist/{internal/core → core}/match.d.ts +0 -0
- /package/dist/{internal/files → files}/index.d.ts +0 -0
- /package/dist/{internal/preact → preact}/runtime.d.ts +0 -0
- /package/dist/{internal/react → react}/hooks.d.ts +0 -0
- /package/dist/{internal/react → react}/runtime.d.ts +0 -0
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* React components and typed data hooks. Import from @kasperrt/smolter/react.
|
|
3
|
+
* @module
|
|
4
|
+
*/
|
|
5
|
+
import type { NavigationRouter, Snapshot } from "../core/index.ts";
|
|
6
|
+
import { type ReactNode } from "./runtime.ts";
|
|
7
|
+
/** Router instance and children rendered within its context. */
|
|
8
|
+
export interface RouterProviderProps {
|
|
9
|
+
router: NavigationRouter;
|
|
10
|
+
children?: ReactNode;
|
|
11
|
+
}
|
|
12
|
+
/** Provide a router to descendant hooks and connect its browser lifecycle. */
|
|
13
|
+
export declare function RouterProvider({ router, children, }: RouterProviderProps): ReactNode;
|
|
14
|
+
/** Hooks require a RouterProvider. */
|
|
15
|
+
export declare function useRouter<T extends NavigationRouter = NavigationRouter>(): T;
|
|
16
|
+
export declare function useSnapshot(): Snapshot;
|
|
17
|
+
export declare function useSnapshot<K extends keyof Snapshot>(key: K): Snapshot[K];
|
|
18
|
+
export declare function useSnapshot<K extends keyof Snapshot>(key: K, path: string | undefined): Snapshot[K] | undefined;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { createContext, createElement, useContext, useEffect, useSyncExternalStore } from "./runtime.js";
|
|
2
|
+
//#region .generated/react/context.ts
|
|
3
|
+
var RouterContext = createContext(void 0);
|
|
4
|
+
/** Provide a router to descendant hooks and connect its browser lifecycle. */
|
|
5
|
+
function RouterProvider({ router, children }) {
|
|
6
|
+
useEffect(router.start, [router]);
|
|
7
|
+
return createElement(RouterContext.Provider, { value: router }, children);
|
|
8
|
+
}
|
|
9
|
+
/** Hooks require a RouterProvider. */
|
|
10
|
+
function useRouter() {
|
|
11
|
+
return useContext(RouterContext);
|
|
12
|
+
}
|
|
13
|
+
function useSnapshot(key, path) {
|
|
14
|
+
const router = useRouter();
|
|
15
|
+
const getSnapshot = () => {
|
|
16
|
+
const snapshot = router.getSnapshot();
|
|
17
|
+
if (path !== void 0 && path !== snapshot.path) return void 0;
|
|
18
|
+
return key ? snapshot[key] : snapshot;
|
|
19
|
+
};
|
|
20
|
+
return useSyncExternalStore(router.subscribe, getSnapshot, getSnapshot);
|
|
21
|
+
}
|
|
22
|
+
//#endregion
|
|
23
|
+
export { RouterProvider, useRouter, useSnapshot };
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Resource subscriptions independent of URL navigation. @module */
|
|
2
|
+
export type { ActionFunctionArgs as ResourceActionArgs, DataResult as ResourceResult, LoaderFunctionArgs as ResourceLoaderArgs, ShouldRevalidateFunctionArgs as ResourceRevalidationArgs, } from "../core/resource-types.ts";
|
|
3
|
+
export { createResourceRouter, ResourceRouter, } from "../core/resources.ts";
|
|
4
|
+
export type { ResourceRouteModule } from "./resources/components.tsx";
|
|
5
|
+
export { Form as ResourceForm, Route as Resource, RouterProvider as ResourceProvider, useActionData as useResourceActionData, useFetcher as useResourceFetcher, useLoaderData as useResourceData, useNavigation as useResourceNavigation, useRevalidator as useResourceRevalidator, useRouteLoaderData, useRouter as useResourceRouter, useSubmit as useResourceSubmit, } from "./resources/components.tsx";
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { ResourceRouter, createResourceRouter } from "../core/resources.js";
|
|
2
|
+
import { Form, Route, RouterProvider, useActionData, useFetcher, useLoaderData, useNavigation, useRevalidator, useRouteLoaderData, useRouter, useSubmit } from "./resources/components.js";
|
|
3
|
+
export { Route as Resource, Form as ResourceForm, RouterProvider as ResourceProvider, ResourceRouter, createResourceRouter, useActionData as useResourceActionData, useLoaderData as useResourceData, useFetcher as useResourceFetcher, useNavigation as useResourceNavigation, useRevalidator as useResourceRevalidator, useRouter as useResourceRouter, useSubmit as useResourceSubmit, useRouteLoaderData };
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
* React components and typed data hooks. Import from @kasperrt/smolter/react.
|
|
3
3
|
* @module
|
|
4
4
|
*/
|
|
5
|
-
import type
|
|
5
|
+
import { type AnyDataFunction, type DataFunction, type DataOf, type FetcherSnapshot, type Result, type Route as RouteDefinition, type RouteModule, type SubmitOptions } from "../core/index.ts";
|
|
6
6
|
import { type FormProps } from "./form.ts";
|
|
7
|
-
import type
|
|
7
|
+
import { type ComponentType } from "./runtime.ts";
|
|
8
8
|
/** Action method and optional explicit route URL for a fetcher submission. */
|
|
9
9
|
export interface FetcherSubmitOptions extends SubmitOptions {
|
|
10
10
|
action?: string;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { createElement, useEffect, useMemo, useSyncExternalStore } from "./runtime.js";
|
|
2
|
+
import { useRouter } from "./context.js";
|
|
3
|
+
import { Form } from "./form.js";
|
|
4
|
+
//#region .generated/react/fetcher.ts
|
|
5
|
+
/** Create a fetcher for independent route reads and mutations; its data stays local. */
|
|
6
|
+
function useFetcher(route) {
|
|
7
|
+
const router = useRouter();
|
|
8
|
+
const path = route?.path;
|
|
9
|
+
const fetcher = useMemo(() => {
|
|
10
|
+
const store = router.createFetcher();
|
|
11
|
+
const target = () => {
|
|
12
|
+
const snapshot = router.getSnapshot();
|
|
13
|
+
return path === void 0 || path === snapshot.path ? snapshot.url : path;
|
|
14
|
+
};
|
|
15
|
+
return {
|
|
16
|
+
...store,
|
|
17
|
+
Form: (props) => createElement(Form, {
|
|
18
|
+
action: target(),
|
|
19
|
+
...props,
|
|
20
|
+
fetcher: store
|
|
21
|
+
}),
|
|
22
|
+
load: (url) => store.load(url ?? target()),
|
|
23
|
+
submit: (body, options) => store.submit(options?.action ?? target(), body, options)
|
|
24
|
+
};
|
|
25
|
+
}, [router, path]);
|
|
26
|
+
useEffect(() => fetcher.dispose, [fetcher]);
|
|
27
|
+
const state = useSyncExternalStore(fetcher.subscribe, fetcher.getSnapshot, fetcher.getSnapshot);
|
|
28
|
+
return {
|
|
29
|
+
...fetcher,
|
|
30
|
+
...state
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//#endregion
|
|
34
|
+
export { useFetcher };
|
|
@@ -2,16 +2,15 @@
|
|
|
2
2
|
* React components and typed data hooks. Import from @kasperrt/smolter/react.
|
|
3
3
|
* @module
|
|
4
4
|
*/
|
|
5
|
-
import type
|
|
6
|
-
import
|
|
5
|
+
import { type Fetcher } from "../core/index.ts";
|
|
6
|
+
import { type RouteFormOptions } from "../core/submission.ts";
|
|
7
|
+
import { type FormHTMLAttributes, type ReactNode } from "./runtime.ts";
|
|
7
8
|
/** Form attributes with GET loader requests or POST, PUT, PATCH, and DELETE actions. */
|
|
8
|
-
export interface FormProps extends Omit<FormHTMLAttributes<HTMLFormElement>, "action" | "method"
|
|
9
|
-
action?: string;
|
|
10
|
-
method?: "get" | "post" | "put" | "patch" | "delete";
|
|
9
|
+
export interface FormProps extends Omit<FormHTMLAttributes<HTMLFormElement>, "action" | "method">, RouteFormOptions {
|
|
11
10
|
}
|
|
12
11
|
interface InternalFormProps extends FormProps {
|
|
13
12
|
fetcher?: Fetcher;
|
|
14
13
|
}
|
|
15
14
|
/** Submit form data to a registered route without a document reload. */
|
|
16
|
-
export declare function Form(
|
|
15
|
+
export declare function Form(options: InternalFormProps): ReactNode;
|
|
17
16
|
export {};
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { createElement } from "./runtime.js";
|
|
2
|
+
import { useRouter } from "./context.js";
|
|
3
|
+
import { submitForm } from "../core/submission.js";
|
|
4
|
+
//#region .generated/react/form.ts
|
|
5
|
+
/** Submit form data to a registered route without a document reload. */
|
|
6
|
+
function Form(options) {
|
|
7
|
+
const { action, method, fetcher, onSubmit, reloadDocument, preventScrollReset, replace, ...props } = options;
|
|
8
|
+
const router = useRouter();
|
|
9
|
+
const submit = (event) => {
|
|
10
|
+
onSubmit?.(event);
|
|
11
|
+
submitForm(router, event, event.nativeEvent.submitter, options, fetcher);
|
|
12
|
+
};
|
|
13
|
+
return createElement("form", {
|
|
14
|
+
...props,
|
|
15
|
+
action,
|
|
16
|
+
method: method === "get" ? "get" : "post",
|
|
17
|
+
onSubmit: submit
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
//#endregion
|
|
21
|
+
export { Form };
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { useRouter, useSnapshot } from "./context.js";
|
|
2
|
+
//#region .generated/react/hooks.ts
|
|
3
|
+
/** Pass a route for inference, or use useLoaderData<typeof loader>() in its module. */
|
|
4
|
+
function useLoaderData(route) {
|
|
5
|
+
return useSnapshot("data", route?.path);
|
|
6
|
+
}
|
|
7
|
+
/** Read the last page action result, optionally inferring its type from a route. */
|
|
8
|
+
function useActionData(route) {
|
|
9
|
+
return useSnapshot("actionData", route?.path);
|
|
10
|
+
}
|
|
11
|
+
/** Read path parameters for the active route. */
|
|
12
|
+
function useParams() {
|
|
13
|
+
return useSnapshot("params");
|
|
14
|
+
}
|
|
15
|
+
/** Read the current path, search, and hash together with the navigate function. */
|
|
16
|
+
function useLocation() {
|
|
17
|
+
const router = useRouter();
|
|
18
|
+
return [useSnapshot("url").replace(/^\w+:\/\/[^/]+/, ""), router.navigate];
|
|
19
|
+
}
|
|
20
|
+
/** Get the function that revalidates the current loader subject to shouldRevalidate. */
|
|
21
|
+
function useRevalidator() {
|
|
22
|
+
return useRouter().revalidate;
|
|
23
|
+
}
|
|
24
|
+
//#endregion
|
|
25
|
+
export { useActionData, useLoaderData, useLocation, useParams, useRevalidator };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/** Framework components and typed data hooks. @module */
|
|
2
2
|
export type * from "../core/index.ts";
|
|
3
|
-
export { createRouter, defineRoute } from "../core/index.ts";
|
|
3
|
+
export { createDataRouter, createRouter, defineRoute, } from "../core/index.ts";
|
|
4
4
|
export { RouterProvider, type RouterProviderProps, useRouter, } from "./context.ts";
|
|
5
5
|
export * from "./fetcher.ts";
|
|
6
6
|
export * from "./form.ts";
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { defineRoute } from "../core/match.js";
|
|
2
|
+
import { createRouter } from "../core/navigation-router.js";
|
|
3
|
+
import { createDataRouter } from "../core/router.js";
|
|
4
|
+
import { RouterProvider, useRouter } from "./context.js";
|
|
5
|
+
import { Form } from "./form.js";
|
|
6
|
+
import { useFetcher } from "./fetcher.js";
|
|
7
|
+
import { useActionData, useLoaderData, useLocation, useParams, useRevalidator } from "./hooks.js";
|
|
8
|
+
import { Link } from "./link.js";
|
|
9
|
+
import { Routes } from "./routes.js";
|
|
10
|
+
export { Form, Link, RouterProvider, Routes, createDataRouter, createRouter, defineRoute, useActionData, useFetcher, useLoaderData, useLocation, useParams, useRevalidator, useRouter };
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
* React components and typed data hooks. Import from @kasperrt/smolter/react.
|
|
3
3
|
* @module
|
|
4
4
|
*/
|
|
5
|
-
import type
|
|
5
|
+
import { type AnchorHTMLAttributes, type ReactNode } from "./runtime.ts";
|
|
6
6
|
/** Anchor attributes with internal navigation and optional history replacement. */
|
|
7
7
|
export interface LinkProps extends AnchorHTMLAttributes<HTMLAnchorElement> {
|
|
8
8
|
href: string;
|
|
9
9
|
replace?: boolean;
|
|
10
10
|
}
|
|
11
11
|
/** Render an anchor that handles internal navigation and preserves native modified clicks. */
|
|
12
|
-
export declare function Link(
|
|
12
|
+
export declare function Link(options: LinkProps): ReactNode;
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { internalURL, navigationClick } from "../core/url.js";
|
|
2
|
+
import { createElement } from "./runtime.js";
|
|
3
|
+
import { useRouter } from "./context.js";
|
|
4
|
+
//#region .generated/react/link.ts
|
|
5
|
+
/**
|
|
6
|
+
* React components and typed data hooks. Import from @kasperrt/smolter/react.
|
|
7
|
+
* @module
|
|
8
|
+
*/
|
|
9
|
+
/** Render an anchor that handles internal navigation and preserves native modified clicks. */
|
|
10
|
+
function Link(options) {
|
|
11
|
+
const { href, replace, onClick, ...props } = options;
|
|
12
|
+
const router = useRouter();
|
|
13
|
+
const click = (event) => {
|
|
14
|
+
onClick?.(event);
|
|
15
|
+
if (!navigationClick(event, event.currentTarget)) return;
|
|
16
|
+
if (!internalURL(router.getSnapshot().url, href)) return;
|
|
17
|
+
event.preventDefault();
|
|
18
|
+
router.navigate(href, options);
|
|
19
|
+
};
|
|
20
|
+
return createElement("a", {
|
|
21
|
+
...props,
|
|
22
|
+
href,
|
|
23
|
+
onClick: click
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
//#endregion
|
|
27
|
+
export { Link };
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/** @jsxImportSource react */
|
|
2
|
+
import type { DataResult, NavigationState, Params, ResourceModule, RouteState } from "../../core/resource-types.ts";
|
|
3
|
+
import type { ResourceRouter } from "../../core/resources.ts";
|
|
4
|
+
import { type ComponentType, type PropsWithChildren } from "react";
|
|
5
|
+
export interface ResourceRouteModule extends ResourceModule {
|
|
6
|
+
default?: ComponentType;
|
|
7
|
+
ErrorBoundary?: ComponentType<{
|
|
8
|
+
retry: () => void;
|
|
9
|
+
}>;
|
|
10
|
+
HydrateFallback?: ComponentType;
|
|
11
|
+
}
|
|
12
|
+
interface RouterProviderProps extends PropsWithChildren {
|
|
13
|
+
initialMatches?: readonly {
|
|
14
|
+
params?: Params;
|
|
15
|
+
routeId: string;
|
|
16
|
+
}[];
|
|
17
|
+
router: ResourceRouter;
|
|
18
|
+
}
|
|
19
|
+
export declare function RouterProvider({ children, initialMatches, router, }: RouterProviderProps): import("react").JSX.Element;
|
|
20
|
+
interface RouteProps extends PropsWithChildren {
|
|
21
|
+
params?: Params;
|
|
22
|
+
persistent?: boolean;
|
|
23
|
+
routeId: string;
|
|
24
|
+
}
|
|
25
|
+
export declare function Route({ children, params, persistent, routeId, }: RouteProps): import("react").JSX.Element;
|
|
26
|
+
export declare function useLoaderData<Data>(): Data | null;
|
|
27
|
+
export declare function useRouteLoaderData<Data>(routeId: string, params?: Params): Data | null;
|
|
28
|
+
export declare function useActionData<Data>(): Data | null;
|
|
29
|
+
export declare function useNavigation(): {
|
|
30
|
+
state: NavigationState;
|
|
31
|
+
};
|
|
32
|
+
export declare function useRevalidator(): {
|
|
33
|
+
revalidate: () => Promise<DataResult<unknown>>;
|
|
34
|
+
state: string;
|
|
35
|
+
};
|
|
36
|
+
interface FetcherOptions {
|
|
37
|
+
params?: Params;
|
|
38
|
+
routeId?: string;
|
|
39
|
+
}
|
|
40
|
+
interface FetcherTarget {
|
|
41
|
+
params?: Params;
|
|
42
|
+
routeId?: string;
|
|
43
|
+
}
|
|
44
|
+
interface FormProps extends PropsWithChildren {
|
|
45
|
+
action?: string;
|
|
46
|
+
input?: unknown;
|
|
47
|
+
params?: Params;
|
|
48
|
+
}
|
|
49
|
+
export declare function Form({ action, children, input, params, }: FormProps): import("react").JSX.Element;
|
|
50
|
+
export declare function useSubmit(): (input?: unknown) => Promise<DataResult<unknown>>;
|
|
51
|
+
export declare function useFetcher<Data = unknown>(options?: FetcherOptions): readonly [
|
|
52
|
+
{
|
|
53
|
+
data: Data | null;
|
|
54
|
+
error: string;
|
|
55
|
+
state: NavigationState;
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
Form: ({ children, input, }: Pick<FormProps, "children" | "input">) => import("react").JSX.Element;
|
|
59
|
+
load: (target?: FetcherTarget) => Promise<DataResult<Data>>;
|
|
60
|
+
submit: (input: unknown, target?: FetcherTarget) => Promise<DataResult<Data>>;
|
|
61
|
+
}
|
|
62
|
+
];
|
|
63
|
+
export declare function useRouter(): ResourceRouter;
|
|
64
|
+
export type { NavigationState, RouteState };
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
import { Component, createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
|
|
2
|
+
import { jsx } from "react/jsx-runtime";
|
|
3
|
+
//#region .generated/react/resources/components.tsx
|
|
4
|
+
var RouterContext = createContext(null);
|
|
5
|
+
var RouteContext = createContext(null);
|
|
6
|
+
var FormContext = createContext(null);
|
|
7
|
+
function RouterProvider({ children, initialMatches = EMPTY_MATCHES, router }) {
|
|
8
|
+
useEffect(() => {
|
|
9
|
+
for (const match of initialMatches) router.load(match.routeId, match.params ?? {});
|
|
10
|
+
return () => router.dispose();
|
|
11
|
+
}, [initialMatches, router]);
|
|
12
|
+
return /* @__PURE__ */ jsx(RouterContext.Provider, {
|
|
13
|
+
value: router,
|
|
14
|
+
children
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
function Route({ children, params = {}, persistent = false, routeId }) {
|
|
18
|
+
const router = useRouter();
|
|
19
|
+
const stableParams = useStableParams(params);
|
|
20
|
+
const state = useRouteState(routeId, stableParams, true);
|
|
21
|
+
const route = router.getRoute(routeId);
|
|
22
|
+
const retry = useCallback(() => void router.retry(routeId, stableParams), [
|
|
23
|
+
routeId,
|
|
24
|
+
router,
|
|
25
|
+
stableParams
|
|
26
|
+
]);
|
|
27
|
+
const contextValue = useMemo(() => ({
|
|
28
|
+
params: stableParams,
|
|
29
|
+
routeId
|
|
30
|
+
}), [routeId, stableParams]);
|
|
31
|
+
useEffect(() => {
|
|
32
|
+
if (persistent) router.persist(routeId, stableParams);
|
|
33
|
+
}, [
|
|
34
|
+
persistent,
|
|
35
|
+
routeId,
|
|
36
|
+
router,
|
|
37
|
+
stableParams
|
|
38
|
+
]);
|
|
39
|
+
let content = children;
|
|
40
|
+
if (children === void 0 && route?.default) {
|
|
41
|
+
const RouteComponent = route.default;
|
|
42
|
+
content = /* @__PURE__ */ jsx(RouteComponent, {});
|
|
43
|
+
}
|
|
44
|
+
if (state.unexpectedError && route?.ErrorBoundary) {
|
|
45
|
+
const ErrorBoundary = route.ErrorBoundary;
|
|
46
|
+
content = /* @__PURE__ */ jsx(ErrorBoundary, { retry });
|
|
47
|
+
}
|
|
48
|
+
if (!state.unexpectedError && !state.loaderInitialized && route?.HydrateFallback) {
|
|
49
|
+
const HydrateFallback = route.HydrateFallback;
|
|
50
|
+
content = /* @__PURE__ */ jsx(HydrateFallback, {});
|
|
51
|
+
}
|
|
52
|
+
return /* @__PURE__ */ jsx(RouteContext.Provider, {
|
|
53
|
+
value: contextValue,
|
|
54
|
+
children: /* @__PURE__ */ jsx(RenderErrorBoundary, {
|
|
55
|
+
onRetry: retry,
|
|
56
|
+
resetKey: `${routeId}:${JSON.stringify(stableParams)}`,
|
|
57
|
+
...route?.ErrorBoundary ? { fallback: route.ErrorBoundary } : {},
|
|
58
|
+
children: content
|
|
59
|
+
})
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
function useLoaderData() {
|
|
63
|
+
const route = useCurrentRoute();
|
|
64
|
+
return useRouteLoaderData(route.routeId, route.params);
|
|
65
|
+
}
|
|
66
|
+
function useRouteLoaderData(routeId, params = {}) {
|
|
67
|
+
return useRouteState(routeId, useStableParams(params), true).loaderData;
|
|
68
|
+
}
|
|
69
|
+
function useActionData() {
|
|
70
|
+
const route = useCurrentRoute();
|
|
71
|
+
return useRouteState(route.routeId, route.params, false).actionData;
|
|
72
|
+
}
|
|
73
|
+
function useNavigation() {
|
|
74
|
+
const route = useCurrentRoute();
|
|
75
|
+
return { state: useRouteState(route.routeId, route.params, false).navigationState };
|
|
76
|
+
}
|
|
77
|
+
function useRevalidator() {
|
|
78
|
+
const route = useCurrentRoute();
|
|
79
|
+
const router = useRouter();
|
|
80
|
+
const state = useRouteState(route.routeId, route.params, false);
|
|
81
|
+
return useMemo(() => ({
|
|
82
|
+
revalidate: () => router.load(route.routeId, route.params, true),
|
|
83
|
+
state: state.navigationState === "loading" ? "loading" : "idle"
|
|
84
|
+
}), [
|
|
85
|
+
route,
|
|
86
|
+
router,
|
|
87
|
+
state.navigationState
|
|
88
|
+
]);
|
|
89
|
+
}
|
|
90
|
+
function Form({ action, children, input, params }) {
|
|
91
|
+
const currentRoute = useContext(RouteContext);
|
|
92
|
+
const router = useRouter();
|
|
93
|
+
const routeId = action ?? currentRoute?.routeId ?? "";
|
|
94
|
+
const routeParams = useStableParams(params ?? currentRoute?.params ?? {});
|
|
95
|
+
const submit = useCallback((override) => router.submit(routeId, override === void 0 ? input : override, routeParams), [
|
|
96
|
+
input,
|
|
97
|
+
routeId,
|
|
98
|
+
routeParams,
|
|
99
|
+
router
|
|
100
|
+
]);
|
|
101
|
+
if (!routeId) throw new Error("Form requires an action or a parent Route.");
|
|
102
|
+
return /* @__PURE__ */ jsx(FormContext.Provider, {
|
|
103
|
+
value: submit,
|
|
104
|
+
children
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
function useSubmit() {
|
|
108
|
+
const submit = useContext(FormContext);
|
|
109
|
+
if (!submit) throw new Error("useSubmit must be used inside Form.");
|
|
110
|
+
return submit;
|
|
111
|
+
}
|
|
112
|
+
function useFetcher(options = {}) {
|
|
113
|
+
const currentRoute = useContext(RouteContext);
|
|
114
|
+
const router = useRouter();
|
|
115
|
+
const routeId = options.routeId ?? currentRoute?.routeId ?? "";
|
|
116
|
+
const params = useStableParams(options.params ?? currentRoute?.params ?? {});
|
|
117
|
+
const [data, setData] = useState(null);
|
|
118
|
+
const [error, setError] = useState("");
|
|
119
|
+
const [state, setState] = useState("idle");
|
|
120
|
+
const controller = useRef(null);
|
|
121
|
+
useEffect(() => () => {
|
|
122
|
+
controller.current?.abort();
|
|
123
|
+
}, []);
|
|
124
|
+
const run = useCallback(async (mutating, input, target) => {
|
|
125
|
+
controller.current?.abort();
|
|
126
|
+
const nextController = new AbortController();
|
|
127
|
+
const { signal } = nextController;
|
|
128
|
+
const targetId = target.routeId ?? routeId;
|
|
129
|
+
const targetParams = target.params ?? params;
|
|
130
|
+
controller.current = nextController;
|
|
131
|
+
setError("");
|
|
132
|
+
setState(mutating ? "submitting" : "loading");
|
|
133
|
+
const result = await (mutating ? router.fetchAction(targetId, input, targetParams, signal) : router.fetchLoader(targetId, targetParams, signal));
|
|
134
|
+
if (signal.aborted) return result;
|
|
135
|
+
controller.current = null;
|
|
136
|
+
setData(result.data);
|
|
137
|
+
setError(result.error);
|
|
138
|
+
setState("idle");
|
|
139
|
+
if (result.unexpected && currentRoute) router.reportUnexpected(currentRoute.routeId, currentRoute.params);
|
|
140
|
+
return result;
|
|
141
|
+
}, [
|
|
142
|
+
currentRoute,
|
|
143
|
+
params,
|
|
144
|
+
routeId,
|
|
145
|
+
router
|
|
146
|
+
]);
|
|
147
|
+
const submit = useCallback((input, target = {}) => run(true, input, target), [run]);
|
|
148
|
+
const load = useCallback((target = {}) => run(false, void 0, target), [run]);
|
|
149
|
+
const BoundForm = useCallback(({ children, input }) => /* @__PURE__ */ jsx(FormContext.Provider, {
|
|
150
|
+
value: (override) => submit(override === void 0 ? input : override),
|
|
151
|
+
children
|
|
152
|
+
}), [submit]);
|
|
153
|
+
if (!routeId) throw new Error("useFetcher requires a routeId or a parent Route.");
|
|
154
|
+
return [useMemo(() => ({
|
|
155
|
+
data,
|
|
156
|
+
error,
|
|
157
|
+
state
|
|
158
|
+
}), [
|
|
159
|
+
data,
|
|
160
|
+
error,
|
|
161
|
+
state
|
|
162
|
+
]), useMemo(() => ({
|
|
163
|
+
Form: BoundForm,
|
|
164
|
+
load,
|
|
165
|
+
submit
|
|
166
|
+
}), [
|
|
167
|
+
BoundForm,
|
|
168
|
+
load,
|
|
169
|
+
submit
|
|
170
|
+
])];
|
|
171
|
+
}
|
|
172
|
+
function useRouter() {
|
|
173
|
+
const router = useContext(RouterContext);
|
|
174
|
+
if (!router) throw new Error("RouterProvider is missing.");
|
|
175
|
+
return router;
|
|
176
|
+
}
|
|
177
|
+
function useCurrentRoute() {
|
|
178
|
+
const route = useContext(RouteContext);
|
|
179
|
+
if (!route) throw new Error("This hook requires a parent Route.");
|
|
180
|
+
return route;
|
|
181
|
+
}
|
|
182
|
+
function useRouteState(routeId, params, loadOnMount) {
|
|
183
|
+
const router = useRouter();
|
|
184
|
+
const subscribe = useCallback((listener) => router.subscribe(routeId, params, listener), [
|
|
185
|
+
params,
|
|
186
|
+
routeId,
|
|
187
|
+
router
|
|
188
|
+
]);
|
|
189
|
+
const getSnapshot = useCallback(() => router.getSnapshot(routeId, params), [
|
|
190
|
+
params,
|
|
191
|
+
routeId,
|
|
192
|
+
router
|
|
193
|
+
]);
|
|
194
|
+
const state = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
|
|
195
|
+
useEffect(() => {
|
|
196
|
+
if (loadOnMount) router.load(routeId, params);
|
|
197
|
+
}, [
|
|
198
|
+
loadOnMount,
|
|
199
|
+
params,
|
|
200
|
+
routeId,
|
|
201
|
+
router
|
|
202
|
+
]);
|
|
203
|
+
return state;
|
|
204
|
+
}
|
|
205
|
+
function useStableParams(params) {
|
|
206
|
+
const key = JSON.stringify(Object.entries(params).sort(([left], [right]) => left.localeCompare(right)));
|
|
207
|
+
const ref = useRef({
|
|
208
|
+
key,
|
|
209
|
+
value: params
|
|
210
|
+
});
|
|
211
|
+
if (ref.current.key !== key) ref.current = {
|
|
212
|
+
key,
|
|
213
|
+
value: params
|
|
214
|
+
};
|
|
215
|
+
return ref.current.value;
|
|
216
|
+
}
|
|
217
|
+
var RenderErrorBoundary = class extends Component {
|
|
218
|
+
state = { error: null };
|
|
219
|
+
static getDerivedStateFromError(error) {
|
|
220
|
+
return { error };
|
|
221
|
+
}
|
|
222
|
+
componentDidUpdate(previousProps) {
|
|
223
|
+
if (this.state.error && previousProps.resetKey !== this.props.resetKey) this.setState({ error: null });
|
|
224
|
+
}
|
|
225
|
+
render() {
|
|
226
|
+
if (this.state.error && this.props.fallback) {
|
|
227
|
+
const ErrorBoundary = this.props.fallback;
|
|
228
|
+
return /* @__PURE__ */ jsx(ErrorBoundary, { retry: () => {
|
|
229
|
+
this.setState({ error: null });
|
|
230
|
+
this.props.onRetry();
|
|
231
|
+
} });
|
|
232
|
+
}
|
|
233
|
+
if (this.state.error) throw this.state.error;
|
|
234
|
+
return this.props.children;
|
|
235
|
+
}
|
|
236
|
+
};
|
|
237
|
+
var EMPTY_MATCHES = [];
|
|
238
|
+
//#endregion
|
|
239
|
+
export { Form, Route, RouterProvider, useActionData, useFetcher, useLoaderData, useNavigation, useRevalidator, useRouteLoaderData, useRouter, useSubmit };
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* @module
|
|
4
4
|
*/
|
|
5
5
|
import type { RouteModule } from "../core/index.ts";
|
|
6
|
-
import type
|
|
6
|
+
import { type ComponentType, type ReactNode } from "./runtime.ts";
|
|
7
7
|
/** Renderable route module with optional loading and error components. */
|
|
8
8
|
export interface ViewModule extends RouteModule {
|
|
9
9
|
default?: ComponentType;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { createElement, useMemo } from "./runtime.js";
|
|
2
|
+
import { useRouter, useSnapshot } from "./context.js";
|
|
3
|
+
//#region .generated/react/routes.ts
|
|
4
|
+
/** Renders the first matching registered module. */
|
|
5
|
+
function Routes({ fallback }) {
|
|
6
|
+
const router = useRouter();
|
|
7
|
+
const state = useSnapshot();
|
|
8
|
+
const component = router.routes.find((route) => route.path === state.path)?.[state.error ? "ErrorBoundary" : state.state === "loading" && !state.loaded ? "HydrateFallback" : "default"];
|
|
9
|
+
return useMemo(() => component && createElement(component, { error: state.error }), [component, state.error]) ?? state.error?.message ?? fallback;
|
|
10
|
+
}
|
|
11
|
+
//#endregion
|
|
12
|
+
export { Routes };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { createContext, createElement, useContext, useEffect, useMemo, useSyncExternalStore } from "react";
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
/** @jsxImportSource preact */
|
|
2
|
+
import type { AppRoute, RootModule } from "../preact/route-types.ts";
|
|
3
|
+
export declare function renderApplication(request: Request, routes: AppRoute[], rootModule: RootModule, entry: string): Promise<Response>;
|
|
4
|
+
export declare function dispatchRoute(request: Request, routes: AppRoute[], document?: boolean): Promise<Response>;
|