totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-15 20:34:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor slightly

Browse Source
This commit is contained in:
Richard Harris
2019-05-20 23:11:50 -04:00
parent 8b310dd458
commit aa31e3ca6a
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/src/app/app.ts
View File

@@ -254,6 +254,18 @@ async function render(redirect: Redirect, branch: any[], props: any, page: Page)
session_dirty = false; session_dirty = false;
} }
function part_changed(i, segment, match) {
const previous = current_branch[i];
if (!previous) return false;
if (segment !== previous.segment) return true;
if (previous.match) {
if (JSON.stringify(previous.match.slice(1, i + 2)) !== JSON.stringify(match.slice(1, i + 2))) {
return true;
}
}
}
export async function hydrate_target(target: Target): Promise<{ export async function hydrate_target(target: Target): Promise<{
redirect?: Redirect; redirect?: Redirect;
props?: any; props?: any;
@@ -292,22 +304,12 @@ export async function hydrate_target(target: Target): Promise<{
let l = 1; let l = 1;
try { try {
const { pattern } = route; const match = route.pattern.exec(page.path);
const match = pattern.exec(page.path);
let segment_dirty = false; let segment_dirty = false;
branch = await Promise.all(route.parts.map(async (part, i) => { branch = await Promise.all(route.parts.map(async (part, i) => {
const segment = segments[i]; const segment = segments[i];
if ( if (part_changed(i, segment, match)) segment_dirty = true;
current_branch[i]
&& (
current_branch[i].segment !== segment
|| (
current_branch[i].match
&& JSON.stringify(current_branch[i].match.slice(1, i+2)) !== JSON.stringify(match.slice(1, i+2))
)
)
) segment_dirty = true;
props.segments[l] = segments[i + 1]; // TODO make this less confusing props.segments[l] = segments[i + 1]; // TODO make this less confusing
if (!part) return { segment }; if (!part) return { segment };