@bufbuild/protobuf 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/cjs/wkt/gen/google/protobuf/type_pb.d.ts

@@ -1,11 +1,11 @@
-import type { GenDescEnum, GenDescFile, GenDescMessage } from "../../../../codegenv1/types.js";
+import type { GenEnum, GenFile, GenMessage } from "../../../../codegenv1/types.js";
 import type { Any, AnyJson } from "./any_pb.js";
 import type { SourceContext, SourceContextJson } from "./source_context_pb.js";
 import type { Message } from "../../../../types.js";
 /**
  * Describes the file google/protobuf/type.proto.
  */
-export declare const file_google_protobuf_type: GenDescFile;
+export declare const file_google_protobuf_type: GenFile;
 /**
  * A protocol buffer message type.
  *
@@ -92,7 +92,7 @@ export type TypeJson = {
  * Describes the message google.protobuf.Type.
  * Use `create(TypeSchema)` to create a new message.
  */
-export declare const TypeSchema: GenDescMessage<Type, TypeJson>;
+export declare const TypeSchema: GenMessage<Type, TypeJson>;
 /**
  * A single field of a message type.
  *
@@ -211,7 +211,7 @@ export type FieldJson = {
  * Describes the message google.protobuf.Field.
  * Use `create(FieldSchema)` to create a new message.
  */
-export declare const FieldSchema: GenDescMessage<Field, FieldJson>;
+export declare const FieldSchema: GenMessage<Field, FieldJson>;
 /**
  * Basic field types.
  *
@@ -340,7 +340,7 @@ export type Field_KindJson = "TYPE_UNKNOWN" | "TYPE_DOUBLE" | "TYPE_FLOAT" | "TY
 /**
  * Describes the enum google.protobuf.Field.Kind.
  */
-export declare const Field_KindSchema: GenDescEnum<Field_Kind, Field_KindJson>;
+export declare const Field_KindSchema: GenEnum<Field_Kind, Field_KindJson>;
 /**
  * Whether a field is optional, required, or repeated.
  *
@@ -379,7 +379,7 @@ export type Field_CardinalityJson = "CARDINALITY_UNKNOWN" | "CARDINALITY_OPTIONA
 /**
  * Describes the enum google.protobuf.Field.Cardinality.
  */
-export declare const Field_CardinalitySchema: GenDescEnum<Field_Cardinality, Field_CardinalityJson>;
+export declare const Field_CardinalitySchema: GenEnum<Field_Cardinality, Field_CardinalityJson>;
 /**
  * Enum type definition.
  *
@@ -456,7 +456,7 @@ export type EnumJson = {
  * Describes the message google.protobuf.Enum.
  * Use `create(EnumSchema)` to create a new message.
  */
-export declare const EnumSchema: GenDescMessage<Enum, EnumJson>;
+export declare const EnumSchema: GenMessage<Enum, EnumJson>;
 /**
  * Enum value definition.
  *
@@ -503,7 +503,7 @@ export type EnumValueJson = {
  * Describes the message google.protobuf.EnumValue.
  * Use `create(EnumValueSchema)` to create a new message.
  */
-export declare const EnumValueSchema: GenDescMessage<EnumValue, EnumValueJson>;
+export declare const EnumValueSchema: GenMessage<EnumValue, EnumValueJson>;
 /**
  * A protocol buffer option, which can be attached to a message, field,
  * enumeration, etc.
@@ -547,7 +547,7 @@ export type OptionJson = {
  * Describes the message google.protobuf.Option.
  * Use `create(OptionSchema)` to create a new message.
  */
-export declare const OptionSchema: GenDescMessage<Option, OptionJson>;
+export declare const OptionSchema: GenMessage<Option, OptionJson>;
 /**
  * The syntax in which a protocol buffer element is defined.
  *
@@ -580,4 +580,4 @@ export type SyntaxJson = "SYNTAX_PROTO2" | "SYNTAX_PROTO3" | "SYNTAX_EDITIONS";
 /**
  * Describes the enum google.protobuf.Syntax.
  */
-export declare const SyntaxSchema: GenDescEnum<Syntax, SyntaxJson>;
+export declare const SyntaxSchema: GenEnum<Syntax, SyntaxJson>;

