Revert "Fix constructor name"

This reverts commit 065ffd3.
lxsmnsyc · Oct 16, 2023 · def657e · def657e
1 parent 065ffd3
commit def657e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git a/packages/seroval/src/core/base/async.ts b/packages/seroval/src/core/base/async.ts
@@ -28,7 +28,6 @@ import {
   FALSE_NODE,
   UNDEFINED_NODE,
 } from '../literals';
-import { getConstructor } from '../object';
 import { BaseParserContext } from '../parser-context';
 import promiseToResult from '../promise-to-result';
 import { hasReferenceID } from '../reference';
@@ -153,7 +152,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
       i: id,
       s: undefined,
       l: current.length,
-      c: getConstructor(current).name,
+      c: current.constructor.name,
       m: undefined,
       p: undefined,
       e: undefined,
@@ -173,7 +172,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
       i: id,
       s: undefined,
       l: current.length,
-      c: getConstructor(current).name,
+      c: current.constructor.name,
       m: undefined,
       p: undefined,
       e: undefined,
@@ -642,7 +641,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     if (Array.isArray(current)) {
       return this.parseArray(id, current);
     }
-    const currentClass = getConstructor(current);
+    const currentClass = current.constructor;
     switch (currentClass) {
       case Object:
         return this.parsePlainObject(

diff --git a/packages/seroval/src/core/base/stream.ts b/packages/seroval/src/core/base/stream.ts
@@ -22,7 +22,6 @@ import type {
   SerovalResponseNode,
 } from '../types';
 import { createDOMExceptionNode, createURLNode, createURLSearchParamsNode } from '../web-api';
-import { getConstructor } from '../object';
 
 export interface BaseStreamParserContextOptions extends BaseSyncParserContextOptions {
   onParse: (node: SerovalNode, initial: boolean) => void;
@@ -297,7 +296,7 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
     if (Array.isArray(current)) {
       return this.parseArray(id, current);
     }
-    const currentClass = getConstructor(current);
+    const currentClass = current.constructor;
     switch (currentClass) {
       case Object:
         return this.parsePlainObject(

diff --git a/packages/seroval/src/core/base/sync.ts b/packages/seroval/src/core/base/sync.ts
@@ -24,7 +24,6 @@ import {
   TRUE_NODE,
   UNDEFINED_NODE,
 } from '../literals';
-import { getConstructor } from '../object';
 import type { BaseParserContextOptions } from '../parser-context';
 import { BaseParserContext } from '../parser-context';
 import { hasReferenceID } from '../reference';
@@ -209,7 +208,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
       i: id,
       s: undefined,
       l: current.length,
-      c: getConstructor(current).name,
+      c: current.constructor.name,
       m: undefined,
       p: undefined,
       e: undefined,
@@ -229,7 +228,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
       i: id,
       s: undefined,
       l: current.length,
-      c: getConstructor(current).name,
+      c: current.constructor.name,
       m: undefined,
       p: undefined,
       e: undefined,
@@ -528,7 +527,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
     if (Array.isArray(current)) {
       return this.parseArray(id, current);
     }
-    const currentClass = getConstructor(current);
+    const currentClass = current.constructor;
     switch (currentClass) {
       case Object:
         return this.parsePlainObject(

diff --git a/packages/seroval/src/core/object.ts b/packages/seroval/src/core/object.ts
diff --git a/packages/seroval/src/core/parser-context.ts b/packages/seroval/src/core/parser-context.ts
@@ -1,6 +1,5 @@
 import { ALL_ENABLED, BIGINT_FLAG, Feature } from './compat';
 import { ERROR_CONSTRUCTOR_STRING } from './constants';
-import { getConstructor } from './object';
 import type { Plugin, PluginAccessOptions, SerovalMode } from './plugin';
 import { getErrorConstructor } from './shared';
 
@@ -36,13 +35,10 @@ export abstract class BaseParserContext implements PluginAccessOptions {
     // Name has been modified
     if (error.name !== constructor) {
       options = { name: error.name };
-    } else {
-      const currentName = getConstructor(error).name;
-      if (currentName !== constructor) {
-        // Otherwise, name is overriden because
-        // the Error class is extended
-        options = { name: currentName };
-      }
+    } else if (error.constructor.name !== constructor) {
+      // Otherwise, name is overriden because
+      // the Error class is extended
+      options = { name: error.constructor.name };
     }
     const names = Object.getOwnPropertyNames(error);
     for (let i = 0, len = names.length, name: string; i < len; i++) {
@@ -74,7 +70,7 @@ export abstract class BaseParserContext implements PluginAccessOptions {
     if (Array.isArray(value)) {
       return false;
     }
-    const currentClass = getConstructor(value);
+    const currentClass = value.constructor;
     if (this.features & Feature.TypedArray) {
       switch (currentClass) {
         case Int8Array: