From 7adb51a9cc265f1f86013caa57b9c7932d328370 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jan 2022 03:41:02 +0000 Subject: [PATCH] Bump ts-proto from 1.97.0 to 1.100.0 Bumps [ts-proto](https://github.com/stephenh/ts-proto) from 1.97.0 to 1.100.0. - [Release notes](https://github.com/stephenh/ts-proto/releases) - [Changelog](https://github.com/stephenh/ts-proto/blob/main/CHANGELOG.md) - [Commits](https://github.com/stephenh/ts-proto/compare/v1.97.0...v1.100.0) --- updated-dependencies: - dependency-name: ts-proto dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++-- src/proto/waku/v2/light_push.ts | 51 ++++++-------- src/proto/waku/v2/message.ts | 28 ++++---- src/proto/waku/v2/store.ts | 120 +++++++++++++------------------- 4 files changed, 86 insertions(+), 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index 78b7129fb3..645031b037 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16533,9 +16533,9 @@ } }, "node_modules/ts-proto": { - "version": "1.97.0", - "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.97.0.tgz", - "integrity": "sha512-GrECiLTy5POpIZehd7r8lsnrBz1QqG9Sfr3x4ytbz7YRjSjMZeBIG3LI2gW0KtIL1VrUTJic3wV61PR5i7AaQQ==", + "version": "1.100.0", + "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.100.0.tgz", + "integrity": "sha512-D3E9wbgzzRlMGgy0RfCdibce7P9XPqFSXat48fzKd0DceBYS0fdBDYfgirJmQzLG0G/4SZZm6Poj2RtkJz3uVw==", "dev": true, "dependencies": { "@types/object-hash": "^1.3.0", @@ -30816,9 +30816,9 @@ } }, "ts-proto": { - "version": "1.97.0", - "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.97.0.tgz", - "integrity": "sha512-GrECiLTy5POpIZehd7r8lsnrBz1QqG9Sfr3x4ytbz7YRjSjMZeBIG3LI2gW0KtIL1VrUTJic3wV61PR5i7AaQQ==", + "version": "1.100.0", + "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.100.0.tgz", + "integrity": "sha512-D3E9wbgzzRlMGgy0RfCdibce7P9XPqFSXat48fzKd0DceBYS0fdBDYfgirJmQzLG0G/4SZZm6Poj2RtkJz3uVw==", "dev": true, "requires": { "@types/object-hash": "^1.3.0", diff --git a/src/proto/waku/v2/light_push.ts b/src/proto/waku/v2/light_push.ts index 59a44e7fe2..dfb539d1d3 100644 --- a/src/proto/waku/v2/light_push.ts +++ b/src/proto/waku/v2/light_push.ts @@ -61,16 +61,12 @@ export const PushRequest = { }, fromJSON(object: any): PushRequest { - const message = createBasePushRequest(); - message.pubSubTopic = - object.pubSubTopic !== undefined && object.pubSubTopic !== null - ? String(object.pubSubTopic) - : ''; - message.message = - object.message !== undefined && object.message !== null + return { + pubSubTopic: isSet(object.pubSubTopic) ? String(object.pubSubTopic) : '', + message: isSet(object.message) ? WakuMessage.fromJSON(object.message) - : undefined; - return message; + : undefined, + }; }, toJSON(message: PushRequest): unknown { @@ -137,16 +133,10 @@ export const PushResponse = { }, fromJSON(object: any): PushResponse { - const message = createBasePushResponse(); - message.isSuccess = - object.isSuccess !== undefined && object.isSuccess !== null - ? Boolean(object.isSuccess) - : false; - message.info = - object.info !== undefined && object.info !== null - ? String(object.info) - : ''; - return message; + return { + isSuccess: isSet(object.isSuccess) ? Boolean(object.isSuccess) : false, + info: isSet(object.info) ? String(object.info) : '', + }; }, toJSON(message: PushResponse): unknown { @@ -212,20 +202,15 @@ export const PushRPC = { }, fromJSON(object: any): PushRPC { - const message = createBasePushRPC(); - message.requestId = - object.requestId !== undefined && object.requestId !== null - ? String(object.requestId) - : ''; - message.request = - object.request !== undefined && object.request !== null + return { + requestId: isSet(object.requestId) ? String(object.requestId) : '', + request: isSet(object.request) ? PushRequest.fromJSON(object.request) - : undefined; - message.response = - object.response !== undefined && object.response !== null + : undefined, + response: isSet(object.response) ? PushResponse.fromJSON(object.response) - : undefined; - return message; + : undefined, + }; }, toJSON(message: PushRPC): unknown { @@ -288,3 +273,7 @@ if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); } + +function isSet(value: any): boolean { + return value !== null && value !== undefined; +} diff --git a/src/proto/waku/v2/message.ts b/src/proto/waku/v2/message.ts index 361448ee7d..096587f818 100644 --- a/src/proto/waku/v2/message.ts +++ b/src/proto/waku/v2/message.ts @@ -68,24 +68,16 @@ export const WakuMessage = { }, fromJSON(object: any): WakuMessage { - const message = createBaseWakuMessage(); - message.payload = - object.payload !== undefined && object.payload !== null + return { + payload: isSet(object.payload) ? bytesFromBase64(object.payload) - : undefined; - message.contentTopic = - object.contentTopic !== undefined && object.contentTopic !== null + : undefined, + contentTopic: isSet(object.contentTopic) ? String(object.contentTopic) - : undefined; - message.version = - object.version !== undefined && object.version !== null - ? Number(object.version) - : undefined; - message.timestamp = - object.timestamp !== undefined && object.timestamp !== null - ? Number(object.timestamp) - : undefined; - return message; + : undefined, + version: isSet(object.version) ? Number(object.version) : undefined, + timestamp: isSet(object.timestamp) ? Number(object.timestamp) : undefined, + }; }, toJSON(message: WakuMessage): unknown { @@ -180,3 +172,7 @@ if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); } + +function isSet(value: any): boolean { + return value !== null && value !== undefined; +} diff --git a/src/proto/waku/v2/store.ts b/src/proto/waku/v2/store.ts index 71e513e611..0aea9b295a 100644 --- a/src/proto/waku/v2/store.ts +++ b/src/proto/waku/v2/store.ts @@ -156,20 +156,15 @@ export const Index = { }, fromJSON(object: any): Index { - const message = createBaseIndex(); - message.digest = - object.digest !== undefined && object.digest !== null + return { + digest: isSet(object.digest) ? bytesFromBase64(object.digest) - : new Uint8Array(); - message.receivedTime = - object.receivedTime !== undefined && object.receivedTime !== null + : new Uint8Array(), + receivedTime: isSet(object.receivedTime) ? Number(object.receivedTime) - : 0; - message.senderTime = - object.senderTime !== undefined && object.senderTime !== null - ? Number(object.senderTime) - : 0; - return message; + : 0, + senderTime: isSet(object.senderTime) ? Number(object.senderTime) : 0, + }; }, toJSON(message: Index): unknown { @@ -239,20 +234,13 @@ export const PagingInfo = { }, fromJSON(object: any): PagingInfo { - const message = createBasePagingInfo(); - message.pageSize = - object.pageSize !== undefined && object.pageSize !== null - ? Number(object.pageSize) - : 0; - message.cursor = - object.cursor !== undefined && object.cursor !== null - ? Index.fromJSON(object.cursor) - : undefined; - message.direction = - object.direction !== undefined && object.direction !== null + return { + pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, + cursor: isSet(object.cursor) ? Index.fromJSON(object.cursor) : undefined, + direction: isSet(object.direction) ? pagingInfo_DirectionFromJSON(object.direction) - : 0; - return message; + : 0, + }; }, toJSON(message: PagingInfo): unknown { @@ -314,12 +302,11 @@ export const ContentFilter = { }, fromJSON(object: any): ContentFilter { - const message = createBaseContentFilter(); - message.contentTopic = - object.contentTopic !== undefined && object.contentTopic !== null + return { + contentTopic: isSet(object.contentTopic) ? String(object.contentTopic) - : ''; - return message; + : '', + }; }, toJSON(message: ContentFilter): unknown { @@ -404,27 +391,19 @@ export const HistoryQuery = { }, fromJSON(object: any): HistoryQuery { - const message = createBaseHistoryQuery(); - message.pubSubTopic = - object.pubSubTopic !== undefined && object.pubSubTopic !== null + return { + pubSubTopic: isSet(object.pubSubTopic) ? String(object.pubSubTopic) - : undefined; - message.contentFilters = (object.contentFilters ?? []).map((e: any) => - ContentFilter.fromJSON(e) - ); - message.pagingInfo = - object.pagingInfo !== undefined && object.pagingInfo !== null + : undefined, + contentFilters: Array.isArray(object?.contentFilters) + ? object.contentFilters.map((e: any) => ContentFilter.fromJSON(e)) + : [], + pagingInfo: isSet(object.pagingInfo) ? PagingInfo.fromJSON(object.pagingInfo) - : undefined; - message.startTime = - object.startTime !== undefined && object.startTime !== null - ? Number(object.startTime) - : undefined; - message.endTime = - object.endTime !== undefined && object.endTime !== null - ? Number(object.endTime) - : undefined; - return message; + : undefined, + startTime: isSet(object.startTime) ? Number(object.startTime) : undefined, + endTime: isSet(object.endTime) ? Number(object.endTime) : undefined, + }; }, toJSON(message: HistoryQuery): unknown { @@ -510,19 +489,17 @@ export const HistoryResponse = { }, fromJSON(object: any): HistoryResponse { - const message = createBaseHistoryResponse(); - message.messages = (object.messages ?? []).map((e: any) => - WakuMessage.fromJSON(e) - ); - message.pagingInfo = - object.pagingInfo !== undefined && object.pagingInfo !== null + return { + messages: Array.isArray(object?.messages) + ? object.messages.map((e: any) => WakuMessage.fromJSON(e)) + : [], + pagingInfo: isSet(object.pagingInfo) ? PagingInfo.fromJSON(object.pagingInfo) - : undefined; - message.error = - object.error !== undefined && object.error !== null + : undefined, + error: isSet(object.error) ? historyResponse_ErrorFromJSON(object.error) - : 0; - return message; + : 0, + }; }, toJSON(message: HistoryResponse): unknown { @@ -607,20 +584,15 @@ export const HistoryRPC = { }, fromJSON(object: any): HistoryRPC { - const message = createBaseHistoryRPC(); - message.requestId = - object.requestId !== undefined && object.requestId !== null - ? String(object.requestId) - : ''; - message.query = - object.query !== undefined && object.query !== null + return { + requestId: isSet(object.requestId) ? String(object.requestId) : '', + query: isSet(object.query) ? HistoryQuery.fromJSON(object.query) - : undefined; - message.response = - object.response !== undefined && object.response !== null + : undefined, + response: isSet(object.response) ? HistoryResponse.fromJSON(object.response) - : undefined; - return message; + : undefined, + }; }, toJSON(message: HistoryRPC): unknown { @@ -726,3 +698,7 @@ if (_m0.util.Long !== Long) { _m0.util.Long = Long as any; _m0.configure(); } + +function isSet(value: any): boolean { + return value !== null && value !== undefined; +}