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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/bundle/bundle.umd.js +23 -20
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/utils/joinPath.d.ts +2 -0
  4. package/bundle/utils/url.d.ts +2 -2
  5. package/dist/services/retail/content.js +0 -8
  6. package/dist/services/retail/content.js.map +1 -1
  7. package/dist/utils/joinPath.d.ts +2 -0
  8. package/dist/utils/joinPath.js +24 -0
  9. package/dist/utils/joinPath.js.map +1 -0
  10. package/dist/utils/url.d.ts +2 -2
  11. package/dist/utils/url.js +2 -10
  12. package/dist/utils/url.js.map +1 -1
  13. package/lib/services/retail/content.js +0 -8
  14. package/lib/services/retail/content.js.map +1 -1
  15. package/lib/utils/joinPath.d.ts +2 -0
  16. package/lib/utils/joinPath.js +20 -0
  17. package/lib/utils/joinPath.js.map +1 -0
  18. package/lib/utils/url.d.ts +2 -2
  19. package/lib/utils/url.js +1 -9
  20. package/lib/utils/url.js.map +1 -1
  21. package/mobile/bundle/bundle.umd.js +23 -20
  22. package/mobile/bundle/bundle.umd.min.js +1 -1
  23. package/mobile/bundle/utils/joinPath.d.ts +2 -0
  24. package/mobile/bundle/utils/url.d.ts +2 -2
  25. package/mobile/dist/services/retail/content.js +0 -8
  26. package/mobile/dist/services/retail/content.js.map +1 -1
  27. package/mobile/dist/utils/joinPath.d.ts +2 -0
  28. package/mobile/dist/utils/joinPath.js +24 -0
  29. package/mobile/dist/utils/joinPath.js.map +1 -0
  30. package/mobile/dist/utils/url.d.ts +2 -2
  31. package/mobile/dist/utils/url.js +2 -10
  32. package/mobile/dist/utils/url.js.map +1 -1
  33. package/mobile/lib/services/retail/content.js +0 -8
  34. package/mobile/lib/services/retail/content.js.map +1 -1
  35. package/mobile/lib/utils/joinPath.d.ts +2 -0
  36. package/mobile/lib/utils/joinPath.js +20 -0
  37. package/mobile/lib/utils/joinPath.js.map +1 -0
  38. package/mobile/lib/utils/url.d.ts +2 -2
  39. package/mobile/lib/utils/url.js +1 -9
  40. package/mobile/lib/utils/url.js.map +1 -1
  41. package/mobile/src/services/retail/content.tsx +0 -8
  42. package/mobile/src/utils/joinPath.ts +24 -0
  43. package/mobile/src/utils/url.ts +2 -11
  44. package/package.json +1 -1
  45. package/src/services/retail/content.tsx +0 -8
  46. package/src/utils/joinPath.ts +24 -0
  47. package/src/utils/url.ts +2 -11
@@ -0,0 +1,2 @@
1
+ export declare const joinPath: (...path: (string | undefined | null)[]) => string;
2
+ export declare const joinSearchParams: (...list: URLSearchParams[]) => URLSearchParams;
@@ -1,7 +1,7 @@
1
1
  import { type Target } from '../model/LinkProps';
2
- export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
2
+ export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
3
3
  export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
4
4
  export declare const isHash: (href: string | undefined) => href is `#${string}`;
5
5
  export declare const withoutQuery: (href: string | undefined) => string;
6
- export declare const joinPath: (...path: (string | undefined | null)[]) => string;
6
+ export { joinPath } from './joinPath';
7
7
  export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;
@@ -264,14 +264,6 @@ exports.DELIVERY_CREDIT_CONTENT = [
264
264
  },
265
265
  ];
