Commit 9918a5a1 authored by Janka Uryga's avatar Janka Uryga

unify DynamicHtml and DynamicHTMLWithReplacements

parent f4002fb9
...@@ -84,15 +84,11 @@ function deserializeStateParts(serialized: string) { ...@@ -84,15 +84,11 @@ function deserializeStateParts(serialized: string) {
return lengthDecodeTupleWithTag(serialized) as SerializedStateParts return lengthDecodeTupleWithTag(serialized) as SerializedStateParts
} }
type SerializedStateParts = type SerializedStateParts = SerializedDynamicData | SerializedDynamicHTML
| SerializedDynamicData
| SerializedDynamicHTML
| SerializedDynamicHTMLWithReplacements
enum SerializedStateTag { enum SerializedStateTag {
DynamicData = 0, DynamicData = 0,
DynamicHTML = 1, DynamicHTML = 1,
DynamicHTMLWithReplacements = 2,
} }
type SerializedDynamicData = [ type SerializedDynamicData = [
...@@ -102,15 +98,14 @@ type SerializedDynamicData = [ ...@@ -102,15 +98,14 @@ type SerializedDynamicData = [
type SerializedDynamicHTML = [ type SerializedDynamicHTML = [
tag: SerializedStateTag.DynamicHTML, tag: SerializedStateTag.DynamicHTML,
resumeDataCache: string, resumeDataCache: string,
/** JSON, but might need to have `replacements` applied before decoding */
postponed: string, postponed: string,
] /** JSON */
type SerializedDynamicHTMLWithReplacements = [
tag: SerializedStateTag.DynamicHTMLWithReplacements,
resumeDataCache: string,
postponed: string,
replacements: string, replacements: string,
] ]
type ParamReplacements = Array<[string, string]> | null
export async function getDynamicHTMLPostponedState( export async function getDynamicHTMLPostponedState(
postponed: ReactPostponed, postponed: ReactPostponed,
preludeState: DynamicHTMLPreludeState, preludeState: DynamicHTMLPreludeState,
...@@ -120,21 +115,16 @@ export async function getDynamicHTMLPostponedState( ...@@ -120,21 +115,16 @@ export async function getDynamicHTMLPostponedState(
const data: DynamicHTMLPostponedState['data'] = [preludeState, postponed] const data: DynamicHTMLPostponedState['data'] = [preludeState, postponed]
const dataString = JSON.stringify(data) const dataString = JSON.stringify(data)
let replacements: ParamReplacements = null
if (!fallbackRouteParams || fallbackRouteParams.size === 0) { if (!fallbackRouteParams || fallbackRouteParams.size === 0) {
return serializeStateParts([ replacements = null
SerializedStateTag.DynamicHTML, } else {
await stringifyResumeDataCache( replacements = Array.from(fallbackRouteParams)
createRenderResumeDataCache(resumeDataCache)
),
dataString,
])
} }
const replacements: Array<[string, string]> = Array.from(fallbackRouteParams)
const replacementsString = JSON.stringify(replacements) const replacementsString = JSON.stringify(replacements)
return serializeStateParts([ return serializeStateParts([
SerializedStateTag.DynamicHTMLWithReplacements, SerializedStateTag.DynamicHTML,
await stringifyResumeDataCache(resumeDataCache), await stringifyResumeDataCache(resumeDataCache),
dataString, dataString,
replacementsString, replacementsString,
...@@ -170,20 +160,18 @@ export function parsePostponedState( ...@@ -170,20 +160,18 @@ export function parsePostponedState(
renderResumeDataCache, renderResumeDataCache,
} }
} }
case SerializedStateTag.DynamicHTML: case SerializedStateTag.DynamicHTML: {
case SerializedStateTag.DynamicHTMLWithReplacements: { let [, resumeDataCacheString, postponedString, replacementsString] =
// These two variants mostly overlap, except for the last element parts
let [, resumeDataCacheString, postponedString] = parts
const renderResumeDataCache = createRenderResumeDataCache( const renderResumeDataCache = createRenderResumeDataCache(
resumeDataCacheString resumeDataCacheString
) )
try { try {
if (tag === SerializedStateTag.DynamicHTMLWithReplacements) { const replacements = JSON.parse(
const replacementsString = parts[3] replacementsString
const replacements = JSON.parse( ) as ParamReplacements
replacementsString if (replacements) {
) as ReadonlyArray<[string, string]>
for (const [key, searchValue] of replacements) { for (const [key, searchValue] of replacements) {
const value = params?.[key] ?? '' const value = params?.[key] ?? ''
const replaceValue = Array.isArray(value) const replaceValue = Array.isArray(value)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment