ts-proto 1.181.2 → 2.0.1

package/build/{main.js → src/main.js}

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contextTypeVar = exports.makeUtils = exports.generateFile = void 0;
+exports.contextTypeVar = void 0;
+exports.generateFile = generateFile;
+exports.makeUtils = makeUtils;
 const ts_poet_1 = require("ts-poet");
 const ConditionalOutput_1 = require("ts-poet/build/ConditionalOutput");
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
@@ -275,7 +277,6 @@ function generateFile(ctx, fileDesc) {
     }
     return [moduleName, (0, ts_poet_1.joinCode)(chunks, { on: "\n\n" })];
 }
-exports.generateFile = generateFile;
 /** These are runtime utility methods used by the generated code. */
 function makeUtils(options) {
     const bytes = makeByteUtils(options);
@@ -293,7 +294,6 @@ function makeUtils(options) {
         ...makeAssertionUtils(bytes),
     };
 }
-exports.makeUtils = makeUtils;
 function makeProtobufTimestampWrapper() {
     const wrappers = (0, ts_poet_1.imp)("wrappers@protobufjs");
     return (0, ts_poet_1.code) `
@@ -319,47 +319,25 @@ function makeProtobufStructWrapper(options) {
     } as any;`;
 }
 function makeLongUtils(options, bytes) {
-    // Regardless of which `forceLong` config option we're using, we always use
-    // the `long` library to either represent or at least sanity-check 64-bit values
-    const util = (0, utils_1.impFile)(options, `util@protobufjs/minimal`);
-    const configure = (0, utils_1.impFile)(options, `configure@protobufjs/minimal`);
-    const LongImp = (0, ts_poet_1.imp)("Long=long");
-    // Instead of exposing `LongImp` directly, let callers think that they are getting the
-    // `imp(Long)` but really it is that + our long initialization snippet. This means the
-    // initialization code will only be emitted in files that actually use the Long import.
-    const Long = (0, ts_poet_1.conditionalOutput)("Long", (0, ts_poet_1.code) `
-      if (${util}.Long !== ${LongImp}) {
-        ${util}.Long = ${LongImp} as any;
-        ${configure}();
-      }
-    `);
+    const Long = (0, ts_poet_1.imp)("Long=long");
     const numberToLong = (0, ts_poet_1.conditionalOutput)("numberToLong", (0, ts_poet_1.code) `
       function numberToLong(number: number) {
         return ${Long}.fromNumber(number);
       }
     `);
-    const longToString = (0, ts_poet_1.conditionalOutput)("longToString", (0, ts_poet_1.code) `
-      function longToString(long: ${Long}) {
-        return long.toString();
-      }
-    `);
-    const longToBigint = (0, ts_poet_1.conditionalOutput)("longToBigint", (0, ts_poet_1.code) `
-      function longToBigint(long: ${Long}) {
-        return BigInt(long.toString());
-      }
-    `);
     const longToNumber = (0, ts_poet_1.conditionalOutput)("longToNumber", (0, ts_poet_1.code) `
-      function longToNumber(long: ${Long}): number {
-        if (long.gt(${bytes.globalThis}.Number.MAX_SAFE_INTEGER)) {
+      function longToNumber(int64: { toString(): string }): number {
+        const num = ${bytes.globalThis}.Number(int64.toString());
+        if (num > ${bytes.globalThis}.Number.MAX_SAFE_INTEGER) {
           throw new ${bytes.globalThis}.Error("Value is larger than Number.MAX_SAFE_INTEGER")
         }
-        if (long.lt(${bytes.globalThis}.Number.MIN_SAFE_INTEGER)) {
+        if (num < ${bytes.globalThis}.Number.MIN_SAFE_INTEGER) {
           throw new ${bytes.globalThis}.Error("Value is smaller than Number.MIN_SAFE_INTEGER")
         }
-        return long.toNumber();
+        return num;
       }
     `);
-    return { numberToLong, longToNumber, longToString, longToBigint, Long };
+    return { numberToLong, longToNumber, Long };
 }
 function makeByteUtils(options) {
     const globalThisPolyfill = (0, ts_poet_1.conditionalOutput)("gt", (0, ts_poet_1.code) `
@@ -653,8 +631,6 @@ function makeGrpcWebErrorClass(bytes) {
     return { GrpcWebError };
 }
 function makeExtensionClass(options) {
-    const Reader = (0, utils_1.impFile)(options, "Reader@protobufjs/minimal");
-    const Writer = (0, utils_1.impFile)(options, "Writer@protobufjs/minimal");
     const Extension = (0, ts_poet_1.conditionalOutput)("Extension", (0, ts_poet_1.code) `
       export interface Extension <T> {
         number: number;
@@ -796,31 +772,39 @@ function getDecodeReadSnippet(ctx, field) {
         readSnippet = (0, ts_poet_1.code) `reader.${(0, types_1.toReaderCall)(field)}()`;
         if ((0, types_1.isBytes)(field)) {
             if (options.env === options_1.EnvOption.NODE) {
-                readSnippet = (0, ts_poet_1.code) `${readSnippet} as Buffer`;
+                readSnippet = (0, ts_poet_1.code) `Buffer.from(${readSnippet})`;
             }
         }
         else if ((0, types_1.basicLongWireType)(field.type) !== undefined) {
             if ((0, types_1.isJsTypeFieldOption)(options, field)) {
                 switch (field.options.jstype) {
                     case ts_proto_descriptors_1.FieldOptions_JSType.JS_NUMBER:
-                        readSnippet = (0, ts_poet_1.code) `${utils.longToNumber}(${readSnippet} as Long)`;
+                        readSnippet = (0, ts_poet_1.code) `${utils.longToNumber}(${readSnippet})`;
                         break;
                     case ts_proto_descriptors_1.FieldOptions_JSType.JS_STRING:
-                        readSnippet = (0, ts_poet_1.code) `${utils.longToString}(${readSnippet} as Long)`;
+                        readSnippet = (0, ts_poet_1.code) `${readSnippet}.toString()`;
                         break;
                 }
             }
             else if (options.forceLong === options_1.LongOption.LONG) {
-                readSnippet = (0, ts_poet_1.code) `${readSnippet} as Long`;
+                switch (field.type) {
+                    case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_UINT64:
+                    case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_FIXED64:
+                        readSnippet = (0, ts_poet_1.code) `${utils.Long}.fromString(${readSnippet}.toString(), true)`;
+                        break;
+                    default:
+                        readSnippet = (0, ts_poet_1.code) `${utils.Long}.fromString(${readSnippet}.toString())`;
+                        break;
+                }
             }
             else if (options.forceLong === options_1.LongOption.STRING) {
-                readSnippet = (0, ts_poet_1.code) `${utils.longToString}(${readSnippet} as Long)`;
+                readSnippet = (0, ts_poet_1.code) `${readSnippet}.toString()`;
             }
             else if (options.forceLong === options_1.LongOption.BIGINT) {
-                readSnippet = (0, ts_poet_1.code) `${utils.longToBigint}(${readSnippet} as Long)`;
+                readSnippet = (0, ts_poet_1.code) `${readSnippet} as bigint`;
             }
             else {
-                readSnippet = (0, ts_poet_1.code) `${utils.longToNumber}(${readSnippet} as Long)`;
+                readSnippet = (0, ts_poet_1.code) `${utils.longToNumber}(${readSnippet})`;
             }
         }
         else if ((0, types_1.isEnum)(field)) {
@@ -877,14 +861,14 @@ function generateDecode(ctx, fullName, messageDesc) {
     if (options.usePrototypeForDefaults) {
         createBase = (0, ts_poet_1.code) `Object.create(${createBase}) as ${fullName}`;
     }
-    const Reader = (0, utils_1.impFile)(ctx.options, "Reader@protobufjs/minimal");
+    const BinaryReader = (0, ts_poet_1.imp)("BinaryReader@@bufbuild/protobuf/wire");
     // create the basic function declaration
     chunks.push((0, ts_poet_1.code) `
     decode(
-      input: ${Reader} | Uint8Array,
+      input: ${BinaryReader} | Uint8Array,
       length?: number,
     ): ${fullName} {
-      const reader = input instanceof ${Reader} ? input : ${Reader}.create(input);
+      const reader = input instanceof ${BinaryReader} ? input : new ${BinaryReader}(input);
       let end = length === undefined ? reader.len : reader.pos + length;
   `);
     chunks.push((0, ts_poet_1.code) `const message = ${createBase}${maybeAsAny(options)};`);
@@ -1019,10 +1003,8 @@ function generateDecode(ctx, fullName, messageDesc) {
       `;
         }
         chunks.push((0, ts_poet_1.code) `
-      const startPos = reader.pos;
-      reader.skipType(tag & 7);
-      const buf = reader.buf.slice(startPos, reader.pos);
-
+      const buf = reader.skip(tag & 7);
+      
       ${unknownFieldsInitializerSnippet}
       const list = message._unknownFields${maybeNonNullAssertion}[tag];
 
@@ -1035,7 +1017,7 @@ function generateDecode(ctx, fullName, messageDesc) {
     }
     else {
         chunks.push((0, ts_poet_1.code) `
-        reader.skipType(tag & 7);
+        reader.skip(tag & 7);
     `);
     }
     // and then wrap up the while/return
@@ -1062,25 +1044,28 @@ function getEncodeWriteSnippet(ctx, field) {
                 return (place, placeAlt) => (0, ts_poet_1.code) `if (BigInt.asIntN(64, ${place}) !== ${placeAlt ?? place}) {
           throw new ${utils.globalThis}.Error('value provided for field ${place} of type ${fieldType} too large');
         }
-        writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
+        writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place})`;
             case "uint64":
             case "fixed64":
                 return (place, placeAlt) => (0, ts_poet_1.code) `if (BigInt.asUintN(64, ${place}) !== ${placeAlt ?? place}) {
           throw new ${utils.globalThis}.Error('value provided for field ${place} of type ${fieldType} too large');
         }
-        writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
+        writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place})`;
             default:
                 throw new Error(`unexpected BigInt type: ${fieldType}`);
         }
     }
     else if ((0, types_1.isScalar)(field) || (0, types_1.isEnum)(field)) {
         const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
+        if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.LONG) {
+            return (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
+        }
         return (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place})`;
     }
     else if ((0, types_1.isObjectId)(field) && options.useMongoObjectId) {
         const tag = ((field.number << 3) | 2) >>> 0;
         const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-        return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toProtoObjectId}(${place}), writer.uint32(${tag}).fork()).ldelim()`;
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toProtoObjectId}(${place}), writer.uint32(${tag}).fork()).join()`;
     }
     else if ((0, types_1.isTimestamp)(field) &&
         (options.useDate === options_1.DateOption.DATE ||
@@ -1088,7 +1073,7 @@ function getEncodeWriteSnippet(ctx, field) {
             options.useDate === options_1.DateOption.STRING_NANO)) {
         const tag = ((field.number << 3) | 2) >>> 0;
         const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-        return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toTimestamp}(${place}), writer.uint32(${tag}).fork()).ldelim()`;
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toTimestamp}(${place}), writer.uint32(${tag}).fork()).join()`;
     }
     else if ((0, types_1.isValueType)(ctx, field)) {
         const maybeTypeField = (0, options_1.addTypeToMessages)(options) ? `$type: '${field.typeName.slice(1)}',` : "";
@@ -1100,7 +1085,7 @@ function getEncodeWriteSnippet(ctx, field) {
             return (0, ts_poet_1.code) `{${maybeTypeField} value: ${place}!}`;
         };
         const tag = ((field.number << 3) | 2) >>> 0;
-        return (place) => (0, ts_poet_1.code) `${type}.encode(${wrappedValue(place)}, writer.uint32(${tag}).fork()).ldelim()`;
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${wrappedValue(place)}, writer.uint32(${tag}).fork()).join()`;
     }
     else if ((0, types_1.isMessage)(field)) {
         const type = (0, types_1.basicTypeName)(ctx, field);
@@ -1109,7 +1094,7 @@ function getEncodeWriteSnippet(ctx, field) {
             return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.uint32(${startTag})).uint32(${endTag})`;
         }
         const tag = ((field.number << 3) | 2) >>> 0;
-        return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.uint32(${tag}).fork()).ldelim()`;
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.uint32(${tag}).fork()).join()`;
     }
     else {
         throw new Error(`Unhandled field ${field}`);
@@ -1119,13 +1104,13 @@ function getEncodeWriteSnippet(ctx, field) {
 function generateEncode(ctx, fullName, messageDesc) {
     const { options, utils, typeMap, currentFile } = ctx;
     const chunks = [];
-    const Writer = (0, utils_1.impFile)(ctx.options, "Writer@protobufjs/minimal");
+    const BinaryWriter = (0, ts_poet_1.imp)("BinaryWriter@@bufbuild/protobuf/wire");
     // create the basic function declaration
     chunks.push((0, ts_poet_1.code) `
     encode(
       ${messageDesc.field.length > 0 || options.unknownFields ? "message" : "_"}: ${fullName},
-      writer: ${Writer} = ${Writer}.create(),
-    ): ${Writer} {
+      writer: ${BinaryWriter} = new ${BinaryWriter}(),
+    ): ${BinaryWriter} {
   `);
     const processedOneofs = new Set();
     const oneOfFieldsDict = messageDesc.field
@@ -1195,7 +1180,7 @@ function generateEncode(ctx, fullName, messageDesc) {
           for (const v of ${messageProperty}) {
             writer.${(0, types_1.toReaderCall)(field)}(${toNumber}(v));
           }
-          writer.ldelim();
+          writer.join();
         `;
                 if (isOptional) {
                     chunks.push((0, ts_poet_1.code) `
@@ -1211,13 +1196,13 @@ function generateEncode(ctx, fullName, messageDesc) {
             else {
                 // Ideally we'd reuse `writeSnippet` but it has tagging embedded inside of it.
                 const tag = ((field.number << 3) | 2) >>> 0;
-                const rhs = (x) => ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT ? `${x}.toString()` : x);
+                const rhs = (x) => ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.LONG ? `${x}.toString()` : x);
                 let listWriteSnippet = (0, ts_poet_1.code) `
           writer.uint32(${tag}).fork();
           for (const v of ${messageProperty}) {
             writer.${(0, types_1.toReaderCall)(field)}(${rhs("v")});
           }
-          writer.ldelim();
+          writer.join();
         `;
                 if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
                     const fieldType = (0, types_1.toReaderCall)(field);
@@ -1233,7 +1218,7 @@ function generateEncode(ctx, fullName, messageDesc) {
                   }
                   writer.${(0, types_1.toReaderCall)(field)}(${rhs("v")});
                 }
-                writer.ldelim();
+                writer.join();
               `;
                             break;
                         case "uint64":
@@ -1246,7 +1231,7 @@ function generateEncode(ctx, fullName, messageDesc) {
                   }
                   writer.${(0, types_1.toReaderCall)(field)}(${rhs("v")});
                 }
-                writer.ldelim();
+                writer.join();
               `;
                             break;
                         default:
@@ -1318,12 +1303,7 @@ function generateEncode(ctx, fullName, messageDesc) {
       for (const [key, values] of Object.entries(message._unknownFields)) {
         const tag = parseInt(key, 10);
         for (const value of values) {
-          writer.uint32(tag);
-          (writer as any)['_push'](
-            (val: Uint8Array, buf: Buffer, pos: number) => buf.set(val, pos),
-            value.length,
-            value
-          );
+          writer.uint32(tag).raw(value);
         }
       }
     }`);
@@ -1403,8 +1383,8 @@ function generateExtension(ctx, message, extension) {
         chunks.push((0, ts_poet_1.code) `singularTag: ${singularTag},`);
     chunks.push((0, ts_poet_1.code) `repeated: ${extension.label == ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED},`);
     chunks.push((0, ts_poet_1.code) `packed: ${extension.options?.packed ? true : false},`);
-    const Reader = (0, utils_1.impFile)(ctx.options, "Reader@protobufjs/minimal");
-    const Writer = (0, utils_1.impFile)(ctx.options, "Writer@protobufjs/minimal");
+    const BinaryReader = (0, ts_poet_1.imp)("BinaryReader@@bufbuild/protobuf/wire");
+    const BinaryWriter = (0, ts_poet_1.imp)("BinaryWriter@@bufbuild/protobuf/wire");
     if (ctx.options.outputEncodeMethods === true ||
         ctx.options.outputEncodeMethods === "encode-only" ||
         ctx.options.outputEncodeMethods === "encode-no-creation") {
@@ -1422,18 +1402,23 @@ function generateExtension(ctx, message, extension) {
                 return (place) => (0, ts_poet_1.code) `writer.${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
             }
             else if ((0, types_1.isScalar)(field) || (0, types_1.isEnum)(field)) {
-                return (place) => (0, ts_poet_1.code) `writer.${(0, types_1.toReaderCall)(field)}(${place})`;
+                if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.LONG) {
+                    return (place) => (0, ts_poet_1.code) `writer.${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
+                }
+                else {
+                    return (place) => (0, ts_poet_1.code) `writer.${(0, types_1.toReaderCall)(field)}(${place})`;
+                }
             }
             else if ((0, types_1.isObjectId)(field) && options.useMongoObjectId) {
                 const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-                return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toProtoObjectId}(${place}), writer.fork()).ldelim()`;
+                return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toProtoObjectId}(${place}), writer.fork()).join()`;
             }
             else if ((0, types_1.isTimestamp)(field) &&
                 (options.useDate === options_1.DateOption.DATE ||
                     options.useDate === options_1.DateOption.STRING ||
                     options.useDate === options_1.DateOption.STRING_NANO)) {
                 const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-                return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toTimestamp}(${place}), writer.fork()).ldelim()`;
+                return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toTimestamp}(${place}), writer.fork()).join()`;
             }
             else if ((0, types_1.isValueType)(ctx, field)) {
                 const maybeTypeField = (0, options_1.addTypeToMessages)(options) ? `$type: '${field.typeName.slice(1)}',` : "";
@@ -1444,7 +1429,7 @@ function generateExtension(ctx, message, extension) {
                     }
                     return (0, ts_poet_1.code) `{${maybeTypeField} value: ${place}!}`;
                 };
