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

package/mobile/bundle/utils/joinPath.d.ts

@@ -0,0 +1,2 @@
+export declare const joinPath: (...path: (string | undefined | null)[]) => string;
+export declare const joinSearchParams: (...list: URLSearchParams[]) => URLSearchParams;

package/mobile/bundle/utils/url.d.ts

@@ -1,7 +1,7 @@
 import { type Target } from '../model/LinkProps';
-export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
+export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
 export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
 export declare const isHash: (href: string | undefined) => href is `#${string}`;
 export declare const withoutQuery: (href: string | undefined) => string;
-export declare const joinPath: (...path: (string | undefined | null)[]) => string;
+export { joinPath } from './joinPath';
 export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;

package/mobile/dist/utils/joinPath.d.ts

@@ -0,0 +1,2 @@
+export declare const joinPath: (...path: (string | undefined | null)[]) => string;
+export declare const joinSearchParams: (...list: URLSearchParams[]) => URLSearchParams;

package/mobile/dist/utils/joinPath.js

@@ -0,0 +1,24 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.joinSearchParams = exports.joinPath = void 0;
+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 = (0, exports.joinSearchParams)(...urls.map((_) => _.searchParams)).toString();
+    const hash = urls.find((_) => _.hash)?.hash;
+    return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
+};
+exports.joinPath = joinPath;
+const joinSearchParams = (...list) => {
+    const result = new URLSearchParams();
+    for (const searchParams of list) {
+        for (const [k, v] of searchParams) {
+            result.set(k, v);
+        }
+    }
+    return result;
+};
+exports.joinSearchParams = joinSearchParams;
+const cleanPath = (pathParts) => pathParts.join('/').replace(/\/+/g, '/');
+//# sourceMappingURL=joinPath.js.map

package/mobile/dist/utils/joinPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"joinPath.js","sourceRoot":"","sources":["../../src/utils/joinPath.ts"],"names":[],"mappings":";;AAAA,MAAM,WAAW,GAAG,UAAU,CAAC;AAExB,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE;IACzE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IAChF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,EAAE,MAAM,CAAC;IAClE,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,IAAA,wBAAgB,EAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9E,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IAE5C,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;AARW,QAAA,QAAQ,YAQnB;AAEK,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAuB,EAAmB,EAAE;IAC9E,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,KAAK,MAAM,YAAY,IAAI,IAAI,EAAE;QAC/B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,YAAY,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAClB;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AATW,QAAA,gBAAgB,oBAS3B;AAEF,MAAM,SAAS,GAAG,CAAC,SAAmB,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}

package/mobile/dist/utils/url.d.ts

@@ -1,7 +1,7 @@
 import { type Target } from '../model/LinkProps';
-export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
+export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
 export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
 export declare const isHash: (href: string | undefined) => href is `#${string}`;
 export declare const withoutQuery: (href: string | undefined) => string;
-export declare const joinPath: (...path: (string | undefined | null)[]) => string;
+export { joinPath } from './joinPath';
 export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;

package/mobile/dist/utils/url.js

@@ -8,16 +8,8 @@ const isHash = (href) => Boolean(href?.startsWith('#'));
 exports.isHash = isHash;
 const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
 exports.withoutQuery = withoutQuery;
-const joinPath = (...path) => path
-    .filter(Boolean)
-    .join('/')
-    .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
-exports.joinPath = joinPath;
+var joinPath_1 = require("./joinPath");
+Object.defineProperty(exports, "joinPath", { enumerable: true, get: function () { return joinPath_1.joinPath; } });
 const hasPrefix = (href) => (prefix) => Boolean(href &&
     prefix &&
     href.startsWith(prefix) &&

package/mobile/dist/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAAwB,EAAiC,EAAE,CAC/E,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AADlB,QAAA,KAAK,SACa;AAExB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AADpB,QAAA,MAAM,UACc;AAE1B,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAE/C,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,4CAA4C;KACzE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AATV,QAAA,QAAQ,YASE;AAEhB,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC;AANS,QAAA,SAAS,aAMlB"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":";;AAEO,MAAM,KAAK,GAAG,CAAC,IAA+B,EAAiC,EAAE,CACtF,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AADlB,QAAA,KAAK,SACa;AAExB,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,IAAA,aAAK,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AADtD,QAAA,UAAU,cAC4C;AAE5D,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AADpB,QAAA,MAAM,UACc;AAE1B,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AADzC,QAAA,YAAY,gBAC6B;AAEtD,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AAEV,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC;AANS,QAAA,SAAS,aAMlB"}

package/mobile/lib/utils/joinPath.d.ts

@@ -0,0 +1,2 @@
+export declare const joinPath: (...path: (string | undefined | null)[]) => string;
+export declare const joinSearchParams: (...list: URLSearchParams[]) => URLSearchParams;

package/mobile/lib/utils/joinPath.js

@@ -0,0 +1,20 @@
+const PLACEHOLDER = 'http://_';
+export 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('');
+};
+export 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, '/');
+//# sourceMappingURL=joinPath.js.map

