@bufbuild/protobuf 1.7.2 → 1.8.0

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

@@ -1,6 +1,7 @@
 import { reifyWkt } from "./private/reify-wkt.js";
 import type { DescEnum, DescEnumValue, DescField, DescExtension, DescMessage, DescMethod, DescOneof, DescService } from "./descriptor-set.js";
-import { LongType, ScalarType } from "./field.js";
+import type { ScalarValue } from "./scalar.js";
+import { LongType, ScalarType } from "./scalar.js";
 interface CodegenInfo {
     /**
      * Name of the runtime library NPM package.
@@ -10,7 +11,11 @@ interface CodegenInfo {
     readonly symbols: Record<RuntimeSymbolName, RuntimeSymbolInfo>;
     readonly getUnwrappedFieldType: (field: DescField | DescExtension) => ScalarType | undefined;
     readonly wktSourceFiles: readonly string[];
+    /**
+     * @deprecated please use scalarZeroValue instead
+     */
     readonly scalarDefaultValue: (type: ScalarType, longType: LongType) => any;
+    readonly scalarZeroValue: <T extends ScalarType, L extends LongType>(type: T, longType: L) => ScalarValue<T, L>;
     /**
      * @deprecated please use reifyWkt from @bufbuild/protoplugin/ecmascript instead
      */

package/dist/cjs/codegen-info.js

@@ -24,7 +24,8 @@ exports.codegenInfo = {
     localName: names_js_1.localName,
     reifyWkt: reify_wkt_js_1.reifyWkt,
     getUnwrappedFieldType: field_wrapper_js_1.getUnwrappedFieldType,
-    scalarDefaultValue: scalars_js_1.scalarDefaultValue,
+    scalarDefaultValue: scalars_js_1.scalarZeroValue,
+    scalarZeroValue: scalars_js_1.scalarZeroValue,
     safeIdentifier: names_js_1.safeIdentifier,
     safeObjectProperty: names_js_1.safeObjectProperty,
     // prettier-ignore
@@ -45,8 +46,8 @@ exports.codegenInfo = {
         JsonObject: { typeOnly: true, privateImportPath: "./json-format.js", publicImportPath: packageName },
         protoDouble: { typeOnly: false, privateImportPath: "./proto-double.js", publicImportPath: packageName },
         protoInt64: { typeOnly: false, privateImportPath: "./proto-int64.js", publicImportPath: packageName },
-        ScalarType: { typeOnly: false, privateImportPath: "./field.js", publicImportPath: packageName },
-        LongType: { typeOnly: false, privateImportPath: "./field.js", publicImportPath: packageName },
+        ScalarType: { typeOnly: false, privateImportPath: "./scalar.js", publicImportPath: packageName },
+        LongType: { typeOnly: false, privateImportPath: "./scalar.js", publicImportPath: packageName },
         MethodKind: { typeOnly: false, privateImportPath: "./service-type.js", publicImportPath: packageName },
         MethodIdempotency: { typeOnly: false, privateImportPath: "./service-type.js", publicImportPath: packageName },
         IMessageTypeRegistry: { typeOnly: true, privateImportPath: "./type-registry.js", publicImportPath: packageName },

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

@@ -16,11 +16,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDescriptorSet = void 0;
 const descriptor_pb_js_1 = require("./google/protobuf/descriptor_pb.js");
 const assert_js_1 = require("./private/assert.js");
-const field_js_1 = require("./field.js");
 const service_type_js_1 = require("./service-type.js");
 const names_js_1 = require("./private/names.js");
 const text_format_js_1 = require("./private/text-format.js");
 const feature_set_js_1 = require("./private/feature-set.js");
+const scalar_js_1 = require("./scalar.js");
+const is_message_js_1 = require("./is-message.js");
 /**
  * Create a DescriptorSet, a convenient interface for working with a set of
  * google.protobuf.FileDescriptorProto.
@@ -30,39 +31,40 @@ const feature_set_js_1 = require("./private/feature-set.js");
  * files in topological order.
  */
 function createDescriptorSet(input, options) {
+    var _a;
     const cart = {
+        files: [],
         enums: new Map(),
         messages: new Map(),
         services: new Map(),
         extensions: new Map(),
         mapEntries: new Map(),
     };
-    const fileDescriptors = input instanceof descriptor_pb_js_1.FileDescriptorSet
+    const fileDescriptors = (0, is_message_js_1.isMessage)(input, descriptor_pb_js_1.FileDescriptorSet)
         ? input.file
         : input instanceof Uint8Array
             ? descriptor_pb_js_1.FileDescriptorSet.fromBinary(input).file
             : input;
     const resolverByEdition = new Map();
-    const files = fileDescriptors.map((proto) => {
-        var _a;
+    for (const proto of fileDescriptors) {
         const edition = (_a = proto.edition) !== null && _a !== void 0 ? _a : parseFileSyntax(proto.syntax, proto.edition).edition;
         let resolveFeatures = resolverByEdition.get(edition);
         if (resolveFeatures === undefined) {
             resolveFeatures = (0, feature_set_js_1.createFeatureResolver)(edition, options === null || options === void 0 ? void 0 : options.featureSetDefaults, options === null || options === void 0 ? void 0 : options.serializationOptions);
             resolverByEdition.set(edition, resolveFeatures);
         }
-        return newFile(proto, cart, resolveFeatures);
-    });
-    return Object.assign({ files }, cart);
+        addFile(proto, cart, resolveFeatures);
+    }
+    return cart;
 }
 exports.createDescriptorSet = createDescriptorSet;
 /**
  * Create a descriptor for a file.
  */
-function newFile(proto, cart, resolveFeatures) {
+function addFile(proto, cart, resolveFeatures) {
     var _a, _b;
     (0, assert_js_1.assert)(proto.name, `invalid FileDescriptorProto: missing name`);
-    const file = Object.assign(Object.assign({ kind: "file", proto, deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false }, parseFileSyntax(proto.syntax, proto.edition)), { name: proto.name.replace(/\.proto/, ""), enums: [], messages: [], extensions: [], services: [], toString() {
+    const file = Object.assign(Object.assign({ kind: "file", proto, deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false }, parseFileSyntax(proto.syntax, proto.edition)), { name: proto.name.replace(/\.proto/, ""), dependencies: findFileDependencies(proto, cart), enums: [], messages: [], extensions: [], services: [], toString() {
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- we asserted above
             return `file ${this.proto.name}`;
         },
@@ -99,7 +101,7 @@ function newFile(proto, cart, resolveFeatures) {
         addExtensions(message, cart, resolveFeatures);
     }
     cart.mapEntries.clear(); // map entries are local to the file, we can safely discard
-    return file;
+    cart.files.push(file);
 }
 /**
  * Create descriptors for extensions, and add them to the message / file,
@@ -491,8 +493,8 @@ function newField(proto, file, parent, oneof, cart, resolveFeatures) {
             return Object.assign(Object.assign({}, common), { kind: "field", fieldKind: "scalar", getDefaultValue,
                 repeated,
                 scalar, longType: ((_c = proto.options) === null || _c === void 0 ? void 0 : _c.jstype) == descriptor_pb_js_1.FieldOptions_JSType.JS_STRING
-                    ? field_js_1.LongType.STRING
-                    : field_js_1.LongType.BIGINT });
+                    ? scalar_js_1.LongType.STRING
+                    : scalar_js_1.LongType.BIGINT });
         }
     }
 }
@@ -575,6 +577,16 @@ function parseFileSyntax(syntax, edition) {
         edition: e,
     };
 }
+/**
+ * Resolve dependencies of FileDescriptorProto to DescFile.
+ */
+function findFileDependencies(proto, cart) {
+    return proto.dependency.map((wantName) => {
+        const dep = cart.files.find((f) => f.proto.name === wantName);
+        (0, assert_js_1.assert)(dep);
+        return dep;
+    });
+}
 /**
  * Create a fully qualified name for a protobuf type or extension field.
  *
@@ -619,9 +631,9 @@ function getMapFieldTypes(mapEntry) {
     (0, assert_js_1.assert)(keyField, `invalid DescriptorProto: map entry ${mapEntry.toString()} is missing key field`);
     const mapKey = keyField.scalar;
     (0, assert_js_1.assert)(mapKey !== undefined &&
-        mapKey !== field_js_1.ScalarType.BYTES &&
-        mapKey !== field_js_1.ScalarType.FLOAT &&
-        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}`);
+        mapKey !== scalar_js_1.ScalarType.BYTES &&
+        mapKey !== scalar_js_1.ScalarType.FLOAT &&
+        mapKey !== scalar_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.fieldKind) {
@@ -737,24 +749,24 @@ function isPackedField(file, parent, proto, resolveFeatures) {
  * subset of field types declared by protobuf enum google.protobuf.FieldDescriptorProto.
  */
 const fieldTypeToScalarType = {
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.DOUBLE]: field_js_1.ScalarType.DOUBLE,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.FLOAT]: field_js_1.ScalarType.FLOAT,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.INT64]: field_js_1.ScalarType.INT64,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.UINT64]: field_js_1.ScalarType.UINT64,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.INT32]: field_js_1.ScalarType.INT32,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.FIXED64]: field_js_1.ScalarType.FIXED64,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.FIXED32]: field_js_1.ScalarType.FIXED32,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.BOOL]: field_js_1.ScalarType.BOOL,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.STRING]: field_js_1.ScalarType.STRING,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.DOUBLE]: scalar_js_1.ScalarType.DOUBLE,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.FLOAT]: scalar_js_1.ScalarType.FLOAT,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.INT64]: scalar_js_1.ScalarType.INT64,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.UINT64]: scalar_js_1.ScalarType.UINT64,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.INT32]: scalar_js_1.ScalarType.INT32,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.FIXED64]: scalar_js_1.ScalarType.FIXED64,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.FIXED32]: scalar_js_1.ScalarType.FIXED32,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.BOOL]: scalar_js_1.ScalarType.BOOL,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.STRING]: scalar_js_1.ScalarType.STRING,
     [descriptor_pb_js_1.FieldDescriptorProto_Type.GROUP]: undefined,
     [descriptor_pb_js_1.FieldDescriptorProto_Type.MESSAGE]: undefined,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.BYTES]: field_js_1.ScalarType.BYTES,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.UINT32]: field_js_1.ScalarType.UINT32,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.BYTES]: scalar_js_1.ScalarType.BYTES,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.UINT32]: scalar_js_1.ScalarType.UINT32,
     [descriptor_pb_js_1.FieldDescriptorProto_Type.ENUM]: undefined,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.SFIXED32]: field_js_1.ScalarType.SFIXED32,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.SFIXED64]: field_js_1.ScalarType.SFIXED64,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.SINT32]: field_js_1.ScalarType.SINT32,
