seroval 1.5.1 → 1.5.3

package/dist/cjs/development/index.cjs

@@ -1973,7 +1973,8 @@ function createBaseDeserializerContext(mode, options) {
     plugins: options.plugins,
     refs: options.refs || /* @__PURE__ */ new Map(),
     features: (_a = options.features) != null ? _a : ALL_ENABLED ^ (options.disabledFeatures || 0),
-    depthLimit: options.depthLimit || DEFAULT_DEPTH_LIMIT
+    depthLimit: options.depthLimit || DEFAULT_DEPTH_LIMIT,
+    types: /* @__PURE__ */ new Map()
   };
 }
 function createVanillaDeserializerContext(options) {
@@ -2097,7 +2098,11 @@ function assignStringProperty(object, key, value) {
 }
 function assignProperty(ctx, depth, object, key, value) {
   if (typeof key === "string") {
-    assignStringProperty(object, key, deserialize(ctx, depth, value));
+    assignStringProperty(
+      object,
+      deserializeString(key),
+      deserialize(ctx, depth, value)
+    );
   } else {
     const actual = deserialize(ctx, depth, key);
     switch (typeof actual) {
@@ -2114,6 +2119,14 @@ function assignProperty(ctx, depth, object, key, value) {
     }
   }
 }
+function assignNodeType(ctx, id, type) {
+  ctx.base.types.set(id, type);
+}
+function validateNodeType(ctx, node, id, type) {
+  if (ctx.base.types.get(id) !== type) {
+    throw new SerovalMalformedNodeError(node);
+  }
+}
 function deserializeProperties(ctx, depth, node, result) {
   const keys = node.k;
   const len = keys.length;
@@ -2267,6 +2280,7 @@ function deserializePlugin(ctx, depth, node) {
   throw new SerovalMissingPluginError(node.c);
 }
 function deserializePromiseConstructor(ctx, node) {
+  assignNodeType(ctx, node.s, 22 /* PromiseConstructor */);
   return assignIndexedValue(
     ctx,
     node.i,
@@ -2276,6 +2290,7 @@ function deserializePromiseConstructor(ctx, node) {
 function deserializePromiseResolve(ctx, depth, node) {
   const deferred = ctx.base.refs.get(node.i);
   if (deferred) {
+    validateNodeType(ctx, node, node.i, 22 /* PromiseConstructor */);
     deferred.s(deserialize(ctx, depth, node.a[1]));
     return NIL;
   }
@@ -2284,6 +2299,7 @@ function deserializePromiseResolve(ctx, depth, node) {
 function deserializePromiseReject(ctx, depth, node) {
   const deferred = ctx.base.refs.get(node.i);
   if (deferred) {
+    validateNodeType(ctx, node, node.i, 22 /* PromiseConstructor */);
     deferred.f(deserialize(ctx, depth, node.a[1]));
     return NIL;
   }
@@ -2300,6 +2316,7 @@ function deserializeAsyncIteratorFactoryInstance(ctx, depth, node) {
   return streamToAsyncIterable(source);
 }
 function deserializeStreamConstructor(ctx, depth, node) {
+  assignNodeType(ctx, node.i, 31 /* StreamConstructor */);
   const result = assignIndexedValue(ctx, node.i, createStream());
   const items = node.a;
   const len = items.length;
@@ -2312,7 +2329,8 @@ function deserializeStreamConstructor(ctx, depth, node) {
 }
 function deserializeStreamNext(ctx, depth, node) {
   const deferred = ctx.base.refs.get(node.i);
-  if (deferred && isStream(deferred)) {
+  if (deferred) {
+    validateNodeType(ctx, node, node.i, 31 /* StreamConstructor */);
     deferred.next(deserialize(ctx, depth, node.f));
     return NIL;
   }
@@ -2320,7 +2338,8 @@ function deserializeStreamNext(ctx, depth, node) {
 }
 function deserializeStreamThrow(ctx, depth, node) {
   const deferred = ctx.base.refs.get(node.i);
-  if (deferred && isStream(deferred)) {
+  if (deferred) {
+    validateNodeType(ctx, node, node.i, 31 /* StreamConstructor */);
     deferred.throw(deserialize(ctx, depth, node.f));
     return NIL;
   }
@@ -2328,7 +2347,8 @@ function deserializeStreamThrow(ctx, depth, node) {
 }
 function deserializeStreamReturn(ctx, depth, node) {
   const deferred = ctx.base.refs.get(node.i);
-  if (deferred && isStream(deferred)) {
+  if (deferred) {
+    validateNodeType(ctx, node, node.i, 31 /* StreamConstructor */);
     deferred.return(deserialize(ctx, depth, node.f));
     return NIL;
   }
@@ -2696,7 +2716,11 @@ function createObjectAssign(ctx, ref, key, value) {
   createAssignment(ctx.base, getRefParam(ctx, ref) + "." + key, value);
 }
 function createSequenceAssign(ctx, ref, index, value) {
-  createAssignment(ctx.base, getRefParam(ctx, ref) + ".v[" + index + "]", value);
+  createAssignment(
+    ctx.base,
+    getRefParam(ctx, ref) + ".v[" + index + "]",
+    value
+  );
 }
 function isIndexedValueInStack(ctx, node) {
   return node.t === 4 /* IndexedValue */ && ctx.stack.includes(node.i);