asv-hlps 1.4.29 → 1.4.31

package/lib/cjs/forms/AdditFormType.d.ts

@@ -1,6 +1,7 @@
-export type AdditFormType<T = any> = {
+type AdditFormType<T = any> = {
     onSubmitForm?: (value: any) => any;
     onCancelForm?: any;
     tob?: T;
     url?: string;
 };
+export default AdditFormType;

package/lib/cjs/forms/index.d.ts

@@ -0,0 +1 @@
+export { default as AdditFormType } from "./AdditFormType";

package/lib/cjs/forms/index.js

@@ -1 +1,2 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/react-query/OptionsQueries.d.ts

@@ -0,0 +1,23 @@
+export interface OptionsQueries {
+    gcTime?: any;
+    enabled?: any;
+    networkMode?: any;
+    initialData?: any;
+    initialDataUpdatedAt?: any;
+    meta?: any;
+    notifyOnChangeProps?: any;
+    placeholderData?: any;
+    queryKeyHashFn?: any;
+    refetchInterval?: any;
+    refetchIntervalInBackground?: any;
+    refetchOnMount?: any;
+    refetchOnReconnect?: any;
+    refetchOnWindowFocus?: any;
+    retry?: any;
+    retryOnMount?: any;
+    retryDelay?: any;
+    select?: any;
+    staleTime?: any;
+    structuralSharing?: any;
+    throwOnError?: any;
+}

package/lib/cjs/react-query/OptionsQueries.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/react-query/OptionsType.d.ts

@@ -0,0 +1,4 @@
+export type OptionsType = {
+    propId?: string;
+    invalidate?: boolean;
+};

package/lib/cjs/react-query/OptionsType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/react-query/index.d.ts

@@ -0,0 +1,3 @@
+export { default as useQueryFn } from "./useQueryFn";
+export { default as useQueryGet } from "./useQueryGet";
+export { default as useQueryPost } from "./useQueryPost";

package/lib/cjs/react-query/index.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useQueryPost = exports.useQueryGet = exports.useQueryFn = void 0;
+// export { default as hlpQuery } from "./hlpQuery";
+// export { default as useQueryAdd } from "./useQueryAdd";
+// export { default as useQueryAddOpti } from "./useQueryAddOpti";
+// export { default as useQueryAddit } from "./useQueryAddit";
+// export { default as useQueryAdditOpti } from "./useQueryAdditOpti";
+// export { default as useQueryCrud } from "./useQueryCrud";
+// export { default as useQueryDel } from "./useQueryDel";
+var useQueryFn_1 = require("./useQueryFn");
+Object.defineProperty(exports, "useQueryFn", { enumerable: true, get: function () { return __importDefault(useQueryFn_1).default; } });
+var useQueryGet_1 = require("./useQueryGet");
+Object.defineProperty(exports, "useQueryGet", { enumerable: true, get: function () { return __importDefault(useQueryGet_1).default; } });
+// export { default as useQueryMutatePost } from "./useQueryMutatePost";
+var useQueryPost_1 = require("./useQueryPost");
+Object.defineProperty(exports, "useQueryPost", { enumerable: true, get: function () { return __importDefault(useQueryPost_1).default; } });
+// export { default as useQueryToggle } from "./useQueryToggle";
+// export { default as useQueryUpdate } from "./useQueryUpdate";
+// export { default as useQueryUpdateOpti } from "./useQueryUpdateOpti";

package/lib/cjs/react-query/useQueryFn.d.ts

@@ -0,0 +1,4 @@
+import { QueryFunction } from "@tanstack/react-query";
+import { OptionsQueries } from "./OptionsQueries";
+declare const useQueryFn: (keys: any[], fetchData: QueryFunction, queryOptions?: OptionsQueries) => import("@tanstack/react-query").UseQueryResult<any, any>;
+export default useQueryFn;

package/lib/cjs/react-query/useQueryFn.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_query_1 = require("@tanstack/react-query");
+// const useQueryFn = (keys: any[], fetchData: QueryFunction, options?:{queryConfigs: UseQueryOptions}) => {
+const useQueryFn = (keys, fetchData, queryOptions) => {
+    return (0, react_query_1.useQuery)(Object.assign({ queryKey: keys, queryFn: fetchData }, queryOptions));
+};
+exports.default = useQueryFn;

package/lib/cjs/react-query/useQueryGet.d.ts

@@ -0,0 +1,11 @@
+import { OptionsQueries } from "./OptionsQueries";
+type CrudProps = {
+    httpService: any;
+    keys: any[];
+    queryOptions?: OptionsQueries;
+    getByParam?: string | number;
+    getByQueryParam?: any;
+    url: string;
+};
+declare const useQueryGet: <T = any>(crud: CrudProps) => import("@tanstack/react-query").UseQueryResult<any, any>;
+export default useQueryGet;

package/lib/cjs/react-query/useQueryGet.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_query_1 = require("@tanstack/react-query");
+const useQueryGet = (crud) => {
+    const fetchDatas = () => {
+        if (crud.getByParam) {
+            return crud.httpService.getByParam(crud.getByParam, crud.url).then((res) => res.data);
+        }
+        if (crud.getByQueryParam) {
+            return crud.httpService.getByQueryParam(crud.url, crud.getByQueryParam).then((res) => res.data);
+        }
+        return crud.httpService.get(crud.url).then((res) => res.data);
+    };
+    return (0, react_query_1.useQuery)(Object.assign({ queryKey: crud === null || crud === void 0 ? void 0 : crud.keys, queryFn: fetchDatas }, crud === null || crud === void 0 ? void 0 : crud.queryOptions));
+};
+exports.default = useQueryGet;

package/lib/cjs/react-query/useQueryPost.d.ts

@@ -0,0 +1,10 @@
+import { OptionsQueries } from "./OptionsQueries";
+type CrudProps = {
+    httpService: any;
+    keys: any[];
+    url: string;
+    postParam?: any;
+    queryOptions?: OptionsQueries;
+};
+declare const useQueryPost: <T = any>(crud: CrudProps) => import("@tanstack/react-query").UseQueryResult<any, any>;
+export default useQueryPost;

package/lib/cjs/react-query/useQueryPost.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_query_1 = require("@tanstack/react-query");
+// const useQueryPost = <T = any>(crud: CrudProps, queryOptions?: OptionsQueries) => {
+const useQueryPost = (crud) => {
+    const fetchDatas = () => crud.httpService.postBody(crud.postParam, crud.url).then((res) => res.data);
+    return (0, react_query_1.useQuery)(Object.assign({ queryKey: crud === null || crud === void 0 ? void 0 : crud.keys, queryFn: fetchDatas }, crud === null || crud === void 0 ? void 0 : crud.queryOptions));
+};
+exports.default = useQueryPost;

package/lib/cjs/users/user.d.ts

@@ -24,6 +24,9 @@ export declare const inSteGrp: <T extends {
     ste?: Ste;
 }>(grps: string[], user: T) => boolean;
 export declare const hasRole: (roles: string[], userRole: UserRole) => boolean;
+export declare const hasRoles: <T extends {
+    roles?: string[];
+}>(roles: string[], user: T) => boolean;
 export declare const isBillPeriod: <T extends {
     periodBill: string;
 }>(user: T, period: string) => boolean;

package/lib/cjs/users/user.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSteShortname = exports.labelSteName = exports.userCoef = exports.userGrpCode = exports.secureUserPassword = exports.secureUser = exports.entryDesignationUser = exports.getFullname = exports.isStaffSte = exports.isBillPeriod = exports.hasRole = exports.inSteGrp = exports.displaySteOrFullname = exports.displaySteOrStaff = exports.inGrp = void 0;
+exports.getSteShortname = exports.labelSteName = exports.userCoef = exports.userGrpCode = exports.secureUserPassword = exports.secureUser = exports.entryDesignationUser = exports.getFullname = exports.isStaffSte = exports.isBillPeriod = exports.hasRoles = exports.hasRole = exports.inSteGrp = exports.displaySteOrFullname = exports.displaySteOrStaff = exports.inGrp = void 0;
 const bcrypt = __importStar(require("bcryptjs"));
 const randomatic_1 = __importDefault(require("randomatic"));
 const utils_1 = require("../utils");
@@ -77,9 +77,14 @@ exports.inSteGrp = inSteGrp;
   return [...roles].includes(user.role.code.toLowerCase()) ? true : false;
 }; */
 const hasRole = (roles, userRole) => {
-    return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    // return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    return [...roles].includes(userRole.code.toLowerCase());
 };
 exports.hasRole = hasRole;