-    [descriptor_pb_js_1.FieldDescriptorProto_Type.SINT64]: field_js_1.ScalarType.SINT64,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.SFIXED32]: scalar_js_1.ScalarType.SFIXED32,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.SFIXED64]: scalar_js_1.ScalarType.SFIXED64,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.SINT32]: scalar_js_1.ScalarType.SINT32,
+    [descriptor_pb_js_1.FieldDescriptorProto_Type.SINT64]: scalar_js_1.ScalarType.SINT64,
 };
 /**
  * Find comments.
@@ -826,7 +838,7 @@ function declarationString() {
     let type;
     switch (this.fieldKind) {
         case "scalar":
-            type = field_js_1.ScalarType[this.scalar].toLowerCase();
+            type = scalar_js_1.ScalarType[this.scalar].toLowerCase();
             break;
         case "enum":
             type = this.enum.typeName;
@@ -835,11 +847,11 @@ function declarationString() {
             type = this.message.typeName;
             break;
         case "map": {
-            const k = field_js_1.ScalarType[this.mapKey].toLowerCase();
+            const k = scalar_js_1.ScalarType[this.mapKey].toLowerCase();
             let v;
             switch (this.mapValue.kind) {
                 case "scalar":
-                    v = field_js_1.ScalarType[this.mapValue.scalar].toLowerCase();
+                    v = scalar_js_1.ScalarType[this.mapValue.scalar].toLowerCase();
                     break;
                 case "enum":
                     v = this.mapValue.enum.typeName;

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

@@ -17,7 +17,6 @@ exports.createRegistryFromDescriptors = void 0;
 const assert_js_1 = require("./private/assert.js");
 const proto3_js_1 = require("./proto3.js");
 const proto2_js_1 = require("./proto2.js");
-const field_js_1 = require("./field.js");
 const names_js_1 = require("./private/names.js");
 const timestamp_pb_js_1 = require("./google/protobuf/timestamp_pb.js");
 const duration_pb_js_1 = require("./google/protobuf/duration_pb.js");
@@ -29,6 +28,7 @@ const enum_js_1 = require("./private/enum.js");
 const wrappers_pb_js_1 = require("./google/protobuf/wrappers_pb.js");
 const descriptor_pb_js_1 = require("./google/protobuf/descriptor_pb.js");
 const create_descriptor_set_js_1 = require("./create-descriptor-set.js");
+const is_message_js_1 = require("./is-message.js");
 // well-known message types with specialized JSON representation
 const wkMessages = [
     any_pb_js_1.Any,
@@ -64,7 +64,7 @@ const wkEnums = [(0, enum_js_1.getEnumType)(struct_pb_js_1.NullValue)];
  * are replaced with their generated counterpart in this package.
  */
 function createRegistryFromDescriptors(input, replaceWkt = true) {
-    const set = input instanceof Uint8Array || input instanceof descriptor_pb_js_1.FileDescriptorSet
+    const set = input instanceof Uint8Array || (0, is_message_js_1.isMessage)(input, descriptor_pb_js_1.FileDescriptorSet)
         ? (0, create_descriptor_set_js_1.createDescriptorSet)(input)
         : input;
     const enums = new Map();
@@ -121,8 +121,7 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
             });
             messages.set(typeName, type);
             for (const field of desc.fields) {
-                const fieldInfo = makeFieldInfo(field, this);
-                fields.push(fieldInfo);
+                fields.push(makeFieldInfo(field, this));
             }
             return type;
         },
