From ce797b8be02b90a39fb0071d741d8fe38769af49 Mon Sep 17 00:00:00 2001 From: Alberto Ricart Date: Thu, 8 Apr 2021 19:19:11 -0500 Subject: [PATCH] remove use of nullish operator as react-create-app will fail to build --- nats-base-client/jsbaseclient_api.ts | 2 +- nats-base-client/jsclient.ts | 28 ++++++++++++++-------------- nats-base-client/jsmsg.ts | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nats-base-client/jsbaseclient_api.ts b/nats-base-client/jsbaseclient_api.ts index b771516f..3aab95f9 100644 --- a/nats-base-client/jsbaseclient_api.ts +++ b/nats-base-client/jsbaseclient_api.ts @@ -32,7 +32,7 @@ const defaultPrefix = "$JS.API"; const defaultTimeout = 5000; export function defaultJsOptions(opts?: JetStreamOptions): JetStreamOptions { - opts = opts ?? {} as JetStreamOptions; + opts = opts || {} as JetStreamOptions; return extend({ apiPrefix: defaultPrefix, timeout: defaultTimeout }, opts); } diff --git a/nats-base-client/jsclient.ts b/nats-base-client/jsclient.ts index b7c7f22d..781ab6f2 100644 --- a/nats-base-client/jsclient.ts +++ b/nats-base-client/jsclient.ts @@ -86,9 +86,9 @@ export class JetStreamClientImpl extends BaseApiClient data: Uint8Array = Empty, opts?: Partial, ): Promise { - opts = opts ?? {}; - opts.expect = opts.expect ?? {}; - const mh = opts?.headers ?? headers(); + opts = opts || {}; + opts.expect = opts.expect || {}; + const mh = opts?.headers || headers(); if (opts) { if (opts.msgID) { mh.set(PubHeaders.MsgIdHdr, opts.msgID); @@ -104,7 +104,7 @@ export class JetStreamClientImpl extends BaseApiClient } } - const to = opts.timeout ?? this.timeout; + const to = opts.timeout || this.timeout; const ro = {} as RequestOptions; if (to) { ro.timeout = to; @@ -159,9 +159,9 @@ export class JetStreamClientImpl extends BaseApiClient let timer: Timeout | null = null; const args: Partial = {}; - args.batch = opts.batch ?? 1; - args.no_wait = opts.no_wait ?? false; - const expires = opts.expires ?? 0; + args.batch = opts.batch || 1; + args.no_wait = opts.no_wait || false; + const expires = opts.expires || 0; if (expires) { args.expires = nanos(expires); } @@ -321,7 +321,7 @@ export class JetStreamClientImpl extends BaseApiClient : opts) as JetStreamSubscriptionInfo; jsi.api = this; - jsi.config = jsi.config ?? {} as ConsumerConfig; + jsi.config = jsi.config || {} as ConsumerConfig; jsi.stream = jsi.stream ? jsi.stream : await this.findStream(subject); jsi.attached = false; @@ -351,7 +351,7 @@ export class JetStreamClientImpl extends BaseApiClient // createInbox(this.nc.options.inboxPrefix); } - jsi.deliver = jsi.config.deliver_subject ?? + jsi.deliver = jsi.config.deliver_subject || createInbox(this.nc.options.inboxPrefix); return jsi; @@ -368,7 +368,7 @@ export class JetStreamClientImpl extends BaseApiClient if (!jsi.mack) { so.dispatchedFn = autoAckJsMsg; } - so.max = jsi.max ?? 0; + so.max = jsi.max || 0; return so; } @@ -412,14 +412,14 @@ class JetStreamSubscriptionImpl extends TypedSubscription await this.drain(); } const jinfo = this.sub.info as JetStreamSubscriptionInfo; - const name = jinfo.config.durable_name ?? jinfo.name; + const name = jinfo.config.durable_name || jinfo.name; const subj = `${jinfo.api.prefix}.CONSUMER.DELETE.${jinfo.stream}.${name}`; await jinfo.api._request(subj); } async consumerInfo(): Promise { const jinfo = this.sub.info as JetStreamSubscriptionInfo; - const name = jinfo.config.durable_name ?? jinfo.name; + const name = jinfo.config.durable_name || jinfo.name; const subj = `${jinfo.api.prefix}.CONSUMER.INFO.${jinfo.stream}.${name}`; return await jinfo.api._request(subj) as ConsumerInfo; } @@ -438,8 +438,8 @@ class JetStreamPullSubscriptionImpl extends JetStreamSubscriptionImpl const { stream, config } = this.sub.info as JetStreamSubscriptionInfo; const consumer = config.durable_name; const args: Partial = {}; - args.batch = opts.batch ?? 1; - args.no_wait = opts.no_wait ?? false; + args.batch = opts.batch || 1; + args.no_wait = opts.no_wait || false; // FIXME: this is nanos if (opts.expires && opts.expires > 0) { args.expires = opts.expires; diff --git a/nats-base-client/jsmsg.ts b/nats-base-client/jsmsg.ts index 2ee2af7c..c5f6b8e2 100644 --- a/nats-base-client/jsmsg.ts +++ b/nats-base-client/jsmsg.ts @@ -92,7 +92,7 @@ class JsMsgImpl implements JsMsg { } get reply(): string { - return this.msg.reply ?? ""; + return this.msg.reply || ""; } get seq(): number {