ord-schema 0.3.47 → 0.3.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ord-schema",
-  "version": "0.3.47",
+  "version": "0.3.49",
   "description": "Schema for the Open Reaction Database",
   "main": "index.js",
   "scripts": {

package/proto/dataset_pb.test.js

@@ -29,7 +29,7 @@ test('round-trip', () => {
     const reaction2 = new ord.Reaction();
     const identifier2 = reaction2.addIdentifiers();
     identifier2.setValue('amide coupling');
-    identifier2.setType(ord.ReactionIdentifier.ReactionIdentifierType.NAME);
+    identifier2.setType(ord.ReactionIdentifier.ReactionIdentifierType.REACTION_TYPE);
     dataset.addReactions(reaction2);
     const serialized = dataset.serializeBinary();
     const other = ord.Dataset.deserializeBinary(serialized);
@@ -37,5 +37,5 @@ test('round-trip', () => {
     expect(other.getDescription()).toBe('test dataset');
     expect(other.getReactionsList()).toHaveLength(2);
     expect(other.getReactionsList()[0].getIdentifiersList()[0].getType()).toBe(ord.ReactionIdentifier.ReactionIdentifierType.REACTION_SMILES);
-    expect(other.getReactionsList()[1].getIdentifiersList()[0].getType()).toBe(ord.ReactionIdentifier.ReactionIdentifierType.NAME);
+    expect(other.getReactionsList()[1].getIdentifiersList()[0].getType()).toBe(ord.ReactionIdentifier.ReactionIdentifierType.REACTION_TYPE);
 });

package/proto/reaction_pb.js

@@ -59,7 +59,6 @@ goog.exportSymbol('proto.ord.ElectrochemistryConditions', null, global);
 goog.exportSymbol('proto.ord.ElectrochemistryConditions.ElectrochemistryCell', null, global);
 goog.exportSymbol('proto.ord.ElectrochemistryConditions.ElectrochemistryCell.ElectrochemistryCellType', null, global);
 goog.exportSymbol('proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement', null, global);
-goog.exportSymbol('proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.KindCase', null, global);
 goog.exportSymbol('proto.ord.ElectrochemistryConditions.ElectrochemistryType', null, global);
 goog.exportSymbol('proto.ord.FloatValue', null, global);
 goog.exportSymbol('proto.ord.FlowConditions', null, global);
@@ -809,7 +808,7 @@ if (goog.DEBUG && !COMPILED) {
  * @constructor
  */
 proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.oneofGroups_);
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
 goog.inherits(proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
@@ -2235,7 +2234,7 @@ proto.ord.ReactionIdentifier.ReactionIdentifierType = {
   REACTION_CXSMILES: 6,
   RDFILE: 3,
   RINCHI: 4,
-  NAME: 5
+  REACTION_TYPE: 5
 };
 
 /**
@@ -5278,8 +5277,10 @@ proto.ord.Vessel.toObject = function(includeInstance, msg) {
     attachmentsList: jspb.Message.toObjectList(msg.getAttachmentsList(),
     proto.ord.VesselAttachment.toObject, includeInstance),
     volume: (f = msg.getVolume()) && proto.ord.Volume.toObject(includeInstance, f),
-    plateId: jspb.Message.getFieldWithDefault(msg, 7, ""),
-    platePosition: jspb.Message.getFieldWithDefault(msg, 8, "")
+    vesselId: jspb.Message.getFieldWithDefault(msg, 7, ""),
+    position: jspb.Message.getFieldWithDefault(msg, 8, ""),
+    row: jspb.Message.getFieldWithDefault(msg, 9, ""),
+    col: jspb.Message.getFieldWithDefault(msg, 10, "")
   };
 
   if (includeInstance) {
@@ -5346,11 +5347,19 @@ proto.ord.Vessel.deserializeBinaryFromReader = function(msg, reader) {
       break;
     case 7:
       var value = /** @type {string} */ (reader.readString());
-      msg.setPlateId(value);
+      msg.setVesselId(value);
       break;
     case 8:
       var value = /** @type {string} */ (reader.readString());
-      msg.setPlatePosition(value);
+      msg.setPosition(value);
+      break;
+    case 9:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setRow(value);
+      break;
+    case 10:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setCol(value);
       break;
     default:
       reader.skipField();
@@ -5427,20 +5436,34 @@ proto.ord.Vessel.serializeBinaryToWriter = function(message, writer) {
       proto.ord.Volume.serializeBinaryToWriter
     );
   }
-  f = message.getPlateId();
+  f = message.getVesselId();
   if (f.length > 0) {
     writer.writeString(
       7,
       f
     );
   }
-  f = message.getPlatePosition();
+  f = message.getPosition();
   if (f.length > 0) {
     writer.writeString(
       8,
       f
     );
   }
+  f = message.getRow();
+  if (f.length > 0) {
+    writer.writeString(
+      9,
+      f
+    );
+  }
+  f = message.getCol();
+  if (f.length > 0) {
+    writer.writeString(
+      10,
+      f
+    );
+  }
 };
 
 
@@ -5650,10 +5673,10 @@ proto.ord.Vessel.prototype.hasVolume = function() {
 
 
 /**
- * optional string plate_id = 7;
+ * optional string vessel_id = 7;
  * @return {string}
  */
-proto.ord.Vessel.prototype.getPlateId = function() {
+proto.ord.Vessel.prototype.getVesselId = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
 };
 
@@ -5662,16 +5685,16 @@ proto.ord.Vessel.prototype.getPlateId = function() {
  * @param {string} value
  * @return {!proto.ord.Vessel} returns this
  */
-proto.ord.Vessel.prototype.setPlateId = function(value) {
+proto.ord.Vessel.prototype.setVesselId = function(value) {
   return jspb.Message.setProto3StringField(this, 7, value);
 };
 
 
 /**
- * optional string plate_position = 8;
+ * optional string position = 8;
  * @return {string}
  */
-proto.ord.Vessel.prototype.getPlatePosition = function() {
+proto.ord.Vessel.prototype.getPosition = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 8, ""));
 };
 
@@ -5680,11 +5703,47 @@ proto.ord.Vessel.prototype.getPlatePosition = function() {
  * @param {string} value
  * @return {!proto.ord.Vessel} returns this
  */
-proto.ord.Vessel.prototype.setPlatePosition = function(value) {
+proto.ord.Vessel.prototype.setPosition = function(value) {
   return jspb.Message.setProto3StringField(this, 8, value);
 };
 
 
+/**
+ * optional string row = 9;
+ * @return {string}
+ */
+proto.ord.Vessel.prototype.getRow = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.ord.Vessel} returns this
+ */
+proto.ord.Vessel.prototype.setRow = function(value) {
+  return jspb.Message.setProto3StringField(this, 9, value);
+};
+
+
+/**
+ * optional string col = 10;
+ * @return {string}
+ */
+proto.ord.Vessel.prototype.getCol = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.ord.Vessel} returns this
+ */
+proto.ord.Vessel.prototype.setCol = function(value) {
+  return jspb.Message.setProto3StringField(this, 10, value);
+};
+
+
 
 
 
@@ -9898,32 +9957,6 @@ proto.ord.ElectrochemistryConditions.ElectrochemistryType = {
 };
 
 
-/**
- * Oneof group definitions for this message. Each group defines the field
- * numbers belonging to that group. When of these fields' value is set, all
- * other fields in the group are cleared. During deserialization, if multiple
- * fields are encountered for a group, only the last value seen will be kept.
- * @private {!Array<!Array<number>>}
- * @const
- */
-proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.oneofGroups_ = [[2,3]];
-
-/**
- * @enum {number}
- */
-proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.KindCase = {
-  KIND_NOT_SET: 0,
-  CURRENT: 2,
-  VOLTAGE: 3
-};
-
-/**
- * @return {proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.KindCase}
- */
-proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.prototype.getKindCase = function() {
-  return /** @type {proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.KindCase} */(jspb.Message.computeOneofCase(this, proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.oneofGroups_[0]));
-};
-
 
 
 if (jspb.Message.GENERATE_TO_OBJECT) {
@@ -10117,7 +10150,7 @@ proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.prototype.getCu
  * @return {!proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement} returns this
 */
 proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.prototype.setCurrent = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 2, proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.oneofGroups_[0], value);
+  return jspb.Message.setWrapperField(this, 2, value);
 };
 
 
@@ -10154,7 +10187,7 @@ proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.prototype.getVo
  * @return {!proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement} returns this
 */
 proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.prototype.setVoltage = function(value) {
-  return jspb.Message.setOneofWrapperField(this, 3, proto.ord.ElectrochemistryConditions.ElectrochemistryMeasurement.oneofGroups_[0], value);
+  return jspb.Message.setWrapperField(this, 3, value);
 };
 
 
@@ -15148,7 +15181,8 @@ proto.ord.ReactionProvenance.toObject = function(includeInstance, msg) {
     publicationUrl: jspb.Message.getFieldWithDefault(msg, 6, ""),
     recordCreated: (f = msg.getRecordCreated()) && proto.ord.RecordEvent.toObject(includeInstance, f),
     recordModifiedList: jspb.Message.toObjectList(msg.getRecordModifiedList(),
-    proto.ord.RecordEvent.toObject, includeInstance)
+    proto.ord.RecordEvent.toObject, includeInstance),
+    reactionMetadataMap: (f = msg.getReactionMetadataMap()) ? f.toObject(includeInstance, proto.ord.Data.toObject) : []
   };
 
   if (includeInstance) {
@@ -15221,6 +15255,12 @@ proto.ord.ReactionProvenance.deserializeBinaryFromReader = function(msg, reader)
       reader.readMessage(value,proto.ord.RecordEvent.deserializeBinaryFromReader);
       msg.addRecordModified(value);
       break;
+    case 9:
+      var value = msg.getReactionMetadataMap();
+      reader.readMessage(value, function(message, reader) {
+        jspb.Map.deserializeBinary(message, reader, jspb.BinaryReader.prototype.readString, jspb.BinaryReader.prototype.readMessage, proto.ord.Data.deserializeBinaryFromReader, "", new proto.ord.Data());
+         });
+      break;
     default:
       reader.skipField();
       break;
@@ -15310,6 +15350,10 @@ proto.ord.ReactionProvenance.serializeBinaryToWriter = function(message, writer)
       proto.ord.RecordEvent.serializeBinaryToWriter
     );
   }
