av6-core 1.3.2 → 1.3.4

package/dist/index.d.mts

@@ -145,6 +145,24 @@ interface DynamicCreateInput {
 interface DynamicUpdateInput extends DynamicCreateInput {
     id: number;
 }
+type Simplify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+type PathToSelect<P extends string> = P extends `${infer K}.${infer Rest}` ? {
+    [Key in K]: PathToSelect<Rest>;
+} : {
+    [Key in P]: true;
+};
+type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+type MergeAll<U> = UnionToIntersection<U> extends infer I ? (I extends object ? Simplify<I> : never) : never;
+type PathsToSelect<Paths extends string> = MergeAll<Paths extends any ? PathToSelect<Paths> : never>;
+type PathValue<Row, P extends string> = Row extends object ? P extends `${infer K}.${infer Rest}` ? K extends keyof Row ? PathValue<Row[K], Rest> : unknown : P extends keyof Row ? Row[P] : unknown : unknown;
+type DtoFromMapping<M extends Record<string, string>, Row> = {
+    [K in keyof M]: PathValue<Row, M[K]>;
+};
+type DtoNullOnMissing<M extends Record<string, string>, Row extends object> = {
+    [K in keyof M]: Exclude<DtoFromMapping<M, Row>[K], undefined> | null;
+};
 
 interface EmployeeCache {
     id: number;
@@ -270,6 +288,9 @@ interface DropdownRequest {
     searchText?: string;
     fixedSearch?: Record<string, ColValue>;
     fixedNotSearch?: Record<string, ColValue>;
+    sortBy?: string;
+    sortDir?: "ASC" | "DESC";
+    selectColumns?: Record<string, string>;
 }
 interface DropdownRequestService<T extends DynamicShortCode> extends DropdownRequest {
     shortCodeData: T;
@@ -600,4 +621,4 @@ declare class AuditProxy<Module extends string = "OPD" | "PROCEDURE" | "GENERAL_
     createAuditedService<T extends object>(serviceName: string, service: T): T;
 }
 
-export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DtoFromMapping, type DtoNullOnMissing, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type MergeAll, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type PathToSelect, type PathValue, type PathsToSelect, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Simplify, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UnionToIntersection, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.d.ts

@@ -145,6 +145,24 @@ interface DynamicCreateInput {
 interface DynamicUpdateInput extends DynamicCreateInput {
     id: number;
 }
+type Simplify<T> = {
+    [K in keyof T]: T[K];
+} & {};
+type PathToSelect<P extends string> = P extends `${infer K}.${infer Rest}` ? {
+    [Key in K]: PathToSelect<Rest>;
+} : {
+    [Key in P]: true;
+};
+type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
+type MergeAll<U> = UnionToIntersection<U> extends infer I ? (I extends object ? Simplify<I> : never) : never;
+type PathsToSelect<Paths extends string> = MergeAll<Paths extends any ? PathToSelect<Paths> : never>;
+type PathValue<Row, P extends string> = Row extends object ? P extends `${infer K}.${infer Rest}` ? K extends keyof Row ? PathValue<Row[K], Rest> : unknown : P extends keyof Row ? Row[P] : unknown : unknown;
+type DtoFromMapping<M extends Record<string, string>, Row> = {
+    [K in keyof M]: PathValue<Row, M[K]>;
+};
+type DtoNullOnMissing<M extends Record<string, string>, Row extends object> = {
+    [K in keyof M]: Exclude<DtoFromMapping<M, Row>[K], undefined> | null;
+};
 
 interface EmployeeCache {
     id: number;
@@ -270,6 +288,9 @@ interface DropdownRequest {
     searchText?: string;
     fixedSearch?: Record<string, ColValue>;
     fixedNotSearch?: Record<string, ColValue>;
+    sortBy?: string;
+    sortDir?: "ASC" | "DESC";
+    selectColumns?: Record<string, string>;
 }
 interface DropdownRequestService<T extends DynamicShortCode> extends DropdownRequest {
     shortCodeData: T;
@@ -600,4 +621,4 @@ declare class AuditProxy<Module extends string = "OPD" | "PROCEDURE" | "GENERAL_
     createAuditedService<T extends object>(serviceName: string, service: T): T;
 }
 
-export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };
+export { type AuditContext, type AuditContextProvider, AuditCore, type AuditLogPayload, AuditLogger, AuditProxy, type CacheAdapter, type CalculationRes, type ColValue, type CommonCreateRequestRepository, type CommonExcelRequest, type CommonFilterRequest, type CommonFilterWithDate, type CommonServiceResponse, type CommonUpdateRequestRepository, type Config, type Context, type CreateUINConfigRequest, type CrudContext, type CrudDelegate, type DataType, type DeleteParams, type DeleteRequestRepository, type Deps, type DropdownRequest, type DropdownRequestService, type DtoFromMapping, type DtoNullOnMissing, type DynamicCreateInput, type DynamicCrudConfig, type DynamicShortCode, type DynamicUpdateInput, type EmitPayload, type EmployeeCache, type ExcelConfig, type ExportExcel, type ExportExcelRequestService, type FetchRequest, type FetchRequestRepository, type FieldConfig, type FieldRules, type FieldType, type FixedSearchRequest, type FixedSearchRequestService, type Helpers, type ImportExcel, type ImportExcelRequestService, type LockUnlockParams, type LockUnlockRequestRepository, type Mapper, type MergeAll, type NewFixedSearchRequest, type NewFixedSearchRequestService, type NewSearchRequest, NotificationEmitter, type Op, type PaginatedResponse, type PathToSelect, type PathValue, type PathsToSelect, type Presence, type Recipient, type RelationConfig, type RelationStrategy, type RelationWriteConfig, type SearchRequest, type SearchRequestService, type ServiceCacheAdapter, type Simplify, type SingleValidationMapping, type SourcePath, type Store, type ToggleActive, type TxClient, type UINConfigDTO, type UINPreviewRequest, type UINSegment, type UINSegmentType, type UIN_RESET_POLICY, type UinDeps, type UnionToIntersection, type UniqueConfig, type UpdateConfigByCodeInput, type UpdateStatusRequestRepository, type UpdateUINConfigRequest, type ValidationErrorItem, commonService, customOmit, findDifferences, fromTimestampToSqlDatetime, getDynamicValue, getPattern, interpolate, objectTo2DArray, toNumberOrNull, toUINConfigDTO, uinConfigService, type updateStatusParams };

package/dist/index.js

@@ -249,6 +249,55 @@ function buildNestedConditionForSingleValue(keys, fieldType, val, isNot = false)
     [keys[0]]: buildNestedConditionForSingleValue(keys.slice(1), fieldType, val, isNot)
   };
 }
+function buildPrismaSelect(mapping) {
+  const select = {};
+  for (const path of Object.values(mapping)) {
+    if (typeof path !== "string") continue;
+    const parts = path.split(".").map((s) => s.trim()).filter(Boolean);
+    if (!parts.length) continue;
+    let cur = select;
+    for (let i = 0; i < parts.length; i++) {
+      const key = parts[i];
+      const isLeaf = i === parts.length - 1;
+      if (isLeaf) {
+        if (cur[key] && typeof cur[key] === "object") {
+          throw new Error(
+            `buildPrismaSelect conflict: "${parts.join(".")}" tries to set "${key}=true" but it's already an object`
+          );
+        }
+        cur[key] = true;
+      } else {
+        if (cur[key] === true) {
+          throw new Error(
+            `buildPrismaSelect conflict: "${parts.slice(0, i + 1).join(".")}" is already true, cannot nest "${parts.slice(i + 1).join(".")}"`
+          );
+        }
+        if (!cur[key]) cur[key] = {};
+        cur = cur[key];
+      }
+    }
+  }
+  return select;
+}
+function getByPathOrNull(row, path) {
+  const parts = String(path || "").split(".").map((p) => p.trim()).filter(Boolean);
+  let cur = row;
+  for (const key of parts) {
+    if (cur == null) return null;
+    cur = cur[key];
+  }
+  return cur === void 0 ? null : cur;
+}
+function toDynamicDropdownDto(mapping, row) {
+  const out = {};
+  for (const [dtoKey, path] of Object.entries(mapping)) {
+    out[dtoKey] = getByPathOrNull(row, path);
+  }
+  return out;
+}
+function toDynamicDropdownDtoList(mapping, rows) {
+  return rows.map((r) => toDynamicDropdownDto(mapping, r));
+}
 
 // src/repository/common.repository.ts
 var import_util2 = require("util");
@@ -335,7 +384,10 @@ var commonRepository = (serviceDeps) => {
       searchColumns,
       shortCodeData,
       fixedSearch,
-      fixedNotSearch
+      fixedNotSearch,
+      sortBy,
+      sortDir,
+      selectColumns
     }) {
       logger.info("entering::commonSearch::repository");
       const tableName = shortCodeData.tableName;
@@ -355,34 +407,25 @@ var commonRepository = (serviceDeps) => {
         });
         whereClause.OR = transformData(whereClause.OR);
       }
