@bufbuild/protobuf 1.7.2 → 1.9.0

package/dist/cjs/proto2.js

@@ -15,78 +15,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proto2 = void 0;
 const proto_runtime_js_1 = require("./private/proto-runtime.js");
-const binary_format_proto2_js_1 = require("./private/binary-format-proto2.js");
-const util_common_js_1 = require("./private/util-common.js");
 const field_list_js_1 = require("./private/field-list.js");
-const field_js_1 = require("./private/field.js");
-const names_js_1 = require("./private/names.js");
-const json_format_proto2_js_1 = require("./private/json-format-proto2.js");
-const field_js_2 = require("./field.js");
+const field_normalize_js_1 = require("./private/field-normalize.js");
 /**
  * Provides functionality for messages defined with the proto2 syntax.
  */
-exports.proto2 = (0, proto_runtime_js_1.makeProtoRuntime)("proto2", (0, json_format_proto2_js_1.makeJsonFormatProto2)(), (0, binary_format_proto2_js_1.makeBinaryFormatProto2)(), Object.assign(Object.assign({}, (0, util_common_js_1.makeUtilCommon)()), { newFieldList(fields) {
-        return new field_list_js_1.InternalFieldList(fields, normalizeFieldInfosProto2);
-    },
-    initFields(target) {
-        for (const member of target.getType().fields.byMember()) {
-            const name = member.localName, t = target;
-            if (member.repeated) {
-                t[name] = [];
-                continue;
-            }
-            switch (member.kind) {
-                case "oneof":
-                    t[name] = { case: undefined };
-                    break;
-                case "map":
-                    t[name] = {};
-                    break;
-                case "scalar":
-                case "enum":
-                case "message":
-                    // In contrast to proto3, enum and scalar fields have no intrinsic default value,
-                    // only an optional explicit default value.
-                    // Unlike proto3 intrinsic default values, proto2 explicit default values are not
-                    // set on construction, because they are not omitted on the wire. If we did set
-                    // default values on construction, a deserialize-serialize round-trip would add
-                    // fields to a message.
-                    break;
-            }
+exports.proto2 = (0, proto_runtime_js_1.makeProtoRuntime)("proto2", (fields) => {
+    return new field_list_js_1.InternalFieldList(fields, (source) => (0, field_normalize_js_1.normalizeFieldInfos)(source, false));
+}, 
+// TODO merge with proto3 and initExtensionField, also see initPartial, equals, clone
+(target) => {
+    for (const member of target.getType().fields.byMember()) {
+        const name = member.localName, t = target;
+        if (member.repeated) {
+            t[name] = [];
+            continue;
         }
-    } }));
-/* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
-function normalizeFieldInfosProto2(fieldInfos) {
-    var _a, _b, _c, _d, _e;
-    const r = [];
-    let o;
-    for (const field of typeof fieldInfos == "function"
-        ? fieldInfos()
-        : fieldInfos) {
-        const f = field;
-        f.localName = (0, names_js_1.localFieldName)(field.name, field.oneof !== undefined);
-        f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : (0, names_js_1.fieldJsonName)(field.name);
-        f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
-        if (field.kind == "scalar") {
-            f.L = (_c = field.L) !== null && _c !== void 0 ? _c : field_js_2.LongType.BIGINT;
+        switch (member.kind) {
+            case "oneof":
+                t[name] = { case: undefined };
+                break;
+            case "map":
+                t[name] = {};
+                break;
+            case "scalar":
+            case "enum":
+            case "message":
+                // In contrast to proto3, enum and scalar fields have no intrinsic default value,
+                // only an optional explicit default value.
+                // Unlike proto3 intrinsic default values, proto2 explicit default values are not
+                // set on construction, because they are not omitted on the wire. If we did set
+                // default values on construction, a deserialize-serialize round-trip would add
+                // fields to a message.
+                break;
         }
-        // We do not surface options at this time
-        // f.options = field.options ?? emptyReadonlyObject;
-        if (field.oneof !== undefined) {
-            const ooname = typeof field.oneof == "string" ? field.oneof : field.oneof.name;
-            if (!o || o.name != ooname) {
-                o = new field_js_1.InternalOneofInfo(ooname);
-            }
-            f.oneof = o;
-            o.addField(f);
-        }
-        // proto2 specific:
-        if (field.kind == "message") {
-            f.delimited = (_d = field.delimited) !== null && _d !== void 0 ? _d : false;
-        }
-        // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
-        f.packed = (_e = field.packed) !== null && _e !== void 0 ? _e : false;
-        r.push(f);
     }
-    return r;
-}
+});

package/dist/cjs/proto3.js

@@ -15,89 +15,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.proto3 = void 0;
 const proto_runtime_js_1 = require("./private/proto-runtime.js");
-const binary_format_proto3_js_1 = require("./private/binary-format-proto3.js");
-const json_format_proto3_js_1 = require("./private/json-format-proto3.js");
-const util_common_js_1 = require("./private/util-common.js");
 const field_list_js_1 = require("./private/field-list.js");
 const scalars_js_1 = require("./private/scalars.js");
-const field_js_1 = require("./field.js");
-const field_js_2 = require("./private/field.js");
-const names_js_1 = require("./private/names.js");
+const field_normalize_js_1 = require("./private/field-normalize.js");
 /**
  * Provides functionality for messages defined with the proto3 syntax.
  */
-exports.proto3 = (0, proto_runtime_js_1.makeProtoRuntime)("proto3", (0, json_format_proto3_js_1.makeJsonFormatProto3)(), (0, binary_format_proto3_js_1.makeBinaryFormatProto3)(), Object.assign(Object.assign({}, (0, util_common_js_1.makeUtilCommon)()), { newFieldList(fields) {
-        return new field_list_js_1.InternalFieldList(fields, normalizeFieldInfosProto3);
-    },
-    initFields(target) {
-        for (const member of target.getType().fields.byMember()) {
-            if (member.opt) {
-                continue;
-            }
-            const name = member.localName, t = target;
-            if (member.repeated) {
-                t[name] = [];
-                continue;
-            }
-            switch (member.kind) {
-                case "oneof":
-                    t[name] = { case: undefined };
-                    break;
-                case "enum":
-                    t[name] = 0;
-                    break;
-                case "map":
-                    t[name] = {};
-                    break;
-                case "scalar":
-                    t[name] = (0, scalars_js_1.scalarDefaultValue)(member.T, member.L); // eslint-disable-line @typescript-eslint/no-unsafe-assignment
-                    break;
-                case "message":
-                    // message fields are always optional in proto3
-                    break;
-            }
+exports.proto3 = (0, proto_runtime_js_1.makeProtoRuntime)("proto3", (fields) => {
+    return new field_list_js_1.InternalFieldList(fields, (source) => (0, field_normalize_js_1.normalizeFieldInfos)(source, true));
+}, 
+// TODO merge with proto2 and initExtensionField, also see initPartial, equals, clone
+(target) => {
+    for (const member of target.getType().fields.byMember()) {
+        if (member.opt) {
+            continue;
         }
-    } }));
-/* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
-function normalizeFieldInfosProto3(fieldInfos) {
-    var _a, _b, _c, _d;
-    const r = [];
-    let o;
-    for (const field of typeof fieldInfos == "function"
-        ? fieldInfos()
-        : fieldInfos) {
-        const f = field;
-        f.localName = (0, names_js_1.localFieldName)(field.name, field.oneof !== undefined);
-        f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : (0, names_js_1.fieldJsonName)(field.name);
-        f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
-        if (field.kind == "scalar") {
-            f.L = (_c = field.L) !== null && _c !== void 0 ? _c : field_js_1.LongType.BIGINT;
+        const name = member.localName, t = target;
+        if (member.repeated) {
+            t[name] = [];
+            continue;
         }
-        // We do not surface options at this time
-        // f.options = field.options ?? emptyReadonlyObject;
-        if (field.oneof !== undefined) {
-            const ooname = typeof field.oneof == "string" ? field.oneof : field.oneof.name;
-            if (!o || o.name != ooname) {
-                o = new field_js_2.InternalOneofInfo(ooname);
-            }
-            f.oneof = o;
-            o.addField(f);
+        switch (member.kind) {
+            case "oneof":
+                t[name] = { case: undefined };
+                break;
+            case "enum":
+                t[name] = 0;
+                break;
+            case "map":
+                t[name] = {};
+                break;
+            case "scalar":
+                t[name] = (0, scalars_js_1.scalarZeroValue)(member.T, member.L);
+                break;
+            case "message":
+                // message fields are always optional in proto3
+                break;
         }
-        // proto3 specific:
-        if (field.kind == "message") {
-            f.delimited = false;
-        }
-        // From the proto3 language guide:
-        // > In proto3, repeated fields of scalar numeric types are packed by default.
-        // This information is incomplete - according to the conformance tests, BOOL
-        // and ENUM are packed by default as well. This means only STRING and BYTES
-        // are not packed by default, which makes sense because they are length-delimited.
-        f.packed =
-            (_d = field.packed) !== null && _d !== void 0 ? _d : (field.kind == "enum" ||
-                (field.kind == "scalar" &&
-                    field.T != field_js_1.ScalarType.BYTES &&
-                    field.T != field_js_1.ScalarType.STRING));
-        r.push(f);
     }
-    return r;
-}
+});

package/dist/cjs/scalar.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Scalar value types. This is a subset of field types declared by protobuf
+ * enum google.protobuf.FieldDescriptorProto.Type The types GROUP and MESSAGE
+ * are omitted, but the numerical values are identical.
+ */
+export declare enum ScalarType {
+    DOUBLE = 1,
+    FLOAT = 2,
+    INT64 = 3,
+    UINT64 = 4,
+    INT32 = 5,
+    FIXED64 = 6,
+    FIXED32 = 7,
+    BOOL = 8,
+    STRING = 9,
+    BYTES = 12,
+    UINT32 = 13,
+    SFIXED32 = 15,
+    SFIXED64 = 16,
+    SINT32 = 17,// Uses ZigZag encoding.
+    SINT64 = 18
+}
+/**
+ * JavaScript representation of fields with 64 bit integral types (int64, uint64,
+ * sint64, fixed64, sfixed64).
+ *
+ * This is a subset of google.protobuf.FieldOptions.JSType, which defines JS_NORMAL,
+ * JS_STRING, and JS_NUMBER. Protobuf-ES uses BigInt by default, but will use
+ * String if `[jstype = JS_STRING]` is specified.
+ *
+ * ```protobuf
+ * uint64 field_a = 1; // BigInt
+ * uint64 field_b = 2 [jstype = JS_NORMAL]; // BigInt
+ * uint64 field_b = 2 [jstype = JS_NUMBER]; // BigInt
+ * uint64 field_b = 2 [jstype = JS_STRING]; // String
+ * ```
+ */
+export declare enum LongType {
+    /**
+     * Use JavaScript BigInt.
+     */
+    BIGINT = 0,
+    /**
+     * Use JavaScript String.
+     *
+     * Field option `[jstype = JS_STRING]`.
+     */
+    STRING = 1
+}
+/**
+ * ScalarValue maps from a scalar field type to a TypeScript value type.
+ */
+export type ScalarValue<T = ScalarType, L extends LongType = LongType.STRING | LongType.BIGINT> = T extends ScalarType.STRING ? string : T extends ScalarType.INT32 ? number : T extends ScalarType.UINT32 ? number : T extends ScalarType.UINT32 ? number : T extends ScalarType.SINT32 ? number : T extends ScalarType.FIXED32 ? number : T extends ScalarType.SFIXED32 ? number : T extends ScalarType.FLOAT ? number : T extends ScalarType.DOUBLE ? number : T extends ScalarType.INT64 ? (L extends LongType.STRING ? string : bigint) : T extends ScalarType.SINT64 ? (L extends LongType.STRING ? string : bigint) : T extends ScalarType.SFIXED64 ? (L extends LongType.STRING ? string : bigint) : T extends ScalarType.UINT64 ? (L extends LongType.STRING ? string : bigint) : T extends ScalarType.FIXED64 ? (L extends LongType.STRING ? string : bigint) : T extends ScalarType.BOOL ? boolean : T extends ScalarType.BYTES ? Uint8Array : never;

package/dist/cjs/scalar.js

@@ -0,0 +1,81 @@
+"use strict";
+// Copyright 2021-2024 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.LongType = exports.ScalarType = void 0;
+/**
+ * Scalar value types. This is a subset of field types declared by protobuf
+ * enum google.protobuf.FieldDescriptorProto.Type The types GROUP and MESSAGE
+ * are omitted, but the numerical values are identical.
+ */
+var ScalarType;
+(function (ScalarType) {
+    // 0 is reserved for errors.
+    // Order is weird for historical reasons.
+    ScalarType[ScalarType["DOUBLE"] = 1] = "DOUBLE";
+    ScalarType[ScalarType["FLOAT"] = 2] = "FLOAT";
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+    // negative values are likely.
+    ScalarType[ScalarType["INT64"] = 3] = "INT64";
+    ScalarType[ScalarType["UINT64"] = 4] = "UINT64";
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+    // negative values are likely.
+    ScalarType[ScalarType["INT32"] = 5] = "INT32";
+    ScalarType[ScalarType["FIXED64"] = 6] = "FIXED64";
+    ScalarType[ScalarType["FIXED32"] = 7] = "FIXED32";
+    ScalarType[ScalarType["BOOL"] = 8] = "BOOL";
+    ScalarType[ScalarType["STRING"] = 9] = "STRING";
+    // Tag-delimited aggregate.
+    // Group type is deprecated and not supported in proto3. However, Proto3
+    // implementations should still be able to parse the group wire format and
+    // treat group fields as unknown fields.
+    // TYPE_GROUP = 10,
+    // TYPE_MESSAGE = 11,  // Length-delimited aggregate.
+    // New in version 2.
+    ScalarType[ScalarType["BYTES"] = 12] = "BYTES";
+    ScalarType[ScalarType["UINT32"] = 13] = "UINT32";
+    // TYPE_ENUM = 14,
+    ScalarType[ScalarType["SFIXED32"] = 15] = "SFIXED32";
+    ScalarType[ScalarType["SFIXED64"] = 16] = "SFIXED64";
+    ScalarType[ScalarType["SINT32"] = 17] = "SINT32";
+    ScalarType[ScalarType["SINT64"] = 18] = "SINT64";
+})(ScalarType || (exports.ScalarType = ScalarType = {}));
+/**
+ * JavaScript representation of fields with 64 bit integral types (int64, uint64,
+ * sint64, fixed64, sfixed64).
+ *
+ * This is a subset of google.protobuf.FieldOptions.JSType, which defines JS_NORMAL,
+ * JS_STRING, and JS_NUMBER. Protobuf-ES uses BigInt by default, but will use
+ * String if `[jstype = JS_STRING]` is specified.
+ *
+ * ```protobuf
+ * uint64 field_a = 1; // BigInt
+ * uint64 field_b = 2 [jstype = JS_NORMAL]; // BigInt
+ * uint64 field_b = 2 [jstype = JS_NUMBER]; // BigInt
+ * uint64 field_b = 2 [jstype = JS_STRING]; // String
+ * ```
+ */
+var LongType;
+(function (LongType) {
+    /**
+     * Use JavaScript BigInt.
+     */
+    LongType[LongType["BIGINT"] = 0] = "BIGINT";
+    /**
+     * Use JavaScript String.
+     *
+     * Field option `[jstype = JS_STRING]`.
+     */
+    LongType[LongType["STRING"] = 1] = "STRING";
+})(LongType || (exports.LongType = LongType = {}));

package/dist/cjs/to-plain-message.js

@@ -14,8 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toPlainMessage = void 0;
-/* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-argument,no-case-declarations */
-const message_js_1 = require("./message.js");
+const is_message_js_1 = require("./is-message.js");
 /**
  * toPlainMessage returns a new object by stripping
  * all methods from a message, leaving only fields and
@@ -26,7 +25,7 @@ const message_js_1 = require("./message.js");
  * returned as-is.
  */
 function toPlainMessage(message) {
-    if (!(message instanceof message_js_1.Message)) {
+    if (!(0, is_message_js_1.isMessage)(message)) {
         return message;
     }
     const type = message.getType();
@@ -61,7 +60,7 @@ function toPlainValue(value) {
     if (value === undefined) {
         return value;
     }
-    if (value instanceof message_js_1.Message) {
+    if ((0, is_message_js_1.isMessage)(value)) {
         return toPlainMessage(value);
     }
     if (value instanceof Uint8Array) {

package/dist/esm/binary-encoding.d.ts

@@ -63,11 +63,11 @@ export interface IBinaryReader {
      */
     skip(wireType: WireType): Uint8Array;
     /**
-     * Read a `int32` field, a signed 32 bit varint.
+     * Read a `uint32` field, an unsigned 32 bit varint.
      */
     uint32(): number;
     /**
-     * Read a `sint32` field, a signed, zigzag-encoded 32-bit varint.
+     * Read a `int32` field, a signed 32 bit varint.
      */
     int32(): number;
     /**

package/dist/esm/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/esm/codegen-info.js

@@ -13,16 +13,17 @@
 // limitations under the License.
 import { localName, safeIdentifier, safeObjectProperty, } from "./private/names.js";
 import { getUnwrappedFieldType } from "./private/field-wrapper.js";
-import { scalarDefaultValue } from "./private/scalars.js";
+import { scalarZeroValue } from "./private/scalars.js";
 import { reifyWkt } from "./private/reify-wkt.js";
-import { LongType, ScalarType } from "./field.js";
+import { LongType, ScalarType } from "./scalar.js";
 const packageName = "@bufbuild/protobuf";
 export const codegenInfo = {
     packageName: "@bufbuild/protobuf",
     localName,
     reifyWkt,
     getUnwrappedFieldType,
-    scalarDefaultValue,
+    scalarDefaultValue: scalarZeroValue,
+    scalarZeroValue,
     safeIdentifier,
     safeObjectProperty,
     // prettier-ignore
@@ -43,8 +44,8 @@ export const 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/esm/create-descriptor-set.js

@@ -13,11 +13,12 @@
 // limitations under the License.
 import { Edition, FeatureSet_RepeatedFieldEncoding, FeatureSetDefaults, FieldDescriptorProto_Label, FieldDescriptorProto_Type, FieldOptions_JSType, FileDescriptorProto, FileDescriptorSet, MethodDescriptorProto, MethodOptions_IdempotencyLevel, ServiceDescriptorProto, SourceCodeInfo, } from "./google/protobuf/descriptor_pb.js";
 import { assert } from "./private/assert.js";
-import { LongType, ScalarType } from "./field.js";
 import { MethodIdempotency, MethodKind } from "./service-type.js";
 import { fieldJsonName, findEnumSharedPrefix } from "./private/names.js";
 import { parseTextFormatEnumValue, parseTextFormatScalarValue, } from "./private/text-format.js";
 import { createFeatureResolver } from "./private/feature-set.js";
+import { LongType, ScalarType } from "./scalar.js";
+import { isMessage } from "./is-message.js";
 /**
  * Create a DescriptorSet, a convenient interface for working with a set of
  * google.protobuf.FileDescriptorProto.
@@ -27,38 +28,39 @@ import { createFeatureResolver } from "./private/feature-set.js";
  * files in topological order.
  */
 export 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 FileDescriptorSet
+    const fileDescriptors = isMessage(input, FileDescriptorSet)
         ? input.file
         : input instanceof Uint8Array
             ? 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 = 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;
 }
 /**
  * Create a descriptor for a file.
  */
-function newFile(proto, cart, resolveFeatures) {
+function addFile(proto, cart, resolveFeatures) {
     var _a, _b;
     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}`;
         },
@@ -95,7 +97,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,
@@ -571,6 +573,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);
+        assert(dep);
+        return dep;
+    });
+}
 /**
  * Create a fully qualified name for a protobuf type or extension field.
  *