totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-12 19:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement this.error

Browse Source
This commit is contained in:
Rich Harris
2018-02-18 09:48:32 -05:00
parent d55401d45b
commit cb12231053
7 changed files with 168 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/runtime/index.ts
View File

@@ -75,20 +75,38 @@ function render(Component: ComponentConstructor, data: any, scroll: ScrollPositi
function prepare_route(Component: ComponentConstructor, data: RouteData) {
let redirect: { statusCode: number, location: string } = null;
let error: { statusCode: number, message: Error | string } = null;
if (!Component.preload) {
return { Component, data, redirect };
return { Component, data, redirect, error };
}
if (!component && window.__SAPPER__ && window.__SAPPER__.preloaded) {
return { Component, data: Object.assign(data, window.__SAPPER__.preloaded), redirect };
return { Component, data: Object.assign(data, window.__SAPPER__.preloaded), redirect, error };
}
return Promise.resolve(Component.preload.call({
redirect: (statusCode: number, location: string) => {
redirect = { statusCode, location };
},
error: (statusCode: number, message: Error | string) => {
error = { statusCode, message };
}
}, data)).then(preloaded => {
}, data)).catch(err => {
error = { statusCode: 500, message: err };
}).then(preloaded => {
if (error) {
const route = error.statusCode >= 400 && error.statusCode < 500
? errors['4xx']
: errors['5xx'];
return route.load().then(({ default: Component }: { default: ComponentConstructor }) => {
const err = error.message instanceof Error ? error.message : new Error(error.message);
Object.assign(data, { status: error.statusCode, error: err });
return { Component, data, redirect: null };
});
}
Object.assign(data, preloaded)
return { Component, data, redirect };
});
@@ -117,7 +135,10 @@ function navigate(target: Target, id: number) {
const token = current_token = {};
return loaded.then(({ Component, data, redirect }) => {
if (redirect) return goto(redirect.location, { replaceState: true });
if (redirect) {
return goto(redirect.location, { replaceState: true });
}
render(Component, data, scroll_history[id], token);
});
}