package/dist/cjs/wkt/gen/google/protobuf/wrappers_pb.d.ts

@@ -1,9 +1,9 @@
-import type { GenDescFile, GenDescMessage } from "../../../../codegenv1/types.js";
+import type { GenFile, GenMessage } from "../../../../codegenv1/types.js";
 import type { Message } from "../../../../types.js";
 /**
  * Describes the file google/protobuf/wrappers.proto.
  */
-export declare const file_google_protobuf_wrappers: GenDescFile;
+export declare const file_google_protobuf_wrappers: GenFile;
 /**
  * Wrapper message for `double`.
  *
@@ -27,7 +27,7 @@ export type DoubleValueJson = number | "NaN" | "Infinity" | "-Infinity";
  * Describes the message google.protobuf.DoubleValue.
  * Use `create(DoubleValueSchema)` to create a new message.
  */
-export declare const DoubleValueSchema: GenDescMessage<DoubleValue, DoubleValueJson>;
+export declare const DoubleValueSchema: GenMessage<DoubleValue, DoubleValueJson>;
 /**
  * Wrapper message for `float`.
  *
@@ -51,7 +51,7 @@ export type FloatValueJson = number | "NaN" | "Infinity" | "-Infinity";
  * Describes the message google.protobuf.FloatValue.
  * Use `create(FloatValueSchema)` to create a new message.
  */
-export declare const FloatValueSchema: GenDescMessage<FloatValue, FloatValueJson>;
+export declare const FloatValueSchema: GenMessage<FloatValue, FloatValueJson>;
 /**
  * Wrapper message for `int64`.
  *
@@ -75,7 +75,7 @@ export type Int64ValueJson = string;
  * Describes the message google.protobuf.Int64Value.
  * Use `create(Int64ValueSchema)` to create a new message.
  */
-export declare const Int64ValueSchema: GenDescMessage<Int64Value, Int64ValueJson>;
+export declare const Int64ValueSchema: GenMessage<Int64Value, Int64ValueJson>;
 /**
  * Wrapper message for `uint64`.
  *
@@ -99,7 +99,7 @@ export type UInt64ValueJson = string;
  * Describes the message google.protobuf.UInt64Value.
  * Use `create(UInt64ValueSchema)` to create a new message.
  */
-export declare const UInt64ValueSchema: GenDescMessage<UInt64Value, UInt64ValueJson>;
+export declare const UInt64ValueSchema: GenMessage<UInt64Value, UInt64ValueJson>;
 /**
  * Wrapper message for `int32`.
  *
@@ -123,7 +123,7 @@ export type Int32ValueJson = number;
  * Describes the message google.protobuf.Int32Value.
  * Use `create(Int32ValueSchema)` to create a new message.
  */
-export declare const Int32ValueSchema: GenDescMessage<Int32Value, Int32ValueJson>;
+export declare const Int32ValueSchema: GenMessage<Int32Value, Int32ValueJson>;
 /**
  * Wrapper message for `uint32`.
  *
@@ -147,7 +147,7 @@ export type UInt32ValueJson = number;
  * Describes the message google.protobuf.UInt32Value.
  * Use `create(UInt32ValueSchema)` to create a new message.
  */
-export declare const UInt32ValueSchema: GenDescMessage<UInt32Value, UInt32ValueJson>;
+export declare const UInt32ValueSchema: GenMessage<UInt32Value, UInt32ValueJson>;
 /**
  * Wrapper message for `bool`.
  *
@@ -171,7 +171,7 @@ export type BoolValueJson = boolean;
  * Describes the message google.protobuf.BoolValue.
  * Use `create(BoolValueSchema)` to create a new message.
  */
-export declare const BoolValueSchema: GenDescMessage<BoolValue, BoolValueJson>;
+export declare const BoolValueSchema: GenMessage<BoolValue, BoolValueJson>;
 /**
  * Wrapper message for `string`.
  *
@@ -195,7 +195,7 @@ export type StringValueJson = string;
  * Describes the message google.protobuf.StringValue.
  * Use `create(StringValueSchema)` to create a new message.
  */