+const hasRoles = (roles, user) => {
+    return (0, utils_1.arraySome)(roles, user.roles);
+};
+exports.hasRoles = hasRoles;
 const isBillPeriod = (user, period) => {
     return user.periodBill.toLowerCase() === period ? true : false;
 };

package/lib/esm/forms/AdditFormType.d.ts

@@ -1,6 +1,7 @@
-export type AdditFormType<T = any> = {
+type AdditFormType<T = any> = {
     onSubmitForm?: (value: any) => any;
     onCancelForm?: any;
     tob?: T;
     url?: string;
 };
+export default AdditFormType;

package/lib/esm/forms/index.d.ts

@@ -0,0 +1 @@
+export { default as AdditFormType } from "./AdditFormType";

package/lib/esm/forms/index.js

@@ -1 +1 @@
-"use strict";
+export {};

package/lib/esm/react-query/OptionsQueries.d.ts

@@ -0,0 +1,23 @@
+export interface OptionsQueries {
+    gcTime?: any;
+    enabled?: any;
+    networkMode?: any;
+    initialData?: any;
+    initialDataUpdatedAt?: any;
+    meta?: any;
+    notifyOnChangeProps?: any;
+    placeholderData?: any;
+    queryKeyHashFn?: any;
+    refetchInterval?: any;
+    refetchIntervalInBackground?: any;
+    refetchOnMount?: any;
+    refetchOnReconnect?: any;
+    refetchOnWindowFocus?: any;
+    retry?: any;
+    retryOnMount?: any;
+    retryDelay?: any;
+    select?: any;
+    staleTime?: any;
+    structuralSharing?: any;
+    throwOnError?: any;
+}

package/lib/esm/react-query/OptionsQueries.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/react-query/OptionsType.d.ts

@@ -0,0 +1,4 @@
+export type OptionsType = {
+    propId?: string;
+    invalidate?: boolean;
+};

package/lib/esm/react-query/OptionsType.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/react-query/index.d.ts

@@ -0,0 +1,3 @@
+export { default as useQueryFn } from "./useQueryFn";
+export { default as useQueryGet } from "./useQueryGet";
+export { default as useQueryPost } from "./useQueryPost";

package/lib/esm/react-query/index.js

@@ -0,0 +1,14 @@
+// export { default as hlpQuery } from "./hlpQuery";
+// export { default as useQueryAdd } from "./useQueryAdd";
+// export { default as useQueryAddOpti } from "./useQueryAddOpti";
+// export { default as useQueryAddit } from "./useQueryAddit";
+// export { default as useQueryAdditOpti } from "./useQueryAdditOpti";
+// export { default as useQueryCrud } from "./useQueryCrud";
+// export { default as useQueryDel } from "./useQueryDel";
+export { default as useQueryFn } from "./useQueryFn";
+export { default as useQueryGet } from "./useQueryGet";
+// export { default as useQueryMutatePost } from "./useQueryMutatePost";
+export { default as useQueryPost } from "./useQueryPost";
+// export { default as useQueryToggle } from "./useQueryToggle";
+// export { default as useQueryUpdate } from "./useQueryUpdate";
+// export { default as useQueryUpdateOpti } from "./useQueryUpdateOpti";

package/lib/esm/react-query/useQueryFn.d.ts

@@ -0,0 +1,4 @@
+import { QueryFunction } from "@tanstack/react-query";
+import { OptionsQueries } from "./OptionsQueries";
+declare const useQueryFn: (keys: any[], fetchData: QueryFunction, queryOptions?: OptionsQueries) => import("@tanstack/react-query").UseQueryResult<any, any>;
+export default useQueryFn;

package/lib/esm/react-query/useQueryFn.js

@@ -0,0 +1,6 @@
+import { useQuery } from "@tanstack/react-query";
+// const useQueryFn = (keys: any[], fetchData: QueryFunction, options?:{queryConfigs: UseQueryOptions}) => {
+const useQueryFn = (keys, fetchData, queryOptions) => {
+    return useQuery(Object.assign({ queryKey: keys, queryFn: fetchData }, queryOptions));
+};
+export default useQueryFn;

package/lib/esm/react-query/useQueryGet.d.ts

@@ -0,0 +1,11 @@
+import { OptionsQueries } from "./OptionsQueries";
+type CrudProps = {
+    httpService: any;
+    keys: any[];
+    queryOptions?: OptionsQueries;
+    getByParam?: string | number;
+    getByQueryParam?: any;
+    url: string;
+};
+declare const useQueryGet: <T = any>(crud: CrudProps) => import("@tanstack/react-query").UseQueryResult<any, any>;
+export default useQueryGet;

package/lib/esm/react-query/useQueryGet.js

@@ -0,0 +1,14 @@
+import { useQuery } from "@tanstack/react-query";
+const useQueryGet = (crud) => {
+    const fetchDatas = () => {
+        if (crud.getByParam) {
+            return crud.httpService.getByParam(crud.getByParam, crud.url).then((res) => res.data);
+        }
+        if (crud.getByQueryParam) {
+            return crud.httpService.getByQueryParam(crud.url, crud.getByQueryParam).then((res) => res.data);
+        }
+        return crud.httpService.get(crud.url).then((res) => res.data);
+    };
+    return useQuery(Object.assign({ queryKey: crud === null || crud === void 0 ? void 0 : crud.keys, queryFn: fetchDatas }, crud === null || crud === void 0 ? void 0 : crud.queryOptions));
+};
+export default useQueryGet;

package/lib/esm/react-query/useQueryPost.d.ts

@@ -0,0 +1,10 @@
+import { OptionsQueries } from "./OptionsQueries";
+type CrudProps = {
+    httpService: any;
+    keys: any[];
+    url: string;
+    postParam?: any;
+    queryOptions?: OptionsQueries;
+};
+declare const useQueryPost: <T = any>(crud: CrudProps) => import("@tanstack/react-query").UseQueryResult<any, any>;
+export default useQueryPost;

package/lib/esm/react-query/useQueryPost.js

@@ -0,0 +1,7 @@
+import { useQuery } from "@tanstack/react-query";
+// const useQueryPost = <T = any>(crud: CrudProps, queryOptions?: OptionsQueries) => {
+const useQueryPost = (crud) => {
+    const fetchDatas = () => crud.httpService.postBody(crud.postParam, crud.url).then((res) => res.data);
+    return useQuery(Object.assign({ queryKey: crud === null || crud === void 0 ? void 0 : crud.keys, queryFn: fetchDatas }, crud === null || crud === void 0 ? void 0 : crud.queryOptions));
+};
+export default useQueryPost;

package/lib/esm/users/user.d.ts

@@ -24,6 +24,9 @@ export declare const inSteGrp: <T extends {
     ste?: Ste;
 }>(grps: string[], user: T) => boolean;
 export declare const hasRole: (roles: string[], userRole: UserRole) => boolean;
+export declare const hasRoles: <T extends {
+    roles?: string[];
+}>(roles: string[], user: T) => boolean;
 export declare const isBillPeriod: <T extends {
     periodBill: string;
 }>(user: T, period: string) => boolean;

package/lib/esm/users/user.js

@@ -1,6 +1,6 @@
 import * as bcrypt from "bcryptjs";
 import randomatic from "randomatic";
-import { limitTo, titleCase } from "../utils";
+import { arraySome, limitTo, titleCase } from "../utils";
 // export const inGrp = (grps: string[], user: User | UserNotarial) => {
 export const inGrp = (grps, user) => {
     return [...grps].includes(user.grp.code.toLowerCase()) ? true : false;
@@ -34,7 +34,11 @@ export const inSteGrp = (grps, user) => {
   return [...roles].includes(user.role.code.toLowerCase()) ? true : false;
 }; */
 export const hasRole = (roles, userRole) => {
-    return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    // return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    return [...roles].includes(userRole.code.toLowerCase());
+};
+export const hasRoles = (roles, user) => {
+    return arraySome(roles, user.roles);
 };
 export const isBillPeriod = (user, period) => {
     return user.periodBill.toLowerCase() === period ? true : false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.4.29",
+  "version": "1.4.31",
   "description": "helpers",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -24,6 +24,7 @@
     "@types/react": "^19.0.12"
   },
   "dependencies": {
+    "@tanstack/react-query": "^5.71.0",
     "axios": "^1.8.4",
     "bcryptjs": "^3.0.2",
     "class-validator": "^0.14.1",