jsdom 类型 - 合并配置时基础配置不为 undefined 才会进行处理

Author: coder-hxl

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "x-crawl",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "CoderHxl",
   "description": "XCrawl is a Nodejs multifunctional crawler library.",
   "license": "MIT",
@@ -13,7 +13,8 @@
     "prettier": "prettier --write ."
   },
   "dependencies": {
-    "jsdom": "^21.1.0"
+    "jsdom": "^21.1.0",
+    "x-crawl": "link:"
   },
   "devDependencies": {
     "@babel/core": "^7.20.12",
@@ -22,6 +23,7 @@
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-run": "^3.0.1",
     "@rollup/plugin-terser": "^0.3.0",
+    "@types/jsdom": "^20.0.1",
     "@types/node": "^18.11.18",
     "@typescript-eslint/eslint-plugin": "^5.48.2",
     "@typescript-eslint/parser": "^5.48.2",

pnpm-lock.yaml

@@ -1,6 +1,6 @@
 {
   "name": "x-crawl",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "CoderHxl",
   "description": "XCrawl is a Nodejs multifunctional crawler library.",
   "license": "MIT",
@@ -27,5 +27,8 @@
   },
   "dependencies": {
     "jsdom": "^21.1.0"
+  },
+  "devDependencies": {
+    "@types/jsdom": "^20.0.1"
   }
 }

publish/package.json

@@ -85,14 +85,16 @@ export function mergeConfig<T extends IFetchConfig>(
   for (const requestItem of requestConifgArr) {
     const { url, timeout } = requestItem
 
-    requestItem.url = baseUrl + url
+    if (!isUndefined(baseUrl)) {
+      requestItem.url = baseUrl + url
+    }
 
-    if (isUndefined(timeout)) {
+    if (isUndefined(timeout) && !isUndefined(baseTimeout)) {
       requestItem.timeout = baseTimeout
     }
   }
 
-  if (isUndefined(intervalTime)) {
+  if (isUndefined(intervalTime) && !isUndefined(baseIntervalTime)) {
     config.intervalTime = baseIntervalTime
   }