@bufbuild/protobuf 2.0.0-alpha.2 → 2.0.0-alpha.4

package/README.md

@@ -15,7 +15,7 @@ Some additional features that set it apart from the others:
 - ECMAScript module support
 - First-class TypeScript support
 - Generation of idiomatic JavaScript and TypeScript code.
-- Generation of [much smaller bundles](https://github.com/bufbuild/protobuf-es/blob/main/packages/protobuf-bench)
+- Generation of [much smaller bundles](https://github.com/bufbuild/protobuf-es/blob/main/packages/bundle-size)
 - Implementation of all proto3 features, including the [canonical JSON format](https://developers.google.com/protocol-buffers/docs/proto3#json).
 - Implementation of all proto2 features, except for extensions and the text format.  
 - Usage of standard JavaScript APIs instead of the [Closure Library](http://googlecode.blogspot.com/2009/11/introducing-closure-tools.html)

package/dist/cjs/clone.d.ts

@@ -1,5 +1,5 @@
 import type { MessageShape } from "./types.js";
-import type { DescMessage } from "./desc-types.js";
+import { type DescMessage } from "./descriptors.js";
 /**
  * Create a deep copy of a message, including extensions and unknown fields.
  */

package/dist/cjs/clone.js

@@ -14,9 +14,9 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clone = void 0;
+const descriptors_js_1 = require("./descriptors.js");
 const reflect_js_1 = require("./reflect/reflect.js");
 const guard_js_1 = require("./reflect/guard.js");
-const scalar_js_1 = require("./reflect/scalar.js");
 /**
  * Create a deep copy of a message, including extensions and unknown fields.
  */
@@ -40,18 +40,21 @@ function cloneReflect(i) {
                 break;
             }
             case "list":
+                // eslint-disable-next-line no-case-declarations
+                const list = o.get(f);
                 for (const item of i.get(f)) {
-                    // TODO fix type error
-                    // @ts-expect-error TODO
-                    const err = o.addListItem(f, cloneSingular(f, item));
+                    const err = list.add(cloneSingular(f, item));
                     if (err) {
                         throw err;
                     }
                 }
                 break;
             case "map":
+                // eslint-disable-next-line no-case-declarations
+                const map = o.get(f);
                 for (const entry of i.get(f).entries()) {
-                    const err = o.setMapEntry(f, entry[0], cloneSingular(f, entry[1]));
+                    // @ts-expect-error TODO fix type error
+                    const err = map.set(entry[0], cloneSingular(f, entry[1]));
                     if (err) {
                         throw err;
                     }
@@ -69,7 +72,7 @@ function cloneSingular(field, value) {
     if (field.message !== undefined && (0, guard_js_1.isReflectMessage)(value)) {
         return cloneReflect(value);
     }
-    if (field.scalar == scalar_js_1.ScalarType.BYTES && value instanceof Uint8Array) {
+    if (field.scalar == descriptors_js_1.ScalarType.BYTES && value instanceof Uint8Array) {
         // @ts-expect-error T cannot extend Uint8Array in practice
         return value.slice();
     }

package/dist/cjs/codegenv1/boot.d.ts

@@ -1,5 +1,5 @@
 import type { DescriptorProto_ExtensionRange, FieldDescriptorProto_Label, FieldDescriptorProto_Type, FieldOptions_OptionRetention, FieldOptions_OptionTargetType, FieldOptions_EditionDefault, EnumValueDescriptorProto, FileDescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
-import type { DescFile } from "../desc-types.js";
+import type { DescFile } from "../descriptors.js";
 /**
  * Hydrate a file descriptor for google/protobuf/descriptor.proto from a plain
  * object.

package/dist/cjs/codegenv1/boot.js

@@ -15,8 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bootFileDescriptorProto = exports.boot = void 0;
 const restore_json_names_js_1 = require("./restore-json-names.js");
-const registry_js_1 = require("../reflect/registry.js");
-const assert_js_1 = require("../reflect/assert.js");
+const registry_js_1 = require("../registry.js");
 /**
  * Hydrate a file descriptor for google/protobuf/descriptor.proto from a plain
  * object.
@@ -29,9 +28,8 @@ function boot(boot) {
     const root = bootFileDescriptorProto(boot);
     root.messageType.forEach(restore_json_names_js_1.restoreJsonNames);
     const reg = (0, registry_js_1.createFileRegistry)(root, () => undefined);
-    const file = reg.getFile(root.name);
-    (0, assert_js_1.assert)(file);
-    return file;
+    // non-null assertion because we just created the registry from the file we look up
+    return reg.getFile(root.name);
 }
 exports.boot = boot;
 /**

package/dist/cjs/codegenv1/embed.d.ts

@@ -1,4 +1,4 @@
-import type { DescEnum, DescExtension, DescMessage, DescService } from "../desc-types.js";
+import type { DescEnum, DescExtension, DescMessage, DescService } from "../descriptors.js";
 import type { FileDescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
 import type { FileDescriptorProtoBoot } from "./boot.js";
 type EmbedUnknown = {

package/dist/cjs/codegenv1/embed.js

@@ -15,7 +15,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFileDescriptorProtoBoot = exports.pathInFileDesc = exports.embedFileDesc = void 0;
 const names_js_1 = require("../reflect/names.js");
-const assert_js_1 = require("../reflect/assert.js");
 const fields_js_1 = require("../fields.js");
 const base64_encoding_js_1 = require("../wire/base64-encoding.js");
 const to_binary_js_1 = require("../to-binary.js");
@@ -118,17 +117,17 @@ exports.pathInFileDesc = pathInFileDesc;
  */
 function createFileDescriptorProtoBoot(proto) {
     var _a;
-    (0, assert_js_1.assert)(proto.name == "google/protobuf/descriptor.proto");
-    (0, assert_js_1.assert)(proto.package == "google.protobuf");
-    (0, assert_js_1.assert)(!proto.dependency.length);
-    (0, assert_js_1.assert)(!proto.publicDependency.length);
-    (0, assert_js_1.assert)(!proto.weakDependency.length);
-    (0, assert_js_1.assert)(!proto.service.length);
-    (0, assert_js_1.assert)(!proto.extension.length);
-    (0, assert_js_1.assert)(proto.sourceCodeInfo === undefined);
-    (0, assert_js_1.assert)(proto.syntax == "" || proto.syntax == "proto2");
-    (0, assert_js_1.assert)(!((_a = proto.options) === null || _a === void 0 ? void 0 : _a.features)); // we're dropping file options
-    (0, assert_js_1.assert)(proto.edition === descriptor_pb_js_1.Edition.EDITION_UNKNOWN);
+    assert(proto.name == "google/protobuf/descriptor.proto");
+    assert(proto.package == "google.protobuf");
+    assert(!proto.dependency.length);
+    assert(!proto.publicDependency.length);
+    assert(!proto.weakDependency.length);
+    assert(!proto.service.length);
+    assert(!proto.extension.length);
+    assert(proto.sourceCodeInfo === undefined);
+    assert(proto.syntax == "" || proto.syntax == "proto2");
+    assert(!((_a = proto.options) === null || _a === void 0 ? void 0 : _a.features)); // we're dropping file options
+    assert(proto.edition === descriptor_pb_js_1.Edition.EDITION_UNKNOWN);
     return {
         name: proto.name,
         package: proto.package,
@@ -138,10 +137,9 @@ function createFileDescriptorProtoBoot(proto) {
 }
 exports.createFileDescriptorProtoBoot = createFileDescriptorProtoBoot;
 function createDescriptorBoot(proto) {
-    (0, assert_js_1.assert)(proto.extension.length == 0);
-    (0, assert_js_1.assert)(!proto.oneofDecl.length);
-    (0, assert_js_1.assert)(!proto.options);
-    (0, assert_js_1.assert)(!proto.reservedName.length); // we're also dropping reserved_range
+    assert(proto.extension.length == 0);
+    assert(!proto.oneofDecl.length);
+    assert(!proto.options);
     const b = {
         name: proto.name,
     };
@@ -156,18 +154,18 @@ function createDescriptorBoot(proto) {
     }
     if (proto.extensionRange.length) {
         b.extensionRange = proto.extensionRange.map((r) => {
-            (0, assert_js_1.assert)(!r.options);
+            assert(!r.options);
             return { start: r.start, end: r.end };
         });
     }
     return b;
 }
 function createFieldDescriptorBoot(proto) {
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.name));
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.number));
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.type));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.oneofIndex));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName) ||
+    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.name));
+    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.number));
+    assert((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.type));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.oneofIndex));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName) ||
         proto.jsonName === (0, names_js_1.protoCamelCase)(proto.name));
     const b = {
         name: proto.name,
@@ -193,18 +191,18 @@ function createFieldDescriptorBoot(proto) {
 }
 function createFieldOptionsBoot(proto) {
     const b = {};
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.ctype));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.ctype));
     if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.packed)) {
         b.packed = proto.packed;
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.jstype));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.lazy));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.unverifiedLazy));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.jstype));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.lazy));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.unverifiedLazy));
     if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.deprecated)) {
         b.deprecated = proto.deprecated;
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.weak));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.debugRedact));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.weak));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.debugRedact));
     if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.retention)) {
         b.retention = proto.retention;
     }