+  f = message.getReactionMetadataMap(true);
+  if (f && f.getLength() > 0) {
+    f.serializeBinary(9, writer, jspb.BinaryWriter.prototype.writeString, jspb.BinaryWriter.prototype.writeMessage, proto.ord.Data.serializeBinaryToWriter);
+  }
 };
 
 
@@ -15534,6 +15578,28 @@ proto.ord.ReactionProvenance.prototype.clearRecordModifiedList = function() {
 };
 
 
+/**
+ * map<string, Data> reaction_metadata = 9;
+ * @param {boolean=} opt_noLazyCreate Do not create the map if
+ * empty, instead returning `undefined`
+ * @return {!jspb.Map<string,!proto.ord.Data>}
+ */
+proto.ord.ReactionProvenance.prototype.getReactionMetadataMap = function(opt_noLazyCreate) {
+  return /** @type {!jspb.Map<string,!proto.ord.Data>} */ (
+      jspb.Message.getMapField(this, 9, opt_noLazyCreate,
+      proto.ord.Data));
+};
+
+
+/**
+ * Clears values from the map. The map will be non-null.
+ * @return {!proto.ord.ReactionProvenance} returns this
+ */
+proto.ord.ReactionProvenance.prototype.clearReactionMetadataMap = function() {
+  this.getReactionMetadataMap().clear();
+  return this;};
+
+