From 228c882410d47a26576f839b15f1601e8aa7914d Mon Sep 17 00:00:00 2001 From: dcodeIO Date: Mon, 20 Mar 2017 20:46:41 +0100 Subject: [PATCH] New: Optional fields handle null just like undefined regardless of type see #709 --- src/encoder.js | 2 +- tests/data/comments.js | 6 +- tests/data/convert.js | 4 +- tests/data/mapbox/vector_tile.js | 12 +- tests/data/package.js | 24 ++-- tests/data/rpc.js | 4 +- tests/data/test.js | 202 +++++++++++++++---------------- 7 files changed, 127 insertions(+), 127 deletions(-) diff --git a/src/encoder.js b/src/encoder.js index 266152bb0..898a43b8c 100644 --- a/src/encoder.js +++ b/src/encoder.js @@ -110,7 +110,7 @@ function encoder(mtype) { else if (field.bytes || field.resolvedType && !(field.resolvedType instanceof Enum)) gen ("if(%s&&m.hasOwnProperty(%j))", ref, field.name); else gen - ("if(%s!==undefined&&m.hasOwnProperty(%j))", ref, field.name); + ("if(%s!==undefined&&%s!==null&&m.hasOwnProperty(%j))", ref, ref, field.name); } diff --git a/tests/data/comments.js b/tests/data/comments.js index c2b932f76..5b8c36c73 100644 --- a/tests/data/comments.js +++ b/tests/data/comments.js @@ -66,11 +66,11 @@ $root.Test1 = (function() { Test1.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.field1 !== undefined && message.hasOwnProperty("field1")) + if (message.field1 !== undefined && message.field1 !== null && message.hasOwnProperty("field1")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.field1); - if (message.field2 !== undefined && message.hasOwnProperty("field2")) + if (message.field2 !== undefined && message.field2 !== null && message.hasOwnProperty("field2")) writer.uint32(/* id 2, wireType 0 =*/16).uint32(message.field2); - if (message.field3 !== undefined && message.hasOwnProperty("field3")) + if (message.field3 !== undefined && message.field3 !== null && message.hasOwnProperty("field3")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.field3); return writer; }; diff --git a/tests/data/convert.js b/tests/data/convert.js index fc033dde4..821063060 100644 --- a/tests/data/convert.js +++ b/tests/data/convert.js @@ -104,7 +104,7 @@ $root.Message = (function() { Message.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.stringVal !== undefined && message.hasOwnProperty("stringVal")) + if (message.stringVal !== undefined && message.stringVal !== null && message.hasOwnProperty("stringVal")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.stringVal); if (message.stringRepeated !== undefined && message.hasOwnProperty("stringRepeated")) for (var i = 0; i < message.stringRepeated.length; ++i) @@ -122,7 +122,7 @@ $root.Message = (function() { if (message.bytesRepeated !== undefined && message.hasOwnProperty("bytesRepeated")) for (var i = 0; i < message.bytesRepeated.length; ++i) writer.uint32(/* id 6, wireType 2 =*/50).bytes(message.bytesRepeated[i]); - if (message.enumVal !== undefined && message.hasOwnProperty("enumVal")) + if (message.enumVal !== undefined && message.enumVal !== null && message.hasOwnProperty("enumVal")) writer.uint32(/* id 7, wireType 0 =*/56).uint32(message.enumVal); if (message.enumRepeated && message.enumRepeated.length && message.hasOwnProperty("enumRepeated")) { writer.uint32(/* id 8, wireType 2 =*/66).fork(); diff --git a/tests/data/mapbox/vector_tile.js b/tests/data/mapbox/vector_tile.js index 280aedfa1..7bf683394 100644 --- a/tests/data/mapbox/vector_tile.js +++ b/tests/data/mapbox/vector_tile.js @@ -302,11 +302,11 @@ $root.vector_tile = (function() { Value.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.stringValue !== undefined && message.hasOwnProperty("stringValue")) + if (message.stringValue !== undefined && message.stringValue !== null && message.hasOwnProperty("stringValue")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.stringValue); - if (message.floatValue !== undefined && message.hasOwnProperty("floatValue")) + if (message.floatValue !== undefined && message.floatValue !== null && message.hasOwnProperty("floatValue")) writer.uint32(/* id 2, wireType 5 =*/21).float(message.floatValue); - if (message.doubleValue !== undefined && message.hasOwnProperty("doubleValue")) + if (message.doubleValue !== undefined && message.doubleValue !== null && message.hasOwnProperty("doubleValue")) writer.uint32(/* id 3, wireType 1 =*/25).double(message.doubleValue); if (message.intValue !== undefined && message.intValue !== null && message.hasOwnProperty("intValue")) writer.uint32(/* id 4, wireType 0 =*/32).int64(message.intValue); @@ -314,7 +314,7 @@ $root.vector_tile = (function() { writer.uint32(/* id 5, wireType 0 =*/40).uint64(message.uintValue); if (message.sintValue !== undefined && message.sintValue !== null && message.hasOwnProperty("sintValue")) writer.uint32(/* id 6, wireType 0 =*/48).sint64(message.sintValue); - if (message.boolValue !== undefined && message.hasOwnProperty("boolValue")) + if (message.boolValue !== undefined && message.boolValue !== null && message.hasOwnProperty("boolValue")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.boolValue); return writer; }; @@ -620,7 +620,7 @@ $root.vector_tile = (function() { writer.uint32(message.tags[i]); writer.ldelim(); } - if (message.type !== undefined && message.hasOwnProperty("type")) + if (message.type !== undefined && message.type !== null && message.hasOwnProperty("type")) writer.uint32(/* id 3, wireType 0 =*/24).uint32(message.type); if (message.geometry && message.geometry.length && message.hasOwnProperty("geometry")) { writer.uint32(/* id 4, wireType 2 =*/34).fork(); @@ -949,7 +949,7 @@ $root.vector_tile = (function() { if (message.values !== undefined && message.hasOwnProperty("values")) for (var i = 0; i < message.values.length; ++i) $types[4].encode(message.values[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.extent !== undefined && message.hasOwnProperty("extent")) + if (message.extent !== undefined && message.extent !== null && message.hasOwnProperty("extent")) writer.uint32(/* id 5, wireType 0 =*/40).uint32(message.extent); writer.uint32(/* id 15, wireType 0 =*/120).uint32(message.version); return writer; diff --git a/tests/data/package.js b/tests/data/package.js index c92657b14..3dd15b383 100644 --- a/tests/data/package.js +++ b/tests/data/package.js @@ -157,26 +157,26 @@ $root.Package = (function() { Package.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.version !== undefined && message.hasOwnProperty("version")) + if (message.version !== undefined && message.version !== null && message.hasOwnProperty("version")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.version); - if (message.description !== undefined && message.hasOwnProperty("description")) + if (message.description !== undefined && message.description !== null && message.hasOwnProperty("description")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.description); - if (message.author !== undefined && message.hasOwnProperty("author")) + if (message.author !== undefined && message.author !== null && message.hasOwnProperty("author")) writer.uint32(/* id 4, wireType 2 =*/34).string(message.author); - if (message.license !== undefined && message.hasOwnProperty("license")) + if (message.license !== undefined && message.license !== null && message.hasOwnProperty("license")) writer.uint32(/* id 5, wireType 2 =*/42).string(message.license); if (message.repository && message.hasOwnProperty("repository")) $types[6].encode(message.repository, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.bugs !== undefined && message.hasOwnProperty("bugs")) + if (message.bugs !== undefined && message.bugs !== null && message.hasOwnProperty("bugs")) writer.uint32(/* id 7, wireType 2 =*/58).string(message.bugs); - if (message.homepage !== undefined && message.hasOwnProperty("homepage")) + if (message.homepage !== undefined && message.homepage !== null && message.hasOwnProperty("homepage")) writer.uint32(/* id 8, wireType 2 =*/66).string(message.homepage); if (message.keywords !== undefined && message.hasOwnProperty("keywords")) for (var i = 0; i < message.keywords.length; ++i) writer.uint32(/* id 9, wireType 2 =*/74).string(message.keywords[i]); - if (message.main !== undefined && message.hasOwnProperty("main")) + if (message.main !== undefined && message.main !== null && message.hasOwnProperty("main")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.main); if (message.bin && message.hasOwnProperty("bin")) for (var keys = Object.keys(message.bin), i = 0; i < keys.length; ++i) @@ -193,12 +193,12 @@ $root.Package = (function() { if (message.devDependencies && message.hasOwnProperty("devDependencies")) for (var keys = Object.keys(message.devDependencies), i = 0; i < keys.length; ++i) writer.uint32(/* id 15, wireType 2 =*/122).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.devDependencies[keys[i]]).ldelim(); - if (message.types !== undefined && message.hasOwnProperty("types")) + if (message.types !== undefined && message.types !== null && message.hasOwnProperty("types")) writer.uint32(/* id 17, wireType 2 =*/138).string(message.types); if (message.cliDependencies !== undefined && message.hasOwnProperty("cliDependencies")) for (var i = 0; i < message.cliDependencies.length; ++i) writer.uint32(/* id 18, wireType 2 =*/146).string(message.cliDependencies[i]); - if (message.versionScheme !== undefined && message.hasOwnProperty("versionScheme")) + if (message.versionScheme !== undefined && message.versionScheme !== null && message.hasOwnProperty("versionScheme")) writer.uint32(/* id 19, wireType 2 =*/154).string(message.versionScheme); return writer; }; @@ -682,9 +682,9 @@ $root.Package = (function() { Repository.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.type !== undefined && message.hasOwnProperty("type")) + if (message.type !== undefined && message.type !== null && message.hasOwnProperty("type")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.type); - if (message.url !== undefined && message.hasOwnProperty("url")) + if (message.url !== undefined && message.url !== null && message.hasOwnProperty("url")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.url); return writer; }; diff --git a/tests/data/rpc.js b/tests/data/rpc.js index e629df41f..8e2c4e4d4 100644 --- a/tests/data/rpc.js +++ b/tests/data/rpc.js @@ -108,7 +108,7 @@ $root.MyRequest = (function() { MyRequest.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.path !== undefined && message.hasOwnProperty("path")) + if (message.path !== undefined && message.path !== null && message.hasOwnProperty("path")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.path); return writer; }; @@ -274,7 +274,7 @@ $root.MyResponse = (function() { MyResponse.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.status !== undefined && message.hasOwnProperty("status")) + if (message.status !== undefined && message.status !== null && message.hasOwnProperty("status")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.status); return writer; }; diff --git a/tests/data/test.js b/tests/data/test.js index 2d1cef06a..08dcdbc94 100644 --- a/tests/data/test.js +++ b/tests/data/test.js @@ -230,7 +230,7 @@ $root.jspb = (function() { EnumContainer.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.outerEnum !== undefined && message.hasOwnProperty("outerEnum")) + if (message.outerEnum !== undefined && message.outerEnum !== null && message.hasOwnProperty("outerEnum")) writer.uint32(/* id 1, wireType 0 =*/8).uint32(message.outerEnum); return writer; }; @@ -425,7 +425,7 @@ $root.jspb = (function() { if (message.aRepeatedString !== undefined && message.hasOwnProperty("aRepeatedString")) for (var i = 0; i < message.aRepeatedString.length; ++i) writer.uint32(/* id 2, wireType 2 =*/18).string(message.aRepeatedString[i]); - if (message.aBoolean !== undefined && message.hasOwnProperty("aBoolean")) + if (message.aBoolean !== undefined && message.aBoolean !== null && message.hasOwnProperty("aBoolean")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.aBoolean); return writer; }; @@ -1088,7 +1088,7 @@ $root.jspb = (function() { OptionalFields.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.aString !== undefined && message.hasOwnProperty("aString")) + if (message.aString !== undefined && message.aString !== null && message.hasOwnProperty("aString")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.aString); writer.uint32(/* id 2, wireType 0 =*/16).bool(message.aBool); if (message.aNestedMessage && message.hasOwnProperty("aNestedMessage")) @@ -1346,7 +1346,7 @@ $root.jspb = (function() { Nested.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.anInt !== undefined && message.hasOwnProperty("anInt")) + if (message.anInt !== undefined && message.anInt !== null && message.hasOwnProperty("anInt")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.anInt); return writer; }; @@ -1577,17 +1577,17 @@ $root.jspb = (function() { HasExtensions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.str1 !== undefined && message.hasOwnProperty("str1")) + if (message.str1 !== undefined && message.str1 !== null && message.hasOwnProperty("str1")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.str1); - if (message.str2 !== undefined && message.hasOwnProperty("str2")) + if (message.str2 !== undefined && message.str2 !== null && message.hasOwnProperty("str2")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.str2); - if (message.str3 !== undefined && message.hasOwnProperty("str3")) + if (message.str3 !== undefined && message.str3 !== null && message.hasOwnProperty("str3")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.str3); if (message[".jspb.test.IsExtension.extField"] && message.hasOwnProperty(".jspb.test.IsExtension.extField")) $types[3].encode(message[".jspb.test.IsExtension.extField"], writer.uint32(/* id 100, wireType 2 =*/802).fork()).ldelim(); if (message[".jspb.test.IndirectExtension.simple"] && message.hasOwnProperty(".jspb.test.IndirectExtension.simple")) $types[4].encode(message[".jspb.test.IndirectExtension.simple"], writer.uint32(/* id 101, wireType 2 =*/810).fork()).ldelim(); - if (message[".jspb.test.IndirectExtension.str"] !== undefined && message.hasOwnProperty(".jspb.test.IndirectExtension.str")) + if (message[".jspb.test.IndirectExtension.str"] !== undefined && message[".jspb.test.IndirectExtension.str"] !== null && message.hasOwnProperty(".jspb.test.IndirectExtension.str")) writer.uint32(/* id 102, wireType 2 =*/818).string(message[".jspb.test.IndirectExtension.str"]); if (message[".jspb.test.IndirectExtension.repeatedStr"] !== undefined && message.hasOwnProperty(".jspb.test.IndirectExtension.repeatedStr")) for (var i = 0; i < message[".jspb.test.IndirectExtension.repeatedStr"].length; ++i) @@ -2496,7 +2496,7 @@ $root.jspb = (function() { Complex.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.innerComplexField !== undefined && message.hasOwnProperty("innerComplexField")) + if (message.innerComplexField !== undefined && message.innerComplexField !== null && message.hasOwnProperty("innerComplexField")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.innerComplexField); return writer; }; @@ -2665,7 +2665,7 @@ $root.jspb = (function() { IsExtension.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ext1 !== undefined && message.hasOwnProperty("ext1")) + if (message.ext1 !== undefined && message.ext1 !== null && message.hasOwnProperty("ext1")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.ext1); return writer; }; @@ -3008,15 +3008,15 @@ $root.jspb = (function() { DefaultValues.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.stringField !== undefined && message.hasOwnProperty("stringField")) + if (message.stringField !== undefined && message.stringField !== null && message.hasOwnProperty("stringField")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.stringField); - if (message.boolField !== undefined && message.hasOwnProperty("boolField")) + if (message.boolField !== undefined && message.boolField !== null && message.hasOwnProperty("boolField")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.boolField); if (message.intField !== undefined && message.intField !== null && message.hasOwnProperty("intField")) writer.uint32(/* id 3, wireType 0 =*/24).int64(message.intField); - if (message.enumField !== undefined && message.hasOwnProperty("enumField")) + if (message.enumField !== undefined && message.enumField !== null && message.hasOwnProperty("enumField")) writer.uint32(/* id 4, wireType 0 =*/32).uint32(message.enumField); - if (message.emptyField !== undefined && message.hasOwnProperty("emptyField")) + if (message.emptyField !== undefined && message.emptyField !== null && message.hasOwnProperty("emptyField")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.emptyField); if (message.bytesField && message.hasOwnProperty("bytesField")) writer.uint32(/* id 8, wireType 2 =*/66).bytes(message.bytesField); @@ -3331,21 +3331,21 @@ $root.jspb = (function() { FloatingPointFields.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.optionalFloatField !== undefined && message.hasOwnProperty("optionalFloatField")) + if (message.optionalFloatField !== undefined && message.optionalFloatField !== null && message.hasOwnProperty("optionalFloatField")) writer.uint32(/* id 1, wireType 5 =*/13).float(message.optionalFloatField); writer.uint32(/* id 2, wireType 5 =*/21).float(message.requiredFloatField); if (message.repeatedFloatField !== undefined && message.hasOwnProperty("repeatedFloatField")) for (var i = 0; i < message.repeatedFloatField.length; ++i) writer.uint32(/* id 3, wireType 5 =*/29).float(message.repeatedFloatField[i]); - if (message.defaultFloatField !== undefined && message.hasOwnProperty("defaultFloatField")) + if (message.defaultFloatField !== undefined && message.defaultFloatField !== null && message.hasOwnProperty("defaultFloatField")) writer.uint32(/* id 4, wireType 5 =*/37).float(message.defaultFloatField); - if (message.optionalDoubleField !== undefined && message.hasOwnProperty("optionalDoubleField")) + if (message.optionalDoubleField !== undefined && message.optionalDoubleField !== null && message.hasOwnProperty("optionalDoubleField")) writer.uint32(/* id 5, wireType 1 =*/41).double(message.optionalDoubleField); writer.uint32(/* id 6, wireType 1 =*/49).double(message.requiredDoubleField); if (message.repeatedDoubleField !== undefined && message.hasOwnProperty("repeatedDoubleField")) for (var i = 0; i < message.repeatedDoubleField.length; ++i) writer.uint32(/* id 7, wireType 1 =*/57).double(message.repeatedDoubleField[i]); - if (message.defaultDoubleField !== undefined && message.hasOwnProperty("defaultDoubleField")) + if (message.defaultDoubleField !== undefined && message.defaultDoubleField !== null && message.hasOwnProperty("defaultDoubleField")) writer.uint32(/* id 8, wireType 1 =*/65).double(message.defaultDoubleField); return writer; }; @@ -3669,7 +3669,7 @@ $root.jspb = (function() { TestClone.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.str !== undefined && message.hasOwnProperty("str")) + if (message.str !== undefined && message.str !== null && message.hasOwnProperty("str")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.str); if (message.simple1 && message.hasOwnProperty("simple1")) $types[1].encode(message.simple1, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); @@ -3678,7 +3678,7 @@ $root.jspb = (function() { $types[2].encode(message.simple2[i], writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.bytesField && message.hasOwnProperty("bytesField")) writer.uint32(/* id 6, wireType 2 =*/50).bytes(message.bytesField); - if (message.unused !== undefined && message.hasOwnProperty("unused")) + if (message.unused !== undefined && message.unused !== null && message.hasOwnProperty("unused")) writer.uint32(/* id 7, wireType 2 =*/58).string(message.unused); if (message[".jspb.test.CloneExtension.extField"] && message.hasOwnProperty(".jspb.test.CloneExtension.extField")) $types[5].encode(message[".jspb.test.CloneExtension.extField"], writer.uint32(/* id 100, wireType 2 =*/802).fork()).ldelim(); @@ -3935,7 +3935,7 @@ $root.jspb = (function() { CloneExtension.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ext !== undefined && message.hasOwnProperty("ext")) + if (message.ext !== undefined && message.ext !== null && message.hasOwnProperty("ext")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.ext); return writer; }; @@ -4146,7 +4146,7 @@ $root.jspb = (function() { $types[1].encode(message.requiredGroup, writer.uint32(/* id 2, wireType 3 =*/19)).uint32(/* id 2, wireType 4 =*/20); if (message.optionalGroup && message.hasOwnProperty("optionalGroup")) $types[2].encode(message.optionalGroup, writer.uint32(/* id 3, wireType 3 =*/27)).uint32(/* id 3, wireType 4 =*/28); - if (message.id !== undefined && message.hasOwnProperty("id")) + if (message.id !== undefined && message.id !== null && message.hasOwnProperty("id")) writer.uint32(/* id 4, wireType 2 =*/34).string(message.id); $types[4].encode(message.requiredSimple, writer.uint32(/* id 5, wireType 2 =*/42).fork()).ldelim(); if (message.optionalSimple && message.hasOwnProperty("optionalSimple")) @@ -5138,9 +5138,9 @@ $root.jspb = (function() { TestReservedNames.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.extension !== undefined && message.hasOwnProperty("extension")) + if (message.extension !== undefined && message.extension !== null && message.hasOwnProperty("extension")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.extension); - if (message[".jspb.test.TestReservedNamesExtension.foo"] !== undefined && message.hasOwnProperty(".jspb.test.TestReservedNamesExtension.foo")) + if (message[".jspb.test.TestReservedNamesExtension.foo"] !== undefined && message[".jspb.test.TestReservedNamesExtension.foo"] !== null && message.hasOwnProperty(".jspb.test.TestReservedNamesExtension.foo")) writer.uint32(/* id 10, wireType 0 =*/80).int32(message[".jspb.test.TestReservedNamesExtension.foo"]); return writer; }; @@ -5562,26 +5562,26 @@ $root.jspb = (function() { TestMessageWithOneof.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.pone !== undefined && message.hasOwnProperty("pone")) + if (message.pone !== undefined && message.pone !== null && message.hasOwnProperty("pone")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.pone); - if (message.pthree !== undefined && message.hasOwnProperty("pthree")) + if (message.pthree !== undefined && message.pthree !== null && message.hasOwnProperty("pthree")) writer.uint32(/* id 5, wireType 2 =*/42).string(message.pthree); if (message.rone && message.hasOwnProperty("rone")) $types[2].encode(message.rone, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim(); - if (message.rtwo !== undefined && message.hasOwnProperty("rtwo")) + if (message.rtwo !== undefined && message.rtwo !== null && message.hasOwnProperty("rtwo")) writer.uint32(/* id 7, wireType 2 =*/58).string(message.rtwo); - if (message.normalField !== undefined && message.hasOwnProperty("normalField")) + if (message.normalField !== undefined && message.normalField !== null && message.hasOwnProperty("normalField")) writer.uint32(/* id 8, wireType 0 =*/64).bool(message.normalField); if (message.repeatedField !== undefined && message.hasOwnProperty("repeatedField")) for (var i = 0; i < message.repeatedField.length; ++i) writer.uint32(/* id 9, wireType 2 =*/74).string(message.repeatedField[i]); - if (message.aone !== undefined && message.hasOwnProperty("aone")) + if (message.aone !== undefined && message.aone !== null && message.hasOwnProperty("aone")) writer.uint32(/* id 10, wireType 0 =*/80).int32(message.aone); - if (message.atwo !== undefined && message.hasOwnProperty("atwo")) + if (message.atwo !== undefined && message.atwo !== null && message.hasOwnProperty("atwo")) writer.uint32(/* id 11, wireType 0 =*/88).int32(message.atwo); - if (message.bone !== undefined && message.hasOwnProperty("bone")) + if (message.bone !== undefined && message.bone !== null && message.hasOwnProperty("bone")) writer.uint32(/* id 12, wireType 0 =*/96).int32(message.bone); - if (message.btwo !== undefined && message.hasOwnProperty("btwo")) + if (message.btwo !== undefined && message.btwo !== null && message.hasOwnProperty("btwo")) writer.uint32(/* id 13, wireType 0 =*/104).int32(message.btwo); return writer; }; @@ -5873,7 +5873,7 @@ $root.jspb = (function() { TestEndsWithBytes.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.value !== undefined && message.hasOwnProperty("value")) + if (message.value !== undefined && message.value !== null && message.hasOwnProperty("value")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.value); if (message.data && message.hasOwnProperty("data")) writer.uint32(/* id 2, wireType 2 =*/18).bytes(message.data); @@ -6724,7 +6724,7 @@ $root.jspb = (function() { MapValueMessageNoBinary.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.foo !== undefined && message.hasOwnProperty("foo")) + if (message.foo !== undefined && message.foo !== null && message.hasOwnProperty("foo")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.foo); return writer; }; @@ -7168,7 +7168,7 @@ $root.jspb = (function() { Message.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.count !== undefined && message.hasOwnProperty("count")) + if (message.count !== undefined && message.count !== null && message.hasOwnProperty("count")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.count); return writer; }; @@ -7632,9 +7632,9 @@ $root.google = (function() { FileDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message["package"] !== undefined && message.hasOwnProperty("package")) + if (message["package"] !== undefined && message["package"] !== null && message.hasOwnProperty("package")) writer.uint32(/* id 2, wireType 2 =*/18).string(message["package"]); if (message.dependency !== undefined && message.hasOwnProperty("dependency")) for (var i = 0; i < message.dependency.length; ++i) @@ -7661,7 +7661,7 @@ $root.google = (function() { if (message.weakDependency !== undefined && message.hasOwnProperty("weakDependency")) for (var i = 0; i < message.weakDependency.length; ++i) writer.uint32(/* id 11, wireType 0 =*/88).int32(message.weakDependency[i]); - if (message.syntax !== undefined && message.hasOwnProperty("syntax")) + if (message.syntax !== undefined && message.syntax !== null && message.hasOwnProperty("syntax")) writer.uint32(/* id 12, wireType 2 =*/98).string(message.syntax); return writer; }; @@ -8155,7 +8155,7 @@ $root.google = (function() { DescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.field !== undefined && message.hasOwnProperty("field")) for (var i = 0; i < message.field.length; ++i) @@ -8604,9 +8604,9 @@ $root.google = (function() { ExtensionRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start !== undefined && message.hasOwnProperty("start")) + if (message.start !== undefined && message.start !== null && message.hasOwnProperty("start")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end !== undefined && message.hasOwnProperty("end")) + if (message.end !== undefined && message.end !== null && message.hasOwnProperty("end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; @@ -8790,9 +8790,9 @@ $root.google = (function() { ReservedRange.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.start !== undefined && message.hasOwnProperty("start")) + if (message.start !== undefined && message.start !== null && message.hasOwnProperty("start")) writer.uint32(/* id 1, wireType 0 =*/8).int32(message.start); - if (message.end !== undefined && message.hasOwnProperty("end")) + if (message.end !== undefined && message.end !== null && message.hasOwnProperty("end")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.end); return writer; }; @@ -9034,25 +9034,25 @@ $root.google = (function() { FieldDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.extendee !== undefined && message.hasOwnProperty("extendee")) + if (message.extendee !== undefined && message.extendee !== null && message.hasOwnProperty("extendee")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.extendee); - if (message.number !== undefined && message.hasOwnProperty("number")) + if (message.number !== undefined && message.number !== null && message.hasOwnProperty("number")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.number); - if (message.label !== undefined && message.hasOwnProperty("label")) + if (message.label !== undefined && message.label !== null && message.hasOwnProperty("label")) writer.uint32(/* id 4, wireType 0 =*/32).uint32(message.label); - if (message.type !== undefined && message.hasOwnProperty("type")) + if (message.type !== undefined && message.type !== null && message.hasOwnProperty("type")) writer.uint32(/* id 5, wireType 0 =*/40).uint32(message.type); - if (message.typeName !== undefined && message.hasOwnProperty("typeName")) + if (message.typeName !== undefined && message.typeName !== null && message.hasOwnProperty("typeName")) writer.uint32(/* id 6, wireType 2 =*/50).string(message.typeName); - if (message.defaultValue !== undefined && message.hasOwnProperty("defaultValue")) + if (message.defaultValue !== undefined && message.defaultValue !== null && message.hasOwnProperty("defaultValue")) writer.uint32(/* id 7, wireType 2 =*/58).string(message.defaultValue); if (message.options && message.hasOwnProperty("options")) $types[9].encode(message.options, writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim(); - if (message.oneofIndex !== undefined && message.hasOwnProperty("oneofIndex")) + if (message.oneofIndex !== undefined && message.oneofIndex !== null && message.hasOwnProperty("oneofIndex")) writer.uint32(/* id 9, wireType 0 =*/72).int32(message.oneofIndex); - if (message.jsonName !== undefined && message.hasOwnProperty("jsonName")) + if (message.jsonName !== undefined && message.jsonName !== null && message.hasOwnProperty("jsonName")) writer.uint32(/* id 10, wireType 2 =*/82).string(message.jsonName); return writer; }; @@ -9509,7 +9509,7 @@ $root.google = (function() { OneofDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.options && message.hasOwnProperty("options")) $types[1].encode(message.options, writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); @@ -9712,7 +9712,7 @@ $root.google = (function() { EnumDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.value !== undefined && message.hasOwnProperty("value")) for (var i = 0; i < message.value.length; ++i) @@ -9948,9 +9948,9 @@ $root.google = (function() { EnumValueDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.number !== undefined && message.hasOwnProperty("number")) + if (message.number !== undefined && message.number !== null && message.hasOwnProperty("number")) writer.uint32(/* id 2, wireType 0 =*/16).int32(message.number); if (message.options && message.hasOwnProperty("options")) $types[2].encode(message.options, writer.uint32(/* id 3, wireType 2 =*/26).fork()).ldelim(); @@ -10164,7 +10164,7 @@ $root.google = (function() { ServiceDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); if (message.method !== undefined && message.hasOwnProperty("method")) for (var i = 0; i < message.method.length; ++i) @@ -10418,17 +10418,17 @@ $root.google = (function() { MethodDescriptorProto.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.name !== undefined && message.hasOwnProperty("name")) + if (message.name !== undefined && message.name !== null && message.hasOwnProperty("name")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.name); - if (message.inputType !== undefined && message.hasOwnProperty("inputType")) + if (message.inputType !== undefined && message.inputType !== null && message.hasOwnProperty("inputType")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.inputType); - if (message.outputType !== undefined && message.hasOwnProperty("outputType")) + if (message.outputType !== undefined && message.outputType !== null && message.hasOwnProperty("outputType")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.outputType); if (message.options && message.hasOwnProperty("options")) $types[3].encode(message.options, writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim(); - if (message.clientStreaming !== undefined && message.hasOwnProperty("clientStreaming")) + if (message.clientStreaming !== undefined && message.clientStreaming !== null && message.hasOwnProperty("clientStreaming")) writer.uint32(/* id 5, wireType 0 =*/40).bool(message.clientStreaming); - if (message.serverStreaming !== undefined && message.hasOwnProperty("serverStreaming")) + if (message.serverStreaming !== undefined && message.serverStreaming !== null && message.hasOwnProperty("serverStreaming")) writer.uint32(/* id 6, wireType 0 =*/48).bool(message.serverStreaming); return writer; }; @@ -10745,33 +10745,33 @@ $root.google = (function() { FileOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.javaPackage !== undefined && message.hasOwnProperty("javaPackage")) + if (message.javaPackage !== undefined && message.javaPackage !== null && message.hasOwnProperty("javaPackage")) writer.uint32(/* id 1, wireType 2 =*/10).string(message.javaPackage); - if (message.javaOuterClassname !== undefined && message.hasOwnProperty("javaOuterClassname")) + if (message.javaOuterClassname !== undefined && message.javaOuterClassname !== null && message.hasOwnProperty("javaOuterClassname")) writer.uint32(/* id 8, wireType 2 =*/66).string(message.javaOuterClassname); - if (message.optimizeFor !== undefined && message.hasOwnProperty("optimizeFor")) + if (message.optimizeFor !== undefined && message.optimizeFor !== null && message.hasOwnProperty("optimizeFor")) writer.uint32(/* id 9, wireType 0 =*/72).uint32(message.optimizeFor); - if (message.javaMultipleFiles !== undefined && message.hasOwnProperty("javaMultipleFiles")) + if (message.javaMultipleFiles !== undefined && message.javaMultipleFiles !== null && message.hasOwnProperty("javaMultipleFiles")) writer.uint32(/* id 10, wireType 0 =*/80).bool(message.javaMultipleFiles); - if (message.goPackage !== undefined && message.hasOwnProperty("goPackage")) + if (message.goPackage !== undefined && message.goPackage !== null && message.hasOwnProperty("goPackage")) writer.uint32(/* id 11, wireType 2 =*/90).string(message.goPackage); - if (message.ccGenericServices !== undefined && message.hasOwnProperty("ccGenericServices")) + if (message.ccGenericServices !== undefined && message.ccGenericServices !== null && message.hasOwnProperty("ccGenericServices")) writer.uint32(/* id 16, wireType 0 =*/128).bool(message.ccGenericServices); - if (message.javaGenericServices !== undefined && message.hasOwnProperty("javaGenericServices")) + if (message.javaGenericServices !== undefined && message.javaGenericServices !== null && message.hasOwnProperty("javaGenericServices")) writer.uint32(/* id 17, wireType 0 =*/136).bool(message.javaGenericServices); - if (message.pyGenericServices !== undefined && message.hasOwnProperty("pyGenericServices")) + if (message.pyGenericServices !== undefined && message.pyGenericServices !== null && message.hasOwnProperty("pyGenericServices")) writer.uint32(/* id 18, wireType 0 =*/144).bool(message.pyGenericServices); - if (message.javaGenerateEqualsAndHash !== undefined && message.hasOwnProperty("javaGenerateEqualsAndHash")) + if (message.javaGenerateEqualsAndHash !== undefined && message.javaGenerateEqualsAndHash !== null && message.hasOwnProperty("javaGenerateEqualsAndHash")) writer.uint32(/* id 20, wireType 0 =*/160).bool(message.javaGenerateEqualsAndHash); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 23, wireType 0 =*/184).bool(message.deprecated); - if (message.javaStringCheckUtf8 !== undefined && message.hasOwnProperty("javaStringCheckUtf8")) + if (message.javaStringCheckUtf8 !== undefined && message.javaStringCheckUtf8 !== null && message.hasOwnProperty("javaStringCheckUtf8")) writer.uint32(/* id 27, wireType 0 =*/216).bool(message.javaStringCheckUtf8); - if (message.ccEnableArenas !== undefined && message.hasOwnProperty("ccEnableArenas")) + if (message.ccEnableArenas !== undefined && message.ccEnableArenas !== null && message.hasOwnProperty("ccEnableArenas")) writer.uint32(/* id 31, wireType 0 =*/248).bool(message.ccEnableArenas); - if (message.objcClassPrefix !== undefined && message.hasOwnProperty("objcClassPrefix")) + if (message.objcClassPrefix !== undefined && message.objcClassPrefix !== null && message.hasOwnProperty("objcClassPrefix")) writer.uint32(/* id 36, wireType 2 =*/290).string(message.objcClassPrefix); - if (message.csharpNamespace !== undefined && message.hasOwnProperty("csharpNamespace")) + if (message.csharpNamespace !== undefined && message.csharpNamespace !== null && message.hasOwnProperty("csharpNamespace")) writer.uint32(/* id 37, wireType 2 =*/298).string(message.csharpNamespace); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -11179,13 +11179,13 @@ $root.google = (function() { MessageOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.messageSetWireFormat !== undefined && message.hasOwnProperty("messageSetWireFormat")) + if (message.messageSetWireFormat !== undefined && message.messageSetWireFormat !== null && message.hasOwnProperty("messageSetWireFormat")) writer.uint32(/* id 1, wireType 0 =*/8).bool(message.messageSetWireFormat); - if (message.noStandardDescriptorAccessor !== undefined && message.hasOwnProperty("noStandardDescriptorAccessor")) + if (message.noStandardDescriptorAccessor !== undefined && message.noStandardDescriptorAccessor !== null && message.hasOwnProperty("noStandardDescriptorAccessor")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.noStandardDescriptorAccessor); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.mapEntry !== undefined && message.hasOwnProperty("mapEntry")) + if (message.mapEntry !== undefined && message.mapEntry !== null && message.hasOwnProperty("mapEntry")) writer.uint32(/* id 7, wireType 0 =*/56).bool(message.mapEntry); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -11462,17 +11462,17 @@ $root.google = (function() { FieldOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.ctype !== undefined && message.hasOwnProperty("ctype")) + if (message.ctype !== undefined && message.ctype !== null && message.hasOwnProperty("ctype")) writer.uint32(/* id 1, wireType 0 =*/8).uint32(message.ctype); - if (message.packed !== undefined && message.hasOwnProperty("packed")) + if (message.packed !== undefined && message.packed !== null && message.hasOwnProperty("packed")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.packed); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); - if (message.lazy !== undefined && message.hasOwnProperty("lazy")) + if (message.lazy !== undefined && message.lazy !== null && message.hasOwnProperty("lazy")) writer.uint32(/* id 5, wireType 0 =*/40).bool(message.lazy); - if (message.jstype !== undefined && message.hasOwnProperty("jstype")) + if (message.jstype !== undefined && message.jstype !== null && message.hasOwnProperty("jstype")) writer.uint32(/* id 6, wireType 0 =*/48).uint32(message.jstype); - if (message.weak !== undefined && message.hasOwnProperty("weak")) + if (message.weak !== undefined && message.weak !== null && message.hasOwnProperty("weak")) writer.uint32(/* id 10, wireType 0 =*/80).bool(message.weak); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -12013,14 +12013,14 @@ $root.google = (function() { EnumOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.allowAlias !== undefined && message.hasOwnProperty("allowAlias")) + if (message.allowAlias !== undefined && message.allowAlias !== null && message.hasOwnProperty("allowAlias")) writer.uint32(/* id 2, wireType 0 =*/16).bool(message.allowAlias); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 3, wireType 0 =*/24).bool(message.deprecated); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) $types[2].encode(message.uninterpretedOption[i], writer.uint32(/* id 999, wireType 2 =*/7994).fork()).ldelim(); - if (message[".jspb.test.IsExtension.simpleOption"] !== undefined && message.hasOwnProperty(".jspb.test.IsExtension.simpleOption")) + if (message[".jspb.test.IsExtension.simpleOption"] !== undefined && message[".jspb.test.IsExtension.simpleOption"] !== null && message.hasOwnProperty(".jspb.test.IsExtension.simpleOption")) writer.uint32(/* id 42113038, wireType 2 =*/336904306).string(message[".jspb.test.IsExtension.simpleOption"]); return writer; }; @@ -12251,7 +12251,7 @@ $root.google = (function() { EnumValueOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 1, wireType 0 =*/8).bool(message.deprecated); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -12462,7 +12462,7 @@ $root.google = (function() { ServiceOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -12680,9 +12680,9 @@ $root.google = (function() { MethodOptions.encode = function encode(message, writer) { if (!writer) writer = $Writer.create(); - if (message.deprecated !== undefined && message.hasOwnProperty("deprecated")) + if (message.deprecated !== undefined && message.deprecated !== null && message.hasOwnProperty("deprecated")) writer.uint32(/* id 33, wireType 0 =*/264).bool(message.deprecated); - if (message.idempotencyLevel !== undefined && message.hasOwnProperty("idempotencyLevel")) + if (message.idempotencyLevel !== undefined && message.idempotencyLevel !== null && message.hasOwnProperty("idempotencyLevel")) writer.uint32(/* id 34, wireType 0 =*/272).uint32(message.idempotencyLevel); if (message.uninterpretedOption !== undefined && message.hasOwnProperty("uninterpretedOption")) for (var i = 0; i < message.uninterpretedOption.length; ++i) @@ -12973,17 +12973,17 @@ $root.google = (function() { if (message.name !== undefined && message.hasOwnProperty("name")) for (var i = 0; i < message.name.length; ++i) $types[0].encode(message.name[i], writer.uint32(/* id 2, wireType 2 =*/18).fork()).ldelim(); - if (message.identifierValue !== undefined && message.hasOwnProperty("identifierValue")) + if (message.identifierValue !== undefined && message.identifierValue !== null && message.hasOwnProperty("identifierValue")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.identifierValue); if (message.positiveIntValue !== undefined && message.positiveIntValue !== null && message.hasOwnProperty("positiveIntValue")) writer.uint32(/* id 4, wireType 0 =*/32).uint64(message.positiveIntValue); if (message.negativeIntValue !== undefined && message.negativeIntValue !== null && message.hasOwnProperty("negativeIntValue")) writer.uint32(/* id 5, wireType 0 =*/40).int64(message.negativeIntValue); - if (message.doubleValue !== undefined && message.hasOwnProperty("doubleValue")) + if (message.doubleValue !== undefined && message.doubleValue !== null && message.hasOwnProperty("doubleValue")) writer.uint32(/* id 6, wireType 1 =*/49).double(message.doubleValue); if (message.stringValue && message.hasOwnProperty("stringValue")) writer.uint32(/* id 7, wireType 2 =*/58).bytes(message.stringValue); - if (message.aggregateValue !== undefined && message.hasOwnProperty("aggregateValue")) + if (message.aggregateValue !== undefined && message.aggregateValue !== null && message.hasOwnProperty("aggregateValue")) writer.uint32(/* id 8, wireType 2 =*/66).string(message.aggregateValue); return writer; }; @@ -13677,9 +13677,9 @@ $root.google = (function() { writer.int32(message.span[i]); writer.ldelim(); } - if (message.leadingComments !== undefined && message.hasOwnProperty("leadingComments")) + if (message.leadingComments !== undefined && message.leadingComments !== null && message.hasOwnProperty("leadingComments")) writer.uint32(/* id 3, wireType 2 =*/26).string(message.leadingComments); - if (message.trailingComments !== undefined && message.hasOwnProperty("trailingComments")) + if (message.trailingComments !== undefined && message.trailingComments !== null && message.hasOwnProperty("trailingComments")) writer.uint32(/* id 4, wireType 2 =*/34).string(message.trailingComments); if (message.leadingDetachedComments !== undefined && message.hasOwnProperty("leadingDetachedComments")) for (var i = 0; i < message.leadingDetachedComments.length; ++i) @@ -14162,11 +14162,11 @@ $root.google = (function() { writer.int32(message.path[i]); writer.ldelim(); } - if (message.sourceFile !== undefined && message.hasOwnProperty("sourceFile")) + if (message.sourceFile !== undefined && message.sourceFile !== null && message.hasOwnProperty("sourceFile")) writer.uint32(/* id 2, wireType 2 =*/18).string(message.sourceFile); - if (message.begin !== undefined && message.hasOwnProperty("begin")) + if (message.begin !== undefined && message.begin !== null && message.hasOwnProperty("begin")) writer.uint32(/* id 3, wireType 0 =*/24).int32(message.begin); - if (message.end !== undefined && message.hasOwnProperty("end")) + if (message.end !== undefined && message.end !== null && message.hasOwnProperty("end")) writer.uint32(/* id 4, wireType 0 =*/32).int32(message.end); return writer; };