diff --git a/packages/core/src/decorators/decorator.utils.ts b/packages/core/src/decorators/decorator.utils.ts index 7fdeaeafd..3ef8a4729 100644 --- a/packages/core/src/decorators/decorator.utils.ts +++ b/packages/core/src/decorators/decorator.utils.ts @@ -1,5 +1,5 @@ +import { hasValue } from "../shared"; import { $ } from "../types/namespace/Utility.ns"; -import { hasValue } from "../utils/object.utils"; import { DecoratorPartialProps, ValidationGroup } from "./decorator.types"; export function extractMessage( diff --git a/packages/core/src/model/processor/entity.processor.ts b/packages/core/src/model/processor/entity.processor.ts index d87706e12..39954a305 100644 --- a/packages/core/src/model/processor/entity.processor.ts +++ b/packages/core/src/model/processor/entity.processor.ts @@ -1,5 +1,6 @@ import { Payload } from "tdv-core"; import { ValidationGroup } from "../../decorators/decorator.types"; +import { deepEquals, hasErrors } from "../../shared"; import { Class } from "../../types/Class.type"; import { DetailedErrors } from "../../types/DetailedErrors.type"; import { @@ -8,7 +9,6 @@ import { EntityProcessorResult, } from "../../types/EntityProcessor.type"; import { Errors } from "../../types/Errors.type"; -import { deepEquals, hasErrors } from "../../utils/object.utils"; import StrategyRegister from "../constants/strategy.constants"; import ClassDescriptor, { Descriptor } from "../descriptor/class.descriptor"; diff --git a/packages/core/src/utils/object.utils.ts b/packages/core/src/shared.ts similarity index 83% rename from packages/core/src/utils/object.utils.ts rename to packages/core/src/shared.ts index 5ba8a827b..fce3e939d 100644 --- a/packages/core/src/utils/object.utils.ts +++ b/packages/core/src/shared.ts @@ -1,26 +1,4 @@ -import { Errors } from "../types/Errors.type"; - -function hasSetter(parent: T, key: K): boolean { - const descriptor = Object.getOwnPropertyDescriptor(parent, key); - return ( - !!descriptor && - (descriptor.writable || typeof descriptor.set === "function") - ); -} - -function isFunctionSetter( - value: T[K] | (() => T[K]) -): value is () => T[K] { - return typeof value === "function"; -} - -export function safeSetter(parent: T, key: K) { - return (value: T[K] | (() => T[K])) => { - if (hasSetter(parent, key)) { - parent[key] = isFunctionSetter(value) ? value() : value; - } - }; -} +import { Errors } from "./types/Errors.type"; export function hasErrors(data: Errors): boolean { const data0: any = data; diff --git a/packages/core/validators/any/Required.ts b/packages/core/validators/any/Required.ts index b950925c3..8d6b5746c 100644 --- a/packages/core/validators/any/Required.ts +++ b/packages/core/validators/any/Required.ts @@ -5,8 +5,8 @@ import { extractMessage, } from "../../src/decorators/decorator.utils"; import ErrorMessage from "../../src/messages/model/errors"; +import { hasValue } from "../../src/shared"; import { $ } from "../../src/types/namespace/Utility.ns"; -import { hasValue } from "../../src/utils/object.utils"; export default function Required( props?: DecoratorPartialProps diff --git a/packages/core/validators/array/ArrayUnique.ts b/packages/core/validators/array/ArrayUnique.ts index 9b129e1a7..094672313 100644 --- a/packages/core/validators/array/ArrayUnique.ts +++ b/packages/core/validators/array/ArrayUnique.ts @@ -8,8 +8,8 @@ import { extractMessage, } from "../../src/decorators/decorator.utils"; import ErrorMessage from "../../src/messages/model/errors"; +import { hash } from "../../src/shared"; import { $ } from "../../src/types/namespace/Utility.ns"; -import { hash } from "../../src/utils/object.utils"; export type ArrayUniqueType = { hash?: $.HashGenerator;