@nordcraft/ssr 1.0.10 → 1.0.12
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.
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { PageComponent, PageRoute, RouteDeclaration } from '@nordcraft/core/dist/component/component.types';
|
|
2
|
+
import type { ToddleEnv } from '@nordcraft/core/dist/formula/formula';
|
|
2
3
|
import type { ProjectFiles, Route } from '../ssr.types';
|
|
3
4
|
export declare const matchPageForUrl: ({ url, components, }: {
|
|
4
5
|
url: URL;
|
|
@@ -17,10 +18,11 @@ export declare const matchRoutes: <T>({ url, entries, getRoute, }: {
|
|
|
17
18
|
entries: T[];
|
|
18
19
|
getRoute: (entry: T) => Pick<PageRoute, "path" | "query">;
|
|
19
20
|
}) => T | undefined;
|
|
20
|
-
export declare const getRouteDestination: ({ files, req, route, }: {
|
|
21
|
+
export declare const getRouteDestination: ({ files, req, route, env, }: {
|
|
21
22
|
files: ProjectFiles;
|
|
22
23
|
req: Request;
|
|
23
24
|
route: Route;
|
|
25
|
+
env: ToddleEnv;
|
|
24
26
|
}) => URL | undefined;
|
|
25
27
|
export declare const get404Page: (components: ProjectFiles["components"]) => PageComponent | undefined;
|
|
26
28
|
export declare const getPathSegments: (url: URL) => string[];
|
package/dist/routing/routing.js
CHANGED
|
@@ -43,7 +43,7 @@ export const matchRoutes = ({ url, entries, getRoute, }) => {
|
|
|
43
43
|
});
|
|
44
44
|
return matches[0];
|
|
45
45
|
};
|
|
46
|
-
export const getRouteDestination = ({ files, req, route, }) => {
|
|
46
|
+
export const getRouteDestination = ({ files, req, route, env, }) => {
|
|
47
47
|
try {
|
|
48
48
|
const requestUrl = new URL(req.url);
|
|
49
49
|
const { searchParamsWithDefaults, pathParams } = getParameters({
|
|
@@ -55,12 +55,14 @@ export const getRouteDestination = ({ files, req, route, }) => {
|
|
|
55
55
|
// the route's source definition + global formulas.
|
|
56
56
|
{
|
|
57
57
|
data: {
|
|
58
|
+
Attributes: {},
|
|
58
59
|
'Route parameters': {
|
|
59
60
|
path: pathParams,
|
|
60
61
|
query: searchParamsWithDefaults,
|
|
61
62
|
},
|
|
62
63
|
},
|
|
63
64
|
toddle: getServerToddleObject(files),
|
|
65
|
+
env,
|
|
64
66
|
},
|
|
65
67
|
// Redirects can redirect to relative URLs - rewrites can't
|
|
66
68
|
route.type === 'redirect' ? requestUrl.origin : undefined);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/routing/routing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/routing/routing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
"main": "dist/index.js",
|
|
14
14
|
"types": "dist/index.d.ts",
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@nordcraft/core": "1.0.
|
|
17
|
-
"@nordcraft/std-lib": "1.0.
|
|
16
|
+
"@nordcraft/core": "1.0.12",
|
|
17
|
+
"@nordcraft/std-lib": "1.0.12",
|
|
18
18
|
"cookie": "1.0.2",
|
|
19
19
|
"xss": "1.0.15"
|
|
20
20
|
},
|
|
21
|
-
"version": "1.0.
|
|
21
|
+
"version": "1.0.12"
|
|
22
22
|
}
|
package/src/routing/routing.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type {
|
|
|
4
4
|
PageRoute,
|
|
5
5
|
RouteDeclaration,
|
|
6
6
|
} from '@nordcraft/core/dist/component/component.types'
|
|
7
|
+
import type { ToddleEnv } from '@nordcraft/core/dist/formula/formula'
|
|
7
8
|
import { isDefined } from '@nordcraft/core/dist/utils/util'
|
|
8
9
|
import {
|
|
9
10
|
getParameters,
|
|
@@ -87,10 +88,12 @@ export const getRouteDestination = ({
|
|
|
87
88
|
files,
|
|
88
89
|
req,
|
|
89
90
|
route,
|
|
91
|
+
env,
|
|
90
92
|
}: {
|
|
91
93
|
files: ProjectFiles
|
|
92
94
|
req: Request
|
|
93
95
|
route: Route
|
|
96
|
+
env: ToddleEnv
|
|
94
97
|
}) => {
|
|
95
98
|
try {
|
|
96
99
|
const requestUrl = new URL(req.url)
|
|
@@ -106,12 +109,14 @@ export const getRouteDestination = ({
|
|
|
106
109
|
// the route's source definition + global formulas.
|
|
107
110
|
{
|
|
108
111
|
data: {
|
|
112
|
+
Attributes: {},
|
|
109
113
|
'Route parameters': {
|
|
110
114
|
path: pathParams,
|
|
111
115
|
query: searchParamsWithDefaults,
|
|
112
116
|
},
|
|
113
117
|
},
|
|
114
118
|
toddle: getServerToddleObject(files),
|
|
119
|
+
env,
|
|
115
120
|
} as any,
|
|
116
121
|
// Redirects can redirect to relative URLs - rewrites can't
|
|
117
122
|
route.type === 'redirect' ? requestUrl.origin : undefined,
|