Merge pull request #7 from wxhccc/dev

fix: 添加更加具体的wrapPromise函数ts重载定义

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxhccc/es-util",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A library that contains some useful methods",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",

src/promise.ts

@@ -68,11 +68,15 @@ const emptyPromise = () => {
 }
 const lockCtx: Record<string, boolean> = {}
 
-type WpReturn<T> = PromiseWithLock<T | undefined | [null, T] | [Error, undefined]>
+
+type WpReturn<T> = PromiseWithLock<T | undefined>
+type WpArrReturn<T> = PromiseWithLock<[null, T] | [Error, undefined]>
 type WpPromise<T> = Promise<T> | (() => Promise<T>)
 
-function wrapPromise<T>(this: any, promise: WpPromise<T>, wrap?: boolean): WpReturn<T>
-function wrapPromise<T>(this: any, promise: WpPromise<T>, options?: WpOptions): WpReturn<T>
+function wrapPromise<T>(this: any, promise: WpPromise<T>, wrap?: false): WpReturn<T>
+function wrapPromise<T>(this: any, promise: WpPromise<T>, wrap: true): WpArrReturn<T>
+function wrapPromise<T>(this: any, promise: WpPromise<T>, options?: WpOptions & { wrap?: false }): WpReturn<T>
+function wrapPromise<T>(this: any, promise: WpPromise<T>, options?: WpOptions & { wrap: true }): WpArrReturn<T>
 function wrapPromise<T>(this: any, promise: WpPromise<T>, wrapOrOptions?: boolean | WpOptions) {
   const contextType = checkContext(this)
   const isReactiveIns = contextType !== 'unknown'
@@ -180,6 +184,7 @@ function wrapPromise<T>(this: any, promise: WpPromise<T>, wrapOrOptions?: boolea
 
   Object.defineProperties(corePromsie, {
     '__lockValue': { get: checkLock },
+    _checkLockKey: { value: (key: string) => lockCtx[key] },
     unlock: { value: unlock }
   })
 
@@ -191,16 +196,14 @@ function wrapPromise<T>(this: any, promise: WpPromise<T>, wrapOrOptions?: boolea
   return corePromsie as PromiseWithLock<T>
 }
 
-type WP = typeof wrapPromise & { _checkLockKey: (key: string) => boolean }
-
-export const wp: WP = Object.defineProperty(wrapPromise, '_checkLockKey', { value: (key: string) => lockCtx[key] })
+export const wp = wrapPromise
 
 export const wpVuePlugin = {
   install(appOrVue: any, key = '$wp') {
     if (appOrVue.config && 'globalProperties' in appOrVue.config) {
-      appOrVue.config.globalProperties[key] = wp
+      appOrVue.config.globalProperties[key] = wrapPromise
     } else {
-      appOrVue.prototype[key] = wp
+      appOrVue.prototype[key] = wrapPromise
     }
   }
 }