av6-core 1.3.4 → 1.3.6

package/dist/index.d.mts

@@ -148,14 +148,20 @@ interface DynamicUpdateInput extends DynamicCreateInput {
 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>;
+type IsPlainObject<T> = T extends object ? (T extends any[] ? false : T extends Date ? false : true) : false;
+type DeepMerge<A, B> = A extends true ? IsPlainObject<B> extends true ? never : true : B extends true ? IsPlainObject<A> extends true ? never : true : IsPlainObject<A> extends true ? IsPlainObject<B> extends true ? Simplify<{
+    [K in keyof A | keyof B]: K extends keyof A ? K extends keyof B ? DeepMerge<A[K], B[K]> : A[K] : K extends keyof B ? B[K] : never;
+}> : never : never;
+type PathToSelectWithSelect<P extends string> = P extends `${infer K}.${infer Rest}` ? {
+    [Key in K]: {
+        select: PathToSelectWithSelect<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 PathsToSelectWithSelect<Paths extends string> = MergeAll<Paths extends any ? PathToSelectWithSelect<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]>;
@@ -621,4 +627,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 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 };
+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 DeepMerge, 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 PathToSelectWithSelect, type PathValue, type PathsToSelectWithSelect, 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 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

@@ -148,14 +148,20 @@ interface DynamicUpdateInput extends DynamicCreateInput {
 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>;
+type IsPlainObject<T> = T extends object ? (T extends any[] ? false : T extends Date ? false : true) : false;
+type DeepMerge<A, B> = A extends true ? IsPlainObject<B> extends true ? never : true : B extends true ? IsPlainObject<A> extends true ? never : true : IsPlainObject<A> extends true ? IsPlainObject<B> extends true ? Simplify<{
+    [K in keyof A | keyof B]: K extends keyof A ? K extends keyof B ? DeepMerge<A[K], B[K]> : A[K] : K extends keyof B ? B[K] : never;
+}> : never : never;
+type PathToSelectWithSelect<P extends string> = P extends `${infer K}.${infer Rest}` ? {
+    [Key in K]: {
+        select: PathToSelectWithSelect<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 PathsToSelectWithSelect<Paths extends string> = MergeAll<Paths extends any ? PathToSelectWithSelect<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]>;
@@ -621,4 +627,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 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 };
+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 DeepMerge, 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 PathToSelectWithSelect, type PathValue, type PathsToSelectWithSelect, 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 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

@@ -272,8 +272,9 @@ function buildPrismaSelect(mapping) {
             `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];
+        if (!cur[key]) cur[key] = { select: {} };
+        if (!cur[key].select) cur[key].select = {};
+        cur = cur[key].select;
       }
     }
   }
@@ -1561,9 +1562,10 @@ var commonService = (serviceDeps) => {
       }
       const ctx = { userId: currentUser ?? void 0, vars: {} };
       const schema = buildJoiSchemaForOp(cfg, "update");
-      const validated = await schema.validateAsync(updateParams.body);
+      let validated = await schema.validateAsync(updateParams.body);
       if (validationMapping && validationMapping[shortCodeData.shortCode] && validationMapping[shortCodeData.shortCode].update) {
-        await validationMapping[shortCodeData.shortCode].update?.({ ...validated, id: updateParams.id });
+        validated = { ...validated, id: updateParams.id };
+        await validationMapping[shortCodeData.shortCode].update?.(validated);
       }
       const updateResult = await commonCreateUpdateRepositoryFactory.commonUpdate({
         body: validated,

package/dist/index.mjs

@@ -222,8 +222,9 @@ function buildPrismaSelect(mapping) {
             `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];
+        if (!cur[key]) cur[key] = { select: {} };
+        if (!cur[key].select) cur[key].select = {};
+        cur = cur[key].select;
       }
     }
   }
@@ -1511,9 +1512,10 @@ var commonService = (serviceDeps) => {
       }
       const ctx = { userId: currentUser ?? void 0, vars: {} };
       const schema = buildJoiSchemaForOp(cfg, "update");
-      const validated = await schema.validateAsync(updateParams.body);
+      let validated = await schema.validateAsync(updateParams.body);
       if (validationMapping && validationMapping[shortCodeData.shortCode] && validationMapping[shortCodeData.shortCode].update) {
-        await validationMapping[shortCodeData.shortCode].update?.({ ...validated, id: updateParams.id });
+        validated = { ...validated, id: updateParams.id };
+        await validationMapping[shortCodeData.shortCode].update?.(validated);
       }
       const updateResult = await commonCreateUpdateRepositoryFactory.commonUpdate({
         body: validated,

package/package.json

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