commit 743a4322ba8332d0b78e30a699e1f3538f8b2093
author Artem Kustikov <artem.kustikov@gmail.com> Thu Feb 27 20:10:16 2020 +0300
committer GitHub <noreply@github.com> Thu Feb 27 09:10:16 2020 -0800
tree ff4d6ae0a85f56e4c07ce053601ce1c324e3a3aa
parent 88579a44fb8e6283d7e55117233abf6bd10b3cb0

Fix js message pivot selection (#6813)

* fix javascript setFieldIgnoringDefault_ logic

* remove package-lock.json

* fix build script to include new UT asset file

Co-authored-by: Daniel Kurka <kurka.daniel@gmail.com>

js/message.js

diff --git a/js/message.js b/js/message.js
index 5c08112..c1736b3 100644
--- a/js/message.js
+++ b/js/message.js
@@ -1112,8 +1112,11 @@
   goog.asserts.assertInstanceof(msg, jspb.Message);
   if (value !== defaultValue) {
     jspb.Message.setField(msg, fieldNumber, value);
-  } else {
+  } else if (fieldNumber < msg.pivot_) {
     msg.array[jspb.Message.getIndex_(msg, fieldNumber)] = null;
+  } else {
+    jspb.Message.maybeInitEmptyExtensionObject_(msg);
+    delete msg.extensionObject_[fieldNumber];
   }
   return msg;
 };