@@ -140,10 +139,8 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
             }
             const methods = {};
             for (const method of desc.methods) {
-                const I = this.findMessage(method.input.typeName);
-                const O = this.findMessage(method.output.typeName);
-                (0, assert_js_1.assert)(I, `message "${method.input.typeName}" for ${method.toString()} not found`);
-                (0, assert_js_1.assert)(O, `output message "${method.output.typeName}" for ${method.toString()} not found`);
+                const I = resolve(method.input, this, method);
+                const O = resolve(method.output, this, method);
                 methods[(0, names_js_1.localName)(method)] = {
                     name: method.name,
                     I,
@@ -193,8 +190,7 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
             if (!desc) {
                 return undefined;
             }
-            const extendee = this.findMessage(desc.extendee.typeName);
-            (0, assert_js_1.assert)(extendee, `message "${desc.extendee.typeName}" for ${desc.toString()} not found`);
+            const extendee = resolve(desc.extendee, this, desc);
             const runtime = desc.file.syntax == "proto3" ? proto3_js_1.proto3 : proto2_js_1.proto2;
             const ext = runtime.makeExtension(typeName, extendee, makeFieldInfo(desc, this));
             extensions.set(typeName, ext);
@@ -203,112 +199,66 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
     };
 }
 exports.createRegistryFromDescriptors = createRegistryFromDescriptors;
