@bufbuild/protobuf 2.0.0-alpha.1 → 2.0.0-alpha.3

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.
  */
@@ -69,7 +69,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, DescFile, 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 = {
@@ -16,7 +16,7 @@ type EmbedDescriptorProto = Omit<EmbedUnknown, "bootable"> & {
  *
  * @private
  */
-export declare function embedFileDesc(file: DescFile): EmbedUnknown | EmbedDescriptorProto;
+export declare function embedFileDesc(file: FileDescriptorProto): EmbedUnknown | EmbedDescriptorProto;
 /**
  * Compute the path to a message, enumeration, extension, or service in a
  * file descriptor.

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");
@@ -31,9 +30,9 @@ function embedFileDesc(file) {
     const embed = {
         bootable: false,
         proto() {
-            const stripped = (0, clone_js_1.clone)(descriptor_pb_js_1.FileDescriptorProtoDesc, file.proto);
-            (0, fields_js_1.clearField)(descriptor_pb_js_1.FileDescriptorProtoDesc, stripped, "dependency");
-            (0, fields_js_1.clearField)(descriptor_pb_js_1.FileDescriptorProtoDesc, stripped, "sourceCodeInfo");
+            const stripped = (0, clone_js_1.clone)(descriptor_pb_js_1.FileDescriptorProtoDesc, file);
+            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoDesc.field.dependency);
+            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoDesc.field.sourceCodeInfo);
             stripped.messageType.map(stripJsonNames);
             return stripped;
         },
@@ -42,7 +41,7 @@ function embedFileDesc(file) {
             return (0, base64_encoding_js_1.base64Encode)(bytes, "std_raw");
         },
     };
-    return file.proto.name == "google/protobuf/descriptor.proto"
+    return file.name == "google/protobuf/descriptor.proto"
         ? Object.assign(Object.assign({}, embed), { bootable: true, boot() {
                 return createFileDescriptorProtoBoot(this.proto());
             } }) : embed;
@@ -51,7 +50,7 @@ exports.embedFileDesc = embedFileDesc;
 function stripJsonNames(d) {
     for (const f of d.field) {
         if (f.jsonName === (0, names_js_1.protoCamelCase)(f.name)) {
-            (0, fields_js_1.clearField)(descriptor_pb_js_1.FieldDescriptorProtoDesc, f, "jsonName");
+            (0, fields_js_1.clearField)(f, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName);
         }
     }
     for (const n of d.nestedType) {
@@ -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,34 +154,34 @@ 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)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "name"));
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "number"));
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "type"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "oneofIndex"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "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,
         number: proto.number,
         type: proto.type,
     };
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "label")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.label)) {
         b.label = proto.label;
     }
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "typeName")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.typeName)) {
         b.typeName = proto.typeName;
     }
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "extendee")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.extendee)) {
         b.extendee = proto.extendee;
     }
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "defaultValue")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.defaultValue)) {
         b.defaultValue = proto.defaultValue;
     }
     if (proto.options) {
@@ -193,19 +191,19 @@ function createFieldDescriptorBoot(proto) {
 }
 function createFieldOptionsBoot(proto) {
     const b = {};
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "ctype"));
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "packed")) {
+    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)(descriptor_pb_js_1.FieldOptionsDesc, proto, "jstype"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "lazy"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "unverifiedLazy"));
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "deprecated")) {
+    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)(descriptor_pb_js_1.FieldOptionsDesc, proto, "weak"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "debugRedact"));
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "retention")) {
+    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;
     }
     if (proto.targets.length) {
@@ -217,18 +215,16 @@ function createFieldOptionsBoot(proto) {
             edition: d.edition,
         }));
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "features"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "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/enum.js

@@ -14,7 +14,6 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsEnum = exports.enumDesc = void 0;
-const names_js_1 = require("../reflect/names.js");
 /**
  * Hydrate an enum descriptor.
  *
@@ -34,9 +33,8 @@ exports.enumDesc = enumDesc;
 function tsEnum(desc) {
     const enumObject = {};
     for (const value of desc.values) {
-        const name = (0, names_js_1.localName)(value);
-        enumObject[name] = value.number;
-        enumObject[value.number] = name;
+        enumObject[value.localName] = value.number;
+        enumObject[value.number] = value.localName;
     }
     return enumObject;
 }

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/restore-json-names.d.ts

@@ -1,2 +1,5 @@
 import type { DescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
+/**
+ * @private
+ */
 export declare function restoreJsonNames(message: DescriptorProto): void;

package/dist/cjs/codegenv1/restore-json-names.js

@@ -16,6 +16,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreJsonNames = void 0;
 const names_js_1 = require("../reflect/names.js");
 const unsafe_js_1 = require("../reflect/unsafe.js");
+/**
+ * @private
+ */
 function restoreJsonNames(message) {
     for (const f of message.field) {
         if (!(0, unsafe_js_1.unsafeIsSetExplicit)(f, "jsonName")) {

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/symbols.d.ts

@@ -1,5 +1,14 @@
+/**
+ * @private
+ */
 export declare const packageName = "@bufbuild/protobuf";
+/**
+ * @private
+ */
 export declare const wktPublicImportPaths: Readonly<Record<string, string>>;
+/**
+ * @private
+ */
 export declare const symbols: {
     readonly isMessage: {
         readonly typeOnly: false;

package/dist/cjs/codegenv1/symbols.js

@@ -14,7 +14,13 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.symbols = exports.wktPublicImportPaths = exports.packageName = void 0;
+/**
+ * @private
+ */
 exports.packageName = "@bufbuild/protobuf";
+/**
+ * @private
+ */
 exports.wktPublicImportPaths = {
     "google/protobuf/compiler/plugin.proto": exports.packageName + "/wkt",
     "google/protobuf/any.proto": exports.packageName + "/wkt",
@@ -29,6 +35,9 @@ exports.wktPublicImportPaths = {
     "google/protobuf/type.proto": exports.packageName + "/wkt",
     "google/protobuf/wrappers.proto": exports.packageName + "/wkt",
 };
+/**
+ * @private
+ */
 // prettier-ignore
 exports.symbols = {
     isMessage: { typeOnly: false, bootstrapWktFrom: "../../is-message.js", from: exports.packageName },

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

@@ -1,19 +1,70 @@
 import type { Message } from "../types.js";
-import type { DescEnum, DescExtension, DescFile, DescMessage, DescService } from "../desc-types.js";
+import type { DescEnum, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescService } from "../descriptors.js";
+/**
+ * Describes a protobuf source file.
+ *
+ * @private
+ */
 export type GenDescFile = DescFile;
-export type GenDescMessage<RuntimeShape extends Message> = DescMessage & brand<RuntimeShape>;
+/**
+ * Describes a message declaration in a protobuf source file.
+ *
+ * This type is identical to DescMessage, but carries additional type
+ * information.
+ *
+ * @private
+ */
+export type GenDescMessage<RuntimeShape extends Message> = Omit<DescMessage, "field"> & {
+    field: Record<MessageFieldNames<RuntimeShape>, DescField>;
+} & brand<RuntimeShape>;
+/**
+ * Describes an enumeration in a protobuf source file.
+ *
+ * This type is identical to DescEnum, but carries additional type
+ * information.
+ *
+ * @private
+ */
 export type GenDescEnum<RuntimeShape> = DescEnum & brand<RuntimeShape>;
+/**
+ * Describes an extension in a protobuf source file.
+ *
+ * This type is identical to DescExtension, but carries additional type
+ * information.
+ *
+ * @private
+ */
 export type GenDescExtension<Extendee extends Message = Message, RuntimeShape = unknown> = DescExtension & brand<Extendee, RuntimeShape>;
-export type GenDescService<RuntimeShape extends GenDescServiceShape> = DescService & brand<RuntimeShape>;
-export type GenDescServiceShape = {
-    [localName: string]: {
-        kind: "unary" | "server_streaming" | "client_streaming" | "bidi_streaming";
-        I: Message;
-        O: Message;
+/**
+ * Describes a service declaration in a protobuf source file.
+ *
+ * This type is identical to DescService, but carries additional type
+ * information.
+ *
+ * @private
+ */
+export type GenDescService<RuntimeShape extends GenDescServiceMethods> = Omit<DescService, "method"> & {
+    method: {
+        [K in keyof RuntimeShape]: RuntimeShape[K] & DescMethod;
     };
 };
+/**
+ * @private
+ */
+export type GenDescServiceMethods = Record<string, Pick<DescMethod, "input" | "output" | "methodKind">>;
 declare class brand<A, B = unknown> {
     protected a: A | boolean;
     protected b: B | boolean;
 }
+/**
+ * Union of the property names of all fields, including oneof members.
+ * For an anonymous message (no generated message shape), it's simply a string.
+ */
+type MessageFieldNames<T extends Message> = Message extends T ? string : Exclude<keyof {
+    [P in keyof T as P extends ("$typeName" | "$unknown") ? never : T[P] extends Oneof<infer K> ? K : P]-?: true;
+}, number | symbol>;
+type Oneof<K extends string> = {
+    case: K | undefined;
+    value?: unknown;
+};
 export {};

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.