-export declare const StringValueSchema: GenDescMessage<StringValue, StringValueJson>;
+export declare const StringValueSchema: GenMessage<StringValue, StringValueJson>;
 /**
  * Wrapper message for `bytes`.
  *
@@ -219,4 +219,4 @@ export type BytesValueJson = string;
  * Describes the message google.protobuf.BytesValue.
  * Use `create(BytesValueSchema)` to create a new message.
  */
-export declare const BytesValueSchema: GenDescMessage<BytesValue, BytesValueJson>;
+export declare const BytesValueSchema: GenMessage<BytesValue, BytesValueJson>;

package/dist/cjs/wkt/timestamp.js

@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timestampMs = exports.timestampFromMs = exports.timestampDate = exports.timestampFromDate = exports.timestampNow = void 0;
+exports.timestampNow = timestampNow;
+exports.timestampFromDate = timestampFromDate;
+exports.timestampDate = timestampDate;
+exports.timestampFromMs = timestampFromMs;
+exports.timestampMs = timestampMs;
 const timestamp_pb_js_1 = require("./gen/google/protobuf/timestamp_pb.js");
 const create_js_1 = require("../create.js");
 const proto_int64_js_1 = require("../proto-int64.js");
@@ -23,21 +27,18 @@ const proto_int64_js_1 = require("../proto-int64.js");
 function timestampNow() {
     return timestampFromDate(new Date());
 }
-exports.timestampNow = timestampNow;
 /**
  * Create a google.protobuf.Timestamp message from an ECMAScript Date.
  */
 function timestampFromDate(date) {
     return timestampFromMs(date.getTime());
 }
-exports.timestampFromDate = timestampFromDate;
 /**
  * Convert a google.protobuf.Timestamp message to an ECMAScript Date.
  */
 function timestampDate(timestamp) {
     return new Date(timestampMs(timestamp));
 }
-exports.timestampDate = timestampDate;
 /**
  * Create a google.protobuf.Timestamp message from a Unix timestamp in milliseconds.
  */
@@ -47,11 +48,9 @@ function timestampFromMs(timestampMs) {
         nanos: (timestampMs % 1000) * 1000000,
     });
 }
-exports.timestampFromMs = timestampFromMs;
 /**
  * Convert a google.protobuf.Timestamp to a Unix timestamp in milliseconds.
  */
 function timestampMs(timestamp) {
     return (Number(timestamp.seconds) * 1000 + Math.ceil(timestamp.nanos / 1000000));
 }
-exports.timestampMs = timestampMs;

package/dist/cjs/wkt/wrappers.js

@@ -13,11 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWrapperDesc = exports.isWrapper = void 0;
+exports.isWrapper = isWrapper;
+exports.isWrapperDesc = isWrapperDesc;
 function isWrapper(arg) {
     return isWrapperTypeName(arg.$typeName);
 }
