@dxos/codec-protobuf 2.33.9-dev.a78b0c94 → 2.33.9-dev.cf61eddc

package/README.md

@@ -1,5 +1,44 @@
 # codec-protobuf
 
+There's an associated @dxos/protobuf-compiler package that does codegen based on protobuf schema.
+
+## Handling of scalar fields with default values
+
+Based on:
+- https://github.com/protocolbuffers/protobuf/blob/main/docs/field_presence.md
+- https://github.com/protocolbuffers/protobuf/blob/main/docs/implementing_proto3_presence.md
+
+
+In protobuf scalar fields (numbers, booleans, strings, bytes, enums) may have an implicit default value:
+
+- 0 for number types
+- false for booleans
+- '' (empty string) for strings
+- [] for bytes
+- First enum value for enums
+
+### Non-optional fields
+
+Example:
+
+```protobuf
+int32 number = 1;
+```
+
+If the field is set to it's default value (0 in this example) it MAY be missing in the wire encoding (Go implementation) or present with the value set to 0 (JS implementation).
+
+When decoding, the missing fields MUST be treated as having the default implicit value (0 in this case).
+
+### Optional fields
+
+```protobuf
+optional int32 number = 1;
+```
+
+If the field is set to it's default value (0 in this example) it MUST be present in the wire encoding with the value set to 0.
+
+When decoding, the missing fields it MUST be set as undefined. If the field is present in the wire format, it must be set to its numeric value.
+
 ## Toolchain
 
 This package must NOT use `toolchain` to avoid cyclic dependencies.

package/dist/browser.js

