feat: ✨ 支持动态函数

Author: xiaohuohumax

libs/zip-downloader/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @xiaohuohumax/xpath-selector
 
+## 2.2.0
+
+### Minor Changes
+
+- 支持动态函数
+
 ## 2.1.0
 
 ### Minor Changes

libs/zip-downloader/README.md

@@ -19,20 +19,20 @@
 
 **Options 参数说明：**
 
-| 参数名        | 类型                             | 是否必填 | 默认值 | 说明                                                                             |
-| ------------- | -------------------------------- | -------- | ------ | -------------------------------------------------------------------------------- |
-| `filename`    | string                           | 否       |        | 保存的文件名，**添加此参数时会将压缩包保存到本地，未配置返回压缩包的 Blob 对象** |
-| `resources`   | Resource[]                       | 是       |        | 资源列表，数组，每个元素为对象，包含 `name` 和 `url` 或者 `blob` 字段            |
-| `concurrency` | number                           | 否       | `10`   | 并发数，默认 `10`                                                                |
-| `onProgress`  | (index: number) => Promise<void> | 否       |        | 下载进度回调函数，参数为当前正在下载的资源索引                                   |
+| 参数名        | 类型                                      | 是否必填 | 默认值 | 说明                                                                             |
+| ------------- | ----------------------------------------- | -------- | ------ | -------------------------------------------------------------------------------- |
+| `filename`    | string                                    | 否       |        | 保存的文件名，**添加此参数时会将压缩包保存到本地，未配置返回压缩包的 Blob 对象** |
+| `resources`   | (Resource \| () => Promise\<Resource\>)[] | 是       |        | 资源列表，数组，每个元素为对象，包含 `name` 和 `url` 或者 `blob` 字段            |
+| `concurrency` | number                                    | 否       | `10`   | 并发数，默认 `10`                                                                |
+| `onProgress`  | (index: number) => Promise\<void\>        | 否       |        | 下载进度回调函数，参数为当前正在下载的资源索引                                   |
 
 **Resource 参数说明：**
 
-| 参数名 | 类型                          | 是否必填 | 默认值 | 说明          |
-| ------ | ----------------------------- | -------- | ------ | ------------- |
-| `name` | string                        | 是       |        | 资源名称      |
-| `url`  | string                        | 否       |        | URL 类型资源  |
-| `blob` | Blob 或者 () => Promise<Blob> | 否       |        | Blob 类型资源 |
+| 参数名 | 类型                            | 是否必填 | 默认值 | 说明          |
+| ------ | ------------------------------- | -------- | ------ | ------------- |
+| `name` | string                          | 是       |        | 资源名称      |
+| `url`  | string                          | 否       |        | URL 类型资源  |
+| `blob` | Blob 或者 () => Promise\<Blob\> | 否       |        | Blob 类型资源 |
 
 ## 📦 使用示例
 
@@ -48,12 +48,13 @@ await zipDownloader({
       blob: new Blob(['hello world'], { type: 'text/plain' }),
     },
     {
-      name: 'world.txt',
-      blob: async () => {
-        const response = await fetch('https://example.com/world.txt')
-        return response.blob()
-      },
+      name: 'example.txt',
+      blob: () => fetch('https://example.com').then(response => response.blob()),
     },
+    () => fetch('https://example.com').then(response => ({
+      name: 'example2.txt',
+      blob: () => response.blob(),
+    })),
   ],
   concurrency: 10,
   async onProgress(index) {
@@ -73,12 +74,13 @@ const blob = await zipDownloader({
       blob: new Blob(['hello world'], { type: 'text/plain' }),
     },
     {
-      name: 'world.txt',
-      blob: async () => {
-        const response = await fetch('https://example.com/world.txt')
-        return response.blob()
-      },
+      name: 'example.txt',
+      blob: () => fetch('https://example.com').then(response => response.blob()),
     },
+    () => fetch('https://example.com').then(response => ({
+      name: 'example2.txt',
+      blob: () => response.blob(),
+    })),
   ],
   concurrency: 10,
   async onProgress(index) {

libs/zip-downloader/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xiaohuohumax/zip-downloader",
   "type": "module",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Zip Downloader -- 资源下载器（下载资源、Zip 压缩、下载到本地）",
   "author": {
     "name": "xiaohuohumax",

libs/zip-downloader/src/index.ts

@@ -11,11 +11,7 @@ export interface BlobResource {
   blob: Blob | (() => Promise<Blob>)
 }
 
-function isBlobResource(resource: Resource): resource is BlobResource {
-  return (resource as BlobResource).blob instanceof Blob
-}
-
-export type Resource = UrlResource | BlobResource
+export type Resource = UrlResource | BlobResource | (() => Promise<UrlResource | BlobResource>)
 
 interface OptionsBase {
   resources: Resource[]
@@ -42,10 +38,15 @@ export default async function zipDownloader(options: Options): Promise<void | Bl
   const limit = pLimit(options.concurrency || 10)
   await Promise.all(options.resources.map((resource, index) => limit(async () => {
     await options.onProgress?.(index)
-    const reader = isBlobResource(resource)
-      ? new BlobReader(typeof resource.blob === 'function' ? await resource.blob() : resource.blob)
-      : new HttpReader(resource.url)
-    return writer.add(resource.name, reader)
+    if (typeof resource === 'function') {
+      resource = await resource()
+    }
+    if (typeof resource === 'object' && 'url' in resource) {
+      return writer.add(resource.name, new HttpReader(resource.url))
+    }
+    if (typeof resource === 'object' && 'blob' in resource) {
+      return writer.add(resource.name, new BlobReader(typeof resource.blob === 'function' ? await resource.blob() : resource.blob))
+    }
   })))
   const blob = await writer.close()
   if (!isSaveOptions(options)) {