totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-14 03:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch to single App component model (#157)

Browse Source
This commit is contained in:
Rich Harris
2018-05-04 22:46:41 -04:00
parent 9e4b79c6ff
commit 8ee5346900
6 changed files with 74 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/middleware.ts
View File

@@ -20,14 +20,7 @@ type RouteObject = {
type: 'page' | 'route';
pattern: RegExp;
params: (match: RegExpMatchArray) => Record<string, string>;
module: {
render: (data: any, opts: { store: Store }) => {
head: string;
css: { code: string, map: any };
html: string
},
preload: (data: any) => any | Promise<any>
};
module: Component;
error?: string;
}
@@ -47,7 +40,17 @@ interface Req extends ClientRequest {
headers: Record<string, string>;
}
export default function middleware({ routes, store }: {
interface Component {
render: (data: any, opts: { store: Store }) => {
head: string;
css: { code: string, map: any };
html: string
},
preload: (data: any) => any | Promise<any>
}
export default function middleware({ App, routes, store }: {
App: Component,
routes: RouteObject[],
store: (req: Req) => Store
}) {
@@ -90,7 +93,7 @@ export default function middleware({ routes, store }: {
cache_control: 'max-age=31536000'
}),
get_route_handler(client_info.assets, routes, store)
get_route_handler(client_info.assets, App, routes, store)
].filter(Boolean));
return middleware;
@@ -135,7 +138,7 @@ function serve({ prefix, pathname, cache_control }: {
const resolved = Promise.resolve();
function get_route_handler(chunks: Record<string, string>, routes: RouteObject[], store_getter: (req: Req) => Store) {
function get_route_handler(chunks: Record<string, string>, App: Component, routes: RouteObject[], store_getter: (req: Req) => Store) {
const template = dev()
? () => fs.readFileSync(`${locations.app()}/template.html`, 'utf-8')
: (str => () => str)(fs.readFileSync(`${locations.dest()}/template.html`, 'utf-8'));
@@ -170,7 +173,7 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
res.setHeader('Link', link);
const store = store_getter ? store_getter(req) : null;
const data = { params: req.params, query: req.query };
const props = { params: req.params, query: req.query, path: req.path };
let redirect: { statusCode: number, location: string };
let error: { statusCode: number, message: Error | string };
@@ -240,9 +243,9 @@ function get_route_handler(chunks: Record<string, string>, routes: RouteObject[]
preloaded: mod.preload && try_serialize(preloaded),
store: store && try_serialize(store.get())
};
Object.assign(data, preloaded);
Object.assign(props, preloaded);
const { html, head, css } = mod.render(data, {
const { html, head, css } = App.render({ Page: mod, props }, {
store
});