From 3910769de3676eed236252e4332b4540ada0fa35 Mon Sep 17 00:00:00 2001 From: Rintim Date: Sat, 11 May 2024 15:41:32 +0800 Subject: [PATCH] refactor: support null. --- noname/library/init/index.js | 6 +++--- noname/library/init/promises.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/noname/library/init/index.js b/noname/library/init/index.js index 38295f735..b7fbe69ac 100644 --- a/noname/library/init/index.js +++ b/noname/library/init/index.js @@ -840,12 +840,12 @@ export class LibInit { /** * @async * @param {string | URL} link - 需要解析的路径 - * @param {(item: string) => string} [defaultHandle] - 在给定路径不符合可用情况（或基于无名杀相关默认情况）时，处理路径的函数，返回的路径应是相对于根目录的相对路径，默认为恒等函数 + * @param {((item: string) => string) | null} [defaultHandle] - 在给定路径不符合可用情况（或基于无名杀相关默认情况）时，处理路径的函数，返回的路径应是相对于根目录的相对路径，默认为`null`，当且仅当无法解析成`URL`时会调用该回调 * @param {boolean} [forceLoadAsDataUrl] - 是否将资源加载为[Data URL](https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Basics_of_HTTP/Data_URLs)，默认为`false` * @param {boolean} [dbNow] - 此刻是否在解析数据库中的内容，请勿直接使用 * @returns {Promise} */ - async parseResourceAddress(link, defaultHandle = item => item, forceLoadAsDataUrl = false, dbNow = false) { + async parseResourceAddress(link, defaultHandle = null, forceLoadAsDataUrl = false, dbNow = false) { let linkString = link instanceof URL ? link.href : link; // 如果传入值为Data URL，经过分析可知无需处理，故直接返回成品URL @@ -864,7 +864,7 @@ export class LibInit { let content = new Blob([linkString], { type: "text/plain" }); resultUrl = new URL(await get.dataUrl(content)); } else { - let resultLink = defaultHandle(linkString); + let resultLink = defaultHandle == null ? linkString : defaultHandle(linkString); resultUrl = new URL(resultLink, rootURL); } diff --git a/noname/library/init/promises.js b/noname/library/init/promises.js index e485ebbef..0b50e1d3e 100644 --- a/noname/library/init/promises.js +++ b/noname/library/init/promises.js @@ -67,11 +67,11 @@ export class LibInitPromises { /** * @async * @param {string | URL} link - 需要解析的路径 - * @param {(item: string) => string} [defaultHandle] - 在给定路径不符合可用情况（或基于无名杀相关默认情况）时，处理路径的函数，返回的路径应是相对于根目录的相对路径，默认为恒等函数 + * @param {((item: string) => string) | null} [defaultHandle] - 在给定路径不符合可用情况（或基于无名杀相关默认情况）时，处理路径的函数，返回的路径应是相对于根目录的相对路径，默认为`null`，当且仅当无法解析成`URL`时会调用该回调 * @param {boolean} [forceLoadAsDataUrl] - 是否将资源加载为[Data URL](https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Basics_of_HTTP/Data_URLs)，默认为`false` * @returns {Promise} */ - parseResourceAddress(link, defaultHandle = item => item, forceLoadAsDataUrl = false) { + parseResourceAddress(link, defaultHandle = null, forceLoadAsDataUrl = false) { return lib.init.parseResourceAddress(link, defaultHandle, forceLoadAsDataUrl); } }