+      const orderByClause = {};
+      if (sortBy && sortDir) {
+        orderByClause[sortBy] = sortDir.toLowerCase();
+      }
       const model = db[tableName];
       if (!model) {
         throw new ErrorHandler(400, "Invalid mapping table name");
       }
       const fixWhere = typeof shortCodeData.whereClause === "string" ? JSON.parse(shortCodeData.whereClause) : {};
-      const select = typeof shortCodeData.selectClause === "string" ? JSON.parse(shortCodeData.selectClause) : {};
-      const selectKeys = Object.keys(select);
-      const selectValues = Object.values(select);
-      const selectClause = {};
-      if (selectValues.length > 0) {
-        selectValues.forEach((key) => {
-          selectClause[key] = true;
-        });
-      }
+      const select = selectColumns ? selectColumns : typeof shortCodeData.selectClause === "string" ? JSON.parse(shortCodeData.selectClause) : {};
+      const selectClause = buildPrismaSelect(select);
       const query = {
         where: { ...whereClause, ...fixWhere, ...customWhereClause },
-        select: selectClause
+        select: selectClause,
+        orderBy: orderByClause
       };
       const results = await model.findMany(query);
-      const toDto = (record) => {
-        const dto = {};
-        selectKeys.forEach((keys) => {
-          dto[keys] = record[select[keys]];
-        });
-        return dto;
-      };
       if (shortCodeData.isDropDown) {
-        const dtoRes = results.map((record) => toDto(record));
+        const dtoRes = toDynamicDropdownDtoList(select, results);
         return dtoRes;
       }
       logger.info("exiting::commonSearch::repository");
