seroval 1.4.0 → 1.4.2

package/src/core/errors.ts

@@ -78,6 +78,9 @@ const enum SpecificErrorCodes {
   MissingReference = 5,
   MissingReferenceForId = 6,
   UnknownTypedArray = 7,
+  MalformedNode = 8,
+  ConflictedNodeId = 9,
+  DepthLimit = 10,
 }
 
 function getSpecificErrorMessage(code: SpecificErrorCodes): string {
@@ -161,3 +164,33 @@ export class SerovalUnknownTypedArrayError extends Error {
     );
   }
 }
+
+export class SerovalMalformedNodeError extends Error {
+  constructor(node: SerovalNode) {
+    super(
+      import.meta.env.PROD
+        ? getSpecificErrorMessage(SpecificErrorCodes.MalformedNode)
+        : 'Malformed node type "' + node.t + '".',
+    );
+  }
+}
+
+export class SerovalConflictedNodeIdError extends Error {
+  constructor(node: SerovalNode) {
+    super(
+      import.meta.env.PROD
+        ? getSpecificErrorMessage(SpecificErrorCodes.ConflictedNodeId)
+        : 'Conflicted node id "' + node.i + '".',
+    );
+  }
+}
+
+export class SerovalDepthLimitError extends Error {
+  constructor(limit: number) {
+    super(
+      import.meta.env.PROD
+        ? getSpecificErrorMessage(SpecificErrorCodes.ConflictedNodeId)
+        : 'Depth limit of ' + limit + ' reached',
+    );
+  }
+}

package/src/core/node.ts

@@ -13,7 +13,6 @@ export function createSerovalNode<
   t: T,
   i: N['i'],
   s: N['s'],
-  l: N['l'],
   c: N['c'],
   m: N['m'],
   p: N['p'],
@@ -22,12 +21,12 @@ export function createSerovalNode<
   f: N['f'],
   b: N['b'],
   o: N['o'],
+  l: N['l'],
 ): N {
   return {
     t,
     i,
     s,
-    l,
     c,
     m,
     p,
@@ -36,5 +35,6 @@ export function createSerovalNode<
     f,
     b,
     o,
+    l,
   } as N;
 }

package/src/core/string.ts

@@ -1,3 +1,5 @@
+import { NIL } from './constants';
+
 export function serializeChar(str: string): string | undefined {
   switch (str) {
     case '"':
@@ -21,7 +23,7 @@ export function serializeChar(str: string): string | undefined {
     case '\u2029':
       return '\\u2029';
     default:
-      return undefined;
+      return NIL;
   }
 }
 

package/src/core/tree/index.ts

@@ -18,6 +18,7 @@ import {
   SerovalMode,
 } from '../plugin';
 import type { SerovalNode } from '../types';
+import { ALL_ENABLED } from '../compat';
 export type SyncParserContextOptions = Omit<BaseParserContextOptions, 'refs'>;
 export type AsyncParserContextOptions = Omit<BaseParserContextOptions, 'refs'>;
 
@@ -67,6 +68,10 @@ export interface SerovalJSON {
   m: number[];
 }
 
+export interface FromJSONOptions extends PluginAccessOptions {
+  disabledFeatures?: number;
+}
+
 export function toJSON<T>(
   source: T,
   options: SyncParserContextOptions = {},
@@ -114,12 +119,16 @@ export function compileJSON(
 
 export function fromJSON<T>(
   source: SerovalJSON,
-  options: PluginAccessOptions = {},
+  options: FromJSONOptions = {},
 ): T {
   const plugins = resolvePlugins(options.plugins);
+  const disabledFeatures = options.disabledFeatures || 0;
+  const sourceFeatures = source.f ?? ALL_ENABLED;
   const ctx = createVanillaDeserializerContext({
     plugins,
     markedRefs: source.m,
+    features: sourceFeatures & ~disabledFeatures,
+    disabledFeatures,
   });
   return deserializeTop(ctx, source.t) as T;
 }

package/src/core/types.ts

@@ -14,8 +14,6 @@ export interface SerovalBaseNode {
   i: number | undefined;
   // Serialized value
   s: unknown;
-  // size/length
-  l: number | undefined;
   // Constructor name / RegExp source
   c: string | undefined;
   // message/flags
@@ -25,13 +23,15 @@ export interface SerovalBaseNode {
   // entries (for Map, etc.)
   e: SerovalMapRecordNode | undefined;
   // array of nodes
-  a: (SerovalNode | undefined)[] | undefined;
+  a: (SerovalNode | 0)[] | undefined;
   // fulfilled node
   f: SerovalNode | undefined;
   // byte offset/object flags
   b: number | undefined;
   // object flag
   o: SerovalObjectFlags | undefined;
+  // length
+  l: number | undefined;
 }
 
 export type SerovalObjectRecordKey = string | SerovalNode;
@@ -39,13 +39,11 @@ export type SerovalObjectRecordKey = string | SerovalNode;
 export interface SerovalObjectRecordNode {
   k: SerovalObjectRecordKey[];
   v: SerovalNode[];
-  s: number;
 }
 
 export interface SerovalMapRecordNode {
   k: SerovalNode[];
   v: SerovalNode[];
-  s: number;
 }
 
 export interface SerovalNumberNode extends SerovalBaseNode {
@@ -104,38 +102,35 @@ export interface SerovalArrayBufferNode extends SerovalBaseNode {
   i: number;
   // byte string
   s: string;
-  // length
-  l: number;
   // array buffer constructor
   f: SerovalNodeWithID;
 }
 
-
 export interface SerovalTypedArrayNode extends SerovalBaseNode {
   t: SerovalNodeType.TypedArray;
   // id
   i: number;
-  // length
-  l: number;
   // TypedArray Constructor
   c: string;
   // ArrayBuffer reference
   f: SerovalNode;
   // Byte Offset
   b: number;
+  // length
+  l: number;
 }
 
 export interface SerovalBigIntTypedArrayNode extends SerovalBaseNode {
   t: SerovalNodeType.BigIntTypedArray;
   i: number;
-  // length
-  l: number;
   // TypedArray Constructor
   c: string;
   // ArrayBuffer reference
   f: SerovalNode;
   // Byte Offset
   b: number;
+  // length
+  l: number;
 }
 
 export type SerovalSemiPrimitiveNode =
@@ -149,8 +144,6 @@ export interface SerovalSetNode extends SerovalBaseNode {
   t: SerovalNodeType.Set;
   // id
   i: number;
-  // Size of Set
-  l: number;
   // Items in Set (as array)
   a: SerovalNode[];
 }
@@ -165,10 +158,8 @@ export interface SerovalMapNode extends SerovalBaseNode {
 
 export interface SerovalArrayNode extends SerovalBaseNode {
   t: SerovalNodeType.Array;
-  // size of array
-  l: number;
   // items
-  a: (SerovalNode | undefined)[];
+  a: (SerovalNode | 0)[];
   i: number;
   o: SerovalObjectFlags;
 }
@@ -233,12 +224,12 @@ export interface SerovalReferenceNode extends SerovalBaseNode {
 export interface SerovalDataViewNode extends SerovalBaseNode {
   t: SerovalNodeType.DataView;
   i: number;
-  // byte length
-  l: number;
   // reference to array buffer
   f: SerovalNode;
   // byte offset
   b: number;
+  // byte length
+  l: number;
 }
 
 export interface SerovalBoxedNode extends SerovalBaseNode {