Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 45 additions & 27 deletions packages/express/src/snapshot/zod/v1/dtos/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ export function mapFromAllMapsDto(dto: dtos.AllMapsDto): types.AllMaps {
export function mapFromComplexKeyMapADto(
dto: dtos.ComplexKeyMapADto,
): types.ComplexKeyMapA {
return Object.keys(dto).reduce((acc, key) => {
const result: types.ComplexKeyMapA = {};
for (const key of Object.keys(dto)) {
const value = dto[key];
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as types.ComplexKeyMapA);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromCreateWidgetBodyDto(
Expand Down Expand Up @@ -159,13 +161,15 @@ export function mapFromMixedMapDDto(dto: dtos.MixedMapDDto): types.MixedMapD {
}

export function mapFromPureMapADto(dto: dtos.PureMapADto): types.PureMapA {
return Object.keys(dto).reduce((acc, key) => {
const result: types.PureMapA = {};
for (const key of Object.keys(dto)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromExampleMapValueDto(dto[key] as dtos.ExampleMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as types.PureMapA);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromPureMapBDto(dto: dtos.PureMapBDto): types.PureMapB {
Expand All @@ -176,13 +180,15 @@ export function mapFromPureMapBDto(dto: dtos.PureMapBDto): types.PureMapB {
objBuzz: mapFromExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: types.PureMapB = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromExampleMapValueDto(dto[key] as dtos.ExampleMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as types.PureMapB);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromPureMapCDto(dto: dtos.PureMapCDto): types.PureMapC {
Expand All @@ -193,13 +199,15 @@ export function mapFromPureMapCDto(dto: dtos.PureMapCDto): types.PureMapC {
objBuzz: mapFromExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: types.PureMapC = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromExampleMapValueDto(dto[key] as dtos.ExampleMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as types.PureMapC);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromPureMapDDto(dto: dtos.PureMapDDto): types.PureMapD {
Expand Down Expand Up @@ -228,10 +236,12 @@ export function mapToAllMapsDto(obj: types.AllMaps): dtos.AllMapsDto {
export function mapToComplexKeyMapADto(
obj: types.ComplexKeyMapA,
): dtos.ComplexKeyMapADto {
return Object.keys(obj).reduce((acc, key) => {
const result: dtos.ComplexKeyMapADto = {};
for (const key of Object.keys(obj)) {
const value = obj[key];
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as dtos.ComplexKeyMapADto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToExampleMapValueDto(
Expand Down Expand Up @@ -346,13 +356,15 @@ export function mapToMixedMapDDto(obj: types.MixedMapD): dtos.MixedMapDDto {
}

export function mapToPureMapADto(obj: types.PureMapA): dtos.PureMapADto {
return Object.keys(obj).reduce((acc, key) => {
const result: dtos.PureMapADto = {};
for (const key of Object.keys(obj)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToExampleMapValueDto(obj[key] as types.ExampleMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as dtos.PureMapADto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToPureMapBDto(obj: types.PureMapB): dtos.PureMapBDto {
Expand All @@ -363,13 +375,15 @@ export function mapToPureMapBDto(obj: types.PureMapB): dtos.PureMapBDto {
'obj-buzz': mapToExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: dtos.PureMapBDto = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToExampleMapValueDto(obj[key] as types.ExampleMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as dtos.PureMapBDto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToPureMapCDto(obj: types.PureMapC): dtos.PureMapCDto {
Expand All @@ -380,13 +394,15 @@ export function mapToPureMapCDto(obj: types.PureMapC): dtos.PureMapCDto {
'obj-buzz': mapToExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: dtos.PureMapCDto = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToExampleMapValueDto(obj[key] as types.ExampleMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as dtos.PureMapCDto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToPureMapDDto(obj: types.PureMapD): dtos.PureMapDDto {
Expand Down Expand Up @@ -419,13 +435,15 @@ export function mapToWidgetDataDto(obj: types.WidgetData): dtos.WidgetDataDto {
buzz: mapToGizmoMapValueDto(buzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: dtos.WidgetDataDto = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToGizmoMapValueDto(obj[key] as types.GizmoMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as dtos.WidgetDataDto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToWidgetFooDto(obj: types.WidgetFoo): dtos.WidgetFooDto {
Expand Down
72 changes: 45 additions & 27 deletions packages/http-client/src/snapshot/zod/v1/dtos/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ export function mapFromAllMapsDto(dto: dtos.AllMapsDto): types.AllMaps {
export function mapFromComplexKeyMapADto(
dto: dtos.ComplexKeyMapADto,
): types.ComplexKeyMapA {
return Object.keys(dto).reduce((acc, key) => {
const result: types.ComplexKeyMapA = {};
for (const key of Object.keys(dto)) {
const value = dto[key];
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as types.ComplexKeyMapA);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromExampleMapValueDto(
Expand Down Expand Up @@ -177,13 +179,15 @@ export function mapFromMixedMapDDto(dto: dtos.MixedMapDDto): types.MixedMapD {
}

export function mapFromPureMapADto(dto: dtos.PureMapADto): types.PureMapA {
return Object.keys(dto).reduce((acc, key) => {
const result: types.PureMapA = {};
for (const key of Object.keys(dto)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromExampleMapValueDto(dto[key] as dtos.ExampleMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as types.PureMapA);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromPureMapBDto(dto: dtos.PureMapBDto): types.PureMapB {
Expand All @@ -194,13 +198,15 @@ export function mapFromPureMapBDto(dto: dtos.PureMapBDto): types.PureMapB {
objBuzz: mapFromExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: types.PureMapB = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromExampleMapValueDto(dto[key] as dtos.ExampleMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as types.PureMapB);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromPureMapCDto(dto: dtos.PureMapCDto): types.PureMapC {
Expand All @@ -211,13 +217,15 @@ export function mapFromPureMapCDto(dto: dtos.PureMapCDto): types.PureMapC {
objBuzz: mapFromExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: types.PureMapC = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromExampleMapValueDto(dto[key] as dtos.ExampleMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as types.PureMapC);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromPureMapDDto(dto: dtos.PureMapDDto): types.PureMapD {
Expand Down Expand Up @@ -253,13 +261,15 @@ export function mapFromWidgetDataDto(
buzz: mapFromGizmoMapValueDto(buzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: types.WidgetData = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof dto[key] === 'undefined'
? dto[key]
: mapFromGizmoMapValueDto(dto[key] as dtos.GizmoMapValueDto);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as types.WidgetData);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapFromWidgetFooDto(dto: dtos.WidgetFooDto): types.WidgetFoo {
Expand All @@ -286,10 +296,12 @@ export function mapToAllMapsDto(obj: types.AllMaps): dtos.AllMapsDto {
export function mapToComplexKeyMapADto(
obj: types.ComplexKeyMapA,
): dtos.ComplexKeyMapADto {
return Object.keys(obj).reduce((acc, key) => {
const result: dtos.ComplexKeyMapADto = {};
for (const key of Object.keys(obj)) {
const value = obj[key];
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as dtos.ComplexKeyMapADto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToCreateWidgetBodyDto(
Expand Down Expand Up @@ -386,13 +398,15 @@ export function mapToMixedMapDDto(obj: types.MixedMapD): dtos.MixedMapDDto {
}

export function mapToPureMapADto(obj: types.PureMapA): dtos.PureMapADto {
return Object.keys(obj).reduce((acc, key) => {
const result: dtos.PureMapADto = {};
for (const key of Object.keys(obj)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToExampleMapValueDto(obj[key] as types.ExampleMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, {} as dtos.PureMapADto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToPureMapBDto(obj: types.PureMapB): dtos.PureMapBDto {
Expand All @@ -403,13 +417,15 @@ export function mapToPureMapBDto(obj: types.PureMapB): dtos.PureMapBDto {
'obj-buzz': mapToExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: dtos.PureMapBDto = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToExampleMapValueDto(obj[key] as types.ExampleMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as dtos.PureMapBDto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToPureMapCDto(obj: types.PureMapC): dtos.PureMapCDto {
Expand All @@ -420,13 +436,15 @@ export function mapToPureMapCDto(obj: types.PureMapC): dtos.PureMapCDto {
'obj-buzz': mapToExampleMapValueDto(objBuzz),
});

return Object.keys(__rest__).reduce((acc, key) => {
const result: dtos.PureMapCDto = __defined__;
for (const key of Object.keys(__rest__)) {
const value =
typeof obj[key] === 'undefined'
? obj[key]
: mapToExampleMapValueDto(obj[key] as types.ExampleMapValue);
return value === undefined ? acc : { ...acc, [key]: value };
}, __defined__ as dtos.PureMapCDto);
if (value !== undefined) result[key] = value;
}
return result;
}

export function mapToPureMapDDto(obj: types.PureMapD): dtos.PureMapDDto {
Expand Down
12 changes: 8 additions & 4 deletions packages/typescript-dtos/src/mapper-factory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ export class ExpressMapperFactory extends BaseFactory {
mode,
).input;

// TODO: remove O(n²) call to reduce
yield ``;
yield `return Object.keys(__rest__).reduce((acc, key) => {`;
yield `const value = ${this.builder.buildValue(mapProperties.value.value, mode, `${paramName}[key]`, asType)};`;
Expand Down Expand Up @@ -350,10 +351,12 @@ export class ExpressMapperFactory extends BaseFactory {
const initialObj = destructure ? '__defined__' : '{}';

yield ``;
yield `return Object.keys(${sourceName}).reduce((acc, key) => {`;
yield `const value = ${this.builder.buildValue(mapProperties.value.value, mode, `${paramName}[key]`, asType)};`;
yield `return value === undefined ? acc : { ...acc, [key]: value };`;
yield `}, ${initialObj} as ${this.buildTypeNames(type.name.value, mode).output});`;
yield `const result: ${this.buildTypeNames(type.name.value, mode).output} = ${initialObj};`;
yield `for (const key of Object.keys(${sourceName})) {`;
yield ` const value = ${this.builder.buildValue(mapProperties.value.value, mode, `${paramName}[key]`, asType)};`;
yield ` if (value !== undefined) result[key] = value;`;
yield `}`;
yield `return result;`;
}
}

Expand Down Expand Up @@ -716,6 +719,7 @@ export class ExpressMapperFactory extends BaseFactory {
this._needsCompact = true;
}
private *buildCompact(): Iterable<string> {
// TODO: remove O(n²) call to reduce
if (this._needsCompact) {
yield `function compact<T extends object>(obj: T): T {
return Object.keys(obj).reduce((acc, key) => {
Expand Down