Prioritize Promise

lxsmnsyc · Oct 18, 2023 · 24bf6c6 · 24bf6c6
1 parent 059ad42
commit 24bf6c6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 764 deletions.
diff --git a/packages/seroval/src/core/base/async.ts b/packages/seroval/src/core/base/async.ts
@@ -668,6 +668,13 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
         break;
     }
     const currentFeatures = this.features;
+    // Promises
+    if (
+      (currentFeatures & Feature.Promise)
+      && (currentClass === Promise || current instanceof Promise)
+    ) {
+      return this.parsePromise(id, current as unknown as Promise<unknown>);
+    }
     // Typed Arrays
     if (currentFeatures & Feature.TypedArray) {
       switch (currentClass) {
@@ -751,13 +758,6 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     ) {
       return this.parseAggregateError(id, current as unknown as AggregateError);
     }
-    // Promises
-    if (
-      (currentFeatures & Feature.Promise)
-      && (currentClass === Promise || current instanceof Promise)
-    ) {
-      return this.parsePromise(id, current as unknown as Promise<unknown>);
-    }
     // Slow path. We only need to handle Errors and Iterators
     // since they have very broad implementations.
     if (current instanceof Error) {

diff --git a/packages/seroval/src/core/base/stream.ts b/packages/seroval/src/core/base/stream.ts
@@ -346,6 +346,13 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
         break;
     }
     const currentFeatures = this.features;
+    // Promises
+    if (
+      (currentFeatures & Feature.Promise)
+      && (currentClass === Promise || current instanceof Promise)
+    ) {
+      return this.parsePromise(id, current as unknown as Promise<unknown>);
+    }
     // Typed Arrays
     if (currentFeatures & Feature.TypedArray) {
       switch (currentClass) {
@@ -427,12 +434,6 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
     ) {
       return this.parseAggregateError(id, current as unknown as AggregateError);
     }
-    if (
-      (currentFeatures & Feature.Promise)
-      && (currentClass === Promise || current instanceof Promise)
-    ) {
-      return this.parsePromise(id, current as unknown as Promise<unknown>);
-    }
     // Slow path. We only need to handle Errors and Iterators
     // since they have very broad implementations.
     if (current instanceof Error) {