protobufjs 8.6.0 → 8.6.1

package/ext/protojson.js

@@ -393,6 +393,24 @@ function setOwn(o, k, v) {
     o[k] = v;
 }
 
+function wktFieldName(type, name) {
+    var field = fieldsByJsonName(type)[name];
+    return field ? field.name : name;
+}
+
+function wktFieldValue(type, message, name) {
+    var field = fieldsByJsonName(type)[name];
+    if (!field)
+        return message && message[name];
+    if (hasOwn(message, field.name))
+        return message[field.name];
+    if (hasOwn(message, field.protoName))
+        return message[field.protoName];
+    if (hasOwn(message, field.jsonName))
+        return message[field.jsonName];
+    return undefined;
+}
+
 function writeScalar(type, value) {
     switch (type) {
         case "int64": case "sint64": case "sfixed64":
@@ -713,23 +731,27 @@ WKT_FROM[".google.protobuf.Any"] = function (type, value, options, depth) {
                 setOwn(body, k, value[k]);
     }
     var inner = readMessage(msgType, body, options, depth + 1);
-    var url = typeUrl.charAt(0) === "." ? typeUrl.slice(1) : typeUrl;
+    var url = typeUrl.charAt(0) === "." ? typeUrl.slice(1) : typeUrl,
+        out = {};
     if (url.indexOf("/") === -1)
         url = "/" + url;
-    return { type_url: url, value: msgType.encode(inner).finish() };
+    out[wktFieldName(type, "type_url")] = url;
+    out[wktFieldName(type, "value")] = msgType.encode(inner).finish();
+    return out;
 };
 WKT_TO[".google.protobuf.Any"] = function (type, message, options, depth) {
-    if (!message.type_url)
+    var typeUrl = wktFieldValue(type, message, "type_url");
+    if (!typeUrl)
         return {};
-    var name = message.type_url.substring(message.type_url.lastIndexOf("/") + 1),
+    var name = typeUrl.substring(typeUrl.lastIndexOf("/") + 1),
         msgType = type.root.lookupType(name),
-        decoded = msgType.decode(message.value),
+        decoded = msgType.decode(wktFieldValue(type, message, "value")),
         body = toJsonValue(msgType, decoded, options, depth + 1),
         result;
     if (WKT_TO[msgType.fullName])
-        result = { "@type": message.type_url, "value": body };
+        result = { "@type": typeUrl, "value": body };
     else {
-        result = { "@type": message.type_url };
+        result = { "@type": typeUrl };
         for (var k in body)
             if (hasOwn(body, k))
                 setOwn(result, k, body[k]);

package/index.d.ts

@@ -1482,15 +1482,15 @@ export namespace rpc {
 
     /** A service method part of a {@link rpc.Service} as created by {@link Service.create}. */
     type ServiceMethod<TReq extends Message<TReq>, TRes extends Message<TRes>> = {
-  (request: TReq|Properties<TReq>, callback: rpc.ServiceMethodCallback<TRes>): void;
-  (request: TReq|Properties<TReq>): Promise<TRes>;
-  readonly name: string;
-  readonly path: string;
-  readonly requestType: string;
-  readonly responseType: string;
-  readonly requestStream: true|undefined;
-  readonly responseStream: true|undefined;
-};
+      (request: TReq|Properties<TReq>, callback: rpc.ServiceMethodCallback<TRes>): void;
+      (request: TReq|Properties<TReq>): Promise<TRes>;
+      readonly name: string;
+      readonly path: string;
+      readonly requestType: string;
+      readonly responseType: string;
+      readonly requestStream: true|undefined;
+      readonly responseStream: true|undefined;
+    };
 
     /** An RPC service as returned by {@link Service#create}. */
     class Service extends util.EventEmitter {
@@ -2303,14 +2303,6 @@ export namespace util {
         function readDoubleBE(buf: Uint8Array, pos: number): number;
     }
 
-    /**
-     * Requires a module only if available.
-     * @param moduleName Module to require
-     * @returns Required module if available and not empty, otherwise `null`
-     * @deprecated Legacy optional require helper. Will be removed in a future release.
-     */
-    function inquire(moduleName: string): object;
-
     /** Helper class for working with the low and high bits of a 64 bit value. */
     class LongBits {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "description": "Protocol Buffers for JavaScript & TypeScript.",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
   "license": "BSD-3-Clause",

package/src/util/minimal.js

@@ -13,9 +13,6 @@ util.EventEmitter = require("./eventemitter");
 // float handling accross browsers
 util.float = require("./float");
 
-// requires modules optionally and hides the call from bundlers
-util.inquire = require("./inquire");
-
 // converts to / from utf8 encoded strings
 util.utf8 = require("./utf8");
 

package/src/util/inquire.d.ts

@@ -1,10 +0,0 @@
-export = inquire;
-
-/**
- * Requires a module only if available.
- * @memberof util
- * @param {string} moduleName Module to require
- * @returns {?Object} Required module if available and not empty, otherwise `null`
- * @deprecated Legacy optional require helper. Will be removed in a future release.
- */
-declare function inquire(moduleName: string): object;

package/src/util/inquire.js

@@ -1,38 +0,0 @@
-"use strict";
-module.exports = inquire;
-
-/**
- * Requires a module only if available.
- * @memberof util
- * @param {string} moduleName Module to require
- * @returns {?Object} Required module if available and not empty, otherwise `null`
- * @deprecated Legacy optional require helper. Will be removed in a future release.
- */
-function inquire(moduleName) {
-  try {
-    if (typeof require !== "function") {
-      return null;
-    }
-    var mod = require(moduleName);
-    if (mod && (mod.length || Object.keys(mod).length)) return mod;
-    return null;
-  } catch (err) {
-    // ignore
-    return null;
-  }
-}
-
-/*
-// maybe worth a shot to prevent renaming issues:
-// see: https://github.com/webpack/webpack/blob/master/lib/dependencies/CommonJsRequireDependencyParserPlugin.js
-// triggers on:
-// - expression require.cache
-// - expression require (???)
-// - call require
-// - call require:commonjs:item
-// - call require:commonjs:context
-
-Object.defineProperty(Function.prototype, "__self", { get: function() { return this; } });
-var r = require.__self;
-delete Function.prototype.__self;
-*/