Skip to content

Commit 8401a47

Browse files
dcodeIOdcodeIO
committed
Other: Shortened !== undefined && !== null to equivalent != null in static code
1 parent afefa3d commit 8401a47

9 files changed

Lines changed: 793 additions & 798 deletions

File tree

‎src/converter.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ converter.fromObject = function fromObject(mtype) {
133133
// Non-repeated fields
134134
} else {
135135
if (!(field.resolvedType instanceof Enum)) gen // no need to test for null/undefined if an enum (uses switch)
136-
("if(d%s!==undefined&&d%s!==null){", prop, prop);
136+
("if(d%s!=null){", prop); // !== undefined && !== null
137137
genValuePartial_fromObject(gen, field, /* not sorted */ i, prop);
138138
if (!(field.resolvedType instanceof Enum)) gen
139139
("}");
@@ -268,7 +268,7 @@ converter.toObject = function toObject(mtype) {
268268
genValuePartial_toObject(gen, field, /* sorted */ index, prop + "[j]")
269269
("}");
270270
} else { gen
271-
("if(m%s!==undefined&&m%s!==null&&m.hasOwnProperty(%j)){", prop, prop, field.name);
271+
("if(m%s!=null&&m.hasOwnProperty(%j)){", prop, field.name); // !== undefined && !== null
272272
genValuePartial_toObject(gen, field, /* sorted */ index, prop);
273273
if (field.partOf) gen
274274
("if(o.oneofs)")

‎src/encoder.js‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,43 +57,38 @@ function encoder(mtype) {
5757
("}")
5858
("}");
5959

60-
// Repeated fields
61-
} else if (field.repeated) {
60+
// Repeated fields
61+
} else if (field.repeated) { gen
62+
("if(%s&&%s.length&&m.hasOwnProperty(%j)){", ref, ref, field.name);
6263

6364
// Packed repeated
6465
if (field.packed && types.packed[type] !== undefined) { gen
6566

66-
("if(%s&&%s.length&&m.hasOwnProperty(%j)){", ref, ref, field.name)
6767
("w.uint32(%d).fork()", (field.id << 3 | 2) >>> 0)
6868
("for(var i=0;i<%s.length;++i)", ref)
6969
("w.%s(%s[i])", type, ref)
70-
("w.ldelim()")
71-
("}");
70+
("w.ldelim()");
7271

7372
// Non-packed
7473
} else { gen
7574

76-
("if(%s!==undefined&&m.hasOwnProperty(%j)){", ref, field.name)
7775
("for(var i=0;i<%s.length;++i)", ref);
7876
if (wireType === undefined)
7977
genTypePartial(gen, field, index, ref + "[i]");
8078
else gen
8179
("w.uint32(%d).%s(%s[i])", (field.id << 3 | wireType) >>> 0, type, ref);
82-
gen
83-
("}");
8480

85-
}
81+
} gen
82+
("}");
8683

8784
// Non-repeated
8885
} else {
89-
if (!field.required) {
86+
if (field.optional) {
9087

91-
if (field.long) gen
92-
("if(%s!==undefined&&%s!==null&&m.hasOwnProperty(%j))", ref, ref, field.name);
93-
else if (field.bytes || field.resolvedType && !(field.resolvedType instanceof Enum)) gen
88+
if (field.bytes || field.resolvedType && !(field.resolvedType instanceof Enum)) gen
9489
("if(%s&&m.hasOwnProperty(%j))", ref, field.name);
9590
else gen
96-
("if(%s!==undefined&&%s!==null&&m.hasOwnProperty(%j))", ref, ref, field.name);
91+
("if(%s!=null&&m.hasOwnProperty(%j))", ref, field.name); // !== undefined && !== null
9792

9893
}
9994

‎src/verifier.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ function verifier(mtype) {
132132

133133
// map fields
134134
if (field.map) { gen
135-
("if(%s!==undefined){", ref)
135+
("if(%s!=null){", ref) // !== undefined && !== null
136136
("if(!util.isObject(%s))", ref)
137137
("return%j", invalid(field, "object"))
138138
("var k=Object.keys(%s)", ref)
@@ -144,7 +144,7 @@ function verifier(mtype) {
144144

145145
// repeated fields
146146
} else if (field.repeated) { gen
147-
("if(%s!==undefined){", ref)
147+
("if(%s!=null){", ref) // !== undefined && !== null
148148
("if(!Array.isArray(%s))", ref)
149149
("return%j", invalid(field, "array"))
150150
("for(var i=0;i<%s.length;++i){", ref);
@@ -154,8 +154,8 @@ function verifier(mtype) {
154154

155155
// required or present fields
156156
} else {
157-
if (!field.required) gen
158-
("if(%s!==undefined&&%s!==null){", ref, ref);
157+
if (field.optional) gen
158+
("if(%s!=null){", ref); // !== undefined && !== null
159159
if (field.partOf) {
160160
var oneofProp = util.safeProp(field.partOf.name);
161161
if (seenFirstField[field.partOf.name] === 1) gen
@@ -166,7 +166,7 @@ function verifier(mtype) {
166166
("p%s=1", oneofProp);
167167
}
168168
genVerifyValue(gen, field, i, ref);
169-
if (!field.required) gen
169+
if (field.optional) gen
170170
("}");
171171
}
172172
} return gen

‎tests/data/comments.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ $root.Test1 = (function() {
7070
Test1.encode = function encode(message, writer) {
7171
if (!writer)
7272
writer = $Writer.create();
73-
if (message.field1 !== undefined && message.field1 !== null && message.hasOwnProperty("field1"))
73+
if (message.field1 != null && message.hasOwnProperty("field1"))
7474
writer.uint32(/* id 1, wireType 2 =*/10).string(message.field1);
75-
if (message.field2 !== undefined && message.field2 !== null && message.hasOwnProperty("field2"))
75+
if (message.field2 != null && message.hasOwnProperty("field2"))
7676
writer.uint32(/* id 2, wireType 0 =*/16).uint32(message.field2);
77-
if (message.field3 !== undefined && message.field3 !== null && message.hasOwnProperty("field3"))
77+
if (message.field3 != null && message.hasOwnProperty("field3"))
7878
writer.uint32(/* id 3, wireType 0 =*/24).bool(message.field3);
7979
return writer;
8080
};
@@ -142,13 +142,13 @@ $root.Test1 = (function() {
142142
Test1.verify = function verify(message) {
143143
if (typeof message !== "object" || message === null)
144144
return "object expected";
145-
if (message.field1 !== undefined && message.field1 !== null)
145+
if (message.field1 != null)
146146
if (!$util.isString(message.field1))
147147
return "field1: string expected";
148-
if (message.field2 !== undefined && message.field2 !== null)
148+
if (message.field2 != null)
149149
if (!$util.isInteger(message.field2))
150150
return "field2: integer expected";
151-
if (message.field3 !== undefined && message.field3 !== null)
151+
if (message.field3 != null)
152152
if (typeof message.field3 !== "boolean")
153153
return "field3: boolean expected";
154154
return null;
@@ -163,11 +163,11 @@ $root.Test1 = (function() {
163163
if (object instanceof $root.Test1)
164164
return object;
165165
var message = new $root.Test1();
166-
if (object.field1 !== undefined && object.field1 !== null)
166+
if (object.field1 != null)
167167
message.field1 = String(object.field1);
168-
if (object.field2 !== undefined && object.field2 !== null)
168+
if (object.field2 != null)
169169
message.field2 = object.field2 >>> 0;
170-
if (object.field3 !== undefined && object.field3 !== null)
170+
if (object.field3 != null)
171171
message.field3 = Boolean(object.field3);
172172
return message;
173173
};
@@ -196,11 +196,11 @@ $root.Test1 = (function() {
196196
object.field2 = 0;
197197
object.field3 = false;
198198
}
199-
if (message.field1 !== undefined && message.field1 !== null && message.hasOwnProperty("field1"))
199+
if (message.field1 != null && message.hasOwnProperty("field1"))
200200
object.field1 = message.field1;
201-
if (message.field2 !== undefined && message.field2 !== null && message.hasOwnProperty("field2"))
201+
if (message.field2 != null && message.hasOwnProperty("field2"))
202202
object.field2 = message.field2;
203-
if (message.field3 !== undefined && message.field3 !== null && message.hasOwnProperty("field3"))
203+
if (message.field3 != null && message.hasOwnProperty("field3"))
204204
object.field3 = message.field3;
205205
return object;
206206
};

‎tests/data/convert.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ $root.Message = (function() {
107107
Message.encode = function encode(message, writer) {
108108
if (!writer)
109109
writer = $Writer.create();
110-
if (message.stringVal !== undefined && message.stringVal !== null && message.hasOwnProperty("stringVal"))
110+
if (message.stringVal != null && message.hasOwnProperty("stringVal"))
111111
writer.uint32(/* id 1, wireType 2 =*/10).string(message.stringVal);
112-
if (message.stringRepeated !== undefined && message.hasOwnProperty("stringRepeated"))
112+
if (message.stringRepeated && message.stringRepeated.length && message.hasOwnProperty("stringRepeated"))
113113
for (var i = 0; i < message.stringRepeated.length; ++i)
114114
writer.uint32(/* id 2, wireType 2 =*/18).string(message.stringRepeated[i]);
115-
if (message.uint64Val !== undefined && message.uint64Val !== null && message.hasOwnProperty("uint64Val"))
115+
if (message.uint64Val != null && message.hasOwnProperty("uint64Val"))
116116
writer.uint32(/* id 3, wireType 0 =*/24).uint64(message.uint64Val);
117117
if (message.uint64Repeated && message.uint64Repeated.length && message.hasOwnProperty("uint64Repeated")) {
118118
writer.uint32(/* id 4, wireType 2 =*/34).fork();
@@ -122,10 +122,10 @@ $root.Message = (function() {
122122
}
123123
if (message.bytesVal && message.hasOwnProperty("bytesVal"))
124124
writer.uint32(/* id 5, wireType 2 =*/42).bytes(message.bytesVal);
125-
if (message.bytesRepeated !== undefined && message.hasOwnProperty("bytesRepeated"))
125+
if (message.bytesRepeated && message.bytesRepeated.length && message.hasOwnProperty("bytesRepeated"))
126126
for (var i = 0; i < message.bytesRepeated.length; ++i)
127127
writer.uint32(/* id 6, wireType 2 =*/50).bytes(message.bytesRepeated[i]);
128-
if (message.enumVal !== undefined && message.enumVal !== null && message.hasOwnProperty("enumVal"))
128+
if (message.enumVal != null && message.hasOwnProperty("enumVal"))
129129
writer.uint32(/* id 7, wireType 0 =*/56).uint32(message.enumVal);
130130
if (message.enumRepeated && message.enumRepeated.length && message.hasOwnProperty("enumRepeated")) {
131131
writer.uint32(/* id 8, wireType 2 =*/66).fork();
@@ -243,45 +243,45 @@ $root.Message = (function() {
243243
Message.verify = function verify(message) {
244244
if (typeof message !== "object" || message === null)
245245
return "object expected";
246-
if (message.stringVal !== undefined && message.stringVal !== null)
246+
if (message.stringVal != null)
247247
if (!$util.isString(message.stringVal))
248248
return "stringVal: string expected";
249-
if (message.stringRepeated !== undefined) {
249+
if (message.stringRepeated != null) {
250250
if (!Array.isArray(message.stringRepeated))
251251
return "stringRepeated: array expected";
252252
for (var i = 0; i < message.stringRepeated.length; ++i)
253253
if (!$util.isString(message.stringRepeated[i]))
254254
return "stringRepeated: string[] expected";
255255
}
256-
if (message.uint64Val !== undefined && message.uint64Val !== null)
256+
if (message.uint64Val != null)
257257
if (!$util.isInteger(message.uint64Val) && !(message.uint64Val && $util.isInteger(message.uint64Val.low) && $util.isInteger(message.uint64Val.high)))
258258
return "uint64Val: integer|Long expected";
259-
if (message.uint64Repeated !== undefined) {
259+
if (message.uint64Repeated != null) {
260260
if (!Array.isArray(message.uint64Repeated))
261261
return "uint64Repeated: array expected";
262262
for (var i = 0; i < message.uint64Repeated.length; ++i)
263263
if (!$util.isInteger(message.uint64Repeated[i]) && !(message.uint64Repeated[i] && $util.isInteger(message.uint64Repeated[i].low) && $util.isInteger(message.uint64Repeated[i].high)))
264264
return "uint64Repeated: integer|Long[] expected";
265265
}
266-
if (message.bytesVal !== undefined && message.bytesVal !== null)
266+
if (message.bytesVal != null)
267267
if (!(message.bytesVal && typeof message.bytesVal.length === "number" || $util.isString(message.bytesVal)))
268268
return "bytesVal: buffer expected";
269-
if (message.bytesRepeated !== undefined) {
269+
if (message.bytesRepeated != null) {
270270
if (!Array.isArray(message.bytesRepeated))
271271
return "bytesRepeated: array expected";
272272
for (var i = 0; i < message.bytesRepeated.length; ++i)
273273
if (!(message.bytesRepeated[i] && typeof message.bytesRepeated[i].length === "number" || $util.isString(message.bytesRepeated[i])))
274274
return "bytesRepeated: buffer[] expected";
275275
}
276-
if (message.enumVal !== undefined && message.enumVal !== null)
276+
if (message.enumVal != null)
277277
switch (message.enumVal) {
278278
default:
279279
return "enumVal: enum value expected";
280280
case 1:
281281
case 2:
282282
break;
283283
}
284-
if (message.enumRepeated !== undefined) {
284+
if (message.enumRepeated != null) {
285285
if (!Array.isArray(message.enumRepeated))
286286
return "enumRepeated: array expected";
287287
for (var i = 0; i < message.enumRepeated.length; ++i)
@@ -293,7 +293,7 @@ $root.Message = (function() {
293293
break;
294294
}
295295
}
296-
if (message.int64Map !== undefined) {
296+
if (message.int64Map != null) {
297297
if (!$util.isObject(message.int64Map))
298298
return "int64Map: object expected";
299299
var key = Object.keys(message.int64Map);
@@ -313,7 +313,7 @@ $root.Message = (function() {
313313
if (object instanceof $root.Message)
314314
return object;
315315
var message = new $root.Message();
316-
if (object.stringVal !== undefined && object.stringVal !== null)
316+
if (object.stringVal != null)
317317
message.stringVal = String(object.stringVal);
318318
if (object.stringRepeated) {
319319
if (!Array.isArray(object.stringRepeated))
@@ -322,7 +322,7 @@ $root.Message = (function() {
322322
for (var i = 0; i < object.stringRepeated.length; ++i)
323323
message.stringRepeated[i] = String(object.stringRepeated[i]);
324324
}
325-
if (object.uint64Val !== undefined && object.uint64Val !== null)
325+
if (object.uint64Val != null)
326326
if ($util.Long)
327327
(message.uint64Val = $util.Long.fromValue(object.uint64Val)).unsigned = true;
328328
else if (typeof object.uint64Val === "string")
@@ -345,7 +345,7 @@ $root.Message = (function() {
345345
else if (typeof object.uint64Repeated[i] === "object")
346346
message.uint64Repeated[i] = new $util.LongBits(object.uint64Repeated[i].low >>> 0, object.uint64Repeated[i].high >>> 0).toNumber(true);
347347
}
348-
if (object.bytesVal !== undefined && object.bytesVal !== null)
348+
if (object.bytesVal != null)
349349
if (typeof object.bytesVal === "string")
350350
$util.base64.decode(object.bytesVal, message.bytesVal = $util.newBuffer($util.base64.length(object.bytesVal)), 0);
351351
else if (object.bytesVal.length)
@@ -441,14 +441,14 @@ $root.Message = (function() {
441441
object.bytesVal = options.bytes === String ? "" : [];
442442
object.enumVal = options.enums === String ? "ONE" : 1;
443443
}
444-
if (message.stringVal !== undefined && message.stringVal !== null && message.hasOwnProperty("stringVal"))
444+
if (message.stringVal != null && message.hasOwnProperty("stringVal"))
445445
object.stringVal = message.stringVal;
446446
if (message.stringRepeated && message.stringRepeated.length) {
447447
object.stringRepeated = [];
448448
for (var j = 0; j < message.stringRepeated.length; ++j)
449449
object.stringRepeated[j] = message.stringRepeated[j];
450450
}
451-
if (message.uint64Val !== undefined && message.uint64Val !== null && message.hasOwnProperty("uint64Val"))
451+
if (message.uint64Val != null && message.hasOwnProperty("uint64Val"))
452452
if (typeof message.uint64Val === "number")
453453
object.uint64Val = options.longs === String ? String(message.uint64Val) : message.uint64Val;
454454
else
@@ -461,14 +461,14 @@ $root.Message = (function() {
461461
else
462462
object.uint64Repeated[j] = options.longs === String ? $util.Long.prototype.toString.call(message.uint64Repeated[j]) : options.longs === Number ? new $util.LongBits(message.uint64Repeated[j].low >>> 0, message.uint64Repeated[j].high >>> 0).toNumber(true) : message.uint64Repeated[j];
463463
}
464-
if (message.bytesVal !== undefined && message.bytesVal !== null && message.hasOwnProperty("bytesVal"))
464+
if (message.bytesVal != null && message.hasOwnProperty("bytesVal"))
465465
object.bytesVal = options.bytes === String ? $util.base64.encode(message.bytesVal, 0, message.bytesVal.length) : options.bytes === Array ? Array.prototype.slice.call(message.bytesVal) : message.bytesVal;
466466
if (message.bytesRepeated && message.bytesRepeated.length) {
467467
object.bytesRepeated = [];
468468
for (var j = 0; j < message.bytesRepeated.length; ++j)
469469
object.bytesRepeated[j] = options.bytes === String ? $util.base64.encode(message.bytesRepeated[j], 0, message.bytesRepeated[j].length) : options.bytes === Array ? Array.prototype.slice.call(message.bytesRepeated[j]) : message.bytesRepeated[j];
470470
}
471-
if (message.enumVal !== undefined && message.enumVal !== null && message.hasOwnProperty("enumVal"))
471+
if (message.enumVal != null && message.hasOwnProperty("enumVal"))
472472
object.enumVal = options.enums === String ? $root.Message.SomeEnum[message.enumVal] : message.enumVal;
473473
if (message.enumRepeated && message.enumRepeated.length) {
474474
object.enumRepeated = [];

0 commit comments

Comments
 (0)