@@ -1557,7 +1600,7 @@ var commonService = (serviceDeps) => {
     async updateConfigByCode(input) {
       logger.info("entering::updateConfigById::service");
       const shortCodeData = await commonRepositoryFactory.updateShortCodeConfigInDb(input);
-      const cacheKey = `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`;
+      const cacheKey = `${REDIS_PREFIX}${CACHE_KEY_NAME}:dynamicShortCode:all`;
       if (shortCodeData) await updateCache(cacheKey, shortCodeData?.shortCode, shortCodeData);
       logger.info("exiting::updateConfigById::service");
     }

package/dist/index.mjs

@@ -199,6 +199,55 @@ function buildNestedConditionForSingleValue(keys, fieldType, val, isNot = false)
     [keys[0]]: buildNestedConditionForSingleValue(keys.slice(1), fieldType, val, isNot)
   };
 }
+function buildPrismaSelect(mapping) {
+  const select = {};
+  for (const path of Object.values(mapping)) {
+    if (typeof path !== "string") continue;
+    const parts = path.split(".").map((s) => s.trim()).filter(Boolean);
+    if (!parts.length) continue;
+    let cur = select;
+    for (let i = 0; i < parts.length; i++) {
+      const key = parts[i];
+      const isLeaf = i === parts.length - 1;
+      if (isLeaf) {
+        if (cur[key] && typeof cur[key] === "object") {
+          throw new Error(
+            `buildPrismaSelect conflict: "${parts.join(".")}" tries to set "${key}=true" but it's already an object`
+          );
+        }
+        cur[key] = true;
+      } else {
+        if (cur[key] === true) {
+          throw new Error(
+            `buildPrismaSelect conflict: "${parts.slice(0, i + 1).join(".")}" is already true, cannot nest "${parts.slice(i + 1).join(".")}"`
+          );
+        }
+        if (!cur[key]) cur[key] = {};
+        cur = cur[key];
+      }
+    }
+  }
+  return select;
+}
+function getByPathOrNull(row, path) {
+  const parts = String(path || "").split(".").map((p) => p.trim()).filter(Boolean);
+  let cur = row;
+  for (const key of parts) {
+    if (cur == null) return null;
+    cur = cur[key];
+  }
+  return cur === void 0 ? null : cur;
+}
+function toDynamicDropdownDto(mapping, row) {
+  const out = {};
+  for (const [dtoKey, path] of Object.entries(mapping)) {
+    out[dtoKey] = getByPathOrNull(row, path);
+  }
+  return out;
+}
+function toDynamicDropdownDtoList(mapping, rows) {
+  return rows.map((r) => toDynamicDropdownDto(mapping, r));
+}
 
 // src/repository/common.repository.ts
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "util";
@@ -285,7 +334,10 @@ var commonRepository = (serviceDeps) => {
       searchColumns,
       shortCodeData,
       fixedSearch,
-      fixedNotSearch
+      fixedNotSearch,
+      sortBy,
+      sortDir,
+      selectColumns
     }) {
       logger.info("entering::commonSearch::repository");
       const tableName = shortCodeData.tableName;
@@ -305,34 +357,25 @@ var commonRepository = (serviceDeps) => {
         });
         whereClause.OR = transformData(whereClause.OR);
       }