package/mobile/lib/utils/joinPath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"joinPath.js","sourceRoot":"","sources":["../../src/utils/joinPath.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE;IACzE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IAChF,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,EAAE,MAAM,CAAC;IAClE,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9E,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IAE5C,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACrF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAuB,EAAmB,EAAE;IAC9E,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,KAAK,MAAM,YAAY,IAAI,IAAI,EAAE;QAC/B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,YAAY,EAAE;YACjC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAClB;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,SAAmB,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}

package/mobile/lib/utils/url.d.ts

@@ -1,7 +1,7 @@
 import { type Target } from '../model/LinkProps';
-export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
+export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
 export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
 export declare const isHash: (href: string | undefined) => href is `#${string}`;
 export declare const withoutQuery: (href: string | undefined) => string;
-export declare const joinPath: (...path: (string | undefined | null)[]) => string;
+export { joinPath } from './joinPath';
 export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;

package/mobile/lib/utils/url.js

@@ -2,15 +2,7 @@ export const isURL = (href) => Boolean(href?.includes(':'));
 export const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
 export const isHash = (href) => Boolean(href?.startsWith('#'));
 export const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
-export const joinPath = (...path) => path
-    .filter(Boolean)
-    .join('/')
-    .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
+export { joinPath } from './joinPath.js';
 export const hasPrefix = (href) => (prefix) => Boolean(href &&
     prefix &&
     href.startsWith(prefix) &&

package/mobile/lib/utils/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAAwB,EAAiC,EAAE,CAC/E,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAmC,EAAU,EAAE,CACzE,IAAI;KACD,MAAM,CAAC,OAAO,CAAC;KACf,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;KACpB,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,4CAA4C;KACzE,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAC3B,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEvB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/utils/url.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,IAA+B,EAAiC,EAAE,CACtF,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,EAAE,CACtE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAwB,EAAwB,EAAE,CACvE,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC/D,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,EAAE,CAC9D,OAAO,CACL,IAAI;IACF,MAAM;IACN,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IACvB,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CACrE,CAAC"}

package/mobile/src/utils/joinPath.ts

@@ -0,0 +1,24 @@
+const PLACEHOLDER = 'http://_';
+
+export const joinPath = (...path: (string | undefined | null)[]): string => {
+  const urls = path.filter(Boolean).map((_) => new URL(_ as string, 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('');
+};
+
+export const joinSearchParams = (...list: URLSearchParams[]): URLSearchParams => {
+  const result = new URLSearchParams();
+  for (const searchParams of list) {
+    for (const [k, v] of searchParams) {
+      result.set(k, v);
+    }
+  }
+
+  return result;
+};
+
+const cleanPath = (pathParts: string[]) => pathParts.join('/').replace(/\/+/g, '/');

package/mobile/src/utils/url.ts

@@ -1,6 +1,6 @@
 import { type Target } from '../model/LinkProps';
 
-export const isURL = (href: string | undefined): href is `${string}:${string}` =>
+export const isURL = (href: string | undefined | null): href is `${string}:${string}` =>
   Boolean(href?.includes(':'));
 
 export const isLocalURL = (href: string | undefined, target?: Target) =>
@@ -12,16 +12,7 @@ export const isHash = (href: string | undefined): href is `#${string}` =>
 export const withoutQuery = (href: string | undefined): string =>
   (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
 
-export const joinPath = (...path: (string | undefined | null)[]): string =>
-  path
-    .filter(Boolean)
-    .join('/')
-    .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
+export { joinPath } from './joinPath';
 
 export const hasPrefix = (href?: string) => (prefix?: string) =>
   Boolean(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.764",
+  "version": "0.14.765",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/utils/joinPath.ts

@@ -0,0 +1,24 @@
+const PLACEHOLDER = 'http://_';
+
+export const joinPath = (...path: (string | undefined | null)[]): string => {
+  const urls = path.filter(Boolean).map((_) => new URL(_ as string, 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('');
+};
+
+export const joinSearchParams = (...list: URLSearchParams[]): URLSearchParams => {
+  const result = new URLSearchParams();
+  for (const searchParams of list) {
+    for (const [k, v] of searchParams) {
+      result.set(k, v);
+    }
+  }
+
+  return result;
+};
+
+const cleanPath = (pathParts: string[]) => pathParts.join('/').replace(/\/+/g, '/');

package/src/utils/url.ts

@@ -1,6 +1,6 @@
 import { type Target } from '../model/LinkProps';
 
-export const isURL = (href: string | undefined): href is `${string}:${string}` =>
+export const isURL = (href: string | undefined | null): href is `${string}:${string}` =>
   Boolean(href?.includes(':'));
 
 export const isLocalURL = (href: string | undefined, target?: Target) =>
@@ -12,16 +12,7 @@ export const isHash = (href: string | undefined): href is `#${string}` =>
 export const withoutQuery = (href: string | undefined): string =>
   (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
 
-export const joinPath = (...path: (string | undefined | null)[]): string =>
-  path
-    .filter(Boolean)
-    .join('/')
-    .replace(/\/+/g, '/')
-    .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
-    .replace(/^file:/, 'file:/')
-    .replace(/\/(\?|&|#[^!])/g, '$1')
-    .replace(/\?/g, '&')
-    .replace('&', '?');
+export { joinPath } from './joinPath';
 
 export const hasPrefix = (href?: string) => (prefix?: string) =>
   Boolean(