From 4f0ea4565cf56362fb882df3944930b829105d51 Mon Sep 17 00:00:00 2001 From: soheilous Date: Mon, 29 Apr 2024 21:40:54 +0330 Subject: [PATCH] refactor: cleanup `ObjectUtils` --- apps/server/testSrc/classes/Requester.ts | 47 +----------- apps/server/testSrc/types/index.ts | 4 +- packages/classes/src/classes/ObjectUtils.ts | 80 --------------------- 3 files changed, 3 insertions(+), 128 deletions(-) diff --git a/apps/server/testSrc/classes/Requester.ts b/apps/server/testSrc/classes/Requester.ts index 9ce1e1c..d98a26d 100644 --- a/apps/server/testSrc/classes/Requester.ts +++ b/apps/server/testSrc/classes/Requester.ts @@ -11,12 +11,10 @@ import { FIELD_TYPE } from "@/variables"; export class Requester { private error?: NativeError; - private options: RequesterOptions = { - shouldFilterRequestData: true, - }; + private event: SocketEvent; + private options: RequesterOptions = {}; private requestData: IOType["input"]; private response: SocketResponse; - private event: SocketEvent; private socket: Client; constructor(socket: Client, event: SocketEvent) { @@ -76,42 +74,6 @@ export class Requester { return this; } - // private handleFilterRequestData(options = this.getOptions()) { - // const inputFields = this.convertInputField(this.getInputFields()); - // const requestData = this.getEmitData(); - // this.checkRequestDataFields(options, inputFields); - // return this.filterEmitData(requestData, inputFields); - // } - - // private convertInputField(inputFields: ValidationModel) { - // return Object.entries(inputFields).reduce((prevValue, currentValue) => { - // const [requiredFieldKey, requiredFieldProperties] = currentValue; - // prevValue[requiredFieldKey] = requiredFieldProperties.value; - // return prevValue; - // }, {} as StringMap); - // } - // private checkRequestDataFields( - // options = this.getOptions(), - // inputFields: StringMap - // ) { - // if (!this.getEmitData() && Object.keys(inputFields).length) { - // const error = { - // ...errorStore.find("INPUT_FIELDS_MISSING"), - // options, - // requestData: this.getEmitData(), - // }; - // logger.dir("error", error, { depth: 10 }); - // loggerHelper.logEndTestRequest(); - // throw error; - // } - // } - // private filterEmitData(requestData: IOType["input"], inputFields: StringMap) { - // return objectUtils.excludePropsPeerToPeer( - // requestData, - // inputFields - // ) as StringMap; - // } - async emit() { const response = (await new Promise((resolve, _reject) => { // this.socket.connect(); @@ -135,11 +97,6 @@ export class Requester { if (data) this.setEmitData(data); - if (options.shouldFilterRequestData) { - // const filteredRequestData = this.handleFilterRequestData(finalOptions); - // this.setEmitData(finalOptions); - } - loggerHelper.logRequestDetails( finalOptions, this.getEmitData(), diff --git a/apps/server/testSrc/types/index.ts b/apps/server/testSrc/types/index.ts index a2144b5..793fd58 100644 --- a/apps/server/testSrc/types/index.ts +++ b/apps/server/testSrc/types/index.ts @@ -31,9 +31,7 @@ export type AssertionInitializer< options: Partial ) => void; -export interface RequesterOptions { - shouldFilterRequestData: boolean; -} +export interface RequesterOptions {} export type MiddlewareName = keyof typeof middlewares; export type ServiceName = keyof typeof mergedServices; diff --git a/packages/classes/src/classes/ObjectUtils.ts b/packages/classes/src/classes/ObjectUtils.ts index 65b5dec..19a3066 100644 --- a/packages/classes/src/classes/ObjectUtils.ts +++ b/packages/classes/src/classes/ObjectUtils.ts @@ -1,39 +1,8 @@ import { StringMap } from "@repo/type-store"; -interface FilterFields { - [key: string]: any | FilterFields | FilterFields[]; -} - class ObjectUtils { constructor() { this.excludeProps = this.excludeProps.bind(this); - this.excludePropsPeerToPeer = this.excludePropsPeerToPeer.bind(this); - } - - excludePropsPeerToPeer(data: StringMap, filterFields: FilterFields): T { - return Object.entries(filterFields).reduce( - (prevValue: StringMap, [kye, filterFieldValue]) => { - const objectFieldValue = data[kye]; - if (typeof filterFieldValue === "object" && filterFieldValue !== null) { - prevValue[kye] = this.excludePropsPeerToPeer( - objectFieldValue, - filterFieldValue - ); - return prevValue; - } - - if (Array.isArray(filterFieldValue)) { - prevValue[kye] = objectFieldValue.map((v: StringMap) => - this.excludePropsPeerToPeer(v, filterFieldValue[0] as any) - ); - return prevValue; - } - - prevValue[kye] = objectFieldValue; - return prevValue; - }, - {} - ) as T; } excludeProps(data: StringMap, props: string[]) { @@ -59,36 +28,6 @@ class ObjectUtils { }, {}); } - clarify(dirtyObject: StringMap) { - return Object.entries(dirtyObject).reduce( - (prevValue: StringMap, [key, value]) => { - if (typeof value !== "undefined") { - if ( - typeof dirtyObject[key] === "object" && - dirtyObject[key] !== null - ) { - prevValue[key] = this.clarify(dirtyObject[key]); - - return prevValue; - } - - if (Array.isArray(dirtyObject[key])) { - prevValue[key] = dirtyObject[key].map((item: StringMap) => - this.clarify(item) - ); - - return prevValue; - } - - prevValue[key] = value; - } - - return prevValue; - }, - {} - ); - } - rename(object: T, oldKey: string, newKey: string) { const { [oldKey as keyof T]: oldKeyValue, ...rest } = object; @@ -113,22 +52,3 @@ class ObjectUtils { const objectUtils = new ObjectUtils(); export { objectUtils, ObjectUtils }; - -// const assigner = (imports, path, value) => { -// const newPath = pathSplitter(path); - -// const lastKeyIndex = newPath.length - 1; - -// for (var i = 0; i < lastKeyIndex; ++i) { -// const key = newPath[i]; -// if (!(key in imports)) { -// imports[key] = {}; -// } -// imports = imports[key]; -// } - -// imports[newPath[lastKeyIndex]] = { -// ...imports[newPath[lastKeyIndex]], -// ...value, -// }; -// };