Introduced StringSerializer for strings that start with the prefixes …

…of serializers.
genki · Sep 19, 2023 · 5d85187 · 5d85187
1 parent c42dc77
commit 5d85187
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/packages/qwik/src/core/container/pause.ts b/packages/qwik/src/core/container/pause.ts
@@ -28,7 +28,7 @@ import {
 import { isArray, isObject, isSerializableObject } from '../util/types';
 import { directGetAttribute, directSetAttribute } from '../render/fast-calls';
 import { isNotNullable, isPromise } from '../util/promises';
-import { collectDeps, serializeValue, UNDEFINED_PREFIX, NOSERIALIZE_PREFIX } from './serializers';
+import { collectDeps, serializeValue, UNDEFINED_PREFIX } from './serializers';
 import {
   type ContainerState,
   FILTER_REJECT,
@@ -138,8 +138,6 @@ export const _serializeData = async (data: any, pureQRL?: boolean) => {
           break;
         }
         return obj;
-      case 'string':
-        return NOSERIALIZE_PREFIX + obj;
       case 'boolean':
         return obj;
     }
@@ -482,8 +480,6 @@ export const _pauseFromContexts = async (
           break;
         }
         return obj;
-      case 'string':
-        return NOSERIALIZE_PREFIX + obj;
       case 'boolean':
         return obj;
     }

diff --git a/packages/qwik/src/core/container/resume.ts b/packages/qwik/src/core/container/resume.ts
@@ -8,13 +8,7 @@ import { emitEvent } from '../util/event';
 
 import { isArray, isSerializableObject, isString } from '../util/types';
 import { directGetAttribute, directSetAttribute } from '../render/fast-calls';
-import {
-  createParser,
-  OBJECT_TRANSFORMS,
-  type Parser,
-  UNDEFINED_PREFIX,
-  NOSERIALIZE_PREFIX,
-} from './serializers';
+import { createParser, OBJECT_TRANSFORMS, type Parser, UNDEFINED_PREFIX } from './serializers';
 import {
   type ContainerState,
   _getContainerState,
@@ -82,12 +76,7 @@ export const _deserializeData = (data: string, element?: unknown) => {
   for (let i = 0; i < _objs.length; i++) {
     const value = _objs[i];
     if (isString(value)) {
-      _objs[i] =
-        value === UNDEFINED_PREFIX
-          ? undefined
-          : value.startsWith(NOSERIALIZE_PREFIX)
-          ? value.slice(1)
-          : parser.prepare(value);
+      _objs[i] = value === UNDEFINED_PREFIX ? undefined : parser.prepare(value);
     }
   }
 
@@ -239,12 +228,7 @@ export const resumeContainer = (containerEl: Element) => {
     assertTrue(objs.length > index, 'resume: index is out of bounds', id);
     let value = objs[index];
     if (isString(value)) {
-      value =
-        value === UNDEFINED_PREFIX
-          ? undefined
-          : value.startsWith(NOSERIALIZE_PREFIX)
-          ? value.slice(1)
-          : parser.prepare(value);
+      value = value === UNDEFINED_PREFIX ? undefined : parser.prepare(value);
     }
     let obj = value;
     for (let i = id.length - 1; i >= 0; i--) {

diff --git a/packages/qwik/src/core/container/serializers.ts b/packages/qwik/src/core/container/serializers.ts
@@ -49,7 +49,6 @@ import { Slot } from '../render/jsx/slot.public';
 \': single quote (U+0027 APOSTROPHE)
 \\: backslash (U+005C REVERSE SOLIDUS)
  */
-export const NOSERIALIZE_PREFIX = '\u0000';
 export const UNDEFINED_PREFIX = '\u0001';
 
 export interface Serializer<T> {
@@ -486,7 +485,16 @@ const MapSerializer: Serializer<Map<any, any>> = {
   },
 };
 
+const StringSerializer: Serializer<string> = {
+  $prefix$: '\u001b',
+  $test$: (v) => typeof v === 'string' && prefixes.has(v[0]),
+  $serialize$: (v) => v,
+  $prepare$: (data) => data,
+  $fill$: undefined,
+};
+
 const serializers: Serializer<any>[] = [
+  StringSerializer, /////////// \u001b
   QRLSerializer, ////////////// \u0002
   SignalSerializer, /////////// \u0012
   SignalWrapperSerializer, //// \u0013
@@ -508,6 +516,8 @@ const serializers: Serializer<any>[] = [
   DocumentSerializer, ///////// \u000F
 ];
 
+const prefixes = new Set([UNDEFINED_PREFIX, ...serializers.map((a) => a.$prefix$)]);
+
 const collectorSerializers = /*#__PURE__*/ serializers.filter((a) => a.$collect$);
 
 export const canSerialize = (obj: any): boolean => {
@@ -544,6 +554,9 @@ export const serializeValue = (
       return value;
     }
   }
+  if (typeof obj === 'string') {
+    return obj;
+  }
   return undefined;
 };