@redneckz/wildless-cms-uni-blocks 0.14.764 → 0.14.765

package/bundle/bundle.umd.js

@@ -231,19 +231,30 @@
         return /^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12}(\/revs\/[0-9]{1,20})?$/.test(src);
     };
 
+    const PLACEHOLDER = 'http://_';
+    const joinPath = (...path) => {
+        const urls = path.filter(Boolean).map((_) => new URL(_, PLACEHOLDER));
+        const origin = urls.find((_) => _.origin !== PLACEHOLDER)?.origin;
+        const pathname = cleanPath(urls.map((_) => _.pathname));
+        const query = joinSearchParams(...urls.map((_) => _.searchParams)).toString();
+        const hash = urls.find((_) => _.hash)?.hash;
+        return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
+    };
+    const joinSearchParams = (...list) => {
+        const result = new URLSearchParams();
+        for (const searchParams of list) {
+            for (const [k, v] of searchParams) {
+                result.set(k, v);
+            }
+        }
+        return result;
+    };
+    const cleanPath = (pathParts) => pathParts.join('/').replace(/\/+/g, '/');
+
     const isURL = (href) => Boolean(href?.includes(':'));
     const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
     const isHash = (href) => Boolean(href?.startsWith('#'));
     const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
-    const joinPath = (...path) => path
-        .filter(Boolean)
-        .join('/')
-        .replace(/\/+/g, '/')
-        .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
-        .replace(/^file:/, 'file:/')
-        .replace(/\/(\?|&|#[^!])/g, '$1')
-        .replace(/\?/g, '&')
-        .replace('&', '?');
     const hasPrefix = (href) => (prefix) => Boolean(href &&
         prefix &&
         href.startsWith(prefix) &&
@@ -255,8 +266,8 @@
         isLocalURL: isLocalURL,
         isHash: isHash,
         withoutQuery: withoutQuery,
-        joinPath: joinPath,
-        hasPrefix: hasPrefix
+        hasPrefix: hasPrefix,
+        joinPath: joinPath
     });
 
     const API_PREFIX = '/api/';
@@ -10505,7 +10516,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.763";
+    const packageVersion = "0.14.764";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;