-                return (place) => (0, ts_poet_1.code) `${type}.encode(${wrappedValue(place)}, writer.fork()).ldelim()`;
+                return (place) => (0, ts_poet_1.code) `${type}.encode(${wrappedValue(place)}, writer.fork()).join()`;
             }
             else if ((0, types_1.isMessage)(field)) {
                 const type = (0, types_1.basicTypeName)(ctx, field);
@@ -1452,7 +1437,7 @@ function generateExtension(ctx, message, extension) {
                     const endTag = ((field.number << 3) | 4) >>> 0;
                     return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer).uint32(${endTag})`;
                 }
-                return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.fork()).ldelim()`;
+                return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.fork()).join()`;
             }
             else {
                 throw new Error(`Unhandled field ${field}`);
@@ -1463,21 +1448,21 @@ function generateExtension(ctx, message, extension) {
             if (packedTag === undefined) {
                 chunks.push((0, ts_poet_1.code) `
           for (const v of value) {
-            const writer = ${Writer}.create();
+            const writer = new ${BinaryWriter}();
             ${writeSnippet("v")};
             encoded.push(writer.finish());
           }
         `);
             }
             else {
-                const rhs = (x) => (0, types_1.isLong)(extension) && ctx.options.forceLong === options_1.LongOption.BIGINT ? `${x}.toString()` : x;
+                const rhs = (x) => (0, types_1.isLong)(extension) && ctx.options.forceLong === options_1.LongOption.LONG ? `${x}.toString()` : x;
                 chunks.push((0, ts_poet_1.code) `