-function makeFieldInfo(desc, resolver) {
+function makeFieldInfo(desc, registry) {
+    var _a;
+    const f = {
+        kind: desc.fieldKind,
+        no: desc.number,
+        name: desc.name,
+        jsonName: desc.jsonName,
+        delimited: desc.proto.type == descriptor_pb_js_1.FieldDescriptorProto_Type.GROUP,
+        repeated: desc.repeated,
+        packed: desc.packed,
+        oneof: (_a = desc.oneof) === null || _a === void 0 ? void 0 : _a.name,
+        opt: desc.optional,
+        req: desc.proto.label === descriptor_pb_js_1.FieldDescriptorProto_Label.REQUIRED,
+    };
     switch (desc.fieldKind) {
-        case "map":
+        case "map": {
             (0, assert_js_1.assert)(desc.kind == "field"); // maps are not allowed for extensions
-            return makeMapFieldInfo(desc, resolver);
-        case "message":
-            return makeMessageFieldInfo(desc, resolver);
+            let T;
+            switch (desc.mapValue.kind) {
+                case "scalar":
+                    T = desc.mapValue.scalar;
+                    break;
+                case "enum": {
+                    T = resolve(desc.mapValue.enum, registry, desc);
+                    break;
+                }
+                case "message": {
+                    T = resolve(desc.mapValue.message, registry, desc);
+                    break;
+                }
+            }
+            f.K = desc.mapKey;
+            f.V = {
+                kind: desc.mapValue.kind,
+                T,
+            };
+            break;
+        }
+        case "message": {
+            f.T = resolve(desc.message, registry, desc);
+            break;
+        }
         case "enum": {
-            const fi = makeEnumFieldInfo(desc, resolver);
-            fi.default = desc.getDefaultValue();
-            return fi;
+            f.T = resolve(desc.enum, registry, desc);
+            f.default = desc.getDefaultValue();
+            break;
         }
         case "scalar": {
-            const fi = makeScalarFieldInfo(desc);
-            fi.default = desc.getDefaultValue();
-            return fi;
+            f.L = desc.longType;
+            f.T = desc.scalar;
+            f.default = desc.getDefaultValue();
+            break;
         }
     }
+    return f;
 }
-function makeMapFieldInfo(field, resolver) {
-    const base = {
-        kind: "map",
-        no: field.number,
-        name: field.name,
-        jsonName: field.jsonName,
-        K: field.mapKey,
-    };
-    if (field.mapValue.message) {
-        const messageType = resolver.findMessage(field.mapValue.message.typeName);
-        (0, assert_js_1.assert)(messageType, `message "${field.mapValue.message.typeName}" for ${field.toString()} not found`);
-        return Object.assign(Object.assign({}, base), { V: {
-                kind: "message",
-                T: messageType,
-            } });
-    }
-    if (field.mapValue.enum) {
-        const enumType = resolver.findEnum(field.mapValue.enum.typeName);
-        (0, assert_js_1.assert)(enumType, `enum "${field.mapValue.enum.typeName}" for ${field.toString()} not found`);
-        return Object.assign(Object.assign({}, base), { V: {
-                kind: "enum",
-                T: enumType,
-            } });
-    }
-    return Object.assign(Object.assign({}, base), { V: {
-            kind: "scalar",
-            T: field.mapValue.scalar,
-        } });
-}
-function makeScalarFieldInfo(field) {
-    // We are creating _partial_ field info here, so we omit long type bigint,
-    // which is the default.
-    const longType = field.longType == field_js_1.LongType.STRING
-        ? { L: field_js_1.LongType.STRING }
-        : {};
-    const base = Object.assign({ kind: "scalar", no: field.number, name: field.name, jsonName: field.jsonName, T: field.scalar }, longType);
-    if (field.repeated) {
-        return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined, T: field.scalar });
-    }
-    if (field.oneof) {
-        return Object.assign(Object.assign({}, base), { oneof: field.oneof.name });
-    }
-    if (field.optional) {
-        return Object.assign(Object.assign({}, base), { opt: true });
-    }
-    return base;
-}
-function makeMessageFieldInfo(field, resolver) {
-    const messageType = resolver.findMessage(field.message.typeName);
-    (0, assert_js_1.assert)(messageType, `message "${field.message.typeName}" for ${field.toString()} not found`);
-    const base = {
-        kind: "message",
-        no: field.number,
-        name: field.name,
-        jsonName: field.jsonName,
-        T: messageType,
-        delimited: field.proto.type == descriptor_pb_js_1.FieldDescriptorProto_Type.GROUP,
-    };
-    if (field.repeated) {
-        return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined });
-    }
-    if (field.oneof) {
-        return Object.assign(Object.assign({}, base), { oneof: field.oneof.name });
-    }
-    if (field.optional) {
-        return Object.assign(Object.assign({}, base), { opt: true });
-    }
-    return base;
-}
-function makeEnumFieldInfo(field, resolver) {
-    const enumType = resolver.findEnum(field.enum.typeName);
-    (0, assert_js_1.assert)(enumType, `enum "${field.enum.typeName}" for ${field.toString()} not found`);
-    const base = {
-        kind: "enum",
-        no: field.number,
-        name: field.name,
-        jsonName: field.jsonName,
-        T: enumType,
-    };
-    if (field.repeated) {
-        return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined });
-    }
-    if (field.oneof) {
-        return Object.assign(Object.assign({}, base), { oneof: field.oneof.name });
-    }
-    if (field.optional) {
-        return Object.assign(Object.assign({}, base), { opt: true });
-    }
-    return base;
+function resolve(desc, registry, context) {
+    const type = desc.kind == "message"
+        ? registry.findMessage(desc.typeName)
+        : registry.findEnum(desc.typeName);
+    (0, assert_js_1.assert)(type, `${desc.toString()}" for ${context.toString()} not found`);
+    return type;
 }

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

