@bufbuild/protobuf 0.1.1 → 0.2.1

package/dist/cjs/codegen-info.js

@@ -17,10 +17,12 @@ exports.codegenInfo = void 0;
 const names_js_1 = require("./private/names.js");
 const field_wrapper_js_1 = require("./private/field-wrapper.js");
 const scalars_js_1 = require("./private/scalars.js");
+const reify_wkt_js_1 = require("./private/reify-wkt.js");
 const packageName = "@bufbuild/protobuf";
 exports.codegenInfo = {
     packageName,
     localName: names_js_1.localName,
+    reifyWkt: reify_wkt_js_1.reifyWkt,
     getUnwrappedFieldType: field_wrapper_js_1.getUnwrappedFieldType,
     scalarDefaultValue: scalars_js_1.scalarDefaultValue,
     // prettier-ignore

package/dist/cjs/create-descriptor-set.js

@@ -440,24 +440,24 @@ function newField(proto, file, parent, oneof, cart) {
             const mapEntry = cart.mapEntries.get(trimLeadingDot(proto.typeName));
             if (mapEntry !== undefined) {
                 (0, assert_js_1.assert)(repeated, `invalid FieldDescriptorProto: expected map entry to be repeated`);
-                return Object.assign(Object.assign(Object.assign({}, common), { kind: "map_field", repeated: false }), getMapFieldTypes(mapEntry));
+                return Object.assign(Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "map", repeated: false }), getMapFieldTypes(mapEntry));
             }
             const message = cart.messages.get(trimLeadingDot(proto.typeName));
             (0, assert_js_1.assert)(message !== undefined, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
-            return Object.assign(Object.assign({}, common), { kind: "message_field", repeated,
+            return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "message", repeated,
                 message });
         }
         case descriptor_pb_js_1.FieldDescriptorProto_Type.ENUM: {
             (0, assert_js_1.assert)(proto.typeName, `invalid FieldDescriptorProto: missing type_name`);
             const e = cart.enums.get(trimLeadingDot(proto.typeName));
             (0, assert_js_1.assert)(e !== undefined, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
-            return Object.assign(Object.assign({}, common), { kind: "enum_field", getDefaultValue,
+            return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "enum", getDefaultValue,
                 repeated, enum: e });
         }
         default: {
             const scalar = fieldTypeToScalarType[proto.type];
             (0, assert_js_1.assert)(scalar, `invalid FieldDescriptorProto: unknown type ${proto.type}`);
-            return Object.assign(Object.assign({}, common), { kind: "scalar_field", getDefaultValue,
+            return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "scalar", getDefaultValue,
                 repeated,
                 scalar });
         }
@@ -472,7 +472,7 @@ function newExtension(proto, file, parent, cart) {
     undefined, cart);
     const extendee = cart.messages.get(trimLeadingDot(proto.extendee));
     (0, assert_js_1.assert)(extendee, `invalid FieldDescriptorProto: extendee ${proto.extendee} not found`);
-    return Object.assign(Object.assign({}, field), { typeName: makeTypeName(proto, parent, file), parent,
+    return Object.assign(Object.assign({}, field), { kind: "extension", typeName: makeTypeName(proto, parent, file), parent,
         file,
         extendee,
         toString() {
@@ -541,18 +541,18 @@ function getMapFieldTypes(mapEntry) {
         mapKey !== field_js_1.ScalarType.DOUBLE, `invalid DescriptorProto: map entry ${mapEntry.toString()} has unexpected key type ${(_b = keyField.proto.type) !== null && _b !== void 0 ? _b : -1}`);
     const valueField = mapEntry.fields.find((f) => f.proto.number === 2);
     (0, assert_js_1.assert)(valueField, `invalid DescriptorProto: map entry ${mapEntry.toString()} is missing value field`);
-    switch (valueField.kind) {
-        case "scalar_field":
+    switch (valueField.fieldKind) {
+        case "scalar":
             return {
                 mapKey,
                 mapValue: Object.assign(Object.assign({}, valueField), { kind: "scalar" }),
             };
-        case "message_field":
+        case "message":
             return {
                 mapKey,
                 mapValue: Object.assign(Object.assign({}, valueField), { kind: "message" }),
             };
-        case "enum_field":
+        case "enum":
             return {
                 mapKey,
                 mapValue: Object.assign(Object.assign({}, valueField), { kind: "enum" }),
@@ -711,23 +711,23 @@ function declarationString() {
     if (this.optional) {
         parts.push("optional");
     }
-    const file = "extendee" in this ? this.file : this.parent.file;
+    const file = this.kind === "extension" ? this.file : this.parent.file;
     if (file.syntax == "proto2" &&
         this.proto.label === descriptor_pb_js_1.FieldDescriptorProto_Label.REQUIRED) {
         parts.push("required");
     }
     let type;
-    switch (this.kind) {
-        case "scalar_field":
+    switch (this.fieldKind) {
+        case "scalar":
             type = field_js_1.ScalarType[this.scalar].toLowerCase();
             break;
-        case "enum_field":
+        case "enum":
             type = this.enum.typeName;
             break;
-        case "message_field":
+        case "message":
             type = this.message.typeName;
             break;
-        case "map_field": {
+        case "map": {
             const k = field_js_1.ScalarType[this.mapKey].toLowerCase();
             let v;
             switch (this.mapValue.kind) {
@@ -777,13 +777,13 @@ function getDefaultValue() {
     if (d === undefined) {
         return undefined;
     }
-    switch (this.kind) {
-        case "enum_field": {
+    switch (this.fieldKind) {
+        case "enum": {
             const enumValue = this.enum.values.find((v) => v.name === d);
             (0, assert_js_1.assert)(enumValue, `cannot parse ${this.toString()} default value: ${d}`);
             return enumValue.number;
         }
-        case "scalar_field":
+        case "scalar":
             switch (this.scalar) {
                 case field_js_1.ScalarType.STRING:
                     return d;

package/dist/cjs/create-registry-from-desc.js

@@ -161,17 +161,17 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
 }
 exports.createRegistryFromDescriptors = createRegistryFromDescriptors;
 function makeFieldInfo(desc, resolver) {
-    switch (desc.kind) {
-        case "map_field":
+    switch (desc.fieldKind) {
+        case "map":
             return makeMapFieldInfo(desc, resolver);
-        case "message_field":
+        case "message":
             return makeMessageFieldInfo(desc, resolver);
-        case "enum_field": {
+        case "enum": {
             const fi = makeEnumFieldInfo(desc, resolver);
             fi.default = desc.getDefaultValue();
             return fi;
         }
-        case "scalar_field": {
+        case "scalar": {
             const fi = makeScalarFieldInfo(desc);
             fi.default = desc.getDefaultValue();
             return fi;

package/dist/cjs/google/protobuf/any_pb.js

@@ -170,6 +170,9 @@ class Any extends message_js_1.Message {
         if (json === null || Array.isArray(json) || typeof json != "object") {
             throw new Error(`cannot decode message google.protobuf.Any from JSON: expected object but got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`);
         }
+        if (Object.keys(json).length == 0) {
+            return this;
+        }
         const typeUrl = json["@type"];
         if (typeof typeUrl != "string" || typeUrl == "") {
             throw new Error(`cannot decode message google.protobuf.Any from JSON: "@type" is empty`);

package/dist/cjs/google/protobuf/struct_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListValue = exports.Value = exports.Struct = exports.NullValue = void 0;
-// @generated by protoc-gen-es v0.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/google/protobuf/type_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Option = exports.EnumValue = exports.Enum = exports.Field_Cardinality = exports.Field_Kind = exports.Field = exports.Type = exports.Syntax = void 0;
-// @generated by protoc-gen-es v0.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/private/field-wrapper.js

@@ -40,7 +40,7 @@ exports.unwrapField = unwrapField;
  * the base type it wraps.
  */
 function getUnwrappedFieldType(field) {
-    if (field.kind !== "message_field") {
+    if (field.fieldKind !== "message") {
         return undefined;
     }
     if (field.repeated) {

package/dist/cjs/private/names.js

@@ -24,10 +24,7 @@ exports.findEnumSharedPrefix = exports.fieldJsonName = exports.localOneofName =
  */
 function localName(desc) {
     switch (desc.kind) {
-        case "enum_field":
-        case "message_field":
-        case "map_field":
-        case "scalar_field":
+        case "field":
             return localFieldName(desc.name, desc.oneof !== undefined);
         case "oneof":
             return localOneofName(desc.name);

package/dist/cjs/private/reify-wkt.js

@@ -0,0 +1,170 @@
+"use strict";
+// Copyright 2021-2022 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reifyWkt = void 0;
+const field_js_1 = require("../field.js");
+/**
+ * Reifies a given DescMessage into a more concrete object representing its
+ * respective well-known type.  The returned object will contain properties
+ * representing the WKT's defined fields.
+ *
+ * Useful during code generation when immediate access to a particular field
+ * is needed without having to search the object's typename and DescField list.
+ *
+ * Returns undefined if the WKT cannot be completely constructed via the
+ * DescMessage.
+ */
+function reifyWkt(message) {
+    switch (message.typeName) {
+        case "google.protobuf.Any": {
+            const typeUrl = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.STRING);
+            const value = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.BYTES);
+            if (typeUrl && value) {
+                return {
+                    typeName: message.typeName,
+                    typeUrl,
+                    value,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.Timestamp": {
+            const seconds = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.INT64);
+            const nanos = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.INT32);
+            if (seconds && nanos) {
+                return {
+                    typeName: message.typeName,
+                    seconds,
+                    nanos,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.Duration": {
+            const seconds = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.INT64);
+            const nanos = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.INT32);
+            if (seconds && nanos) {
+                return {
+                    typeName: message.typeName,
+                    seconds,
+                    nanos,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.Struct": {
+            const fields = message.fields.find((f) => f.number == 1 && !f.repeated);
+            if ((fields === null || fields === void 0 ? void 0 : fields.fieldKind) !== "map" ||
+                fields.mapValue.kind !== "message" ||
+                fields.mapValue.message.typeName !== "google.protobuf.Value") {
+                break;
+            }
+            return { typeName: message.typeName, fields };
+        }
+        case "google.protobuf.Value": {
+            const kind = message.oneofs.find((o) => o.name === "kind");
+            const nullValue = message.fields.find((f) => f.number == 1 && f.oneof === kind);
+            if ((nullValue === null || nullValue === void 0 ? void 0 : nullValue.fieldKind) !== "enum" ||
+                nullValue.enum.typeName !== "google.protobuf.NullValue") {
+                return undefined;
+            }
+            const numberValue = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.DOUBLE &&
+                f.oneof === kind);
+            const stringValue = message.fields.find((f) => f.number == 3 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.STRING &&
+                f.oneof === kind);
+            const boolValue = message.fields.find((f) => f.number == 4 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.BOOL &&
+                f.oneof === kind);
+            const structValue = message.fields.find((f) => f.number == 5 && f.oneof === kind);
+            if ((structValue === null || structValue === void 0 ? void 0 : structValue.fieldKind) !== "message" ||
+                structValue.message.typeName !== "google.protobuf.Struct") {
+                return undefined;
+            }
+            const listValue = message.fields.find((f) => f.number == 6 && f.oneof === kind);
+            if ((listValue === null || listValue === void 0 ? void 0 : listValue.fieldKind) !== "message" ||
+                listValue.message.typeName !== "google.protobuf.ListValue") {
+                return undefined;
+            }
+            if (kind && numberValue && stringValue && boolValue) {
+                return {
+                    typeName: message.typeName,
+                    kind,
+                    nullValue,
+                    numberValue,
+                    stringValue,
+                    boolValue,
+                    structValue,
+                    listValue,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.ListValue": {
+            const values = message.fields.find((f) => f.number == 1 && f.repeated);
+            if ((values === null || values === void 0 ? void 0 : values.fieldKind) != "message" ||
+                values.message.typeName !== "google.protobuf.Value") {
+                break;
+            }
+            return { typeName: message.typeName, values };
+        }
+        case "google.protobuf.FieldMask": {
+            const paths = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === field_js_1.ScalarType.STRING &&
+                f.repeated);
+            if (paths) {
+                return { typeName: message.typeName, paths };
+            }
+            break;
+        }
+        case "google.protobuf.DoubleValue":
+        case "google.protobuf.FloatValue":
+        case "google.protobuf.Int64Value":
+        case "google.protobuf.UInt64Value":
+        case "google.protobuf.Int32Value":
+        case "google.protobuf.UInt32Value":
+        case "google.protobuf.BoolValue":
+        case "google.protobuf.StringValue":
+        case "google.protobuf.BytesValue": {
+            const value = message.fields.find((f) => f.number == 1 && f.name == "value");
+            if (!value) {
+                break;
+            }
+            if (value.fieldKind !== "scalar") {
+                break;
+            }
+            return { typeName: message.typeName, value };
+        }
+    }
+    return undefined;
+}
+exports.reifyWkt = reifyWkt;

package/dist/esm/codegen-info.js

@@ -14,10 +14,12 @@
 import { localName } from "./private/names.js";
 import { getUnwrappedFieldType } from "./private/field-wrapper.js";
 import { scalarDefaultValue } from "./private/scalars.js";
+import { reifyWkt } from "./private/reify-wkt.js";
 const packageName = "@bufbuild/protobuf";
 export const codegenInfo = {
     packageName,
     localName,
+    reifyWkt,
     getUnwrappedFieldType,
     scalarDefaultValue,
     // prettier-ignore

package/dist/esm/create-descriptor-set.js

@@ -436,24 +436,24 @@ function newField(proto, file, parent, oneof, cart) {
             const mapEntry = cart.mapEntries.get(trimLeadingDot(proto.typeName));
             if (mapEntry !== undefined) {
                 assert(repeated, `invalid FieldDescriptorProto: expected map entry to be repeated`);
-                return Object.assign(Object.assign(Object.assign({}, common), { kind: "map_field", repeated: false }), getMapFieldTypes(mapEntry));
+                return Object.assign(Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "map", repeated: false }), getMapFieldTypes(mapEntry));
             }
             const message = cart.messages.get(trimLeadingDot(proto.typeName));
             assert(message !== undefined, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
-            return Object.assign(Object.assign({}, common), { kind: "message_field", repeated,
+            return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "message", repeated,
                 message });
         }
         case FieldDescriptorProto_Type.ENUM: {
             assert(proto.typeName, `invalid FieldDescriptorProto: missing type_name`);
             const e = cart.enums.get(trimLeadingDot(proto.typeName));
             assert(e !== undefined, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
-            return Object.assign(Object.assign({}, common), { kind: "enum_field", getDefaultValue,
+            return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "enum", getDefaultValue,
                 repeated, enum: e });
         }
         default: {
             const scalar = fieldTypeToScalarType[proto.type];
             assert(scalar, `invalid FieldDescriptorProto: unknown type ${proto.type}`);
-            return Object.assign(Object.assign({}, common), { kind: "scalar_field", getDefaultValue,
+            return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "scalar", getDefaultValue,
                 repeated,
                 scalar });
         }
@@ -468,7 +468,7 @@ function newExtension(proto, file, parent, cart) {
     undefined, cart);
     const extendee = cart.messages.get(trimLeadingDot(proto.extendee));
     assert(extendee, `invalid FieldDescriptorProto: extendee ${proto.extendee} not found`);
-    return Object.assign(Object.assign({}, field), { typeName: makeTypeName(proto, parent, file), parent,
+    return Object.assign(Object.assign({}, field), { kind: "extension", typeName: makeTypeName(proto, parent, file), parent,
         file,
         extendee,
         toString() {
@@ -537,18 +537,18 @@ function getMapFieldTypes(mapEntry) {
         mapKey !== ScalarType.DOUBLE, `invalid DescriptorProto: map entry ${mapEntry.toString()} has unexpected key type ${(_b = keyField.proto.type) !== null && _b !== void 0 ? _b : -1}`);
     const valueField = mapEntry.fields.find((f) => f.proto.number === 2);
     assert(valueField, `invalid DescriptorProto: map entry ${mapEntry.toString()} is missing value field`);
-    switch (valueField.kind) {
-        case "scalar_field":
+    switch (valueField.fieldKind) {
+        case "scalar":
             return {
                 mapKey,
                 mapValue: Object.assign(Object.assign({}, valueField), { kind: "scalar" }),
             };
-        case "message_field":
+        case "message":
             return {
                 mapKey,
                 mapValue: Object.assign(Object.assign({}, valueField), { kind: "message" }),
             };
-        case "enum_field":
+        case "enum":
             return {
                 mapKey,
                 mapValue: Object.assign(Object.assign({}, valueField), { kind: "enum" }),
@@ -706,23 +706,23 @@ function declarationString() {
     if (this.optional) {
         parts.push("optional");
     }
-    const file = "extendee" in this ? this.file : this.parent.file;
+    const file = this.kind === "extension" ? this.file : this.parent.file;
     if (file.syntax == "proto2" &&
         this.proto.label === FieldDescriptorProto_Label.REQUIRED) {
         parts.push("required");
     }
     let type;
-    switch (this.kind) {
-        case "scalar_field":
+    switch (this.fieldKind) {
+        case "scalar":
             type = ScalarType[this.scalar].toLowerCase();
             break;
-        case "enum_field":
+        case "enum":
             type = this.enum.typeName;
             break;
-        case "message_field":
+        case "message":
             type = this.message.typeName;
             break;
-        case "map_field": {
+        case "map": {
             const k = ScalarType[this.mapKey].toLowerCase();
             let v;
             switch (this.mapValue.kind) {
@@ -772,13 +772,13 @@ function getDefaultValue() {
     if (d === undefined) {
         return undefined;
     }
-    switch (this.kind) {
-        case "enum_field": {
+    switch (this.fieldKind) {
+        case "enum": {
             const enumValue = this.enum.values.find((v) => v.name === d);
             assert(enumValue, `cannot parse ${this.toString()} default value: ${d}`);
             return enumValue.number;
         }
-        case "scalar_field":
+        case "scalar":
             switch (this.scalar) {
                 case ScalarType.STRING:
                     return d;

package/dist/esm/create-registry-from-desc.js

@@ -157,17 +157,17 @@ export function createRegistryFromDescriptors(input, replaceWkt = true) {
     };
 }
 function makeFieldInfo(desc, resolver) {
-    switch (desc.kind) {
-        case "map_field":
+    switch (desc.fieldKind) {
+        case "map":
             return makeMapFieldInfo(desc, resolver);
-        case "message_field":
+        case "message":
             return makeMessageFieldInfo(desc, resolver);
-        case "enum_field": {
+        case "enum": {
             const fi = makeEnumFieldInfo(desc, resolver);
             fi.default = desc.getDefaultValue();
             return fi;
         }
-        case "scalar_field": {
+        case "scalar": {
             const fi = makeScalarFieldInfo(desc);
             fi.default = desc.getDefaultValue();
             return fi;

package/dist/esm/google/protobuf/any_pb.js

@@ -167,6 +167,9 @@ export class Any extends Message {
         if (json === null || Array.isArray(json) || typeof json != "object") {
             throw new Error(`cannot decode message google.protobuf.Any from JSON: expected object but got ${json === null ? "null" : Array.isArray(json) ? "array" : typeof json}`);
         }
+        if (Object.keys(json).length == 0) {
+            return this;
+        }
         const typeUrl = json["@type"];
         if (typeof typeUrl != "string" || typeUrl == "") {
             throw new Error(`cannot decode message google.protobuf.Any from JSON: "@type" is empty`);

package/dist/esm/google/protobuf/struct_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v0.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/google/protobuf/type_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v0.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v0.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/private/field-wrapper.js

@@ -35,7 +35,7 @@ export function unwrapField(type, value) {
  * the base type it wraps.
  */
 export function getUnwrappedFieldType(field) {
-    if (field.kind !== "message_field") {
+    if (field.fieldKind !== "message") {
         return undefined;
     }
     if (field.repeated) {

package/dist/esm/private/names.js

@@ -21,10 +21,7 @@
  */
 export function localName(desc) {
     switch (desc.kind) {
-        case "enum_field":
-        case "message_field":
-        case "map_field":
-        case "scalar_field":
+        case "field":
             return localFieldName(desc.name, desc.oneof !== undefined);
         case "oneof":
             return localOneofName(desc.name);

package/dist/esm/private/reify-wkt.js

@@ -0,0 +1,166 @@
+// Copyright 2021-2022 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { ScalarType } from "../field.js";
+/**
+ * Reifies a given DescMessage into a more concrete object representing its
+ * respective well-known type.  The returned object will contain properties
+ * representing the WKT's defined fields.
+ *
+ * Useful during code generation when immediate access to a particular field
+ * is needed without having to search the object's typename and DescField list.
+ *
+ * Returns undefined if the WKT cannot be completely constructed via the
+ * DescMessage.
+ */
+export function reifyWkt(message) {
+    switch (message.typeName) {
+        case "google.protobuf.Any": {
+            const typeUrl = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.STRING);
+            const value = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.BYTES);
+            if (typeUrl && value) {
+                return {
+                    typeName: message.typeName,
+                    typeUrl,
+                    value,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.Timestamp": {
+            const seconds = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.INT64);
+            const nanos = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.INT32);
+            if (seconds && nanos) {
+                return {
+                    typeName: message.typeName,
+                    seconds,
+                    nanos,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.Duration": {
+            const seconds = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.INT64);
+            const nanos = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.INT32);
+            if (seconds && nanos) {
+                return {
+                    typeName: message.typeName,
+                    seconds,
+                    nanos,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.Struct": {
+            const fields = message.fields.find((f) => f.number == 1 && !f.repeated);
+            if ((fields === null || fields === void 0 ? void 0 : fields.fieldKind) !== "map" ||
+                fields.mapValue.kind !== "message" ||
+                fields.mapValue.message.typeName !== "google.protobuf.Value") {
+                break;
+            }
+            return { typeName: message.typeName, fields };
+        }
+        case "google.protobuf.Value": {
+            const kind = message.oneofs.find((o) => o.name === "kind");
+            const nullValue = message.fields.find((f) => f.number == 1 && f.oneof === kind);
+            if ((nullValue === null || nullValue === void 0 ? void 0 : nullValue.fieldKind) !== "enum" ||
+                nullValue.enum.typeName !== "google.protobuf.NullValue") {
+                return undefined;
+            }
+            const numberValue = message.fields.find((f) => f.number == 2 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.DOUBLE &&
+                f.oneof === kind);
+            const stringValue = message.fields.find((f) => f.number == 3 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.STRING &&
+                f.oneof === kind);
+            const boolValue = message.fields.find((f) => f.number == 4 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.BOOL &&
+                f.oneof === kind);
+            const structValue = message.fields.find((f) => f.number == 5 && f.oneof === kind);
+            if ((structValue === null || structValue === void 0 ? void 0 : structValue.fieldKind) !== "message" ||
+                structValue.message.typeName !== "google.protobuf.Struct") {
+                return undefined;
+            }
+            const listValue = message.fields.find((f) => f.number == 6 && f.oneof === kind);
+            if ((listValue === null || listValue === void 0 ? void 0 : listValue.fieldKind) !== "message" ||
+                listValue.message.typeName !== "google.protobuf.ListValue") {
+                return undefined;
+            }
+            if (kind && numberValue && stringValue && boolValue) {
+                return {
+                    typeName: message.typeName,
+                    kind,
+                    nullValue,
+                    numberValue,
+                    stringValue,
+                    boolValue,
+                    structValue,
+                    listValue,
+                };
+            }
+            break;
+        }
+        case "google.protobuf.ListValue": {
+            const values = message.fields.find((f) => f.number == 1 && f.repeated);
+            if ((values === null || values === void 0 ? void 0 : values.fieldKind) != "message" ||
+                values.message.typeName !== "google.protobuf.Value") {
+                break;
+            }
+            return { typeName: message.typeName, values };
+        }
+        case "google.protobuf.FieldMask": {
+            const paths = message.fields.find((f) => f.number == 1 &&
+                f.fieldKind == "scalar" &&
+                f.scalar === ScalarType.STRING &&
+                f.repeated);
+            if (paths) {
+                return { typeName: message.typeName, paths };
+            }
+            break;
+        }
+        case "google.protobuf.DoubleValue":
+        case "google.protobuf.FloatValue":
+        case "google.protobuf.Int64Value":
+        case "google.protobuf.UInt64Value":
+        case "google.protobuf.Int32Value":
+        case "google.protobuf.UInt32Value":
+        case "google.protobuf.BoolValue":
+        case "google.protobuf.StringValue":
+        case "google.protobuf.BytesValue": {
+            const value = message.fields.find((f) => f.number == 1 && f.name == "value");
+            if (!value) {
+                break;
+            }
+            if (value.fieldKind !== "scalar") {
+                break;
+            }
+            return { typeName: message.typeName, value };
+        }
+    }
+    return undefined;
+}

package/dist/types/codegen-info.d.ts

@@ -1,6 +1,7 @@
 import { localName } from "./private/names.js";
 import { getUnwrappedFieldType } from "./private/field-wrapper.js";
 import { scalarDefaultValue } from "./private/scalars.js";
+import { reifyWkt } from "./private/reify-wkt.js";
 interface CodegenInfo {
     readonly packageName: string;
     readonly localName: typeof localName;
@@ -8,6 +9,7 @@ interface CodegenInfo {
     readonly getUnwrappedFieldType: typeof getUnwrappedFieldType;
     readonly wktSourceFiles: readonly string[];
     readonly scalarDefaultValue: typeof scalarDefaultValue;
+    readonly reifyWkt: typeof reifyWkt;
 }
 declare type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoInt64" | "ScalarType" | "MethodKind" | "MethodIdempotency";
 declare type RuntimeSymbolInfo = {

package/dist/types/descriptor-set.d.ts

@@ -8,6 +8,10 @@ import type { MethodIdempotency, MethodKind } from "./service-type.js";
  * When protobuf sources are compiled, each file is parsed into a
  * google.protobuf.FileDescriptorProto. Those messages describe all parts
  * of the source file that are required to generate code for them.
+ *
+ * DescriptorSet resolves references between the descriptors, hides
+ * implementation details like synthetic map entry messages, and provides
+ * simple access to comments.
  */
 export interface DescriptorSet {
     /**
@@ -34,6 +38,10 @@ export interface DescriptorSet {
      */
     readonly extensions: ReadonlyMap<string, DescExtension>;
 }
+/**
+ * A union of all descriptors, discriminated by a `kind` property.
+ */
+export declare type AnyDesc = DescFile | DescEnum | DescEnumValue | DescMessage | DescField | DescExtension | DescOneof | DescService | DescMethod;
 /**
  * Describes a protobuf source file.
  */
@@ -232,6 +240,7 @@ export interface DescMessage {
  * Describes a field declaration in a protobuf source file.
  */
 export declare type DescField = DescFieldCommon & (DescFieldScalar | DescFieldMessage | DescFieldEnum | DescFieldMap) & {
+    kind: "field";
     /**
      * The message this field is declared on.
      */
@@ -241,6 +250,7 @@ export declare type DescField = DescFieldCommon & (DescFieldScalar | DescFieldMe
  * Describes an extension in a protobuf source file.
  */
 export declare type DescExtension = DescFieldCommon & (DescFieldScalar | DescFieldMessage | DescFieldEnum | DescFieldMap) & {
+    kind: "extension";
     /**
      * The fully qualified name of the extension.
      */
@@ -311,7 +321,7 @@ interface DescFieldCommon {
     toString(): string;
 }
 interface DescFieldScalar {
-    readonly kind: "scalar_field";
+    readonly fieldKind: "scalar";
     /**
      * Is the field repeated?
      */
@@ -343,7 +353,7 @@ interface DescFieldScalar {
     getDefaultValue(): number | boolean | string | bigint | Uint8Array | undefined;
 }
 interface DescFieldMessage {
-    readonly kind: "message_field";
+    readonly fieldKind: "message";
     /**
      * Is the field repeated?
      */
@@ -370,7 +380,7 @@ interface DescFieldMessage {
     readonly mapValue: undefined;
 }
 interface DescFieldEnum {
-    readonly kind: "enum_field";
+    readonly fieldKind: "enum";
     /**
      * Is the field repeated?
      */
@@ -402,7 +412,7 @@ interface DescFieldEnum {
     getDefaultValue(): number | boolean | string | bigint | Uint8Array | undefined;
 }
 interface DescFieldMap {
-    readonly kind: "map_field";
+    readonly fieldKind: "map";
     /**
      * Is the field repeated?
      */

package/dist/types/index.d.ts

@@ -15,7 +15,7 @@ export { WireType, BinaryWriter, BinaryReader } from "./binary-encoding.js";
 export type { IBinaryReader, IBinaryWriter } from "./binary-encoding.js";
 export type { BinaryFormat, BinaryWriteOptions, BinaryReadOptions, } from "./binary-format.js";
 export { JsonFormat, JsonObject, JsonValue, JsonReadOptions, JsonWriteOptions, JsonWriteStringOptions, } from "./json-format.js";
-export { DescriptorSet, DescFile, DescEnum, DescEnumValue, DescMessage, DescOneof, DescField, DescService, DescMethod, DescExtension, DescComments, } from "./descriptor-set.js";
+export { DescriptorSet, AnyDesc, DescFile, DescEnum, DescEnumValue, DescMessage, DescOneof, DescField, DescService, DescMethod, DescExtension, DescComments, } from "./descriptor-set.js";
 export { createDescriptorSet } from "./create-descriptor-set.js";
 export { IMessageTypeRegistry } from "./type-registry.js";
 export { createRegistry } from "./create-registry.js";

package/dist/types/private/reify-wkt.d.ts

@@ -0,0 +1,100 @@
+import type { DescField, DescMessage, DescOneof } from "../descriptor-set.js";
+declare type DescWkt = {
+    typeName: "google.protobuf.Any";
+    typeUrl: DescField;
+    value: DescField;
+} | {
+    typeName: "google.protobuf.Timestamp";
+    seconds: DescField;
+    nanos: DescField;
+} | {
+    typeName: "google.protobuf.Duration";
+    seconds: DescField;
+    nanos: DescField;
+} | {
+    typeName: "google.protobuf.Struct";
+    fields: DescField & {
+        fieldKind: "map";
+    };
+} | {
+    typeName: "google.protobuf.Value";
+    kind: DescOneof;
+    nullValue: DescField & {
+        fieldKind: "enum";
+    };
+    numberValue: DescField;
+    stringValue: DescField;
+    boolValue: DescField;
+    structValue: DescField & {
+        fieldKind: "message";
+    };
+    listValue: DescField & {
+        fieldKind: "message";
+    };
+} | {
+    typeName: "google.protobuf.ListValue";
+    values: DescField & {
+        fieldKind: "message";
+    };
+} | {
+    typeName: "google.protobuf.FieldMask";
+    paths: DescField;
+} | {
+    typeName: "google.protobuf.DoubleValue";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.FloatValue";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.Int64Value";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.UInt64Value";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.Int32Value";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.UInt32Value";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.BoolValue";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.StringValue";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+} | {
+    typeName: "google.protobuf.BytesValue";
+    value: DescField & {
+        fieldKind: "scalar";
+    };
+};
+/**
+ * Reifies a given DescMessage into a more concrete object representing its
+ * respective well-known type.  The returned object will contain properties
+ * representing the WKT's defined fields.
+ *
+ * Useful during code generation when immediate access to a particular field
+ * is needed without having to search the object's typename and DescField list.
+ *
+ * Returns undefined if the WKT cannot be completely constructed via the
+ * DescMessage.
+ */
+export declare function reifyWkt(message: DescMessage): DescWkt | undefined;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
   "repository": {