fix: add missing plugins type

ntnyq · Aug 21, 2023 · df898ce · df898ce
1 parent 47d2edf
commit df898ce
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 9 deletions.
diff --git a/lib/config/common.d.ts b/lib/config/common.d.ts
@@ -53,8 +53,6 @@ export interface Compile {
   exclude?: string[]
 }
 
-export type AnyFn = (...args: unknown[]) => unknown
-
 /**
  * 小程序编译时的文件类型集合
  */

diff --git a/lib/config/design-width.d.ts b/lib/config/design-width.d.ts
@@ -1,4 +1,4 @@
-export interface DesignWidthFnInput {
+export interface DesignWidthInput {
   /**
    * 样式文件内容
    */
@@ -17,6 +17,6 @@ export interface DesignWidthFnInput {
  *
  * @returns 设计稿尺寸
  */
-export type DesignWidthFn = (input: DesignWidthFnInput) => number
+export type DesignWidthFn = (input?: number | string | DesignWidthInput) => number
 
 export type DesignWidth = number | DesignWidthFn
diff --git a/lib/config/npm/cssnano.d.ts b/lib/config/npm/cssnano.d.ts
@@ -4,7 +4,7 @@
  * @see https://github.com/cssnano/cssnano/blob/master/packages/cssnano/types/index.d.ts
  */
 
-import type { AnyFn } from '../common'
+import type { AnyFn } from '../../utility-types'
 
 export type CSSNanoConfig<T> = T | [T] | [T, Record<string, any>]
 

diff --git a/lib/config/npm/stylus-loader.d.ts b/lib/config/npm/stylus-loader.d.ts
@@ -5,7 +5,8 @@
  */
 
 import type { Buffer } from 'node:buffer'
-import type { AnyFn, LoaderContext } from '../common'
+import type { LoaderContext } from '../common'
+import type { AnyFn } from '../../utility-types'
 import type { StylusOptions } from './stylus'
 
 export interface StylusOptionsResolveURL {

diff --git a/lib/config/npm/stylus.d.ts b/lib/config/npm/stylus.d.ts
@@ -4,7 +4,7 @@
  * @see https://stylus-lang.com/
  */
 
-import type { AnyFn } from '../common'
+import type { AnyFn } from '../../utility-types'
 
 export type StylusOptionsDefineItemValue = string | number | boolean
 

diff --git a/lib/config/plugins/official/index.d.ts b/lib/config/plugins/official/index.d.ts
@@ -1,6 +1,7 @@
 import type { PluginHtmlOptions } from './html'
 import type { PluginInjectOptions } from './inject'
 import type { PluginHttpOptions } from './http'
+import type { Awaitable } from '../../../utility-types'
 
 export interface OfficialPluginOptionsMap {
   '@tarojs/plugin-html': PluginHtmlOptions
@@ -11,5 +12,7 @@ export interface OfficialPluginOptionsMap {
 export type OfficialPluginName = keyof OfficialPluginOptionsMap
 
 export type OfficialPluginTuple = {
-  [K in OfficialPluginName]: [K, OfficialPluginOptionsMap[K]?]
+  [K in OfficialPluginName]:
+    | [K, OfficialPluginOptionsMap[K]?]
+    | [K, () => Awaitable<OfficialPluginOptionsMap[K]>]
 }[OfficialPluginName]
diff --git a/lib/config/plugins/third-party/index.d.ts b/lib/config/plugins/third-party/index.d.ts
@@ -1,7 +1,11 @@
+import type { Awaitable } from '../../../utility-types'
+
 export interface ThirdPartyPluginOptionsMap {}
 
 export type ThirdPartyPluginName = keyof ThirdPartyPluginOptionsMap
 
 export type ThirdPartyPluginTuple = {
-  [K in ThirdPartyPluginName]: [K, ThirdPartyPluginOptionsMap[K]?]
+  [K in ThirdPartyPluginName]:
+    | [K, ThirdPartyPluginOptionsMap[K]?]
+    | [K, () => Awaitable<ThirdPartyPluginOptionsMap[K]>]
 }[ThirdPartyPluginName]
diff --git a/lib/utility-types.d.ts b/lib/utility-types.d.ts
@@ -1,3 +1,18 @@
+/**
+ * Promise or not
+ */
+export type Awaitable<T> = T | PromiseLike<T>
+
+/**
+ * Array or not
+ */
+export type Arrayable<T> = T | T[]
+
+/**
+ * Any function
+ */
+export type AnyFn<T = unknown> = (...args: T[]) => T
+
 /**
  * A literal type that supports custom further strings but preserves autocompletion in IDEs.
  *