toiljs 0.0.14 → 0.0.16
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/.babelrc +13 -13
- package/.gitattributes +2 -2
- package/.github/ISSUE_TEMPLATE/bug_report.md +38 -38
- package/.github/ISSUE_TEMPLATE/bug_report.yml +90 -90
- package/.github/ISSUE_TEMPLATE/config.yml +8 -8
- package/.github/ISSUE_TEMPLATE/feature_request.md +20 -20
- package/.github/PULL_REQUEST_TEMPLATE.md +43 -43
- package/.github/changelog-config.json +45 -45
- package/.github/dependabot.yml +27 -27
- package/.github/workflows/ci.yml +191 -191
- package/.prettierrc.json +11 -11
- package/.vscode/settings.json +9 -9
- package/CHANGELOG.md +5 -5
- package/LICENSE +187 -187
- package/README.md +339 -315
- package/as-pect.asconfig.json +34 -34
- package/as-pect.config.js +65 -65
- package/assets/logo.svg +36 -36
- package/build/backend/.tsbuildinfo +1 -1
- package/build/cli/.tsbuildinfo +1 -1
- package/build/cli/index.js +2926 -191
- package/build/client/.tsbuildinfo +1 -1
- package/build/client/dev/devtools.d.ts +6 -0
- package/build/client/dev/devtools.js +442 -0
- package/build/client/dev/error-overlay.d.ts +9 -0
- package/build/client/dev/error-overlay.js +19 -4
- package/build/client/head/metadata.d.ts +3 -1
- package/build/client/head/metadata.js +8 -0
- package/build/client/index.d.ts +4 -4
- package/build/client/index.js +2 -2
- package/build/client/navigation/navigation.d.ts +2 -0
- package/build/client/navigation/navigation.js +9 -1
- package/build/client/navigation/prefetch.d.ts +1 -0
- package/build/client/navigation/prefetch.js +35 -0
- package/build/client/routing/Router.js +1 -1
- package/build/client/routing/hooks.js +6 -2
- package/build/client/routing/loader.d.ts +25 -0
- package/build/client/routing/loader.js +53 -7
- package/build/client/routing/mount.js +4 -3
- package/build/compiler/.tsbuildinfo +1 -1
- package/build/compiler/config.d.ts +18 -0
- package/build/compiler/config.js +8 -0
- package/build/compiler/docs.js +16 -16
- package/build/compiler/generate.js +3 -0
- package/build/compiler/index.d.ts +2 -2
- package/build/compiler/index.js +3 -1
- package/build/compiler/plugin.js +156 -0
- package/build/compiler/prerender.d.ts +1 -0
- package/build/compiler/prerender.js +2 -1
- package/build/compiler/seo.d.ts +2 -2
- package/build/compiler/seo.js +8 -6
- package/build/compiler/ssg.d.ts +5 -0
- package/build/compiler/ssg.js +121 -0
- package/build/io/.tsbuildinfo +1 -1
- package/build/logger/.tsbuildinfo +1 -1
- package/build/shared/.tsbuildinfo +1 -1
- package/eslint.config.js +48 -48
- package/examples/basic/client/404.tsx +11 -11
- package/examples/basic/client/components/.gitkeep +1 -1
- package/examples/basic/client/global-error.tsx +13 -13
- package/examples/basic/client/layout.tsx +25 -25
- package/examples/basic/client/public/images/.gitkeep +1 -1
- package/examples/basic/client/public/images/logo.svg +36 -36
- package/examples/basic/client/public/robots.txt +2 -2
- package/examples/basic/client/routes/docs/[...slug].tsx +12 -12
- package/examples/basic/client/routes/features/error/error.tsx +16 -16
- package/examples/basic/client/routes/features/template/b.tsx +14 -14
- package/examples/basic/client/routes/files/[[...slug]].tsx +21 -21
- package/examples/basic/client/routes/gallery/layout.tsx +13 -13
- package/examples/basic/client/routes/io.tsx +24 -24
- package/examples/basic/client/routes/loader-demo/loading.tsx +13 -13
- package/examples/basic/client/routes/search.tsx +61 -61
- package/examples/basic/client/toil.tsx +5 -5
- package/package.json +155 -147
- package/presets/eslint.js +88 -88
- package/presets/no-uint8array-tostring.js +200 -200
- package/presets/prettier.json +18 -18
- package/presets/tsconfig.json +37 -37
- package/src/backend/index.ts +160 -160
- package/src/cli/proc.ts +50 -50
- package/src/cli/updates.ts +69 -69
- package/src/cli/validate.ts +31 -31
- package/src/client/channel/channel.ts +146 -146
- package/src/client/components/Form.tsx +65 -65
- package/src/client/components/Script.tsx +113 -113
- package/src/client/components/Slot.tsx +21 -21
- package/src/client/dev/devtools.tsx +973 -0
- package/src/client/dev/error-overlay.tsx +30 -4
- package/src/client/head/head.ts +167 -167
- package/src/client/head/metadata.ts +19 -1
- package/src/client/index.ts +19 -9
- package/src/client/navigation/NavLink.tsx +86 -86
- package/src/client/navigation/navigation.ts +25 -5
- package/src/client/navigation/prefetch.ts +169 -130
- package/src/client/navigation/scroll.ts +53 -53
- package/src/client/routing/Router.tsx +8 -2
- package/src/client/routing/action.ts +122 -122
- package/src/client/routing/error-boundary.tsx +43 -43
- package/src/client/routing/hooks.ts +21 -6
- package/src/client/routing/loader.ts +325 -225
- package/src/client/routing/match.ts +47 -47
- package/src/client/routing/mount.tsx +54 -52
- package/src/client/routing/params-context.ts +10 -10
- package/src/client/routing/slot-context.ts +7 -7
- package/src/client/search/search.ts +189 -189
- package/src/client/search/use-page-search.ts +73 -73
- package/src/client/types.ts +73 -73
- package/src/compiler/config.ts +47 -1
- package/src/compiler/docs.ts +228 -228
- package/src/compiler/generate.ts +394 -391
- package/src/compiler/index.ts +64 -54
- package/src/compiler/pages.ts +70 -70
- package/src/compiler/plugin.ts +170 -2
- package/src/compiler/prerender.ts +5 -1
- package/src/compiler/seo.ts +23 -7
- package/src/compiler/ssg.ts +162 -0
- package/src/io/BinaryReader.ts +340 -340
- package/src/io/BinaryWriter.ts +385 -385
- package/src/io/FastMap.ts +127 -127
- package/src/io/index.ts +11 -11
- package/src/io/lengths.ts +14 -14
- package/src/io/types.ts +18 -18
- package/src/logger/index.ts +22 -22
- package/src/server/index.ts +10 -10
- package/src/server/main.ts +13 -13
- package/src/server/tsconfig.json +4 -4
- package/src/shared/index.ts +10 -10
- package/std/client/index.d.ts +15 -15
- package/std/client/package.json +3 -3
- package/test/assembly/example.spec.ts +7 -7
- package/test/channel.test.ts +21 -21
- package/test/dom/Link.test.tsx +47 -47
- package/test/dom/NavLink.test.tsx +37 -37
- package/test/dom/error-overlay.test.tsx +44 -44
- package/test/dom/loader.test.tsx +121 -121
- package/test/dom/navigation.test.ts +59 -59
- package/test/dom/revalidate.test.tsx +38 -38
- package/test/dom/route-head.test.tsx +78 -78
- package/test/dom/router-loading.test.tsx +44 -44
- package/test/dom/scroll.test.ts +56 -56
- package/test/dom/use-metadata.test.tsx +58 -0
- package/test/io.test.ts +93 -93
- package/test/navlink.test.ts +28 -28
- package/test/placeholder.test.ts +9 -9
- package/test/routes.test.ts +76 -76
- package/test/seo.test.ts +175 -164
- package/test/slot-layouts.test.ts +69 -69
- package/test/ssg.test.ts +36 -0
- package/test/update.test.ts +44 -44
- package/test/validate.test.ts +42 -42
- package/toil-routes.d.ts +7 -0
- package/toilconfig.json +30 -30
- package/tsconfig.backend.json +13 -13
- package/tsconfig.base.json +35 -35
- package/tsconfig.cli.json +13 -13
- package/tsconfig.client.json +14 -14
- package/tsconfig.compiler.json +13 -13
- package/tsconfig.io.json +12 -12
- package/tsconfig.json +22 -22
- package/tsconfig.logger.json +12 -12
- package/tsconfig.server.json +10 -10
- package/tsconfig.shared.json +12 -12
- package/vitest.config.ts +26 -26
- package/.idea/codeStyles/Project.xml +0 -54
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/prettier.xml +0 -7
- package/.idea/toiljs.iml +0 -8
- package/.idea/vcs.xml +0 -6
- package/.toil/entry.tsx +0 -9
- package/.toil/index.html +0 -12
- package/.toil/routes.ts +0 -9
- package/build/cli/configure.d.ts +0 -16
- package/build/cli/configure.js +0 -272
- package/build/cli/create.d.ts +0 -16
- package/build/cli/create.js +0 -420
- package/build/cli/diagnostics.d.ts +0 -55
- package/build/cli/diagnostics.js +0 -333
- package/build/cli/doctor.d.ts +0 -6
- package/build/cli/doctor.js +0 -249
- package/build/cli/features.d.ts +0 -25
- package/build/cli/features.js +0 -107
- package/build/cli/index.d.ts +0 -2
- package/build/cli/proc.d.ts +0 -6
- package/build/cli/proc.js +0 -31
- package/build/cli/ui.d.ts +0 -9
- package/build/cli/ui.js +0 -75
- package/build/cli/update.d.ts +0 -7
- package/build/cli/update.js +0 -117
- package/build/cli/updates.d.ts +0 -10
- package/build/cli/updates.js +0 -45
- package/build/cli/validate.d.ts +0 -4
- package/build/cli/validate.js +0 -19
- package/build/client/Link.d.ts +0 -8
- package/build/client/Link.js +0 -44
- package/build/client/NavLink.d.ts +0 -14
- package/build/client/NavLink.js +0 -37
- package/build/client/Router.d.ts +0 -7
- package/build/client/Router.js +0 -55
- package/build/client/channel.d.ts +0 -23
- package/build/client/channel.js +0 -94
- package/build/client/error-boundary.d.ts +0 -16
- package/build/client/error-boundary.js +0 -19
- package/build/client/head.d.ts +0 -26
- package/build/client/head.js +0 -87
- package/build/client/hooks.d.ts +0 -17
- package/build/client/hooks.js +0 -48
- package/build/client/lazy.d.ts +0 -16
- package/build/client/lazy.js +0 -53
- package/build/client/match.d.ts +0 -2
- package/build/client/match.js +0 -32
- package/build/client/mount.d.ts +0 -2
- package/build/client/mount.js +0 -13
- package/build/client/navigation.d.ts +0 -13
- package/build/client/navigation.js +0 -97
- package/build/client/params-context.d.ts +0 -2
- package/build/client/params-context.js +0 -2
- package/build/client/prefetch.d.ts +0 -11
- package/build/client/prefetch.js +0 -100
- package/build/client/runtime.d.ts +0 -31
- package/build/client/runtime.js +0 -112
- package/build/client/scroll.d.ts +0 -8
- package/build/client/scroll.js +0 -36
- package/toil-env.d.ts +0 -16
|
@@ -1,73 +1,73 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* React binding for the page-metadata {@link searchPages search}. Gives a route component reactive,
|
|
3
|
-
* memoized search results plus a `goTo` helper that navigates straight to a matched page, a drop-in
|
|
4
|
-
* for a site-wide "jump to page" / command-palette style search box.
|
|
5
|
-
*/
|
|
6
|
-
import { useMemo } from 'react';
|
|
7
|
-
|
|
8
|
-
import { navigate, type NavigateOptions } from '../navigation/navigation.js';
|
|
9
|
-
import type { Href } from '../types.js';
|
|
10
|
-
import {
|
|
11
|
-
getPages,
|
|
12
|
-
type PageMeta,
|
|
13
|
-
pagePath,
|
|
14
|
-
type PageSearchOptions,
|
|
15
|
-
type PageSearchResult,
|
|
16
|
-
searchPages,
|
|
17
|
-
} from './search.js';
|
|
18
|
-
|
|
19
|
-
/** What {@link usePageSearch} returns. */
|
|
20
|
-
export interface PageSearch {
|
|
21
|
-
/** Ranked matches for the current query (best first); empty when the query is blank. */
|
|
22
|
-
readonly results: readonly PageSearchResult[];
|
|
23
|
-
/** The full registered page index (handy for rendering an "all pages" listing). */
|
|
24
|
-
readonly pages: readonly PageMeta[];
|
|
25
|
-
/**
|
|
26
|
-
* Navigates to a result / page / raw path. A dynamic (`:param`) page can't be navigated to
|
|
27
|
-
* as-is, so passing one (or its result) is a no-op unless you pass a concrete path string with
|
|
28
|
-
* the params already filled in. A stable reference, safe to destructure.
|
|
29
|
-
*/
|
|
30
|
-
readonly goTo: (
|
|
31
|
-
target: string | PageMeta | PageSearchResult,
|
|
32
|
-
options?: NavigateOptions,
|
|
33
|
-
) => void;
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
/** Whether a path can be navigated to directly (no unfilled dynamic segments). */
|
|
37
|
-
function isNavigable(path: string): boolean {
|
|
38
|
-
return !/[:*]/.test(path);
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
/**
|
|
42
|
-
* Searches the project's pages by `query` and returns ranked {@link PageSearchResult}s, recomputed
|
|
43
|
-
* only when the query or options change. Use the returned `goTo` to redirect to a match:
|
|
44
|
-
*
|
|
45
|
-
* ```tsx
|
|
46
|
-
* const { results, goTo } = usePageSearch(query);
|
|
47
|
-
* return results.map((r) => (
|
|
48
|
-
* <button key={r.page.path} onClick={() => { goTo(r); }}>{r.page.metadata.title ?? r.page.path}</button>
|
|
49
|
-
* ));
|
|
50
|
-
* ```
|
|
51
|
-
*/
|
|
52
|
-
export function usePageSearch(query: string, options: PageSearchOptions = {}): PageSearch {
|
|
53
|
-
const { limit, includeDynamic, fields } = options;
|
|
54
|
-
const fieldsKey = fields?.join(',');
|
|
55
|
-
const results = useMemo(
|
|
56
|
-
() => searchPages(query, { limit, includeDynamic, fields }),
|
|
57
|
-
// `fields` is compared by content (fieldsKey) so a fresh array literal each render is fine.
|
|
58
|
-
[query, limit, includeDynamic, fieldsKey],
|
|
59
|
-
);
|
|
60
|
-
|
|
61
|
-
return useMemo<PageSearch>(
|
|
62
|
-
() => ({
|
|
63
|
-
results,
|
|
64
|
-
pages: getPages(),
|
|
65
|
-
goTo(target, navOptions) {
|
|
66
|
-
const path = pagePath(target);
|
|
67
|
-
if (typeof target !== 'string' && !isNavigable(path)) return;
|
|
68
|
-
navigate(path as Href, navOptions);
|
|
69
|
-
},
|
|
70
|
-
}),
|
|
71
|
-
[results],
|
|
72
|
-
);
|
|
73
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* React binding for the page-metadata {@link searchPages search}. Gives a route component reactive,
|
|
3
|
+
* memoized search results plus a `goTo` helper that navigates straight to a matched page, a drop-in
|
|
4
|
+
* for a site-wide "jump to page" / command-palette style search box.
|
|
5
|
+
*/
|
|
6
|
+
import { useMemo } from 'react';
|
|
7
|
+
|
|
8
|
+
import { navigate, type NavigateOptions } from '../navigation/navigation.js';
|
|
9
|
+
import type { Href } from '../types.js';
|
|
10
|
+
import {
|
|
11
|
+
getPages,
|
|
12
|
+
type PageMeta,
|
|
13
|
+
pagePath,
|
|
14
|
+
type PageSearchOptions,
|
|
15
|
+
type PageSearchResult,
|
|
16
|
+
searchPages,
|
|
17
|
+
} from './search.js';
|
|
18
|
+
|
|
19
|
+
/** What {@link usePageSearch} returns. */
|
|
20
|
+
export interface PageSearch {
|
|
21
|
+
/** Ranked matches for the current query (best first); empty when the query is blank. */
|
|
22
|
+
readonly results: readonly PageSearchResult[];
|
|
23
|
+
/** The full registered page index (handy for rendering an "all pages" listing). */
|
|
24
|
+
readonly pages: readonly PageMeta[];
|
|
25
|
+
/**
|
|
26
|
+
* Navigates to a result / page / raw path. A dynamic (`:param`) page can't be navigated to
|
|
27
|
+
* as-is, so passing one (or its result) is a no-op unless you pass a concrete path string with
|
|
28
|
+
* the params already filled in. A stable reference, safe to destructure.
|
|
29
|
+
*/
|
|
30
|
+
readonly goTo: (
|
|
31
|
+
target: string | PageMeta | PageSearchResult,
|
|
32
|
+
options?: NavigateOptions,
|
|
33
|
+
) => void;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** Whether a path can be navigated to directly (no unfilled dynamic segments). */
|
|
37
|
+
function isNavigable(path: string): boolean {
|
|
38
|
+
return !/[:*]/.test(path);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
/**
|
|
42
|
+
* Searches the project's pages by `query` and returns ranked {@link PageSearchResult}s, recomputed
|
|
43
|
+
* only when the query or options change. Use the returned `goTo` to redirect to a match:
|
|
44
|
+
*
|
|
45
|
+
* ```tsx
|
|
46
|
+
* const { results, goTo } = usePageSearch(query);
|
|
47
|
+
* return results.map((r) => (
|
|
48
|
+
* <button key={r.page.path} onClick={() => { goTo(r); }}>{r.page.metadata.title ?? r.page.path}</button>
|
|
49
|
+
* ));
|
|
50
|
+
* ```
|
|
51
|
+
*/
|
|
52
|
+
export function usePageSearch(query: string, options: PageSearchOptions = {}): PageSearch {
|
|
53
|
+
const { limit, includeDynamic, fields } = options;
|
|
54
|
+
const fieldsKey = fields?.join(',');
|
|
55
|
+
const results = useMemo(
|
|
56
|
+
() => searchPages(query, { limit, includeDynamic, fields }),
|
|
57
|
+
// `fields` is compared by content (fieldsKey) so a fresh array literal each render is fine.
|
|
58
|
+
[query, limit, includeDynamic, fieldsKey],
|
|
59
|
+
);
|
|
60
|
+
|
|
61
|
+
return useMemo<PageSearch>(
|
|
62
|
+
() => ({
|
|
63
|
+
results,
|
|
64
|
+
pages: getPages(),
|
|
65
|
+
goTo(target, navOptions) {
|
|
66
|
+
const path = pagePath(target);
|
|
67
|
+
if (typeof target !== 'string' && !isNavigable(path)) return;
|
|
68
|
+
navigate(path as Href, navOptions);
|
|
69
|
+
},
|
|
70
|
+
}),
|
|
71
|
+
[results],
|
|
72
|
+
);
|
|
73
|
+
}
|
package/src/client/types.ts
CHANGED
|
@@ -1,73 +1,73 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Public router types shared across the client runtime. Kept dependency-free (type-only React
|
|
3
|
-
* imports) so any module can import them without pulling in component or DOM code.
|
|
4
|
-
*/
|
|
5
|
-
import type { ComponentType, ReactNode } from 'react';
|
|
6
|
-
|
|
7
|
-
/**
|
|
8
|
-
* Augmentation point for the project's generated route types. The compiler emits (into
|
|
9
|
-
* `toil-routes.d.ts`) `declare module 'toiljs/client' { interface Register { routePath: <union> } }`,
|
|
10
|
-
* which narrows {@link RoutePath} from `string` to the project's actual routes.
|
|
11
|
-
*/
|
|
12
|
-
export interface Register {}
|
|
13
|
-
|
|
14
|
-
/**
|
|
15
|
-
* Union of the project's route paths, static routes as literals, dynamic/catch-all as
|
|
16
|
-
* `` `…/${string}` `` templates. Falls back to `string` before the types are generated.
|
|
17
|
-
*/
|
|
18
|
-
export type RoutePath = Register extends { routePath: infer P }
|
|
19
|
-
? P extends string
|
|
20
|
-
? P
|
|
21
|
-
: string
|
|
22
|
-
: string;
|
|
23
|
-
|
|
24
|
-
/**
|
|
25
|
-
* An href accepted by `Link` / `NavLink` / `navigate`: a known {@link RoutePath} (optionally with
|
|
26
|
-
* `?query` or `#hash`), or an absolute/protocol URL (`https:`, `mailto:`, …). When routes haven't
|
|
27
|
-
* been generated yet, this is just `string`.
|
|
28
|
-
*/
|
|
29
|
-
export type Href =
|
|
30
|
-
| RoutePath
|
|
31
|
-
| `${RoutePath}?${string}`
|
|
32
|
-
| `${RoutePath}#${string}`
|
|
33
|
-
| `${string}:${string}`;
|
|
34
|
-
|
|
35
|
-
/** Lazy loader for a layout component (wraps children). */
|
|
36
|
-
export type LayoutComponentLoader = () => Promise<{
|
|
37
|
-
default: ComponentType<{ children?: ReactNode }>;
|
|
38
|
-
}>;
|
|
39
|
-
|
|
40
|
-
/** Props passed to an `error.tsx` / `global-error.tsx` component. */
|
|
41
|
-
export interface RouteErrorProps {
|
|
42
|
-
readonly error: Error;
|
|
43
|
-
readonly reset: () => void;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
/** Lazy loader for an error component (`error.tsx` / `global-error.tsx`), or `null` if none. */
|
|
47
|
-
export type ErrorComponentLoader =
|
|
48
|
-
| (() => Promise<{ default: ComponentType<RouteErrorProps> }>)
|
|
49
|
-
| null;
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* A route entry produced by the compiler: a URL pattern, a lazy loader for its page component, and
|
|
53
|
-
* the chain of nested layout loaders (shallowest → deepest, from nested `layout.tsx` files) that wrap it.
|
|
54
|
-
*/
|
|
55
|
-
export interface RouteDef {
|
|
56
|
-
readonly pattern: string;
|
|
57
|
-
readonly load: () => Promise<{ default: ComponentType }>;
|
|
58
|
-
readonly layouts?: readonly LayoutComponentLoader[];
|
|
59
|
-
/** `template.tsx` chain (root → nested), like layouts, but re-mounted on each navigation. */
|
|
60
|
-
readonly templates?: readonly LayoutComponentLoader[];
|
|
61
|
-
/** Nearest `loading.tsx`, shown as the Suspense fallback while this route loads. */
|
|
62
|
-
readonly loading?: () => Promise<{ default: ComponentType }>;
|
|
63
|
-
/** Nearest `error.tsx`, rendered by an error boundary around this route. */
|
|
64
|
-
readonly errorComponent?: () => Promise<{ default: ComponentType<RouteErrorProps> }>;
|
|
65
|
-
/** Intercepting route (`(.)`/`(..)`/`(...)`), matched in its slot only on soft navigation. */
|
|
66
|
-
readonly intercept?: boolean;
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
/** Optional root layout loader (wraps every page). `null` when the project defines no layout. */
|
|
70
|
-
export type LayoutLoader = LayoutComponentLoader | null;
|
|
71
|
-
|
|
72
|
-
/** Optional custom not-found (404) page loader, rendered when no route matches. */
|
|
73
|
-
export type NotFoundLoader = (() => Promise<{ default: ComponentType }>) | null;
|
|
1
|
+
/**
|
|
2
|
+
* Public router types shared across the client runtime. Kept dependency-free (type-only React
|
|
3
|
+
* imports) so any module can import them without pulling in component or DOM code.
|
|
4
|
+
*/
|
|
5
|
+
import type { ComponentType, ReactNode } from 'react';
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Augmentation point for the project's generated route types. The compiler emits (into
|
|
9
|
+
* `toil-routes.d.ts`) `declare module 'toiljs/client' { interface Register { routePath: <union> } }`,
|
|
10
|
+
* which narrows {@link RoutePath} from `string` to the project's actual routes.
|
|
11
|
+
*/
|
|
12
|
+
export interface Register {}
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Union of the project's route paths, static routes as literals, dynamic/catch-all as
|
|
16
|
+
* `` `…/${string}` `` templates. Falls back to `string` before the types are generated.
|
|
17
|
+
*/
|
|
18
|
+
export type RoutePath = Register extends { routePath: infer P }
|
|
19
|
+
? P extends string
|
|
20
|
+
? P
|
|
21
|
+
: string
|
|
22
|
+
: string;
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* An href accepted by `Link` / `NavLink` / `navigate`: a known {@link RoutePath} (optionally with
|
|
26
|
+
* `?query` or `#hash`), or an absolute/protocol URL (`https:`, `mailto:`, …). When routes haven't
|
|
27
|
+
* been generated yet, this is just `string`.
|
|
28
|
+
*/
|
|
29
|
+
export type Href =
|
|
30
|
+
| RoutePath
|
|
31
|
+
| `${RoutePath}?${string}`
|
|
32
|
+
| `${RoutePath}#${string}`
|
|
33
|
+
| `${string}:${string}`;
|
|
34
|
+
|
|
35
|
+
/** Lazy loader for a layout component (wraps children). */
|
|
36
|
+
export type LayoutComponentLoader = () => Promise<{
|
|
37
|
+
default: ComponentType<{ children?: ReactNode }>;
|
|
38
|
+
}>;
|
|
39
|
+
|
|
40
|
+
/** Props passed to an `error.tsx` / `global-error.tsx` component. */
|
|
41
|
+
export interface RouteErrorProps {
|
|
42
|
+
readonly error: Error;
|
|
43
|
+
readonly reset: () => void;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Lazy loader for an error component (`error.tsx` / `global-error.tsx`), or `null` if none. */
|
|
47
|
+
export type ErrorComponentLoader =
|
|
48
|
+
| (() => Promise<{ default: ComponentType<RouteErrorProps> }>)
|
|
49
|
+
| null;
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* A route entry produced by the compiler: a URL pattern, a lazy loader for its page component, and
|
|
53
|
+
* the chain of nested layout loaders (shallowest → deepest, from nested `layout.tsx` files) that wrap it.
|
|
54
|
+
*/
|
|
55
|
+
export interface RouteDef {
|
|
56
|
+
readonly pattern: string;
|
|
57
|
+
readonly load: () => Promise<{ default: ComponentType }>;
|
|
58
|
+
readonly layouts?: readonly LayoutComponentLoader[];
|
|
59
|
+
/** `template.tsx` chain (root → nested), like layouts, but re-mounted on each navigation. */
|
|
60
|
+
readonly templates?: readonly LayoutComponentLoader[];
|
|
61
|
+
/** Nearest `loading.tsx`, shown as the Suspense fallback while this route loads. */
|
|
62
|
+
readonly loading?: () => Promise<{ default: ComponentType }>;
|
|
63
|
+
/** Nearest `error.tsx`, rendered by an error boundary around this route. */
|
|
64
|
+
readonly errorComponent?: () => Promise<{ default: ComponentType<RouteErrorProps> }>;
|
|
65
|
+
/** Intercepting route (`(.)`/`(..)`/`(...)`), matched in its slot only on soft navigation. */
|
|
66
|
+
readonly intercept?: boolean;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/** Optional root layout loader (wraps every page). `null` when the project defines no layout. */
|
|
70
|
+
export type LayoutLoader = LayoutComponentLoader | null;
|
|
71
|
+
|
|
72
|
+
/** Optional custom not-found (404) page loader, rendered when no route matches. */
|
|
73
|
+
export type NotFoundLoader = (() => Promise<{ default: ComponentType }>) | null;
|
package/src/compiler/config.ts
CHANGED
|
@@ -8,6 +8,29 @@ import { type SeoConfig } from './seo.js';
|
|
|
8
8
|
|
|
9
9
|
export type { SeoConfig } from './seo.js';
|
|
10
10
|
|
|
11
|
+
/** Built-in AI providers the dev toolbar can proxy to. */
|
|
12
|
+
export enum AiProvider {
|
|
13
|
+
Anthropic = 'anthropic',
|
|
14
|
+
OpenAI = 'openai',
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** Dev toolbar AI integration (dev only; the key stays server-side). */
|
|
18
|
+
export interface DevtoolsAiConfig {
|
|
19
|
+
/** Built-in provider. With `endpoint` set, that takes precedence. */
|
|
20
|
+
readonly provider?: AiProvider;
|
|
21
|
+
/** Model id (e.g. `claude-sonnet-4-6`, `gpt-4o`). */
|
|
22
|
+
readonly model?: string;
|
|
23
|
+
/** Name of the env var holding the API key (read by the dev server, never sent to the client). */
|
|
24
|
+
readonly apiKeyEnv?: string;
|
|
25
|
+
/** Custom POST endpoint (`{ prompt }` in, `{ text }` out); overrides `provider`. */
|
|
26
|
+
readonly endpoint?: string;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/** Dev toolbar configuration. */
|
|
30
|
+
export interface DevtoolsConfig {
|
|
31
|
+
readonly ai?: DevtoolsAiConfig;
|
|
32
|
+
}
|
|
33
|
+
|
|
11
34
|
/**
|
|
12
35
|
* Client-side (TSX/React/Vite) configuration. All fields optional; sensible defaults applied.
|
|
13
36
|
*/
|
|
@@ -19,7 +42,7 @@ export interface ClientConfig {
|
|
|
19
42
|
/**
|
|
20
43
|
* Static assets directory, relative to root. Default `<srcDir>/public` (e.g. `client/public`).
|
|
21
44
|
* Holds the `index.html` template (owned and edited by you) plus any files served as-is at the
|
|
22
|
-
* base path (favicons, images,
|
|
45
|
+
* base path (favicons, images, and the like).
|
|
23
46
|
*/
|
|
24
47
|
readonly publicDir?: string;
|
|
25
48
|
/** Production output directory, relative to root. Default `build/client`. */
|
|
@@ -45,6 +68,19 @@ export interface ClientConfig {
|
|
|
45
68
|
* `prefers-reduced-motion`. Default `false`.
|
|
46
69
|
*/
|
|
47
70
|
readonly viewTransitions?: boolean;
|
|
71
|
+
/**
|
|
72
|
+
* Wrap client navigations in a React transition, keeping the current page visible while the next
|
|
73
|
+
* route's loader runs instead of showing its `loading.tsx` right away. Default `false` (a
|
|
74
|
+
* navigation commits eagerly, so the loading state appears immediately).
|
|
75
|
+
*/
|
|
76
|
+
readonly transitions?: boolean;
|
|
77
|
+
/**
|
|
78
|
+
* The dev toolbar (a floating panel in `toiljs dev` with route/build info, errors, and live
|
|
79
|
+
* controls). `true` (default) / `false` to disable, or an object to configure its AI integration.
|
|
80
|
+
* Never included in production builds. The AI key is read server-side from `apiKeyEnv` and never
|
|
81
|
+
* reaches the browser; the toolbar always offers Claude/ChatGPT hand-off links regardless.
|
|
82
|
+
*/
|
|
83
|
+
readonly devtools?: boolean | DevtoolsConfig;
|
|
48
84
|
/**
|
|
49
85
|
* Build-time SEO: bakes site-level metadata into the HTML `<head>` (so JS-less crawlers and AI
|
|
50
86
|
* bots see real tags) and generates `robots.txt`, `sitemap.xml`, and `llms.txt`. Omit to skip.
|
|
@@ -100,6 +136,12 @@ export interface ResolvedToilConfig {
|
|
|
100
136
|
readonly fonts: boolean;
|
|
101
137
|
/** Whether animated View Transitions are enabled for navigation. */
|
|
102
138
|
readonly viewTransitions: boolean;
|
|
139
|
+
/** Whether navigations are wrapped in a React transition (keep current page while loading). */
|
|
140
|
+
readonly transitions: boolean;
|
|
141
|
+
/** Whether the dev toolbar is enabled (dev only). */
|
|
142
|
+
readonly devtools: boolean;
|
|
143
|
+
/** Dev toolbar AI config (dev only), or `null` when not configured. */
|
|
144
|
+
readonly devtoolsAi: DevtoolsAiConfig | null;
|
|
103
145
|
/** Build-time SEO config, or `null` when not configured. */
|
|
104
146
|
readonly seo: SeoConfig | null;
|
|
105
147
|
/** Absolute path to the framework client runtime (`toiljs/client`). */
|
|
@@ -166,6 +208,10 @@ export async function loadConfig(
|
|
|
166
208
|
images: client.images ?? true,
|
|
167
209
|
fonts: client.fonts ?? true,
|
|
168
210
|
viewTransitions: client.viewTransitions ?? false,
|
|
211
|
+
transitions: client.transitions ?? false,
|
|
212
|
+
devtools: client.devtools !== false,
|
|
213
|
+
devtoolsAi:
|
|
214
|
+
typeof client.devtools === 'object' && client.devtools.ai ? client.devtools.ai : null,
|
|
169
215
|
seo: client.seo ?? null,
|
|
170
216
|
runtimePath: resolveRuntimePath(),
|
|
171
217
|
vite: client.vite ?? {},
|