-exports.isWrapper = isWrapper;
 function isWrapperDesc(messageDesc) {
     const f = messageDesc.fields[0];
     return (isWrapperTypeName(messageDesc.typeName) &&
@@ -26,7 +26,6 @@ function isWrapperDesc(messageDesc) {
         f.name == "value" &&
         f.number == 1);
 }
-exports.isWrapperDesc = isWrapperDesc;
 function isWrapperTypeName(name) {
     return (name.startsWith("google.protobuf.") &&
         [

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

@@ -1,12 +1,12 @@
 import type { DescEnum, DescFile } from "../descriptors.js";
-import type { GenDescEnum } from "./types.js";
+import type { GenEnum } from "./types.js";
 import type { JsonValue } from "../json-value.js";
 /**
  * Hydrate an enum descriptor.
  *
  * @private
  */
-export declare function enumDesc<Shape, JsonType extends JsonValue = JsonValue>(file: DescFile, path: number, ...paths: number[]): GenDescEnum<Shape, JsonType>;
+export declare function enumDesc<Shape extends number, JsonType extends JsonValue = JsonValue>(file: DescFile, path: number, ...paths: number[]): GenEnum<Shape, JsonType>;
 /**
  * Construct a TypeScript enum object at runtime from a descriptor.
  */

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

@@ -1,9 +1,9 @@
 import type { Message } from "../types.js";
 import type { DescFile } from "../descriptors.js";
-import type { GenDescExtension } from "./types.js";
+import type { GenExtension } from "./types.js";
 /**
  * Hydrate an extension descriptor.
  *
  * @private
  */
-export declare function extDesc<Extendee extends Message, Value>(file: DescFile, path: number, ...paths: number[]): GenDescExtension<Extendee, Value>;
+export declare function extDesc<Extendee extends Message, Value>(file: DescFile, path: number, ...paths: number[]): GenExtension<Extendee, Value>;

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

@@ -1,10 +1,10 @@
 import type { Message } from "../types.js";
 import type { DescFile } from "../descriptors.js";
-import type { GenDescMessage } from "./types.js";
+import type { GenMessage } from "./types.js";
 import type { JsonValue } from "../json-value.js";
 /**
  * Hydrate a message descriptor.
  *
  * @private
  */
-export declare function messageDesc<Shape extends Message, JsonType extends JsonValue = JsonValue>(file: DescFile, path: number, ...paths: number[]): GenDescMessage<Shape, JsonType>;
+export declare function messageDesc<Shape extends Message, JsonType extends JsonValue = JsonValue>(file: DescFile, path: number, ...paths: number[]): GenMessage<Shape, JsonType>;

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

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

package/dist/esm/codegenv1/symbols.d.ts

@@ -106,27 +106,27 @@ export declare const symbols: {
             readonly bootstrapWktFrom: "../../codegenv1/enum.js";
             readonly from: string;
         };
-        readonly GenDescFile: {
+        readonly GenFile: {
             readonly typeOnly: true;
             readonly bootstrapWktFrom: "../../codegenv1/types.js";
             readonly from: string;
         };
-        readonly GenDescEnum: {
+        readonly GenEnum: {
             readonly typeOnly: true;
             readonly bootstrapWktFrom: "../../codegenv1/types.js";
             readonly from: string;
         };
-        readonly GenDescExtension: {
+        readonly GenExtension: {
             readonly typeOnly: true;
             readonly bootstrapWktFrom: "../../codegenv1/types.js";
             readonly from: string;
         };
-        readonly GenDescMessage: {
+        readonly GenMessage: {
             readonly typeOnly: true;
             readonly bootstrapWktFrom: "../../codegenv1/types.js";
             readonly from: string;
         };
-        readonly GenDescService: {
+        readonly GenService: {
             readonly typeOnly: true;
             readonly bootstrapWktFrom: "../../codegenv1/types.js";
             readonly from: string;

package/dist/esm/codegenv1/symbols.js

@@ -57,10 +57,10 @@ export const symbols = {
         messageDesc: { typeOnly: false, bootstrapWktFrom: "../../codegenv1/message.js", from: packageName + "/codegenv1" },
         serviceDesc: { typeOnly: false, bootstrapWktFrom: "../../codegenv1/service.js", from: packageName + "/codegenv1" },
         tsEnum: { typeOnly: false, bootstrapWktFrom: "../../codegenv1/enum.js", from: packageName + "/codegenv1" },
-        GenDescFile: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
-        GenDescEnum: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
-        GenDescExtension: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
-        GenDescMessage: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
-        GenDescService: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
+        GenFile: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
+        GenEnum: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
+        GenExtension: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
+        GenMessage: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
+        GenService: { typeOnly: true, bootstrapWktFrom: "../../codegenv1/types.js", from: packageName + "/codegenv1" },
     },
 };

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

@@ -1,12 +1,12 @@
 import type { Message } from "../types.js";
-import type { DescEnum, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescService } from "../descriptors.js";
+import type { DescEnum, DescEnumValue, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescService } from "../descriptors.js";
 import type { JsonValue } from "../json-value.js";
 /**
  * Describes a protobuf source file.
  *
  * @private
  */
-export type GenDescFile = DescFile;
+export type GenFile = DescFile;
 /**
  * Describes a message declaration in a protobuf source file.
  *
@@ -15,7 +15,7 @@ export type GenDescFile = DescFile;
  *
  * @private
  */
-export type GenDescMessage<RuntimeShape extends Message, JsonType = JsonValue> = Omit<DescMessage, "field"> & {
+export type GenMessage<RuntimeShape extends Message, JsonType = JsonValue> = Omit<DescMessage, "field"> & {
     field: Record<MessageFieldNames<RuntimeShape>, DescField>;
 } & brandv1<RuntimeShape, JsonType>;
 /**
@@ -26,7 +26,9 @@ export type GenDescMessage<RuntimeShape extends Message, JsonType = JsonValue> =
  *
  * @private
  */
-export type GenDescEnum<RuntimeShape, JsonType extends JsonValue = JsonValue> = DescEnum & brandv1<RuntimeShape, JsonType>;
+export type GenEnum<RuntimeShape extends number, JsonType extends JsonValue = JsonValue> = Omit<DescEnum, "value"> & {
+    value: Record<RuntimeShape, DescEnumValue>;
+} & brandv1<RuntimeShape, JsonType>;
 /**
  * Describes an extension in a protobuf source file.
  *
@@ -35,7 +37,7 @@ export type GenDescEnum<RuntimeShape, JsonType extends JsonValue = JsonValue> =
  *
  * @private
  */
-export type GenDescExtension<Extendee extends Message = Message, RuntimeShape = unknown> = DescExtension & brandv1<Extendee, RuntimeShape>;
+export type GenExtension<Extendee extends Message = Message, RuntimeShape = unknown> = DescExtension & brandv1<Extendee, RuntimeShape>;
 /**
  * Describes a service declaration in a protobuf source file.
  *
@@ -44,7 +46,7 @@ export type GenDescExtension<Extendee extends Message = Message, RuntimeShape =
  *
  * @private
  */
-export type GenDescService<RuntimeShape extends GenDescServiceMethods> = Omit<DescService, "method"> & {
+export type GenService<RuntimeShape extends GenServiceMethods> = Omit<DescService, "method"> & {
     method: {
         [K in keyof RuntimeShape]: RuntimeShape[K] & DescMethod;
     };
@@ -52,7 +54,7 @@ export type GenDescService<RuntimeShape extends GenDescServiceMethods> = Omit<De
 /**
  * @private
  */
-export type GenDescServiceMethods = Record<string, Pick<DescMethod, "input" | "output" | "methodKind">>;
+export type GenServiceMethods = Record<string, Pick<DescMethod, "input" | "output" | "methodKind">>;
 declare class brandv1<A, B = unknown> {
     protected v: "codegenv1";
     protected a: A | boolean;

package/dist/esm/create.js

@@ -149,7 +149,9 @@ const messagePrototypes = new WeakMap();
 function createZeroMessage(desc) {
     let msg;
     if (!needsPrototypeChain(desc)) {
-        msg = {};
+        msg = {
+            $typeName: desc.typeName,
+        };
         for (const member of desc.members) {
             if (member.kind == "oneof" || member.presence == IMPLICIT) {
                 msg[member.localName] = createZeroField(member);
@@ -189,6 +191,7 @@ function createZeroMessage(desc) {
             messagePrototypes.set(desc, { prototype, members });
         }
         msg = Object.create(prototype);
+        msg.$typeName = desc.typeName;
         for (const member of desc.members) {
             if (members.has(member)) {
                 continue;
@@ -206,7 +209,6 @@ function createZeroMessage(desc) {
             msg[member.localName] = createZeroField(member);
         }
     }
-    msg.$typeName = desc.typeName;
     return msg;
 }
 /**

package/dist/esm/descriptors.d.ts

@@ -106,6 +106,10 @@ export interface DescEnum {
      * Values declared for this enumeration.
      */
     readonly values: DescEnumValue[];
+    /**
+     * All values of this enum by their number.
+     */
+    readonly value: Record<number, DescEnumValue>;
     /**
      * A prefix shared by all enum values.
      * For example, `my_enum_` for `enum MyEnum {MY_ENUM_A=0; MY_ENUM_B=1;}`

package/dist/esm/registry.js

@@ -45,6 +45,9 @@ export function createMutableRegistry(...input) {
 }
 export function createFileRegistry(...args) {
     const registry = createBaseRegistry();
+    if (!args.length) {
+        return registry;
+    }
     if ("$typeName" in args[0] &&
         args[0].$typeName == "google.protobuf.FileDescriptorSet") {
         for (const file of args[0].file) {
@@ -376,6 +379,7 @@ function addEnum(proto, file, parent, reg) {
         open: true,
         name: proto.name,
         typeName: makeTypeName(proto, parent, file),
+        value: {},
         values: [],
         sharedPrefix,
         toString() {
@@ -387,18 +391,20 @@ function addEnum(proto, file, parent, reg) {
     proto.value.forEach((proto) => {
         var _a, _b;
         const name = proto.name;
-        desc.values.push({
+        desc.values.push((desc.value[proto.number] = {
             kind: "enum_value",
             proto,
             deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
             parent: desc,
-            name: proto.name,
-            localName: safeObjectProperty(sharedPrefix == undefined ? name : name.substring(sharedPrefix.length)),
+            name,
+            localName: safeObjectProperty(sharedPrefix == undefined
+                ? name
+                : name.substring(sharedPrefix.length)),
             number: proto.number,
             toString() {
-                return `enum value ${desc.typeName}.${this.name}`;
+                return `enum value ${desc.typeName}.${name}`;
             },
-        });
+        }));
     });
     ((_c = parent === null || parent === void 0 ? void 0 : parent.nestedEnums) !== null && _c !== void 0 ? _c : file.enums).push(desc);
 }

package/dist/esm/to-json.js

@@ -56,7 +56,7 @@ export function enumToJson(descEnum, value) {
     if (descEnum.typeName == "google.protobuf.NullValue") {
         return null;
     }
-    const name = (_a = descEnum.values.find((v) => v.number === value)) === null || _a === void 0 ? void 0 : _a.name;
+    const name = (_a = descEnum.value[value]) === null || _a === void 0 ? void 0 : _a.name;
     if (name === undefined) {
         throw new Error(`${String(value)} is not a value in ${descEnum.toString()}`);
     }
@@ -174,7 +174,7 @@ function enumToJsonInternal(desc, value, enumAsInteger) {
     if (enumAsInteger) {
         return value;
     }
-    const val = desc.values.find((v) => v.number == value);
+    const val = desc.value[value];
     return (_a = val === null || val === void 0 ? void 0 : val.name) !== null && _a !== void 0 ? _a : value; // if we don't know the enum value, just return the number
 }
 function scalarToJson(field, value) {

package/dist/esm/types.d.ts

@@ -1,4 +1,4 @@
-import type { GenDescEnum, GenDescExtension, GenDescMessage } from "./codegenv1/types.js";
+import type { GenEnum, GenExtension, GenMessage } from "./codegenv1/types.js";
 import type { DescEnum, DescExtension, DescMessage } from "./descriptors.js";
 import type { OneofADT } from "./reflect/guard.js";
 import type { WireType } from "./wire/index.js";
@@ -19,32 +19,32 @@ export type Message<TypeName extends string = string> = {
 /**
  * Extract the message type from a message descriptor.
  */
-export type MessageShape<Desc extends DescMessage> = Desc extends GenDescMessage<infer RuntimeShape> ? RuntimeShape : Message;
+export type MessageShape<Desc extends DescMessage> = Desc extends GenMessage<infer RuntimeShape> ? RuntimeShape : Message;
 /**
  * Extract the message JSON type from a message descriptor.
  */
-export type MessageJsonType<Desc extends DescMessage> = Desc extends GenDescMessage<Message, infer JsonType> ? JsonType : JsonValue;
+export type MessageJsonType<Desc extends DescMessage> = Desc extends GenMessage<Message, infer JsonType> ? JsonType : JsonValue;
 /**
  * Extract the init type from a message descriptor.
  * The init type is accepted by the function create().
  */
-export type MessageInitShape<Desc extends DescMessage> = Desc extends GenDescMessage<infer RuntimeShape> ? RuntimeShape | MessageInit<RuntimeShape> : Record<string, unknown>;
+export type MessageInitShape<Desc extends DescMessage> = Desc extends GenMessage<infer RuntimeShape> ? RuntimeShape | MessageInit<RuntimeShape> : Record<string, unknown>;
 /**
  * Extract the enum type of from an enum descriptor.
  */
-export type EnumShape<Desc extends DescEnum> = Desc extends GenDescEnum<infer RuntimeShape> ? RuntimeShape : number;
+export type EnumShape<Desc extends DescEnum> = Desc extends GenEnum<infer RuntimeShape> ? RuntimeShape : number;
 /**
  * Extract the enum JSON type from a enum descriptor.
  */
-export type EnumJsonType<Desc extends DescEnum> = Desc extends GenDescEnum<unknown, infer JsonType> ? JsonType : string | null;
+export type EnumJsonType<Desc extends DescEnum> = Desc extends GenEnum<number, infer JsonType> ? JsonType : string | null;
 /**
  * Extract the value type from an extension descriptor.
  */
-export type ExtensionValueShape<Desc extends DescExtension> = Desc extends GenDescExtension<Message, infer RuntimeShape> ? RuntimeShape : unknown;
+export type ExtensionValueShape<Desc extends DescExtension> = Desc extends GenExtension<Message, infer RuntimeShape> ? RuntimeShape : unknown;
 /**
  * Extract the type of the extended message from an extension descriptor.
  */
-export type Extendee<Desc extends DescExtension> = Desc extends GenDescExtension<infer Extendee> ? Extendee : Message;
+export type Extendee<Desc extends DescExtension> = Desc extends GenExtension<infer Extendee> ? Extendee : Message;
 /**
  * Unknown fields are fields that were not recognized during parsing, or
  * extension.

package/dist/esm/wkt/gen/google/protobuf/any_pb.d.ts

@@ -1,9 +1,9 @@
-import type { GenDescFile, GenDescMessage } from "../../../../codegenv1/types.js";
+import type { GenFile, GenMessage } from "../../../../codegenv1/types.js";
 import type { Message } from "../../../../types.js";
 /**
  * Describes the file google/protobuf/any.proto.
  */
-export declare const file_google_protobuf_any: GenDescFile;
+export declare const file_google_protobuf_any: GenFile;
 /**
  * `Any` contains an arbitrary serialized protocol buffer message along with a
  * URL that describes the type of the serialized message.
@@ -146,4 +146,4 @@ export type AnyJson = {
  * Describes the message google.protobuf.Any.
  * Use `create(AnySchema)` to create a new message.
  */
-export declare const AnySchema: GenDescMessage<Any, AnyJson>;
+export declare const AnySchema: GenMessage<Any, AnyJson>;

package/dist/esm/wkt/gen/google/protobuf/api_pb.d.ts

@@ -1,11 +1,11 @@
-import type { GenDescFile, GenDescMessage } from "../../../../codegenv1/types.js";
+import type { GenFile, GenMessage } from "../../../../codegenv1/types.js";
 import type { SourceContext, SourceContextJson } from "./source_context_pb.js";
 import type { Option, OptionJson, Syntax, SyntaxJson } from "./type_pb.js";
 import type { Message } from "../../../../types.js";
 /**
  * Describes the file google/protobuf/api.proto.
  */
-export declare const file_google_protobuf_api: GenDescFile;
+export declare const file_google_protobuf_api: GenFile;
 /**
  * Api is a light-weight descriptor for an API Interface.
  *
@@ -121,7 +121,7 @@ export type ApiJson = {
  * Describes the message google.protobuf.Api.
  * Use `create(ApiSchema)` to create a new message.
  */
-export declare const ApiSchema: GenDescMessage<Api, ApiJson>;
+export declare const ApiSchema: GenMessage<Api, ApiJson>;
 /**
  * Method represents a method of an API interface.
  *
@@ -208,7 +208,7 @@ export type MethodJson = {
  * Describes the message google.protobuf.Method.
  * Use `create(MethodSchema)` to create a new message.
  */
-export declare const MethodSchema: GenDescMessage<Method, MethodJson>;
+export declare const MethodSchema: GenMessage<Method, MethodJson>;
 /**
  * Declares an API Interface to be included in this interface. The including
  * interface must redeclare all the methods from the included interface, but
@@ -323,4 +323,4 @@ export type MixinJson = {
  * Describes the message google.protobuf.Mixin.
  * Use `create(MixinSchema)` to create a new message.
  */
-export declare const MixinSchema: GenDescMessage<Mixin, MixinJson>;
+export declare const MixinSchema: GenMessage<Mixin, MixinJson>;