266
266
  exports.DELIVERY_CREDIT_CARD_CONTENT = [
267
- {
268
- title: 'Способ получения',
269
- columns: 1,
270
- inputs: [],
271
- },
272
- {
273
- inputs: [{ name: 'methodObtain' }],
274
- },
275
267
  {
276
268
  title: 'Адрес',
277
269
  columns: 1,
@@ -1 +1 @@
1
- {"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/services/retail/content.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/services/retail/content.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare const joinPath: (...path: (string | undefined | null)[]) => string;
2
+ export declare const joinSearchParams: (...list: URLSearchParams[]) => URLSearchParams;
@@ -0,0 +1,24 @@
1
+ Object.defineProperty(exports, "__esModule", { value: true });
2
+ exports.joinSearchParams = exports.joinPath = void 0;
3
+ const PLACEHOLDER = 'http://_';
4
+ const joinPath = (...path) => {
5
+ const urls = path.filter(Boolean).map((_) => new URL(_, PLACEHOLDER));
6
+ const origin = urls.find((_) => _.origin !== PLACEHOLDER)?.origin;
7
+ const pathname = cleanPath(urls.map((_) => _.pathname));
8
+ const query = (0, exports.joinSearchParams)(...urls.map((_) => _.searchParams)).toString();
9
+ const hash = urls.find((_) => _.hash)?.hash;
10
+ return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
11
+ };
12
+ exports.joinPath = joinPath;
13
+ const joinSearchParams = (...list) => {
14
+ const result = new URLSearchParams();
15
+ for (const searchParams of list) {
16
+ for (const [k, v] of searchParams) {
17
+ result.set(k, v);
18
+ }
19
+ }
20
+ return result;
21
+ };
22
+ exports.joinSearchParams = joinSearchParams;
23
+ const cleanPath = (pathParts) => pathParts.join('/').replace(/\/+/g, '/');
24
+ //# sourceMappingURL=joinPath.js.map
@@ -0,0 +1 @@
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"}
@@ -1,7 +1,7 @@
1
1
  import { type Target } from '../model/LinkProps';
2
- export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
2
+ export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
3
3
  export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
4
4
  export declare const isHash: (href: string | undefined) => href is `#${string}`;
5
5
  export declare const withoutQuery: (href: string | undefined) => string;
6
- export declare const joinPath: (...path: (string | undefined | null)[]) => string;
6
+ export { joinPath } from './joinPath';
7
7
  export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;
@@ -8,16 +8,8 @@ const isHash = (href) => Boolean(href?.startsWith('#'));
8
8
  exports.isHash = isHash;
9
9
  const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
10
10
  exports.withoutQuery = withoutQuery;
11
- const joinPath = (...path) => path
12
- .filter(Boolean)
13
- .join('/')
14
- .replace(/\/+/g, '/')
15
- .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
16
- .replace(/^file:/, 'file:/')
17
- .replace(/\/(\?|&|#[^!])/g, '$1')
18
- .replace(/\?/g, '&')
19
- .replace('&', '?');
20
- exports.joinPath = joinPath;
11
+ var joinPath_1 = require("./joinPath");
12
+ Object.defineProperty(exports, "joinPath", { enumerable: true, get: function () { return joinPath_1.joinPath; } });
21
13
  const hasPrefix = (href) => (prefix) => Boolean(href &&
22
14
  prefix &&
23
15
  href.startsWith(prefix) &&
@@ -1 +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"}
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"}
@@ -262,14 +262,6 @@ export const DELIVERY_CREDIT_CONTENT = [
262
262
  },
263
263
  ];
264
264
  export const DELIVERY_CREDIT_CARD_CONTENT = [
265
- {
266
- title: 'Способ получения',
267
- columns: 1,
268
- inputs: [],
269
- },
270
- {
271
- inputs: [{ name: 'methodObtain' }],
272
- },
273
265
  {
274
266
  title: 'Адрес',
275
267
  columns: 1,
@@ -1 +1 @@
1
- {"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/services/retail/content.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"content.js","sourceRoot":"","sources":["../../../src/services/retail/content.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare const joinPath: (...path: (string | undefined | null)[]) => string;
2
+ export declare const joinSearchParams: (...list: URLSearchParams[]) => URLSearchParams;
@@ -0,0 +1,20 @@
1
+ const PLACEHOLDER = 'http://_';
2
+ export const joinPath = (...path) => {
3
+ const urls = path.filter(Boolean).map((_) => new URL(_, PLACEHOLDER));
4
+ const origin = urls.find((_) => _.origin !== PLACEHOLDER)?.origin;
5
+ const pathname = cleanPath(urls.map((_) => _.pathname));
6
+ const query = joinSearchParams(...urls.map((_) => _.searchParams)).toString();
7
+ const hash = urls.find((_) => _.hash)?.hash;
8
+ return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
9
+ };
10
+ export const joinSearchParams = (...list) => {
11
+ const result = new URLSearchParams();
12
+ for (const searchParams of list) {
13
+ for (const [k, v] of searchParams) {
14
+ result.set(k, v);
15
+ }
16
+ }
17
+ return result;
18
+ };
19
+ const cleanPath = (pathParts) => pathParts.join('/').replace(/\/+/g, '/');
20
+ //# sourceMappingURL=joinPath.js.map
@@ -0,0 +1 @@
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"}
@@ -1,7 +1,7 @@
1
1
  import { type Target } from '../model/LinkProps';
2
- export declare const isURL: (href: string | undefined) => href is `${string}:${string}`;
2
+ export declare const isURL: (href: string | undefined | null) => href is `${string}:${string}`;
3
3
  export declare const isLocalURL: (href: string | undefined, target?: Target) => boolean;
4
4
  export declare const isHash: (href: string | undefined) => href is `#${string}`;
5
5
  export declare const withoutQuery: (href: string | undefined) => string;
6
- export declare const joinPath: (...path: (string | undefined | null)[]) => string;
6
+ export { joinPath } from './joinPath';
7
7
  export declare const hasPrefix: (href?: string) => (prefix?: string) => boolean;
@@ -2,15 +2,7 @@ export const isURL = (href) => Boolean(href?.includes(':'));
2
2
  export const isLocalURL = (href, target) => Boolean(href && !isURL(href) && (!target || target === '_self'));
3
3
  export const isHash = (href) => Boolean(href?.startsWith('#'));
4
4
  export const withoutQuery = (href) => (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
5
- export const joinPath = (...path) => path
6
- .filter(Boolean)
7
- .join('/')
8
- .replace(/\/+/g, '/')
9
- .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
10
- .replace(/^file:/, 'file:/')
11
- .replace(/\/(\?|&|#[^!])/g, '$1')
12
- .replace(/\?/g, '&')
13
- .replace('&', '?');
5
+ export { joinPath } from './joinPath.js';
14
6
  export const hasPrefix = (href) => (prefix) => Boolean(href &&
15
7
  prefix &&
16
8
  href.startsWith(prefix) &&
@@ -1 +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"}
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"}
@@ -266,14 +266,6 @@ export const DELIVERY_CREDIT_CONTENT: CreditCardSectionsProps[] = [
266
266
  },
267
267
  ];
268
268
  export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
269
- {
270
- title: 'Способ получения',
271
- columns: 1,
272
- inputs: [],
273
- },
274
- {
275
- inputs: [{ name: 'methodObtain' }],
276
- },
277
269
  {
278
270
  title: 'Адрес',
279
271
  columns: 1,
@@ -0,0 +1,24 @@
1
+ const PLACEHOLDER = 'http://_';
2
+
3
+ export const joinPath = (...path: (string | undefined | null)[]): string => {
4
+ const urls = path.filter(Boolean).map((_) => new URL(_ as string, PLACEHOLDER));
5
+ const origin = urls.find((_) => _.origin !== PLACEHOLDER)?.origin;
6
+ const pathname = cleanPath(urls.map((_) => _.pathname));
7
+ const query = joinSearchParams(...urls.map((_) => _.searchParams)).toString();
8
+ const hash = urls.find((_) => _.hash)?.hash;
9
+
10
+ return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
11
+ };
12
+
13
+ export const joinSearchParams = (...list: URLSearchParams[]): URLSearchParams => {
14
+ const result = new URLSearchParams();
15
+ for (const searchParams of list) {
16
+ for (const [k, v] of searchParams) {
17
+ result.set(k, v);
18
+ }
19
+ }
20
+
21
+ return result;
22
+ };
23
+
24
+ const cleanPath = (pathParts: string[]) => pathParts.join('/').replace(/\/+/g, '/');
@@ -1,6 +1,6 @@
1
1
  import { type Target } from '../model/LinkProps';
2
2
 
3
- export const isURL = (href: string | undefined): href is `${string}:${string}` =>
3
+ export const isURL = (href: string | undefined | null): href is `${string}:${string}` =>
4
4
  Boolean(href?.includes(':'));
5
5
 
6
6
  export const isLocalURL = (href: string | undefined, target?: Target) =>
@@ -12,16 +12,7 @@ export const isHash = (href: string | undefined): href is `#${string}` =>
12
12
  export const withoutQuery = (href: string | undefined): string =>
13
13
  (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
14
14
 
15
- export const joinPath = (...path: (string | undefined | null)[]): string =>
16
- path
17
- .filter(Boolean)
18
- .join('/')
19
- .replace(/\/+/g, '/')
20
- .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
21
- .replace(/^file:/, 'file:/')
22
- .replace(/\/(\?|&|#[^!])/g, '$1')
23
- .replace(/\?/g, '&')
24
- .replace('&', '?');
15
+ export { joinPath } from './joinPath';
25
16
 
26
17
  export const hasPrefix = (href?: string) => (prefix?: string) =>
27
18
  Boolean(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.14.763",
3
+ "version": "0.14.765",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
@@ -266,14 +266,6 @@ export const DELIVERY_CREDIT_CONTENT: CreditCardSectionsProps[] = [
266
266
  },
267
267
  ];
268
268
  export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
269
- {
270
- title: 'Способ получения',
271
- columns: 1,
272
- inputs: [],
273
- },
274
- {
275
- inputs: [{ name: 'methodObtain' }],
276
- },
277
269
  {
278
270
  title: 'Адрес',
279
271
  columns: 1,
@@ -0,0 +1,24 @@
1
+ const PLACEHOLDER = 'http://_';
2
+
3
+ export const joinPath = (...path: (string | undefined | null)[]): string => {
4
+ const urls = path.filter(Boolean).map((_) => new URL(_ as string, PLACEHOLDER));
5
+ const origin = urls.find((_) => _.origin !== PLACEHOLDER)?.origin;
6
+ const pathname = cleanPath(urls.map((_) => _.pathname));
7
+ const query = joinSearchParams(...urls.map((_) => _.searchParams)).toString();
8
+ const hash = urls.find((_) => _.hash)?.hash;
9
+
10
+ return [origin, pathname, query ? `?${query}` : '', hash].filter(Boolean).join('');
11
+ };
12
+
13
+ export const joinSearchParams = (...list: URLSearchParams[]): URLSearchParams => {
14
+ const result = new URLSearchParams();
15
+ for (const searchParams of list) {
16
+ for (const [k, v] of searchParams) {
17
+ result.set(k, v);
18
+ }
19
+ }
20
+
21
+ return result;
22
+ };
23
+
24
+ const cleanPath = (pathParts: string[]) => pathParts.join('/').replace(/\/+/g, '/');
package/src/utils/url.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type Target } from '../model/LinkProps';
2
2
 
3
- export const isURL = (href: string | undefined): href is `${string}:${string}` =>
3
+ export const isURL = (href: string | undefined | null): href is `${string}:${string}` =>
4
4
  Boolean(href?.includes(':'));
5
5
 
6
6
  export const isLocalURL = (href: string | undefined, target?: Target) =>
@@ -12,16 +12,7 @@ export const isHash = (href: string | undefined): href is `#${string}` =>
12
12
  export const withoutQuery = (href: string | undefined): string =>
13
13
  (href ?? '').replace(/\?.*/, '').replace(/\/$/, '');
14
14
 
15
- export const joinPath = (...path: (string | undefined | null)[]): string =>
16
- path
17
- .filter(Boolean)
18
- .join('/')
19
- .replace(/\/+/g, '/')
20
- .replace(/^(.+):\//, '$1://') // TODO Череда очень странных преобрвзований
21
- .replace(/^file:/, 'file:/')
22
- .replace(/\/(\?|&|#[^!])/g, '$1')
23
- .replace(/\?/g, '&')
24
- .replace('&', '?');
15
+ export { joinPath } from './joinPath';
25
16
 
26
17
  export const hasPrefix = (href?: string) => (prefix?: string) =>
27
18
  Boolean(