♻️ [refactor]: Move decorator.utils.ts to src/decorators

brunotot · Sep 15, 2023 · 629f9a5 · 629f9a5
1 parent c7a7902
commit 629f9a5
Show file tree

Hide file tree

Showing 42 changed files with 142 additions and 76 deletions.
diff --git a/packages/core/src/utils/decorator.utils.ts → ...es/core/src/decorators/decorator.utils.ts b/packages/core/src/utils/decorator.utils.ts → ...es/core/src/decorators/decorator.utils.ts
@@ -1,9 +1,6 @@
-import {
-  DecoratorPartialProps,
-  ValidationGroup,
-} from "../decorators/decorator.types";
 import { $ } from "../types/namespace/Utility.ns";
-import { hasValue } from "./object.utils";
+import { hasValue } from "../utils/object.utils";
+import { DecoratorPartialProps, ValidationGroup } from "./decorator.types";
 
 export function extractMessage<T extends object>(
   provider: DecoratorPartialProps<any, T>,

diff --git a/packages/core/validators/any/Falsy.ts b/packages/core/validators/any/Falsy.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function Falsy<T extends $.Nullable>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/any/Required.ts b/packages/core/validators/any/Required.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 import { hasValue } from "../../src/utils/object.utils";
 
 export default function Required<T extends $.Nullable>(

diff --git a/packages/core/validators/any/Truthy.ts b/packages/core/validators/any/Truthy.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function Truthy<T extends $.Nullable>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/array/ArrayContains.ts b/packages/core/validators/array/ArrayContains.ts
@@ -1,7 +1,10 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export type ArrayContainsType<T> = {
   value: T;

diff --git a/packages/core/validators/array/ArrayEmpty.ts b/packages/core/validators/array/ArrayEmpty.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function ArrayEmpty<K, T extends K[]>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/array/ArrayEvery.ts b/packages/core/validators/array/ArrayEvery.ts
@@ -1,7 +1,7 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorImpartialProps } from "../../src/decorators/decorator.types";
+import { extractGroups } from "../../src/decorators/decorator.utils";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups } from "../../src/utils/decorator.utils";
 
 export type ArrayEveryType<T> = {
   test: $.Predicate<T>;

diff --git a/packages/core/validators/array/ArrayNone.ts b/packages/core/validators/array/ArrayNone.ts
@@ -1,7 +1,7 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorImpartialProps } from "../../src/decorators/decorator.types";
+import { extractGroups } from "../../src/decorators/decorator.utils";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups } from "../../src/utils/decorator.utils";
 
 export type ArrayNoneType<T> = {
   test: $.Predicate<T>;

diff --git a/packages/core/validators/array/ArrayOne.ts b/packages/core/validators/array/ArrayOne.ts
@@ -1,7 +1,7 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorImpartialProps } from "../../src/decorators/decorator.types";
+import { extractGroups } from "../../src/decorators/decorator.utils";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups } from "../../src/utils/decorator.utils";
 
 export type ArrayOneType<T> = {
   test: $.Predicate<T>;

diff --git a/packages/core/validators/array/ArraySizeExact.ts b/packages/core/validators/array/ArraySizeExact.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type ArraySizeExactType = {
   value: number;

diff --git a/packages/core/validators/array/ArraySizeMax.ts b/packages/core/validators/array/ArraySizeMax.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type ArraySizeMaxType = {
   value: number;

diff --git a/packages/core/validators/array/ArraySizeMin.ts b/packages/core/validators/array/ArraySizeMin.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type ArraySizeMinType = {
   value: number;

diff --git a/packages/core/validators/array/ArraySizeRange.ts b/packages/core/validators/array/ArraySizeRange.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type ArraySizeRangeType = {
   min: number;

diff --git a/packages/core/validators/array/ArraySome.ts b/packages/core/validators/array/ArraySome.ts
@@ -1,7 +1,7 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorImpartialProps } from "../../src/decorators/decorator.types";
+import { extractGroups } from "../../src/decorators/decorator.utils";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups } from "../../src/utils/decorator.utils";
 
 export type ArraySomeType<T> = {
   test: $.Predicate<T>;

diff --git a/packages/core/validators/array/ArrayUnique.ts b/packages/core/validators/array/ArrayUnique.ts
@@ -3,9 +3,12 @@ import {
   DecoratorImpartialProps,
   DecoratorPartialProps,
 } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 import { hash } from "../../src/utils/object.utils";
 
 export type ArrayUniqueType<T> = {

diff --git a/packages/core/validators/date/FutureDate.ts b/packages/core/validators/date/FutureDate.ts
@@ -1,12 +1,12 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
-import ErrorMessage from "../../src/messages/model/errors";
-import { $ } from "../../src/types/namespace/Utility.ns";
 import {
   evaluateNullableValidity,
   extractGroups,
   extractMessage,
-} from "../../src/utils/decorator.utils";
+} from "../../src/decorators/decorator.utils";
+import ErrorMessage from "../../src/messages/model/errors";
+import { $ } from "../../src/types/namespace/Utility.ns";
 
 function isFutureDate(date: $.Nullable<Date>): boolean {
   // TODO: Maybe bump nullable validity to higher hierarchy

diff --git a/packages/core/validators/date/PastDate.ts b/packages/core/validators/date/PastDate.ts
@@ -1,12 +1,12 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
-import ErrorMessage from "../../src/messages/model/errors";
-import { $ } from "../../src/types/namespace/Utility.ns";
 import {
   evaluateNullableValidity,
   extractGroups,
   extractMessage,
-} from "../../src/utils/decorator.utils";
+} from "../../src/decorators/decorator.utils";
+import ErrorMessage from "../../src/messages/model/errors";
+import { $ } from "../../src/types/namespace/Utility.ns";
 
 function isPastDate(date: $.Nullable<Date>): boolean {
   return evaluateNullableValidity(date, (d) => {

diff --git a/packages/core/validators/date/TodayDate.ts b/packages/core/validators/date/TodayDate.ts
@@ -1,12 +1,12 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
-import ErrorMessage from "../../src/messages/model/errors";
-import { $ } from "../../src/types/namespace/Utility.ns";
 import {
   evaluateNullableValidity,
   extractGroups,
   extractMessage,
-} from "../../src/utils/decorator.utils";
+} from "../../src/decorators/decorator.utils";
+import ErrorMessage from "../../src/messages/model/errors";
+import { $ } from "../../src/types/namespace/Utility.ns";
 
 function isTodayDate(date: $.Nullable<Date>): boolean {
   return evaluateNullableValidity(date, (d) => {

diff --git a/packages/core/validators/number/Decimal.ts b/packages/core/validators/number/Decimal.ts
@@ -1,9 +1,12 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function Decimal<T extends $.Nullable<number>>(
   props?: DecoratorPartialProps<number>

diff --git a/packages/core/validators/number/Digits.ts b/packages/core/validators/number/Digits.ts
@@ -1,9 +1,12 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export type DigitsType = {
   maxInteger?: number;

diff --git a/packages/core/validators/number/Integer.ts b/packages/core/validators/number/Integer.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function Integer<T extends $.Nullable<number>>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/number/Negative.ts b/packages/core/validators/number/Negative.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function Negative<T extends $.Nullable<number>>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/number/NonNegative.ts b/packages/core/validators/number/NonNegative.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function NonNegative<T extends $.Nullable<number>>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/number/NonPositive.ts b/packages/core/validators/number/NonPositive.ts
@@ -1,8 +1,8 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import { extractMessage } from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractMessage } from "../../src/utils/decorator.utils";
 
 export default function NonPositive<T extends $.Nullable<number>>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/number/Positive.ts b/packages/core/validators/number/Positive.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function Positive<T extends $.Nullable<number>>(
   props?: DecoratorPartialProps

diff --git a/packages/core/validators/number/ValueMax.ts b/packages/core/validators/number/ValueMax.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type ValueMaxType = {
   value: number;

diff --git a/packages/core/validators/number/ValueMin.ts b/packages/core/validators/number/ValueMin.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type ValueMinType = {
   value: number;

diff --git a/packages/core/validators/number/ValueRange.ts b/packages/core/validators/number/ValueRange.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export type ValueRangeProps = {
   min: number;

diff --git a/packages/core/validators/string/ExactLength.ts b/packages/core/validators/string/ExactLength.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function ExactLength<T extends $.Nullable<string>>(
   props: DecoratorPartialProps<number>

diff --git a/packages/core/validators/string/Length.ts b/packages/core/validators/string/Length.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorImpartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 type LengthType = {
   min: number;

diff --git a/packages/core/validators/string/MaxLength.ts b/packages/core/validators/string/MaxLength.ts
@@ -1,8 +1,11 @@
 import { makeValidator } from "../../src/decorators/decorator.facade";
 import { DecoratorPartialProps } from "../../src/decorators/decorator.types";
+import {
+  extractGroups,
+  extractMessage,
+} from "../../src/decorators/decorator.utils";
 import ErrorMessage from "../../src/messages/model/errors";
 import { $ } from "../../src/types/namespace/Utility.ns";
-import { extractGroups, extractMessage } from "../../src/utils/decorator.utils";
 
 export default function MaxLength<T extends $.Nullable<string>>(
   props: DecoratorPartialProps<number>