@@ -1,5 +1,5 @@
 import type { DescriptorProto, Edition, EnumDescriptorProto, EnumValueDescriptorProto, FieldDescriptorProto, FileDescriptorProto, MethodDescriptorProto, OneofDescriptorProto, ServiceDescriptorProto } from "./google/protobuf/descriptor_pb.js";
-import type { LongType, ScalarType } from "./field.js";
+import { LongType, ScalarType } from "./scalar.js";
 import type { MethodIdempotency, MethodKind } from "./service-type.js";
 import type { MergedFeatureSet } from "./private/feature-set.js";
 /**
@@ -47,7 +47,7 @@ export type AnyDesc = DescFile | DescEnum | DescEnumValue | DescMessage | DescFi
  * Describes a protobuf source file.
  */
 export interface DescFile {
-    kind: "file";
+    readonly kind: "file";
     /**
      * The syntax specified in the protobuf source.
      */
@@ -62,6 +62,10 @@ export interface DescFile {
      * For a protobuf file `foo/bar.proto`, this is `foo/bar`.
      */
     readonly name: string;
+    /**
+     * Files imported by this file.
+     */
+    readonly dependencies: DescFile[];
     /**
      * Top-level enumerations declared in this file.
      * Note that more enumerations might be declared within message declarations.
@@ -107,7 +111,7 @@ export interface DescFile {
  * Describes an enumeration in a protobuf source file.
  */
 export interface DescEnum {
-    kind: "enum";
+    readonly kind: "enum";
     /**
      * The fully qualified name of the enumeration. (We omit the leading dot.)
      */
@@ -195,7 +199,7 @@ export interface DescEnumValue {
  * Describes a message declaration in a protobuf source file.
  */
 export interface DescMessage {
-    kind: "message";
+    readonly kind: "message";
     /**
      * The fully qualified name of the message. (We omit the leading dot.)
      */
@@ -262,7 +266,7 @@ export interface DescMessage {
  * Describes a field declaration in a protobuf source file.
  */
 export type DescField = DescFieldCommon & (DescFieldScalar | DescFieldMessage | DescFieldEnum | DescFieldMap) & {
-    kind: "field";
+    readonly kind: "field";
     /**
      * The message this field is declared on.
      */
@@ -272,7 +276,7 @@ export type DescField = DescFieldCommon & (DescFieldScalar | DescFieldMessage |
  * Describes an extension in a protobuf source file.
  */
 export type DescExtension = DescFieldCommon & (DescFieldScalar | DescFieldMessage | DescFieldEnum | DescFieldMap) & {
-    kind: "extension";
+    readonly kind: "extension";
     /**
      * The fully qualified name of the extension.
      */
@@ -537,7 +541,7 @@ interface DescFieldMapValueScalar {
  * Describes a oneof group in a protobuf source file.
  */
 export interface DescOneof {
-    kind: "oneof";
+    readonly kind: "oneof";
     /**
      * The name of the oneof group, as specified in the protobuf source.
      */
@@ -574,7 +578,7 @@ export interface DescOneof {
  * Describes a service declaration in a protobuf source file.
  */
 export interface DescService {
-    kind: "service";
+    readonly kind: "service";
     /**
      * The fully qualified name of the service. (We omit the leading dot.)
      */
@@ -613,7 +617,7 @@ export interface DescService {
  * Describes an RPC declaration in a protobuf source file.
  */
 export interface DescMethod {
-    kind: "rpc";
+    readonly kind: "rpc";
     /**
      * The name of the RPC, as specified in the protobuf source.
      */