@redneckz/wildless-cms-uni-blocks 0.14.853 → 0.14.854

package/mobile/dist/hooks/useLink.js

@@ -8,6 +8,7 @@ const adjustBase_1 = require("../utils/adjustBase");
 const adjustHref_1 = require("../utils/adjustHref");
 const getBasePath_1 = require("../utils/getBasePath");
 const url_1 = require("../utils/url");
+const RESERVED_PREFIX = ['/api'];
 function useLink() {
     const router = (0, useRouter_1.useRouter)();
     const { closeAll } = (0, useDialogManager_1.useDialogManager)();
@@ -31,6 +32,6 @@ function useLink() {
 }
 exports.useLink = useLink;
 const isClientRouting = (href, target, basePath) => (0, url_1.isLocalURL)(href, target) &&
-    !Env_1.env.SUB_PORTALS?.split(',')?.some((0, url_1.hasPrefix)(href)) &&
+    ![...RESERVED_PREFIX, ...(Env_1.env.SUB_PORTALS?.split(',') ?? [])].some((0, url_1.hasPrefix)(href)) &&
     (0, url_1.hasPrefix)(href)(basePath || '/');
 //# sourceMappingURL=useLink.js.map

package/mobile/dist/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAC7B,mEAAgE;AAChE,qDAAkD;AAElD,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AAMrD,SAAgB,OAAO;IACrB,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,CAAC,EAAqB,EAAE,EAAE;gBAClD,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3C,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACjD,QAAQ,EAAE,CAAC;oBACX,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAvBD,0BAuBC;AAED,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE,CACvF,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC,SAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAA,eAAS,EAAC,IAAI,CAAC,CAAC;IACnD,IAAA,eAAS,EAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":";;AAAA,gCAA6B;AAC7B,mEAAgE;AAChE,qDAAkD;AAElD,+EAA4E;AAE5E,oDAAiD;AACjD,oDAAiD;AACjD,sDAAmD;AACnD,sCAAqD;AAErD,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,CAAC;AAMjC,SAAgB,OAAO;IACrB,MAAM,MAAM,GAAG,IAAA,qBAAS,GAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,IAAA,mCAAgB,EAAC,CAAC,EAAqB,EAAE,EAAE;gBAClD,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,SAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3C,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACjD,QAAQ,EAAE,CAAC;oBACX,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,IAAA,uBAAU,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAvBD,0BAuBC;AAED,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE,CACvF,IAAA,gBAAU,EAAC,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,CAAC,SAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,eAAS,EAAC,IAAI,CAAC,CAAC;IACnF,IAAA,eAAS,EAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC"}

package/mobile/dist/utils/adjustBase.js

@@ -1,5 +1,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.adjustBase = void 0;
-const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
+const FORWARD_SLASH = '/';
+const adjustBase = (href = FORWARD_SLASH, basePath = FORWARD_SLASH) => [href, basePath].some((_) => _ === FORWARD_SLASH)
+    ? href
+    : href.replace(basePath, '') || FORWARD_SLASH;
 exports.adjustBase = adjustBase;
 //# sourceMappingURL=adjustBase.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAO,MAAM,UAAU,GAAG,CAAC,IAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC;AAAlF,QAAA,UAAU,cAAwE"}
+{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":";;AAAA,MAAM,aAAa,GAAG,GAAG,CAAC;AAEnB,MAAM,UAAU,GAAG,CAAC,OAAe,aAAa,EAAE,WAAmB,aAAa,EAAE,EAAE,CAC3F,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC;IAC/C,CAAC,CAAC,IAAI;IACN,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC;AAHrC,QAAA,UAAU,cAG2B"}

package/mobile/lib/hooks/useLink.js

@@ -6,6 +6,7 @@ import { adjustBase } from '../utils/adjustBase.js';
 import { adjustHref } from '../utils/adjustHref.js';
 import { getBasePath } from '../utils/getBasePath.js';
 import { hasPrefix, isLocalURL } from '../utils/url.js';
+const RESERVED_PREFIX = ['/api'];
 export function useLink() {
     const router = useRouter();
     const { closeAll } = useDialogManager();
@@ -28,6 +29,6 @@ export function useLink() {
     };
 }
 const isClientRouting = (href, target, basePath) => isLocalURL(href, target) &&
-    !env.SUB_PORTALS?.split(',')?.some(hasPrefix(href)) &&
+    ![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
     hasPrefix(href)(basePath || '/');
 //# sourceMappingURL=useLink.js.map

package/mobile/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAMrD,MAAM,UAAU,OAAO;IACrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAqB,EAAE,EAAE;gBAClD,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3C,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACjD,QAAQ,EAAE,CAAC;oBACX,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE,CACvF,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACnD,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,CAAC;AAMjC,MAAM,UAAU,OAAO;IACrB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAExC,OAAO,CAA2C,KAAQ,EAAiB,EAAE;QAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO;YACL,GAAG,KAAK;YACR,IAAI;YACJ,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAqB,EAAE,EAAE;gBAClD,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC3C,IAAI,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;oBACjD,QAAQ,EAAE,CAAC;oBACX,EAAE,EAAE,cAAc,EAAE,CAAC;oBACrB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;iBACzC;YACH,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,IAAwB,EAAE,MAAe,EAAE,QAAiB,EAAE,EAAE,CACvF,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;IACxB,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACnF,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,CAAC"}

package/mobile/lib/utils/adjustBase.js

@@ -1,2 +1,5 @@
-export const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
+const FORWARD_SLASH = '/';
+export const adjustBase = (href = FORWARD_SLASH, basePath = FORWARD_SLASH) => [href, basePath].some((_) => _ === FORWARD_SLASH)
+    ? href
+    : href.replace(basePath, '') || FORWARD_SLASH;
 //# sourceMappingURL=adjustBase.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC"}
+{"version":3,"file":"adjustBase.js","sourceRoot":"","sources":["../../src/utils/adjustBase.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,GAAG,CAAC;AAE1B,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,OAAe,aAAa,EAAE,WAAmB,aAAa,EAAE,EAAE,CAC3F,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,aAAa,CAAC;IAC/C,CAAC,CAAC,IAAI;IACN,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC"}

package/mobile/src/hooks/useLink.ts

@@ -9,6 +9,8 @@ import { adjustHref } from '../utils/adjustHref';
 import { getBasePath } from '../utils/getBasePath';
 import { hasPrefix, isLocalURL } from '../utils/url';
 
+const RESERVED_PREFIX = ['/api'];
+
 export interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
@@ -40,5 +42,5 @@ export function useLink() {
 
 const isClientRouting = (href: string | undefined, target?: Target, basePath?: string) =>
   isLocalURL(href, target) &&
-  !env.SUB_PORTALS?.split(',')?.some(hasPrefix(href)) &&
+  ![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
   hasPrefix(href)(basePath || '/');

package/mobile/src/utils/adjustBase.ts

@@ -1 +1,6 @@
-export const adjustBase = (href?: string, basePath = '') => href?.replace(basePath, '') || '/';
+const FORWARD_SLASH = '/';
+
+export const adjustBase = (href: string = FORWARD_SLASH, basePath: string = FORWARD_SLASH) =>
+  [href, basePath].some((_) => _ === FORWARD_SLASH)
+    ? href
+    : href.replace(basePath, '') || FORWARD_SLASH;

package/package.json

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

package/src/hooks/useLink.ts

@@ -9,6 +9,8 @@ import { adjustHref } from '../utils/adjustHref';
 import { getBasePath } from '../utils/getBasePath';
 import { hasPrefix, isLocalURL } from '../utils/url';
 
+const RESERVED_PREFIX = ['/api'];
+
 export interface Clickable {
   onClick(ev?: PreventableEvent): void;
 }
@@ -40,5 +42,5 @@ export function useLink() {
 
 const isClientRouting = (href: string | undefined, target?: Target, basePath?: string) =>
   isLocalURL(href, target) &&
-  !env.SUB_PORTALS?.split(',')?.some(hasPrefix(href)) &&
+  ![...RESERVED_PREFIX, ...(env.SUB_PORTALS?.split(',') ?? [])].some(hasPrefix(href)) &&
   hasPrefix(href)(basePath || '/');

package/src/utils/adjustBase.ts

@@ -1 +1,6 @@
-export const adjustBase = (href?: string, basePath = '') => href?.replace(basePath, '') || '/';
+const FORWARD_SLASH = '/';
+
+export const adjustBase = (href: string = FORWARD_SLASH, basePath: string = FORWARD_SLASH) =>
+  [href, basePath].some((_) => _ === FORWARD_SLASH)
+    ? href
+    : href.replace(basePath, '') || FORWARD_SLASH;