ddan-js 2.9.3 → 2.9.4

package/bin/lib/modules/qs/index.js

@@ -34,20 +34,58 @@ const parsePath = (url) => {
     const route = _url.substring(0, idx) || '';
     return { route, page, name, withoutExtension, extname };
 };
+// const join = (...args: string[]) => {
+//   let arr: string[] = []
+//   args.forEach((e) => {
+//     const _s = e.trim().replace(/^\/*(.*?)\/*$/, '$1')
+//     if (_s.length <= 0) return
+//     if (/^(\w+):\/\//.test(_s)) {
+//       arr = [_s]
+//     } else {
+//       arr.push(_s)
+//     }
+//   })
+//   return arr.join('/')
+// }
 const join = (...args) => {
-    let arr = [];
-    args.forEach((e) => {
-        const _s = e.trim().replace(/^\/*(.*?)\/*$/, '$1');
-        if (_s.length <= 0)
+    const result = [];
+    let hasProtocol = false;
+    args.forEach((part) => {
+        const trimmed = part.trim();
+        if (trimmed === '') {
+            // 忽略空段
             return;
-        if (/^(\w+):\/\//.test(_s)) {
-            arr = [_s];
         }
-        else {
-            arr.push(_s);
+        if (/^(\w+):\/\//.test(trimmed)) {
+            // 处理带协议的路径，重置所有内容
+            result.length = 0;
+            result.push(trimmed);
+            hasProtocol = true;
+            return;
         }
+        const segments = trimmed.split('/');
+        segments.forEach((segment) => {
+            if (segment === '.' || segment === '') {
+                // 忽略当前目录标志或多余的斜杠
+                return;
+            }
+            if (segment === '..') {
+                // 返回上一级目录
+                if (result.length > 0 && result[result.length - 1] !== '..') {
+                    result.pop();
+                }
+                else if (!hasProtocol) {
+                    // 非协议情况下，保留多余的 ".."
+                    result.push('..');
+                }
+            }
+            else {
+                // 普通路径段，直接加入
+                result.push(segment);
+            }
+        });
     });
-    return arr.join('/');
+    return result.join('/');
 };
 const parseHost = (url) => {
     const result = {

package/bin/types/browser.d.ts

@@ -562,7 +562,7 @@ declare const dWeb: {
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
         getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
-        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
+        cache: (url: string, cache?: RequestCache) => Promise<[any, undefined] | [null, boolean]>;
     };
     Http: typeof Http;
     css: {
@@ -1077,7 +1077,7 @@ declare const _default: {
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
         getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
-        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
+        cache: (url: string, cache?: RequestCache) => Promise<[any, undefined] | [null, boolean]>;
     };
     rsa: {
         generateKeys: () => Promise<{

package/bin/types/index.d.ts

@@ -562,7 +562,7 @@ declare const dWeb: {
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
         getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
-        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
+        cache: (url: string, cache?: RequestCache) => Promise<[any, undefined] | [null, boolean]>;
     };
     Http: typeof Http;
     css: {
@@ -1113,7 +1113,7 @@ declare const _default: {
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
         getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
-        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
+        cache: (url: string, cache?: RequestCache) => Promise<[any, undefined] | [null, boolean]>;
     };
     rsa: {
         generateKeys: () => Promise<{

package/bin/types/modules/fetch.d.ts

@@ -11,6 +11,6 @@ declare const _default: {
         fail?: ((error: Error) => void) | undefined;
     }) => Promise<Uint8Array | undefined>;
     getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
-    cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
+    cache: (url: string, cache?: RequestCache) => Promise<[any, undefined] | [null, boolean]>;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "",
   "keywords": [
     "ddan-js",