From 4cde5393872dbf9afc8536bd37dd27a8c8638f12 Mon Sep 17 00:00:00 2001
From: YiJie <yijie4188@gmail.com>
Date: Fri, 25 Oct 2024 00:45:40 +0800
Subject: [PATCH] refactor(validator): abstract `Primitive` type

---
 packages/core/src/types.ts      | 3 ++-
 packages/validator/src/utils.ts | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 0130d56..8fe2969 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -1,3 +1,4 @@
+// dprint-ignore-file
 export type WithThis<T> = T & ThisType<T>
 
 export type AtLeastOneProperty<T> = keyof T extends infer Keys ? Keys extends (
@@ -196,7 +197,7 @@ export type Replace<
 
 type Cast<A, B> = A extends B ? A : B
 
-type Primitive = string | number | boolean | bigint | symbol | undefined | null
+export type Primitive = string | number | boolean | bigint | symbol | undefined | null
 
 export type Narrow<T> = Cast<T, unknown[] | [] | (T extends Primitive ? T : never) | ({
   [K in keyof T]: K extends typeof Symbol.species
diff --git a/packages/validator/src/utils.ts b/packages/validator/src/utils.ts
index 0f732cf..d362f7b 100644
--- a/packages/validator/src/utils.ts
+++ b/packages/validator/src/utils.ts
@@ -1,3 +1,4 @@
+import type { Primitive } from '@typp/core/types'
 import type { Transform } from '@typp/validator/extends'
 
 export function parseBigInt(inputStr: string): bigint {
@@ -94,8 +95,6 @@ function getMethod(obj: unknown, key: string | symbol): Function | undefined {
   throw new TypeError(`${func} is not a function`)
 }
 
-type Primitive = number | bigint | boolean | string | symbol | object | null | undefined
-
 /**
  * @see https://tc39.es/ecma262/multipage/abstract-operations.html#sec-ordinarytoprimitive
  */
@@ -111,7 +110,7 @@ function ordinaryToPrimitive(o: object, hint: 'number' | 'string' | (string & {}
     if (typeof method === 'function') {
       const result = Reflect.apply(method, o, [])
       if (typeof result !== 'object') {
-        return result
+        return result as Primitive
       }
     }
   }