seroval 0.11.1 → 0.11.3

package/src/core/shared.ts

@@ -1,4 +1,4 @@
-import { Feature } from './compat';
+import { BIGINT_FLAG, Feature } from './compat';
 import type {
   ErrorValue,
 } from '../types';
@@ -82,6 +82,7 @@ export function getErrorOptions(
 }
 
 export function isIterable(
+  ctx: BaseParserContext,
   value: unknown,
 ): value is Iterable<unknown> {
   if (!value || typeof value !== 'object') {
@@ -90,25 +91,53 @@ export function isIterable(
   if (Array.isArray(value)) {
     return false;
   }
-  switch (value.constructor) {
-    case Map:
-    case Set:
-    case Int8Array:
-    case Int16Array:
-    case Int32Array:
-    case Uint8Array:
-    case Uint16Array:
-    case Uint32Array:
-    case Uint8ClampedArray:
-    case Float32Array:
-    case Float64Array:
-    case BigInt64Array:
-    case BigUint64Array:
-      return false;
-    default:
-      break;
+  const currentClass = value.constructor;
+  if (ctx.features & Feature.TypedArray) {
+    switch (currentClass) {
+      case Int8Array:
+      case Int16Array:
+      case Int32Array:
+      case Uint8Array:
+      case Uint16Array:
+      case Uint32Array:
+      case Uint8ClampedArray:
+      case Float32Array:
+      case Float64Array:
+        return false;
+      default:
+        break;
+    }
+  }
+  // BigInt Typed Arrays
+  if ((ctx.features & BIGINT_FLAG) === BIGINT_FLAG) {
+    switch (currentClass) {
+      case BigInt64Array:
+      case BigUint64Array:
+        return false;
+      default:
+        break;
+    }
+  }
+  // ES Collection
+  if (ctx.features & Feature.Map && currentClass === Map) {
+    return false;
+  }
+  if (ctx.features & Feature.Set && currentClass === Set) {
+    return false;
+  }
+  if (ctx.features & Feature.WebAPI) {
+    switch (currentClass) {
+      case Headers:
+      case File:
+        return false;
+      default:
+        break;
+    }
+  }
+  if (ctx.features & Feature.Symbol) {
+    return Symbol.iterator in value;
   }
-  return Symbol.iterator in value;
+  return false;
 }
 
 type TypedArrayConstructor =

package/src/core/tree/async.ts

@@ -96,7 +96,7 @@ async function generateNodeList(
   for (let i = 0; i < size; i++) {
     if (i in current) {
       item = current[i];
-      if (isIterable(item)) {
+      if (isIterable(ctx, item)) {
         deferred[i] = item;
       } else {
         nodes[i] = await parseAsync(ctx, item);
@@ -146,7 +146,7 @@ async function generateMapNode(
   let nodeSize = 0;
   for (const [key, value] of current.entries()) {
     // Either key or value might be an iterable
-    if (isIterable(key) || isIterable(value)) {
+    if (isIterable(ctx, key) || isIterable(ctx, value)) {
       deferredKey[deferredSize] = key;
       deferredValue[deferredSize] = value;
       deferredSize++;
@@ -188,7 +188,7 @@ async function generateSetNode(
   let nodeSize = 0;
   for (const item of current.keys()) {
     // Iterables are lazy, so the evaluation must be deferred
-    if (isIterable(item)) {
+    if (isIterable(ctx, item)) {
       deferred[deferredSize++] = item;
     } else {
       nodes[nodeSize++] = await parseAsync(ctx, item);
@@ -231,7 +231,7 @@ async function generateProperties(
   for (const key of keys) {
     item = properties[key];
     escaped = serializeString(key);
-    if (isIterable(item)) {
+    if (isIterable(ctx, item)) {
       deferredKeys[deferredSize] = escaped;
       deferredValues[deferredSize] = item;
       deferredSize++;
@@ -281,7 +281,7 @@ async function generatePlainProperties(
   for (const key of keys) {
     item = properties[key];
     escaped = serializeString(key);
-    if (isIterable(item)) {
+    if (isIterable(ctx, item)) {
       deferredKeys[deferredSize] = escaped;
       deferredValues[deferredSize] = item;
       deferredSize++;

package/src/core/tree/sync.ts

@@ -72,7 +72,7 @@ function generateNodeList(ctx: ParserContext, current: unknown[]): SerovalSyncNo
   for (let i = 0; i < size; i++) {
     if (i in current) {
       item = current[i];
-      if (isIterable(item)) {
+      if (isIterable(ctx, item)) {
         deferred[i] = item;
       } else {
         nodes[i] = parseSync(ctx, item);
@@ -122,7 +122,7 @@ function generateMapNode(
   let nodeSize = 0;
   for (const [key, value] of current.entries()) {
     // Either key or value might be an iterable
-    if (isIterable(key) || isIterable(value)) {
+    if (isIterable(ctx, key) || isIterable(ctx, value)) {
       deferredKey[deferredSize] = key;
       deferredValue[deferredSize] = value;
       deferredSize++;
@@ -164,7 +164,7 @@ function generateSetNode(
   let nodeSize = 0;
   for (const item of current.keys()) {
     // Iterables are lazy, so the evaluation must be deferred
-    if (isIterable(item)) {
+    if (isIterable(ctx, item)) {
       deferred[deferredSize++] = item;
     } else {
       nodes[nodeSize++] = parseSync(ctx, item);
@@ -207,7 +207,7 @@ function generateProperties(
   for (const key of keys) {
     item = properties[key];
     escaped = serializeString(key);
-    if (isIterable(item)) {
+    if (isIterable(ctx, item)) {
       deferredKeys[deferredSize] = escaped;
       deferredValues[deferredSize] = item;
       deferredSize++;
@@ -254,7 +254,7 @@ function generatePlainProperties(
   for (const key of keys) {
     item = properties[key];
     escaped = serializeString(key);
-    if (isIterable(item)) {
+    if (isIterable(ctx, item)) {
       deferredKeys[deferredSize] = escaped;
       deferredValues[deferredSize] = item;
       deferredSize++;