-          const writer = ${Writer}.create();
+          const writer = new ${BinaryWriter};
           writer.fork();
           for (const v of value) {
             ${writeSnippet(rhs("v"))};
           }
-          writer.ldelim();
+          writer.join();
           encoded.push(writer.finish());
         `);
             }
@@ -1485,7 +1470,7 @@ function generateExtension(ctx, message, extension) {
         else if ((0, types_1.isScalar)(extension) || (0, types_1.isEnum)(extension)) {
             chunks.push((0, ts_poet_1.code) `
         if (${(0, types_1.notDefaultCheck)(ctx, extension, message?.options, "value")}) {
-          const writer = ${Writer}.create();
+          const writer = new ${BinaryWriter};
           ${writeSnippet("value")};
           encoded.push(writer.finish());
         }
@@ -1493,7 +1478,7 @@ function generateExtension(ctx, message, extension) {
         }
         else {
             chunks.push((0, ts_poet_1.code) `
-        const writer = ${Writer}.create();
+        const writer = new ${BinaryWriter};
         ${writeSnippet("value")};
         encoded.push(writer.finish());
       `);
@@ -1512,7 +1497,7 @@ function generateExtension(ctx, message, extension) {
             // start loop over all buffers
             chunks.push((0, ts_poet_1.code) `
         for (const buffer of input) {
-          const reader = ${Reader}.create(buffer);
+          const reader = new ${BinaryReader}(buffer);
       `);
             if ((0, types_1.packedType)(extension.type) === undefined) {
                 chunks.push((0, ts_poet_1.code) `
@@ -1541,7 +1526,7 @@ function generateExtension(ctx, message, extension) {
         else {
             // pick the last entry, since it overrides all previous entries if not repeated
             chunks.push((0, ts_poet_1.code) `
-          const reader = ${Reader}.create(input[input.length -1] ?? ${ctx.utils.fail}());
+          const reader = new ${BinaryReader}(input[input.length -1] ?? ${ctx.utils.fail}());
           return ${readSnippet};
         },
       `);

package/build/{options.js → src/options.js}

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTypeToMessages = exports.getTsPoetOpts = exports.optionsFromParameter = exports.defaultOptions = exports.ServiceOption = exports.OneofOption = exports.EnvOption = exports.JsonTimestampOption = exports.DateOption = exports.LongOption = void 0;
+exports.ServiceOption = exports.OneofOption = exports.EnvOption = exports.JsonTimestampOption = exports.DateOption = exports.LongOption = void 0;
+exports.defaultOptions = defaultOptions;
+exports.optionsFromParameter = optionsFromParameter;
+exports.getTsPoetOpts = getTsPoetOpts;
+exports.addTypeToMessages = addTypeToMessages;
 var LongOption;
 (function (LongOption) {
     LongOption["NUMBER"] = "number";
@@ -110,7 +114,6 @@ function defaultOptions() {
         typeSuffix: "",
     };
 }
-exports.defaultOptions = defaultOptions;
 const nestJsOptions = {
     lowerCaseServiceMethods: true,
     outputEncodeMethods: false,
@@ -215,7 +218,6 @@ function optionsFromParameter(parameter) {
     }
     return options;
 }
-exports.optionsFromParameter = optionsFromParameter;
 // A very naive parse function, eventually could/should use iots/runtypes
 function parseParameter(parameter) {
     const options = { M: {} };
@@ -273,8 +275,6 @@ ${fileName ? `// source: ${fileName}` : ""}
         forceModuleImport: esModuleInterop ? [] : [pbjs],
     };
 }
-exports.getTsPoetOpts = getTsPoetOpts;
 function addTypeToMessages(options) {
     return ((options.outputTypeAnnotations || options.outputTypeRegistry) && options.outputTypeAnnotations !== "static-only");
 }
-exports.addTypeToMessages = addTypeToMessages;

package/build/{schema.js → src/schema.js}

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateSchema = void 0;
+exports.generateSchema = generateSchema;
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
 const ts_poet_1 = require("ts-poet");
 const visit_1 = require("./visit");
 const utils_1 = require("./utils");
 const types_1 = require("./types");
-const minimal_1 = require("protobufjs/minimal");
+const wire_1 = require("@bufbuild/protobuf/wire");
 const fileDescriptorProto = (0, ts_poet_1.imp)("FileDescriptorProto@ts-proto-descriptors");
 const extensionCache = {};
 function generateSchema(ctx, fileDesc, sourceInfo) {
@@ -156,21 +156,19 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
   `);
     return chunks;
 }
-exports.generateSchema = generateSchema;
 function getExtensionValue(ctx, extension, data) {
     if (extension.type == ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE) {
         const typeName = (0, types_1.basicTypeName)(ctx, extension);
         const resultBuffer = Buffer.concat(data.map((d) => {
             // Skip length byte
-            const reader = new minimal_1.Reader(d);
-            reader.uint32();
-            return reader.buf.slice(reader.pos);
+            const bytes = new wire_1.BinaryReader(d).bytes();
+            return Buffer.from(bytes);
         }));
         const result = resultBuffer.toString("base64");
         return (0, ts_poet_1.code) `'${extension.name}': ${typeName}.decode(Buffer.from('${result}', 'base64'))`;
     }
     else {
-        const reader = new minimal_1.Reader(data[0]);
+        const reader = new wire_1.BinaryReader(data[0]);
         let value = reader[(0, types_1.toReaderCall)(extension)]();
         if (typeof value === "string") {
             value = (0, ts_poet_1.code) `"${value}"`;