@@ -217,18 +215,16 @@ function createFieldOptionsBoot(proto) {
             edition: d.edition,
         }));
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.features));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.uninterpretedOption));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.features));
+    assert(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.uninterpretedOption));
     return b;
 }
 function createEnumDescriptorBoot(proto) {
-    (0, assert_js_1.assert)(!proto.reservedName.length);
-    (0, assert_js_1.assert)(!proto.reservedRange.length);
-    (0, assert_js_1.assert)(!proto.options);
+    assert(!proto.options);
     return {
         name: proto.name,
         value: proto.value.map((v) => {
-            (0, assert_js_1.assert)(!v.options);
+            assert(!v.options);
             return {
                 name: v.name,
                 number: v.number,
@@ -236,3 +232,12 @@ function createEnumDescriptorBoot(proto) {
         }),
     };
 }
+/**
+ * Assert that condition is truthy or throw error.
+ */
+function assert(condition) {
+    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions -- we want the implicit conversion to boolean
+    if (!condition) {
+        throw new Error();
+    }
+}

package/dist/cjs/codegenv1/enum.d.ts

@@ -1,4 +1,4 @@
-import type { DescEnum, DescFile } from "../desc-types.js";
+import type { DescEnum, DescFile } from "../descriptors.js";
 import type { GenDescEnum } from "./types.js";
 /**
  * Hydrate an enum descriptor.

package/dist/cjs/codegenv1/extension.d.ts

@@ -1,5 +1,5 @@
 import type { Message } from "../types.js";
-import type { DescFile } from "../desc-types.js";
+import type { DescFile } from "../descriptors.js";
 import type { GenDescExtension } from "./types.js";
 /**
  * Hydrate an extension descriptor.

package/dist/cjs/codegenv1/file.d.ts

@@ -1,4 +1,4 @@
-import type { DescFile } from "../desc-types.js";
+import type { DescFile } from "../descriptors.js";
 /**
  * Hydrate a file descriptor.
  *

package/dist/cjs/codegenv1/file.js

@@ -14,10 +14,9 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileDesc = void 0;
-const index_js_1 = require("../wire/index.js");
+const base64_encoding_js_1 = require("../wire/base64-encoding.js");
 const descriptor_pb_js_1 = require("../wkt/gen/google/protobuf/descriptor_pb.js");
-const registry_js_1 = require("../reflect/registry.js");
-const assert_js_1 = require("../reflect/assert.js");
+const registry_js_1 = require("../registry.js");
 const restore_json_names_js_1 = require("./restore-json-names.js");
 const from_binary_js_1 = require("../from-binary.js");
 /**
@@ -27,12 +26,11 @@ const from_binary_js_1 = require("../from-binary.js");
  */
 function fileDesc(b64, imports) {
     var _a;
-    const root = (0, from_binary_js_1.fromBinary)(descriptor_pb_js_1.FileDescriptorProtoDesc, (0, index_js_1.base64Decode)(b64));
+    const root = (0, from_binary_js_1.fromBinary)(descriptor_pb_js_1.FileDescriptorProtoDesc, (0, base64_encoding_js_1.base64Decode)(b64));
     root.messageType.forEach(restore_json_names_js_1.restoreJsonNames);
     root.dependency = (_a = imports === null || imports === void 0 ? void 0 : imports.map((f) => f.proto.name)) !== null && _a !== void 0 ? _a : [];
     const reg = (0, registry_js_1.createFileRegistry)(root, (protoFileName) => imports === null || imports === void 0 ? void 0 : imports.find((f) => f.proto.name === protoFileName));
-    const file = reg.getFile(root.name);
-    (0, assert_js_1.assert)(file);
-    return file;
+    // non-null assertion because we just created the registry from the file we look up
+    return reg.getFile(root.name);
 }
 exports.fileDesc = fileDesc;

package/dist/cjs/codegenv1/index.d.ts

@@ -6,4 +6,5 @@ export * from "./file.js";
 export * from "./message.js";
 export * from "./service.js";
 export * from "./symbols.js";
+export * from "./scalar.js";
 export * from "./types.js";

package/dist/cjs/codegenv1/index.js

@@ -35,4 +35,5 @@ __exportStar(require("./file.js"), exports);
 __exportStar(require("./message.js"), exports);
 __exportStar(require("./service.js"), exports);
 __exportStar(require("./symbols.js"), exports);
+__exportStar(require("./scalar.js"), exports);
 __exportStar(require("./types.js"), exports);

package/dist/cjs/codegenv1/message.d.ts

@@ -1,5 +1,5 @@
 import type { Message } from "../types.js";
-import type { DescFile } from "../desc-types.js";
+import type { DescFile } from "../descriptors.js";
 import type { GenDescMessage } from "./types.js";
 /**
  * Hydrate a message descriptor.

package/dist/cjs/codegenv1/scalar.d.ts

@@ -0,0 +1,5 @@
+import { ScalarType } from "../descriptors.js";
+/**
+ * Return the TypeScript type (as a string) for the given scalar type.
+ */
+export declare function scalarTypeScriptType(scalar: ScalarType, longAsString: boolean): "string" | "boolean" | "bigint" | "bigint | string" | "Uint8Array" | "number";

package/dist/cjs/codegenv1/scalar.js

@@ -0,0 +1,39 @@
+"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.scalarTypeScriptType = void 0;
+const descriptors_js_1 = require("../descriptors.js");
+/**
+ * Return the TypeScript type (as a string) for the given scalar type.
+ */
+function scalarTypeScriptType(scalar, longAsString) {
+    switch (scalar) {
+        case descriptors_js_1.ScalarType.STRING:
+            return "string";
+        case descriptors_js_1.ScalarType.BOOL:
+            return "boolean";
+        case descriptors_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
+        case descriptors_js_1.ScalarType.INT64:
+            return longAsString ? "string" : "bigint";
+        case descriptors_js_1.ScalarType.BYTES:
+            return "Uint8Array";
+        default:
+            return "number";
+    }
+}
+exports.scalarTypeScriptType = scalarTypeScriptType;

package/dist/cjs/codegenv1/service.d.ts

@@ -1,8 +1,8 @@
-import type { GenDescService, GenDescServiceShape } from "./types.js";
-import type { DescFile } from "../desc-types.js";
+import type { GenDescService, GenDescServiceMethods } from "./types.js";
+import type { DescFile } from "../descriptors.js";
 /**
  * Hydrate a service descriptor.
  *
  * @private
  */
-export declare function serviceDesc<T extends GenDescServiceShape>(file: DescFile, path: number, ...paths: number[]): GenDescService<T>;
+export declare function serviceDesc<T extends GenDescServiceMethods>(file: DescFile, path: number, ...paths: number[]): GenDescService<T>;

package/dist/cjs/codegenv1/types.d.ts

@@ -1,5 +1,5 @@
 import type { Message } from "../types.js";
-import type { DescEnum, DescExtension, DescField, DescFile, DescMessage, DescService } from "../desc-types.js";
+import type { DescEnum, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescService } from "../descriptors.js";
 /**
  * Describes a protobuf source file.
  *
@@ -43,17 +43,15 @@ export type GenDescExtension<Extendee extends Message = Message, RuntimeShape =
  *
  * @private
  */
-export type GenDescService<RuntimeShape extends GenDescServiceShape> = DescService & brand<RuntimeShape>;
+export type GenDescService<RuntimeShape extends GenDescServiceMethods> = Omit<DescService, "method"> & {
+    method: {
+        [K in keyof RuntimeShape]: RuntimeShape[K] & DescMethod;
+    };
+};
 /**
  * @private
  */
-export type GenDescServiceShape = {
-    [localName: string]: {
-        kind: "unary" | "server_streaming" | "client_streaming" | "bidi_streaming";
-        I: Message;
-        O: Message;
-    };
-};
+export type GenDescServiceMethods = Record<string, Pick<DescMethod, "input" | "output" | "methodKind">>;
 declare class brand<A, B = unknown> {
     protected a: A | boolean;
     protected b: B | boolean;

package/dist/cjs/create.d.ts

@@ -1,4 +1,4 @@
-import type { DescMessage } from "./desc-types.js";
+import { type DescMessage } from "./descriptors.js";
 import type { MessageInitShape, MessageShape } from "./types.js";
 /**
  * Create a new message instance.

package/dist/cjs/create.js

@@ -15,6 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const is_message_js_1 = require("./is-message.js");
+const descriptors_js_1 = require("./descriptors.js");
 const scalar_js_1 = require("./reflect/scalar.js");
 const guard_js_1 = require("./reflect/guard.js");
 const unsafe_js_1 = require("./reflect/unsafe.js");
@@ -87,14 +88,14 @@ function initMessage(messageDesc, message, init) {
     return message;
 }
 function initScalar(field, value) {
-    if (field.scalar == scalar_js_1.ScalarType.BYTES) {
+    if (field.scalar == descriptors_js_1.ScalarType.BYTES) {
         return toU8Arr(value);
     }
     return value;
 }
 function initMap(field, value) {
     if ((0, guard_js_1.isObject)(value)) {
-        if (field.scalar == scalar_js_1.ScalarType.BYTES) {
+        if (field.scalar == descriptors_js_1.ScalarType.BYTES) {
             return convertObjectValues(value, toU8Arr);
         }
         if (field.mapKind == "message") {
@@ -105,7 +106,7 @@ function initMap(field, value) {
 }
 function initList(field, value) {
     if (Array.isArray(value)) {
-        if (field.scalar == scalar_js_1.ScalarType.BYTES) {
+        if (field.scalar == descriptors_js_1.ScalarType.BYTES) {
             return value.map(toU8Arr);
         }
         if (field.listKind == "message") {
@@ -221,11 +222,11 @@ function createZeroField(field) {
     }
     const defaultValue = field.getDefaultValue();
     if (defaultValue !== undefined) {
-        return field.fieldKind == "scalar" && field.longType == scalar_js_1.LongType.STRING
+        return field.fieldKind == "scalar" && field.longAsString
             ? defaultValue.toString()
             : defaultValue;
     }
     return field.fieldKind == "scalar"
-        ? (0, scalar_js_1.scalarZeroValue)(field.scalar, field.longType)
+        ? (0, scalar_js_1.scalarZeroValue)(field.scalar, field.longAsString)
         : field.enum.values[0].number;
 }

package/dist/cjs/{desc-types.d.ts → descriptors.d.ts}

@@ -1,7 +1,29 @@
 import type { DescriptorProto, Edition, EnumDescriptorProto, EnumValueDescriptorProto, FeatureSet_FieldPresence, FieldDescriptorProto, FileDescriptorProto, MethodDescriptorProto, MethodOptions_IdempotencyLevel, OneofDescriptorProto, ServiceDescriptorProto } from "./wkt/gen/google/protobuf/descriptor_pb.js";
-import type { LongType, ScalarType, ScalarValue } from "./reflect/scalar.js";
+import type { ScalarValue } from "./reflect/scalar.js";
 export type SupportedEdition = Extract<Edition, Edition.EDITION_PROTO2 | Edition.EDITION_PROTO3 | Edition.EDITION_2023>;
 type SupportedFieldPresence = Extract<FeatureSet_FieldPresence, FeatureSet_FieldPresence.EXPLICIT | FeatureSet_FieldPresence.IMPLICIT | FeatureSet_FieldPresence.LEGACY_REQUIRED>;
+/**
+ * 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
+}
 /**
  * A union of all descriptors, discriminated by a `kind` property.
  */
@@ -281,10 +303,13 @@ type descFieldScalar<T extends ScalarType = ScalarType> = T extends T ? {
      */
     readonly scalar: T;
     /**
-     * JavaScript type for 64 bit integral types (int64, uint64,
-     * sint64, fixed64, sfixed64).
+     * By default, 64-bit integral types (int64, uint64, sint64, fixed64,
+     * sfixed64) are represented with BigInt.
+     *
+     * If the field option `jstype = JS_STRING` is set, this property
+     * is true, and 64-bit integral types are represented with String.
      */
-    readonly longType: LongType;
+    readonly longAsString: boolean;
     /**
      * The message type, if it is a message field.
      */
@@ -369,10 +394,13 @@ type descFieldListScalar<T extends ScalarType = ScalarType> = T extends T ? {
      */
     readonly scalar: T;
     /**
-     * JavaScript type for 64 bit integral types (int64, uint64,
-     * sint64, fixed64, sfixed64).
+     * By default, 64-bit integral types (int64, uint64, sint64, fixed64,
+     * sfixed64) are represented with BigInt.
+     *
+     * If the field option `jstype = JS_STRING` is set, this property
+     * is true, and 64-bit integral types are represented with String.
      */
-    readonly longType: LongType;
+    readonly longAsString: boolean;
 } : never;
 type descFieldListEnum = {
     readonly listKind: "enum";
@@ -526,6 +554,10 @@ export interface DescService {
      * The RPCs this service declares.
      */
     readonly methods: DescMethod[];
+    /**
+     * All methods of this service by their "localName".
+     */
+    readonly method: Record<string, DescMethod>;
     /**
      * Marked as deprecated in the protobuf source.
      */

package/dist/cjs/descriptors.js

@@ -0,0 +1,53 @@
+"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.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 = {}));

package/dist/cjs/equals.d.ts

@@ -1,5 +1,5 @@
 import type { MessageShape } from "./types.js";
-import type { DescMessage } from "./desc-types.js";
+import type { DescMessage } from "./descriptors.js";
 /**
  * Compare two messages of the same type.
  *

package/dist/cjs/extensions.d.ts

@@ -1,4 +1,4 @@
-import type { AnyDesc, DescEnum, DescEnumValue, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescOneof, DescService } from "./desc-types.js";
+import type { AnyDesc, DescEnum, DescEnumValue, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescOneof, DescService } from "./descriptors.js";
 import type { ReflectMessage } from "./reflect/reflect-types.js";
 import type { Extendee, ExtensionValueShape } from "./types.js";
 import type { EnumOptions, EnumValueOptions, FieldOptions, FileOptions, MessageOptions, MethodOptions, OneofOptions, ServiceOptions } from "./wkt/gen/google/protobuf/descriptor_pb.js";

package/dist/cjs/extensions.js

@@ -14,7 +14,6 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createExtensionContainer = exports.getOption = exports.hasOption = exports.hasExtension = exports.clearExtension = exports.setExtension = exports.getExtension = void 0;
-const assert_js_1 = require("./reflect/assert.js");
 const create_js_1 = require("./create.js");
 const from_binary_js_1 = require("./from-binary.js");
 const reflect_js_1 = require("./reflect/reflect.js");
@@ -155,7 +154,7 @@ function createExtensionContainer(extension, value) {
                 // Only message fields are undefined, rest will have a zero value.
                 const desc = extension.message;
                 if ((0, wrappers_js_1.isWrapperDesc)(desc)) {
-                    return (0, scalar_js_1.scalarZeroValue)(desc.fields[0].scalar, desc.fields[0].longType);
+                    return (0, scalar_js_1.scalarZeroValue)(desc.fields[0].scalar, desc.fields[0].longAsString);
                 }
                 return (0, create_js_1.create)(desc);
             }
@@ -165,5 +164,7 @@ function createExtensionContainer(extension, value) {
 }
 exports.createExtensionContainer = createExtensionContainer;
 function assertExtendee(extension, message) {
-    (0, assert_js_1.assert)(extension.extendee.typeName == message.$typeName, `extension ${extension.typeName} can only be applied to message ${extension.extendee.typeName}`);
+    if (extension.extendee.typeName != message.$typeName) {
+        throw new Error(`extension ${extension.typeName} can only be applied to message ${extension.extendee.typeName}`);
+    }
 }

package/dist/cjs/fields.d.ts

@@ -1,5 +1,5 @@
 import type { MessageShape } from "./types.js";
-import type { DescField, DescMessage } from "./desc-types.js";
+import type { DescField, DescMessage } from "./descriptors.js";
 /**
  * Returns true if the field is set.
  *