Change RegExp output

lxsmnsyc · Mar 16, 2023 · 3493180 · 3493180
1 parent 8263427
commit 3493180
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/packages/seroval/src/tree/primitives.ts b/packages/seroval/src/tree/primitives.ts
@@ -191,10 +191,10 @@ export function createRegExpNode(id: number, current: RegExp): SerovalRegExpNode
   return {
     t: SerovalNodeType.RegExp,
     i: id,
-    s: String(current),
+    s: undefined,
     l: undefined,
-    c: undefined,
-    m: undefined,
+    c: current.source,
+    m: current.flags,
     d: undefined,
     a: undefined,
     n: undefined,

diff --git a/packages/seroval/src/tree/serialize.ts b/packages/seroval/src/tree/serialize.ts
@@ -577,7 +577,7 @@ export default function serializeTree(
     case SerovalNodeType.Date:
       return assignRef(ctx, node.i, 'new Date("' + node.s + '")');
     case SerovalNodeType.RegExp:
-      return assignRef(ctx, node.i, node.s);
+      return assignRef(ctx, node.i, '/' + node.c + '/' + node.m);
     case SerovalNodeType.Set:
       return serializeSet(ctx, node);
     case SerovalNodeType.Map:

diff --git a/packages/seroval/src/tree/types.ts b/packages/seroval/src/tree/types.ts
@@ -134,7 +134,10 @@ export interface SerovalDateNode extends SerovalBaseNode {
 export interface SerovalRegExpNode extends SerovalBaseNode {
   t: SerovalNodeType.RegExp;
   i: number;
-  s: string;
+  // source
+  c: string;
+  // flags
+  m: string;
 }
 
 export interface SerovalTypedArrayNode extends SerovalBaseNode {

diff --git a/packages/seroval/test/__snapshots__/regexp.test.ts.snap b/packages/seroval/test/__snapshots__/regexp.test.ts.snap
@@ -4,6 +4,6 @@ exports[`RegExp > serialize > supports RegExp 1`] = `"/[a-z0-9]+/i"`;
 
 exports[`RegExp > serializeAsync > supports RegExp 1`] = `"Promise.resolve(/[a-z0-9]+/i)"`;
 
-exports[`RegExp > toJSON > supports RegExp 1`] = `"{\\"t\\":{\\"t\\":12,\\"i\\":0,\\"s\\":\\"/[a-z0-9]+/i\\"},\\"r\\":0,\\"i\\":false,\\"f\\":8191,\\"m\\":[]}"`;
+exports[`RegExp > toJSON > supports RegExp 1`] = `"{\\"t\\":{\\"t\\":12,\\"i\\":0,\\"c\\":\\"[a-z0-9]+\\",\\"m\\":\\"i\\"},\\"r\\":0,\\"i\\":false,\\"f\\":8191,\\"m\\":[]}"`;
 
-exports[`RegExp > toJSONAsync > supports RegExp 1`] = `"{\\"t\\":{\\"t\\":18,\\"i\\":0,\\"n\\":{\\"t\\":12,\\"i\\":1,\\"s\\":\\"/[a-z0-9]+/i\\"}},\\"r\\":0,\\"i\\":false,\\"f\\":8191,\\"m\\":[]}"`;
+exports[`RegExp > toJSONAsync > supports RegExp 1`] = `"{\\"t\\":{\\"t\\":18,\\"i\\":0,\\"n\\":{\\"t\\":12,\\"i\\":1,\\"c\\":\\"[a-z0-9]+\\",\\"m\\":\\"i\\"}},\\"r\\":0,\\"i\\":false,\\"f\\":8191,\\"m\\":[]}"`;