Skip to content

Commit

Permalink
fix: Add 'as any' in create (#895)
Browse files Browse the repository at this point in the history 
* fix: Add 'as any' to create.

This should fix #838 which I believe only happens in complicated
schemas.

* Recodegen.
  • Loading branch information
@stephenh
stephenh authored Jul 29, 2023
1 parent bf6b51a commit 4214d5a
Show file tree
Hide file tree
Showing 156 changed files with 510 additions and 1,035 deletions.
3 changes: 1 addition & 2 deletions integration/angular/simple-message.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ export const SimpleMessage = {
},

create<I extends Exact<DeepPartial<SimpleMessage>, I>>(base?: I): SimpleMessage {
return SimpleMessage.fromPartial(base ?? {});
return SimpleMessage.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<SimpleMessage>, I>>(object: I): SimpleMessage {
const message = createBaseSimpleMessage();
message.numberField = object.numberField ?? 0;
Expand Down
3 changes: 1 addition & 2 deletions integration/async-iterable-services-abort-signal/simple.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ export const EchoMsg = {
},

create<I extends Exact<DeepPartial<EchoMsg>, I>>(base?: I): EchoMsg {
return EchoMsg.fromPartial(base ?? {});
return EchoMsg.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<EchoMsg>, I>>(object: I): EchoMsg {
const message = createBaseEchoMsg();
message.body = object.body ?? "";
Expand Down
3 changes: 1 addition & 2 deletions integration/async-iterable-services/simple.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,8 @@ export const EchoMsg = {
},

create<I extends Exact<DeepPartial<EchoMsg>, I>>(base?: I): EchoMsg {
return EchoMsg.fromPartial(base ?? {});
return EchoMsg.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<EchoMsg>, I>>(object: I): EchoMsg {
const message = createBaseEchoMsg();
message.body = object.body ?? "";
Expand Down
12 changes: 4 additions & 8 deletions integration/avoid-import-conflicts/simple.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ export const Simple = {
},

create<I extends Exact<DeepPartial<Simple>, I>>(base?: I): Simple {
return Simple.fromPartial(base ?? {});
return Simple.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<Simple>, I>>(object: I): Simple {
const message = createBaseSimple();
message.name = object.name ?? "";
Expand Down Expand Up @@ -210,9 +209,8 @@ export const SimpleEnums = {
},

create<I extends Exact<DeepPartial<SimpleEnums>, I>>(base?: I): SimpleEnums {
return SimpleEnums.fromPartial(base ?? {});
return SimpleEnums.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<SimpleEnums>, I>>(object: I): SimpleEnums {
const message = createBaseSimpleEnums();
message.localEnum = object.localEnum ?? 0;
Expand Down Expand Up @@ -269,9 +267,8 @@ export const FooServiceCreateRequest = {
},

create<I extends Exact<DeepPartial<FooServiceCreateRequest>, I>>(base?: I): FooServiceCreateRequest {
return FooServiceCreateRequest.fromPartial(base ?? {});
return FooServiceCreateRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<FooServiceCreateRequest>, I>>(object: I): FooServiceCreateRequest {
const message = createBaseFooServiceCreateRequest();
message.kind = object.kind ?? 0;
Expand Down Expand Up @@ -327,9 +324,8 @@ export const FooServiceCreateResponse = {
},

create<I extends Exact<DeepPartial<FooServiceCreateResponse>, I>>(base?: I): FooServiceCreateResponse {
return FooServiceCreateResponse.fromPartial(base ?? {});
return FooServiceCreateResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<FooServiceCreateResponse>, I>>(object: I): FooServiceCreateResponse {
const message = createBaseFooServiceCreateResponse();
message.kind = object.kind ?? 0;
Expand Down
3 changes: 1 addition & 2 deletions integration/avoid-import-conflicts/simple2.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,8 @@ export const Simple = {
},

create<I extends Exact<DeepPartial<Simple>, I>>(base?: I): Simple {
return Simple.fromPartial(base ?? {});
return Simple.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<Simple>, I>>(object: I): Simple {
const message = createBaseSimple();
message.name = object.name ?? "";
Expand Down
3 changes: 1 addition & 2 deletions integration/barrel-imports/bar.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ export const Bar = {
},

create<I extends Exact<DeepPartial<Bar>, I>>(base?: I): Bar {
return Bar.fromPartial(base ?? {});
return Bar.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<Bar>, I>>(object: I): Bar {
const message = createBaseBar();
message.name = object.name ?? "";
Expand Down
3 changes: 1 addition & 2 deletions integration/barrel-imports/foo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ export const Foo = {
},

create<I extends Exact<DeepPartial<Foo>, I>>(base?: I): Foo {
return Foo.fromPartial(base ?? {});
return Foo.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<Foo>, I>>(object: I): Foo {
const message = createBaseFoo();
message.name = object.name ?? "";
Expand Down
30 changes: 10 additions & 20 deletions integration/batching-with-context-esModuleInterop/batching.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ export const BatchQueryRequest = {
},

create<I extends Exact<DeepPartial<BatchQueryRequest>, I>>(base?: I): BatchQueryRequest {
return BatchQueryRequest.fromPartial(base ?? {});
return BatchQueryRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchQueryRequest>, I>>(object: I): BatchQueryRequest {
const message = createBaseBatchQueryRequest();
message.ids = object.ids?.map((e) => e) || [];
Expand Down Expand Up @@ -152,9 +151,8 @@ export const BatchQueryResponse = {
},

create<I extends Exact<DeepPartial<BatchQueryResponse>, I>>(base?: I): BatchQueryResponse {
return BatchQueryResponse.fromPartial(base ?? {});
return BatchQueryResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchQueryResponse>, I>>(object: I): BatchQueryResponse {
const message = createBaseBatchQueryResponse();
message.entities = object.entities?.map((e) => Entity.fromPartial(e)) || [];
Expand Down Expand Up @@ -210,9 +208,8 @@ export const BatchMapQueryRequest = {
},

create<I extends Exact<DeepPartial<BatchMapQueryRequest>, I>>(base?: I): BatchMapQueryRequest {
return BatchMapQueryRequest.fromPartial(base ?? {});
return BatchMapQueryRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchMapQueryRequest>, I>>(object: I): BatchMapQueryRequest {
const message = createBaseBatchMapQueryRequest();
message.ids = object.ids?.map((e) => e) || [];
Expand Down Expand Up @@ -284,9 +281,8 @@ export const BatchMapQueryResponse = {
},

create<I extends Exact<DeepPartial<BatchMapQueryResponse>, I>>(base?: I): BatchMapQueryResponse {
return BatchMapQueryResponse.fromPartial(base ?? {});
return BatchMapQueryResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchMapQueryResponse>, I>>(object: I): BatchMapQueryResponse {
const message = createBaseBatchMapQueryResponse();
message.entities = Object.entries(object.entities ?? {}).reduce<{ [key: string]: Entity }>((acc, [key, value]) => {
Expand Down Expand Up @@ -365,9 +361,8 @@ export const BatchMapQueryResponse_EntitiesEntry = {
create<I extends Exact<DeepPartial<BatchMapQueryResponse_EntitiesEntry>, I>>(
base?: I,
): BatchMapQueryResponse_EntitiesEntry {
return BatchMapQueryResponse_EntitiesEntry.fromPartial(base ?? {});
return BatchMapQueryResponse_EntitiesEntry.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchMapQueryResponse_EntitiesEntry>, I>>(
object: I,
): BatchMapQueryResponse_EntitiesEntry {
Expand Down Expand Up @@ -428,9 +423,8 @@ export const GetOnlyMethodRequest = {
},

create<I extends Exact<DeepPartial<GetOnlyMethodRequest>, I>>(base?: I): GetOnlyMethodRequest {
return GetOnlyMethodRequest.fromPartial(base ?? {});
return GetOnlyMethodRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<GetOnlyMethodRequest>, I>>(object: I): GetOnlyMethodRequest {
const message = createBaseGetOnlyMethodRequest();
message.id = object.id ?? "";
Expand Down Expand Up @@ -486,9 +480,8 @@ export const GetOnlyMethodResponse = {
},

create<I extends Exact<DeepPartial<GetOnlyMethodResponse>, I>>(base?: I): GetOnlyMethodResponse {
return GetOnlyMethodResponse.fromPartial(base ?? {});
return GetOnlyMethodResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<GetOnlyMethodResponse>, I>>(object: I): GetOnlyMethodResponse {
const message = createBaseGetOnlyMethodResponse();
message.entity = (object.entity !== undefined && object.entity !== null)
Expand Down Expand Up @@ -546,9 +539,8 @@ export const WriteMethodRequest = {
},

create<I extends Exact<DeepPartial<WriteMethodRequest>, I>>(base?: I): WriteMethodRequest {
return WriteMethodRequest.fromPartial(base ?? {});
return WriteMethodRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<WriteMethodRequest>, I>>(object: I): WriteMethodRequest {
const message = createBaseWriteMethodRequest();
message.id = object.id ?? "";
Expand Down Expand Up @@ -591,9 +583,8 @@ export const WriteMethodResponse = {
},

create<I extends Exact<DeepPartial<WriteMethodResponse>, I>>(base?: I): WriteMethodResponse {
return WriteMethodResponse.fromPartial(base ?? {});
return WriteMethodResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<WriteMethodResponse>, I>>(_: I): WriteMethodResponse {
const message = createBaseWriteMethodResponse();
return message;
Expand Down Expand Up @@ -661,9 +652,8 @@ export const Entity = {
},

create<I extends Exact<DeepPartial<Entity>, I>>(base?: I): Entity {
return Entity.fromPartial(base ?? {});
return Entity.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<Entity>, I>>(object: I): Entity {
const message = createBaseEntity();
message.id = object.id ?? "";
Expand Down
30 changes: 10 additions & 20 deletions integration/batching-with-context/batching.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ export const BatchQueryRequest = {
},

create<I extends Exact<DeepPartial<BatchQueryRequest>, I>>(base?: I): BatchQueryRequest {
return BatchQueryRequest.fromPartial(base ?? {});
return BatchQueryRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchQueryRequest>, I>>(object: I): BatchQueryRequest {
const message = createBaseBatchQueryRequest();
message.ids = object.ids?.map((e) => e) || [];
Expand Down Expand Up @@ -152,9 +151,8 @@ export const BatchQueryResponse = {
},

create<I extends Exact<DeepPartial<BatchQueryResponse>, I>>(base?: I): BatchQueryResponse {
return BatchQueryResponse.fromPartial(base ?? {});
return BatchQueryResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchQueryResponse>, I>>(object: I): BatchQueryResponse {
const message = createBaseBatchQueryResponse();
message.entities = object.entities?.map((e) => Entity.fromPartial(e)) || [];
Expand Down Expand Up @@ -210,9 +208,8 @@ export const BatchMapQueryRequest = {
},

create<I extends Exact<DeepPartial<BatchMapQueryRequest>, I>>(base?: I): BatchMapQueryRequest {
return BatchMapQueryRequest.fromPartial(base ?? {});
return BatchMapQueryRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchMapQueryRequest>, I>>(object: I): BatchMapQueryRequest {
const message = createBaseBatchMapQueryRequest();
message.ids = object.ids?.map((e) => e) || [];
Expand Down Expand Up @@ -284,9 +281,8 @@ export const BatchMapQueryResponse = {
},

create<I extends Exact<DeepPartial<BatchMapQueryResponse>, I>>(base?: I): BatchMapQueryResponse {
return BatchMapQueryResponse.fromPartial(base ?? {});
return BatchMapQueryResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchMapQueryResponse>, I>>(object: I): BatchMapQueryResponse {
const message = createBaseBatchMapQueryResponse();
message.entities = Object.entries(object.entities ?? {}).reduce<{ [key: string]: Entity }>((acc, [key, value]) => {
Expand Down Expand Up @@ -365,9 +361,8 @@ export const BatchMapQueryResponse_EntitiesEntry = {
create<I extends Exact<DeepPartial<BatchMapQueryResponse_EntitiesEntry>, I>>(
base?: I,
): BatchMapQueryResponse_EntitiesEntry {
return BatchMapQueryResponse_EntitiesEntry.fromPartial(base ?? {});
return BatchMapQueryResponse_EntitiesEntry.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<BatchMapQueryResponse_EntitiesEntry>, I>>(
object: I,
): BatchMapQueryResponse_EntitiesEntry {
Expand Down Expand Up @@ -428,9 +423,8 @@ export const GetOnlyMethodRequest = {
},

create<I extends Exact<DeepPartial<GetOnlyMethodRequest>, I>>(base?: I): GetOnlyMethodRequest {
return GetOnlyMethodRequest.fromPartial(base ?? {});
return GetOnlyMethodRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<GetOnlyMethodRequest>, I>>(object: I): GetOnlyMethodRequest {
const message = createBaseGetOnlyMethodRequest();
message.id = object.id ?? "";
Expand Down Expand Up @@ -486,9 +480,8 @@ export const GetOnlyMethodResponse = {
},

create<I extends Exact<DeepPartial<GetOnlyMethodResponse>, I>>(base?: I): GetOnlyMethodResponse {
return GetOnlyMethodResponse.fromPartial(base ?? {});
return GetOnlyMethodResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<GetOnlyMethodResponse>, I>>(object: I): GetOnlyMethodResponse {
const message = createBaseGetOnlyMethodResponse();
message.entity = (object.entity !== undefined && object.entity !== null)
Expand Down Expand Up @@ -546,9 +539,8 @@ export const WriteMethodRequest = {
},

create<I extends Exact<DeepPartial<WriteMethodRequest>, I>>(base?: I): WriteMethodRequest {
return WriteMethodRequest.fromPartial(base ?? {});
return WriteMethodRequest.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<WriteMethodRequest>, I>>(object: I): WriteMethodRequest {
const message = createBaseWriteMethodRequest();
message.id = object.id ?? "";
Expand Down Expand Up @@ -591,9 +583,8 @@ export const WriteMethodResponse = {
},

create<I extends Exact<DeepPartial<WriteMethodResponse>, I>>(base?: I): WriteMethodResponse {
return WriteMethodResponse.fromPartial(base ?? {});
return WriteMethodResponse.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<WriteMethodResponse>, I>>(_: I): WriteMethodResponse {
const message = createBaseWriteMethodResponse();
return message;
Expand Down Expand Up @@ -661,9 +652,8 @@ export const Entity = {
},

create<I extends Exact<DeepPartial<Entity>, I>>(base?: I): Entity {
return Entity.fromPartial(base ?? {});
return Entity.fromPartial(base ?? ({} as any));
},

fromPartial<I extends Exact<DeepPartial<Entity>, I>>(object: I): Entity {
const message = createBaseEntity();
message.id = object.id ?? "";
Expand Down
Loading

0 comments on commit 4214d5a

Please sign in to comment.