+      const orderByClause = {};
+      if (sortBy && sortDir) {
+        orderByClause[sortBy] = sortDir.toLowerCase();
+      }
       const model = db[tableName];
       if (!model) {
         throw new ErrorHandler(400, "Invalid mapping table name");
       }
       const fixWhere = typeof shortCodeData.whereClause === "string" ? JSON.parse(shortCodeData.whereClause) : {};
-      const select = typeof shortCodeData.selectClause === "string" ? JSON.parse(shortCodeData.selectClause) : {};
-      const selectKeys = Object.keys(select);
-      const selectValues = Object.values(select);
-      const selectClause = {};
-      if (selectValues.length > 0) {
-        selectValues.forEach((key) => {
-          selectClause[key] = true;
-        });
-      }
+      const select = selectColumns ? selectColumns : typeof shortCodeData.selectClause === "string" ? JSON.parse(shortCodeData.selectClause) : {};
+      const selectClause = buildPrismaSelect(select);
       const query = {
         where: { ...whereClause, ...fixWhere, ...customWhereClause },
-        select: selectClause
+        select: selectClause,
+        orderBy: orderByClause
       };
       const results = await model.findMany(query);
-      const toDto = (record) => {
-        const dto = {};
-        selectKeys.forEach((keys) => {
-          dto[keys] = record[select[keys]];
-        });
-        return dto;
-      };
       if (shortCodeData.isDropDown) {
-        const dtoRes = results.map((record) => toDto(record));
+        const dtoRes = toDynamicDropdownDtoList(select, results);
         return dtoRes;
       }
       logger.info("exiting::commonSearch::repository");
@@ -1507,7 +1550,7 @@ var commonService = (serviceDeps) => {
     async updateConfigByCode(input) {
       logger.info("entering::updateConfigById::service");
       const shortCodeData = await commonRepositoryFactory.updateShortCodeConfigInDb(input);
-      const cacheKey = `${REDIS_PREFIX}${CACHE_KEY_NAME}:${shortCodeData.tableName}:all`;
+      const cacheKey = `${REDIS_PREFIX}${CACHE_KEY_NAME}:dynamicShortCode:all`;
       if (shortCodeData) await updateCache(cacheKey, shortCodeData?.shortCode, shortCodeData);
       logger.info("exiting::updateConfigById::service");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",