@redneckz/wildless-cms-uni-blocks 0.14.770 → 0.14.771

package/bundle/utils/url.d.ts

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

package/dist/utils/url.d.ts

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

package/dist/utils/url.js

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

package/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,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"}
+{"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"}

package/lib/utils/url.d.ts

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

package/lib/utils/url.js

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

package/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,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"}
+{"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"}

package/mobile/bundle/bundle.umd.js

@@ -239,30 +239,19 @@
         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) &&
@@ -274,8 +263,8 @@
         isLocalURL: isLocalURL,
         isHash: isHash,
         withoutQuery: withoutQuery,
-        hasPrefix: hasPrefix,
-        joinPath: joinPath
+        joinPath: joinPath,
+        hasPrefix: hasPrefix
     });
 
     const API_PREFIX = '/api/';
@@ -6637,7 +6626,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.769";
+    const packageVersion = "0.14.770";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;