@@ -5244,7 +5244,7 @@ var require_field = __commonJS({
     module2.exports = Field;
     var ReflectionObject = require_object();
     ((Field.prototype = Object.create(ReflectionObject.prototype)).constructor = Field).className = "Field";
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var types = require_types2();
     var util = require_util2();
     var Type3;
@@ -5335,11 +5335,11 @@ var require_field = __commonJS({
       }
       if (this.options && this.options["default"] != null) {
         this.typeDefault = this.options["default"];
-        if (this.resolvedType instanceof Enum2 && typeof this.typeDefault === "string")
+        if (this.resolvedType instanceof Enum3 && typeof this.typeDefault === "string")
           this.typeDefault = this.resolvedType.values[this.typeDefault];
       }
       if (this.options) {
-        if (this.options.packed === true || this.options.packed !== void 0 && this.resolvedType && !(this.resolvedType instanceof Enum2))
+        if (this.options.packed === true || this.options.packed !== void 0 && this.resolvedType && !(this.resolvedType instanceof Enum3))
           delete this.options.packed;
         if (!Object.keys(this.options).length)
           this.options = void 0;
@@ -5492,7 +5492,7 @@ var require_namespace = __commonJS({
     var util = require_util2();
     var Type3;
     var Service2;
-    var Enum2;
+    var Enum3;
     Namespace.fromJSON = function fromJSON(name, json) {
       return new Namespace(name, json.options).addJSON(json.nested);
     };
@@ -5548,7 +5548,7 @@ var require_namespace = __commonJS({
       if (nestedJson) {
         for (var names = Object.keys(nestedJson), i = 0, nested; i < names.length; ++i) {
           nested = nestedJson[names[i]];
-          ns.add((nested.fields !== void 0 ? Type3.fromJSON : nested.values !== void 0 ? Enum2.fromJSON : nested.methods !== void 0 ? Service2.fromJSON : nested.id !== void 0 ? Field.fromJSON : Namespace.fromJSON)(names[i], nested));
+          ns.add((nested.fields !== void 0 ? Type3.fromJSON : nested.values !== void 0 ? Enum3.fromJSON : nested.methods !== void 0 ? Service2.fromJSON : nested.id !== void 0 ? Field.fromJSON : Namespace.fromJSON)(names[i], nested));
         }
       }
       return this;
@@ -5557,12 +5557,12 @@ var require_namespace = __commonJS({
       return this.nested && this.nested[name] || null;
     };
     Namespace.prototype.getEnum = function getEnum(name) {
-      if (this.nested && this.nested[name] instanceof Enum2)
+      if (this.nested && this.nested[name] instanceof Enum3)
         return this.nested[name].values;
       throw Error("no such enum: " + name);
     };
     Namespace.prototype.add = function add(object) {
-      if (!(object instanceof Field && object.extend !== void 0 || object instanceof Type3 || object instanceof Enum2 || object instanceof Service2 || object instanceof Namespace || object instanceof OneOf))
+      if (!(object instanceof Field && object.extend !== void 0 || object instanceof Type3 || object instanceof Enum3 || object instanceof Service2 || object instanceof Namespace || object instanceof OneOf))
         throw TypeError("object must be a valid nested object");
       if (!this.nested)
         this.nested = {};
@@ -5662,13 +5662,13 @@ var require_namespace = __commonJS({
       return found;
     };
     Namespace.prototype.lookupEnum = function lookupEnum(path) {
-      var found = this.lookup(path, [Enum2]);
+      var found = this.lookup(path, [Enum3]);
       if (!found)
         throw Error("no such Enum '" + path + "' in " + this);
       return found;
     };
     Namespace.prototype.lookupTypeOrEnum = function lookupTypeOrEnum(path) {
-      var found = this.lookup(path, [Type3, Enum2]);
+      var found = this.lookup(path, [Type3, Enum3]);
       if (!found)
         throw Error("no such Type or Enum '" + path + "' in " + this);
       return found;
@@ -5682,7 +5682,7 @@ var require_namespace = __commonJS({
     Namespace._configure = function(Type_, Service_, Enum_) {
       Type3 = Type_;
       Service2 = Service_;
-      Enum2 = Enum_;
+      Enum3 = Enum_;
     };
   }
 });
@@ -5948,7 +5948,7 @@ var require_decoder = __commonJS({
   "../../../common/temp/node_modules/.pnpm/protobufjs@6.11.2/node_modules/protobufjs/src/decoder.js"(exports2, module2) {
     "use strict";
     module2.exports = decoder;
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var types = require_types2();
     var util = require_util2();
     function missing(field) {
@@ -5963,7 +5963,7 @@ var require_decoder = __commonJS({
       gen("switch(t>>>3){");
       var i = 0;
       for (; i < mtype.fieldsArray.length; ++i) {
-        var field = mtype._fieldsArray[i].resolve(), type = field.resolvedType instanceof Enum2 ? "int32" : field.type, ref2 = "m" + util.safeProp(field.name);
+        var field = mtype._fieldsArray[i].resolve(), type = field.resolvedType instanceof Enum3 ? "int32" : field.type, ref2 = "m" + util.safeProp(field.name);
         gen("case %i:", field.id);
         if (field.map) {
           gen("if(%s===util.emptyObject)", ref2)("%s={}", ref2)("var c2 = r.uint32()+r.pos");
@@ -6015,14 +6015,14 @@ var require_verifier = __commonJS({
   "../../../common/temp/node_modules/.pnpm/protobufjs@6.11.2/node_modules/protobufjs/src/verifier.js"(exports2, module2) {
     "use strict";
     module2.exports = verifier;
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var util = require_util2();
     function invalid(field, expected) {
       return field.name + ": " + expected + (field.repeated && expected !== "array" ? "[]" : field.map && expected !== "object" ? "{k:" + field.keyType + "}" : "") + " expected";
     }
     function genVerifyValue(gen, field, fieldIndex, ref2) {
       if (field.resolvedType) {
-        if (field.resolvedType instanceof Enum2) {
+        if (field.resolvedType instanceof Enum3) {
           gen("switch(%s){", ref2)("default:")("return%j", invalid(field, "enum value"));
           for (var keys = Object.keys(field.resolvedType.values), j = 0; j < keys.length; ++j)
             gen("case %i:", field.resolvedType.values[keys[j]]);
@@ -6124,11 +6124,11 @@ var require_converter = __commonJS({
   "../../../common/temp/node_modules/.pnpm/protobufjs@6.11.2/node_modules/protobufjs/src/converter.js"(exports2) {
     "use strict";
     var converter = exports2;
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var util = require_util2();
     function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
       if (field.resolvedType) {
-        if (field.resolvedType instanceof Enum2) {
+        if (field.resolvedType instanceof Enum3) {
           gen("switch(d%s){", prop);
           for (var values = field.resolvedType.values, keys = Object.keys(values), i = 0; i < keys.length; ++i) {
             if (field.repeated && values[keys[i]] === field.typeDefault)
@@ -6190,10 +6190,10 @@ var require_converter = __commonJS({
           gen("if(d%s){", prop)("if(!Array.isArray(d%s))", prop)("throw TypeError(%j)", field.fullName + ": array expected")("m%s=[]", prop)("for(var i=0;i<d%s.length;++i){", prop);
           genValuePartial_fromObject(gen, field, i, prop + "[i]")("}")("}");
         } else {
-          if (!(field.resolvedType instanceof Enum2))
+          if (!(field.resolvedType instanceof Enum3))
             gen("if(d%s!=null){", prop);
           genValuePartial_fromObject(gen, field, i, prop);
-          if (!(field.resolvedType instanceof Enum2))
+          if (!(field.resolvedType instanceof Enum3))
             gen("}");
         }
       }
@@ -6201,7 +6201,7 @@ var require_converter = __commonJS({
     };
     function genValuePartial_toObject(gen, field, fieldIndex, prop) {
       if (field.resolvedType) {
-        if (field.resolvedType instanceof Enum2)
+        if (field.resolvedType instanceof Enum3)
           gen("d%s=o.enums===String?types[%i].values[m%s]:m%s", prop, fieldIndex, prop, prop);
         else
           gen("d%s=types[%i].toObject(m%s,o)", prop, fieldIndex, prop);
@@ -6255,7 +6255,7 @@ var require_converter = __commonJS({
         gen("if(o.defaults){");
         for (i = 0; i < normalFields.length; ++i) {
           var field = normalFields[i], prop = util.safeProp(field.name);
-          if (field.resolvedType instanceof Enum2)
+          if (field.resolvedType instanceof Enum3)
             gen("d%s=o.enums===String?%j:%j", prop, field.resolvedType.valuesById[field.typeDefault], field.typeDefault);
           else if (field.long)
             gen("if(util.Long){")("var n=new util.Long(%i,%i,%j)", field.typeDefault.low, field.typeDefault.high, field.typeDefault.unsigned)("d%s=o.longs===String?n.toString():o.longs===Number?n.toNumber():n", prop)("}else")("d%s=o.longs===String?%j:%i", prop, field.typeDefault.toString(), field.typeDefault.toNumber());
@@ -6351,7 +6351,7 @@ var require_type = __commonJS({
     module2.exports = Type3;
     var Namespace = require_namespace();
     ((Type3.prototype = Object.create(Namespace.prototype)).constructor = Type3).className = "Type";
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var OneOf = require_oneof();
     var Field = require_field();
     var MapField2 = require_mapfield();
@@ -6458,7 +6458,7 @@ var require_type = __commonJS({
       if (json.nested)
         for (names = Object.keys(json.nested), i = 0; i < names.length; ++i) {
           var nested = json.nested[names[i]];
-          type.add((nested.id !== void 0 ? Field.fromJSON : nested.fields !== void 0 ? Type3.fromJSON : nested.values !== void 0 ? Enum2.fromJSON : nested.methods !== void 0 ? Service2.fromJSON : Namespace.fromJSON)(names[i], nested));
+          type.add((nested.id !== void 0 ? Field.fromJSON : nested.fields !== void 0 ? Type3.fromJSON : nested.values !== void 0 ? Enum3.fromJSON : nested.methods !== void 0 ? Service2.fromJSON : Namespace.fromJSON)(names[i], nested));
         }
       if (json.extensions && json.extensions.length)
         type.extensions = json.extensions;
@@ -6636,7 +6636,7 @@ var require_root = __commonJS({
     var Namespace = require_namespace();
     ((Root3.prototype = Object.create(Namespace.prototype)).constructor = Root3).className = "Root";
     var Field = require_field();
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var OneOf = require_oneof();
     var util = require_util2();
     var Type3;
@@ -6796,7 +6796,7 @@ var require_root = __commonJS({
           if (!tryHandleExtension(this, object))
             this.deferred.push(object);
         }
-      } else if (object instanceof Enum2) {
+      } else if (object instanceof Enum3) {
         if (exposeRe.test(object.name))
           object.parent[object.name] = object.values;
       } else if (!(object instanceof OneOf)) {
@@ -6824,7 +6824,7 @@ var require_root = __commonJS({
               this.deferred.splice(index, 1);
           }
         }
-      } else if (object instanceof Enum2) {
+      } else if (object instanceof Enum3) {
         if (exposeRe.test(object.name))
           delete object.parent[object.name];
       } else if (object instanceof Namespace) {
@@ -6849,7 +6849,7 @@ var require_util2 = __commonJS({
     var util = module2.exports = require_minimal();
     var roots = require_roots();
     var Type3;
-    var Enum2;
+    var Enum3;
     util.codegen = require_codegen();
     util.fetch = require_fetch();
     util.path = require_path();
@@ -6916,9 +6916,9 @@ var require_util2 = __commonJS({
     util.decorateEnum = function decorateEnum(object) {
       if (object.$type)
         return object.$type;
-      if (!Enum2)
-        Enum2 = require_enum();
-      var enm = new Enum2("Enum" + decorateEnumIndex++, object);
+      if (!Enum3)
+        Enum3 = require_enum();
+      var enm = new Enum3("Enum" + decorateEnumIndex++, object);
       util.decorateRoot.add(enm);
       Object.defineProperty(object, "$type", { value: enm, enumerable: false });
       return enm;
@@ -7074,12 +7074,12 @@ var require_object = __commonJS({
 var require_enum = __commonJS({
   "../../../common/temp/node_modules/.pnpm/protobufjs@6.11.2/node_modules/protobufjs/src/enum.js"(exports2, module2) {
     "use strict";
-    module2.exports = Enum2;
+    module2.exports = Enum3;
     var ReflectionObject = require_object();
-    ((Enum2.prototype = Object.create(ReflectionObject.prototype)).constructor = Enum2).className = "Enum";
+    ((Enum3.prototype = Object.create(ReflectionObject.prototype)).constructor = Enum3).className = "Enum";
     var Namespace = require_namespace();
     var util = require_util2();
-    function Enum2(name, values, options, comment, comments) {
+    function Enum3(name, values, options, comment, comments) {
       ReflectionObject.call(this, name, options);
       if (values && typeof values !== "object")
         throw TypeError("values must be an object");
@@ -7094,12 +7094,12 @@ var require_enum = __commonJS({
             this.valuesById[this.values[keys[i]] = values[keys[i]]] = keys[i];
       }
     }
-    Enum2.fromJSON = function fromJSON(name, json) {
-      var enm = new Enum2(name, json.values, json.options, json.comment, json.comments);
+    Enum3.fromJSON = function fromJSON(name, json) {
+      var enm = new Enum3(name, json.values, json.options, json.comment, json.comments);
       enm.reserved = json.reserved;
       return enm;
     };
-    Enum2.prototype.toJSON = function toJSON(toJSONOptions) {
+    Enum3.prototype.toJSON = function toJSON(toJSONOptions) {
       var keepComments = toJSONOptions ? Boolean(toJSONOptions.keepComments) : false;
       return util.toObject([
         "options",
@@ -7114,7 +7114,7 @@ var require_enum = __commonJS({
         keepComments ? this.comments : void 0
       ]);
     };
-    Enum2.prototype.add = function add(name, id, comment) {
+    Enum3.prototype.add = function add(name, id, comment) {
       if (!util.isString(name))
         throw TypeError("name must be a string");
       if (!util.isInteger(id))
@@ -7134,7 +7134,7 @@ var require_enum = __commonJS({
       this.comments[name] = comment || null;
       return this;
     };
-    Enum2.prototype.remove = function remove(name) {
+    Enum3.prototype.remove = function remove(name) {
       if (!util.isString(name))
         throw TypeError("name must be a string");
       var val = this.values[name];
@@ -7145,10 +7145,10 @@ var require_enum = __commonJS({
       delete this.comments[name];
       return this;
     };
-    Enum2.prototype.isReservedId = function isReservedId(id) {
+    Enum3.prototype.isReservedId = function isReservedId(id) {
       return Namespace.isReservedId(this.reserved, id);
     };
-    Enum2.prototype.isReservedName = function isReservedName(name) {
+    Enum3.prototype.isReservedName = function isReservedName(name) {
       return Namespace.isReservedName(this.reserved, name);
     };
   }
@@ -7159,7 +7159,7 @@ var require_encoder = __commonJS({
   "../../../common/temp/node_modules/.pnpm/protobufjs@6.11.2/node_modules/protobufjs/src/encoder.js"(exports2, module2) {
     "use strict";
     module2.exports = encoder;
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var types = require_types2();
     var util = require_util2();
     function genTypePartial(gen, field, fieldIndex, ref2) {
@@ -7170,7 +7170,7 @@ var require_encoder = __commonJS({
       var i, ref2;
       var fields = mtype.fieldsArray.slice().sort(util.compareFieldsById);
       for (var i = 0; i < fields.length; ++i) {
-        var field = fields[i].resolve(), index = mtype._fieldsArray.indexOf(field), type = field.resolvedType instanceof Enum2 ? "int32" : field.type, wireType = types.basic[type];
+        var field = fields[i].resolve(), index = mtype._fieldsArray.indexOf(field), type = field.resolvedType instanceof Enum3 ? "int32" : field.type, wireType = types.basic[type];
         ref2 = "m" + util.safeProp(field.name);
         if (field.map) {
           gen("if(%s!=null&&Object.hasOwnProperty.call(m,%j)){", ref2, field.name)("for(var ks=Object.keys(%s),i=0;i<ks.length;++i){", ref2)("w.uint32(%i).fork().uint32(%i).%s(ks[i])", (field.id << 3 | 2) >>> 0, 8 | types.mapKey[field.keyType], field.keyType);
@@ -7497,7 +7497,7 @@ var require_parse = __commonJS({
     var Field = require_field();
     var MapField2 = require_mapfield();
     var OneOf = require_oneof();
-    var Enum2 = require_enum();
+    var Enum3 = require_enum();
     var Service2 = require_service2();
     var Method = require_method();
     var types = require_types2();
@@ -7855,7 +7855,7 @@ var require_parse = __commonJS({
       function parseEnum(parent, token2) {
         if (!nameRe.test(token2 = next()))
           throw illegal(token2, "name");
-        var enm = new Enum2(token2);
+        var enm = new Enum3(token2);
         ifBlock(enm, function parseEnum_block(token3) {
           switch (token3) {
             case "option":
@@ -8367,10 +8367,10 @@ var createMessageMapperCached = (type, substitutions, cache) => {
     cache[type.fullName].map = codegen(`${type.name}$map`, ["obj", "extraArgs"], (c) => {
       c`const res = {};`;
       for (const field of type.fieldsArray) {
+        field.resolve();
         c`if(obj.${field.name} !== undefined && obj.${field.name} !== null) {`;
         {
           const genMapScalar = (value) => {
-            field.resolve();
             const substitution = field.resolvedType && substitutions[field.resolvedType.fullName.slice(1)];
             if (substitution) {
               c`${ref(substitution)}(${value}, ...extraArgs)`;
@@ -8402,12 +8402,52 @@ var createMessageMapperCached = (type, substitutions, cache) => {
           }
         }
         c`}`;
+        if (!field.getOption("proto3_optional") && !field.repeated && !field.map && !field.partOf) {
+          c`else {`;
+          {
+            if (field.resolvedType instanceof pb.Type) {
+              const mapper = createMessageMapperCached(field.resolvedType, substitutions, cache);
+              c`res.${field.name} = ${ref(mapper)}.map({}, extraArgs);`;
+            } else if (field.resolvedType instanceof pb.Enum) {
+              `res.${field.name} = 0;`;
+            } else {
+              c`res.${field.name} = ${getDefaultValue(field.type)};`;
+            }
+          }
+          c`}`;
+        }
       }
       c`return res;`;
     });
   }
   return cache[type.fullName];
 };
+var getDefaultValue = (type) => {
+  switch (type) {
+    case "double":
+    case "float":
+    case "int32":
+    case "sfixed32":
+    case "uint32":
+    case "sint32":
+    case "fixed32":
+      return "0";
+    case "sint64":
+    case "int64":
+    case "uint64":
+    case "fixed64":
+    case "sfixed64":
+      return '"0"';
+    case "bool":
+      return "false";
+    case "string":
+      return '""';
+    case "bytes":
+      return "new Uint8Array()";
+    default:
+      throw new Error(`Unknown type: ${type}`);
+  }
+};
 
 // src/codec.ts
 var OBJECT_CONVERSION_OPTIONS = {
@@ -8567,13 +8607,21 @@ var log = (0, import_debug.default)("dxos:codec-protobuf:stream");
 var Stream = class {
   constructor(producer) {
     this._isClosed = false;
+    this._isReady = false;
     this._buffer = [];
+    this._readyPromise = new Promise((resolve) => {
+      this._resolveReadyPromise = resolve;
+    });
     const disposeCallback = producer({
+      ready: () => {
+        this._markAsReady();
+      },
       next: (msg) => {
         if (this._isClosed) {
           log("Stream is closed, dropping message.");
           return;
         }
+        this._markAsReady();
         if (this._messageHandler) {
           try {
             this._messageHandler(msg);
@@ -8607,6 +8655,9 @@ var Stream = class {
   static consume(stream) {
     return new Promise((resolve) => {
       const items = [];
+      stream.onReady(() => {
+        items.push({ ready: true });
+      });
       stream.subscribe((data) => {
         items.push({ data });
       }, (error) => {
@@ -8619,6 +8670,21 @@ var Stream = class {
       });
     });
   }
+  static map(source, map) {
+    return new Stream(({ ready, next, close }) => {
+      source.onReady(ready);
+      source.subscribe((data) => next(map(data)), close);
+      return () => source.close();
+    });
+  }
+  _markAsReady() {
+    var _a;
+    if (!this._isReady) {
+      this._isReady = true;
+      (_a = this._readyHandler) == null ? void 0 : _a.call(this);
+      this._resolveReadyPromise();
+    }
+  }
   subscribe(onMessage, onClose) {
     (0, import_node_assert3.default)(!this._messageHandler, "Stream is already subscribed to.");
     (0, import_node_assert3.default)(!this._closeHandler, "Stream is already subscribed to.");
@@ -8638,6 +8704,16 @@ var Stream = class {
     this._messageHandler = onMessage;
     this._closeHandler = onClose;
   }
+  waitUntilReady() {
+    return this._readyPromise;
+  }
+  onReady(onReady) {
+    (0, import_node_assert3.default)(!this._readyHandler, "Stream already has a handler for the ready event.");
+    this._readyHandler = onReady;
+    if (this._isReady) {
+      onReady();
+    }
+  }
   close() {
     var _a, _b;
     if (this._isClosed) {
@@ -8695,14 +8771,11 @@ var Service = class {
       } else {
         this[methodName] = (request) => {
           const encoded = requestCodec.encode(request);
-          return new Stream(({ next, close }) => {
-            const stream = backend.callStream(method.name, {
-              value: encoded,
-              type_url: method.resolvedRequestType.fullName
-            });
-            stream.subscribe((data) => next(responseCodec.decode(data.value)), close);
-            return () => stream.close();
+          const stream = backend.callStream(method.name, {
+            value: encoded,
+            type_url: method.resolvedRequestType.fullName
           });
+          return Stream.map(stream, (data) => responseCodec.decode(data.value));
         };
       }
       Object.defineProperty(this[methodName], "name", { value: methodName });
@@ -8739,13 +8812,10 @@ var ServiceHandler = class {
     (0, import_node_assert4.default)(handler, `Handler is missing: ${mappedMethodName}`);
     const requestDecoded = requestCodec.decode(request.value);
     const responseStream = handler.bind(this._handlers)(requestDecoded);
-    return new Stream(({ next, close }) => {
-      responseStream.subscribe((data) => next({
-        value: responseCodec.encode(data),
-        type_url: method.resolvedResponseType.fullName
-      }), close);
-      return () => responseStream.close();
-    });
+    return Stream.map(responseStream, (data) => ({
+      value: responseCodec.encode(data),
+      type_url: method.resolvedResponseType.fullName
+    }));
   }
   _getMethodInfo(methodName) {
     const method = this._service.methods[methodName];

package/dist/src/precompiled-mapping/create-message-mapper.js

@@ -42,10 +42,10 @@ const createMessageMapperCached = (type, substitutions, cache) => {
         cache[type.fullName].map = (0, codegen_1.codegen)(`${type.name}$map`, ['obj', 'extraArgs'], c => {
             c `const res = {};`;
             for (const field of type.fieldsArray) {
+                field.resolve();
                 c `if(obj.${field.name} !== undefined && obj.${field.name} !== null) {`;
                 {
                     const genMapScalar = (value) => {
-                        field.resolve();
                         const substitution = field.resolvedType && substitutions[field.resolvedType.fullName.slice(1)];
                         if (substitution) {
                             c `${(0, codegen_1.ref)(substitution)}(${value}, ...extraArgs)`;
@@ -58,7 +58,6 @@ const createMessageMapperCached = (type, substitutions, cache) => {
                             c `${value}`;
                         }
                     };
-                    // TODO(dmaretskyi): Support maps.
                     if (field.repeated) {
                         c `res.${field.name} = obj.${field.name}.map(item => `;
                         genMapScalar('item');
@@ -82,10 +81,52 @@ const createMessageMapperCached = (type, substitutions, cache) => {
                     }
                 }
                 c `}`;
+                if (!field.getOption('proto3_optional') && !field.repeated && !field.map && !field.partOf) {
+                    c `else {`;
+                    {
+                        if (field.resolvedType instanceof pb.Type) {
+                            const mapper = createMessageMapperCached(field.resolvedType, substitutions, cache);
+                            c `res.${field.name} = ${(0, codegen_1.ref)(mapper)}.map({}, extraArgs);`;
+                        }
+                        else if (field.resolvedType instanceof pb.Enum) {
+                            `res.${field.name} = 0;`;
+                        }
+                        else {
+                            c `res.${field.name} = ${getDefaultValue(field.type)};`;
+                        }
+                    }
+                    c `}`;
+                }
             }
             c `return res;`;
         });
     }
     return cache[type.fullName];
 };
+const getDefaultValue = (type) => {
+    switch (type) {
+        case 'double':
+        case 'float':
+        case 'int32':
+        case 'sfixed32':
+        case 'uint32':
+        case 'sint32':
+        case 'fixed32':
+            return '0';
+        case 'sint64':
+        case 'int64':
+        case 'uint64':
+        case 'fixed64':
+        case 'sfixed64':
+            return '"0"';
+        case 'bool':
+            return 'false';
+        case 'string':
+            return '""';
+        case 'bytes':
+            return 'new Uint8Array()';
+        default:
+            throw new Error(`Unknown type: ${type}`);
+    }
+};
 //# sourceMappingURL=create-message-mapper.js.map

package/dist/src/precompiled-mapping/create-message-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-message-mapper.js","sourceRoot":"","sources":["../../../src/precompiled-mapping/create-message-mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-message-mapper.js","sourceRoot":"","sources":["../../../src/precompiled-mapping/create-message-mapper.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,8DAAiC;AACjC,+CAAiC;AAGjC,uCAAyC;AAIlC,MAAM,mBAAmB,GAAG,CAAC,IAAa,EAAE,aAAgC,EAAU,EAAE,CAAC,yBAAyB,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC;AAA1I,QAAA,mBAAmB,uBAAuH;AAEvJ,MAAM,yBAAyB,GAAG,CAAC,IAAa,EAAE,aAAgC,EAAE,KAAsC,EAAE,EAAE;IAC5H,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACzB,oDAAoD;QACpD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAS,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAA,iBAAO,EAAC,GAAG,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE;YAC/E,CAAC,CAAA,iBAAiB,CAAC;YACnB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpC,KAAK,CAAC,OAAO,EAAE,CAAC;gBAChB,CAAC,CAAA,UAAU,KAAK,CAAC,IAAI,yBAAyB,KAAK,CAAC,IAAI,cAAc,CAAC;gBAAC;oBACtE,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,EAAE;wBACrC,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC/F,IAAI,YAAY,EAAE;4BAChB,CAAC,CAAA,GAAG,IAAA,aAAG,EAAC,YAAY,CAAC,IAAI,KAAK,iBAAiB,CAAC;yBACjD;6BAAM,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,YAAY,EAAE,CAAC,IAAI,EAAE;4BACtE,MAAM,MAAM,GAAG,yBAAyB,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;4BACnF,CAAC,CAAA,GAAG,IAAA,aAAG,EAAC,MAAM,CAAC,QAAQ,KAAK,cAAc,CAAC;yBAC5C;6BAAM;4BACL,CAAC,CAAA,GAAG,KAAK,EAAE,CAAC;yBACb;oBACH,CAAC,CAAC;oBAEF,IAAI,KAAK,CAAC,QAAQ,EAAE;wBAClB,CAAC,CAAA,OAAO,KAAK,CAAC,IAAI,UAAU,KAAK,CAAC,IAAI,eAAe,CAAC;wBACtD,YAAY,CAAC,MAAM,CAAC,CAAC;wBACrB,CAAC,CAAA,IAAI,CAAC;qBACP;yBAAM,IAAI,KAAK,CAAC,GAAG,EAAE;wBACpB,IAAA,qBAAM,EAAC,KAAK,YAAY,EAAE,CAAC,QAAQ,CAAC,CAAC;wBACrC,CAAC,CAAA,OAAO,KAAK,CAAC,IAAI,QAAQ,CAAC;wBAC3B,CAAC,CAAA,oCAAoC,KAAK,CAAC,IAAI,MAAM,CAAC;wBAAC;4BACrD,CAAC,CAAA,OAAO,KAAK,CAAC,IAAI,UAAU,CAAC;4BAC7B,YAAY,CAAC,OAAO,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC;4BACvC,CAAC,CAAA,GAAG,CAAC;yBACN;wBAAC,CAAC,CAAA,GAAG,CAAC;qBACR;yBAAM;wBACL,CAAC,CAAA,OAAO,KAAK,CAAC,IAAI,KAAK,CAAC;wBACxB,YAAY,CAAC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;wBAClC,CAAC,CAAA,GAAG,CAAC;qBACN;iBACF;gBAAC,CAAC,CAAA,GAAG,CAAC;gBACP,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;oBACzF,CAAC,CAAA,QAAQ,CAAC;oBAAC;wBACT,IAAI,KAAK,CAAC,YAAY,YAAY,EAAE,CAAC,IAAI,EAAE;4BACzC,MAAM,MAAM,GAAG,yBAAyB,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;4BACnF,CAAC,CAAA,OAAO,KAAK,CAAC,IAAI,MAAM,IAAA,aAAG,EAAC,MAAM,CAAC,sBAAsB,CAAC;yBAC3D;6BAAM,IAAI,KAAK,CAAC,YAAY,YAAY,EAAE,CAAC,IAAI,EAAE;4BAChD,OAAO,KAAK,CAAC,IAAI,OAAO,CAAC;yBAC1B;6BAAM;4BACL,CAAC,CAAA,OAAO,KAAK,CAAC,IAAI,MAAM,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;yBACxD;qBACF;oBAAC,CAAC,CAAA,GAAG,CAAC;iBACR;aACF;YACD,CAAC,CAAA,aAAa,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE;IAC/C,QAAQ,IAAI,EAAE;QACZ,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,UAAU,CAAC;QAChB,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,UAAU;YACb,OAAO,KAAK,CAAC;QACf,KAAK,MAAM;YACT,OAAO,OAAO,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC;QACd,KAAK,OAAO;YACV,OAAO,kBAAkB,CAAC;QAC5B;YACE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC,CAAC"}

package/dist/src/service.d.ts

@@ -2,8 +2,8 @@ import pb from 'protobufjs';
 import type { Schema } from './schema';
 import { Stream } from './stream';
 export interface Any {
-    'type_url'?: string;
-    value?: Uint8Array;
+    'type_url': string;
+    value: Uint8Array;
 }
 export interface ServiceBackend {
     call(method: string, request: Any): Promise<Any>;

package/dist/src/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,GAAG;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAClD,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;CACxD;AAED,qBAAa,iBAAiB,CAAC,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBADP,QAAQ,EAAE,EAAE,CAAC,OAAO,EACpB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC;IAGvC,IAAI,YAAY,IAAK,EAAE,CAAC,OAAO,CAE9B;IAED,YAAY,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,GAAG,CAAC;IAInD,YAAY,CAAE,QAAQ,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;CAG9C;AAED,qBAAa,OAAO;gBAEhB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC;CAyCtB;AAED,qBAAa,cAAc,CAAC,CAAC,GAAG,EAAE,CAAE,YAAW,cAAc;IAEzD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,QAAQ,EAAE,EAAE,CAAC,OAAO,EACpB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EACpB,SAAS,EAAE,CAAC;IAGzB,IAAI,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAoB3D,UAAU,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IAqB1D,OAAO,CAAC,cAAc;CAavB"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,WAAW,GAAG;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAClD,UAAU,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;CACxD;AAED,qBAAa,iBAAiB,CAAC,CAAC;IAE5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBADP,QAAQ,EAAE,EAAE,CAAC,OAAO,EACpB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC;IAGvC,IAAI,YAAY,IAAK,EAAE,CAAC,OAAO,CAE9B;IAED,YAAY,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,GAAG,CAAC;IAInD,YAAY,CAAE,QAAQ,EAAE,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC;CAG9C;AAED,qBAAa,OAAO;gBAEhB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EACnB,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC;CAqCtB;AAED,qBAAa,cAAc,CAAC,CAAC,GAAG,EAAE,CAAE,YAAW,cAAc;IAEzD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAFT,QAAQ,EAAE,EAAE,CAAC,OAAO,EACpB,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,EACpB,SAAS,EAAE,CAAC;IAGzB,IAAI,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAoB3D,UAAU,CAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IAkB1D,OAAO,CAAC,cAAc;CAavB"}