Update deserializer.ts

lxsmnsyc · Dec 6, 2023 · f42763c · f42763c
1 parent 346020a
commit f42763c
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/packages/seroval/src/core/context/deserializer.ts b/packages/seroval/src/core/context/deserializer.ts
@@ -1,4 +1,3 @@
-/* eslint-disable prefer-spread */
 import { deserializeString } from '../string';
 import type { BigIntTypedArrayValue, TypedArrayValue } from '../../types';
 import { getReference } from '../reference';
@@ -7,12 +6,14 @@ import type {
   SerovalArrayBufferNode,
   SerovalArrayNode,
   SerovalAsyncIteratorFactoryInstanceNode,
+  SerovalAsyncIteratorFactoryNode,
   SerovalBigIntTypedArrayNode,
   SerovalBoxedNode,
   SerovalDataViewNode,
   SerovalDateNode,
   SerovalErrorNode,
   SerovalIteratorFactoryInstanceNode,
+  SerovalIteratorFactoryNode,
   SerovalMapNode,
   SerovalNode,
   SerovalNullConstructorNode,
@@ -331,13 +332,15 @@ export default abstract class BaseDeserializerContext implements PluginAccessOpt
   private deserializeIteratorFactoryInstance(
     node: SerovalIteratorFactoryInstanceNode,
   ): unknown {
+    this.deserialize(node.a[0]);
     const source = this.deserialize(node.a[1]);
     return sequenceToIterator(source as Sequence);
   }
 
   private deserializeAsyncIteratorFactoryInstance(
     node: SerovalAsyncIteratorFactoryInstanceNode,
   ): unknown {
+    this.deserialize(node.a[0]);
     const source = this.deserialize(node.a[1]);
     return streamToAsyncIterable(source as Stream<any>);
   }
@@ -391,6 +394,20 @@ export default abstract class BaseDeserializerContext implements PluginAccessOpt
     return undefined;
   }
 
+  private deserializeIteratorFactory(
+    node: SerovalIteratorFactoryNode,
+  ): unknown {
+    this.deserialize(node.f);
+    return undefined;
+  }
+
+  private deserializeAsyncIteratorFactory(
+    node: SerovalAsyncIteratorFactoryNode,
+  ): unknown {
+    this.deserialize(node.a[1]);
+    return undefined;
+  }
+
   deserialize(node: SerovalNode): unknown {
     switch (node.t) {
       case SerovalNodeType.Constant:
@@ -455,9 +472,11 @@ export default abstract class BaseDeserializerContext implements PluginAccessOpt
         return this.deserializeStreamThrow(node);
       case SerovalNodeType.StreamReturn:
         return this.deserializeStreamReturn(node);
-      case SerovalNodeType.SpecialReference:
       case SerovalNodeType.IteratorFactory:
+        return this.deserializeIteratorFactory(node);
       case SerovalNodeType.AsyncIteratorFactory:
+        return this.deserializeAsyncIteratorFactory(node);
+      case SerovalNodeType.SpecialReference:
       default:
         throw new Error('invariant');
     }