ts-proto 1.181.2 → 2.0.1

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

@@ -1,7 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectBatchMethod = exports.responsePromiseOrObservable = exports.responseObservable = exports.responsePromise = exports.responseType = exports.requestType = exports.observableType = exports.rawRequestType = exports.detectMapType = exports.shouldGenerateJSMapType = exports.toTypeName = exports.getEnumMethod = exports.messageToTypeName = exports.wrapperTypeName = exports.valueTypeName = exports.isEmptyType = exports.isLongValueType = exports.isStructTypeName = exports.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isFieldMaskTypeName = exports.isFieldMaskType = exports.isBytesValueType = exports.isAnyValueTypeName = exports.isAnyValueType = exports.isValueType = exports.isTimestamp = exports.isObjectId = exports.isMapType = exports.isWholeNumber = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isOptionalProperty = exports.isScalar = exports.createTypeMap = exports.notDefaultCheck = exports.defaultValue = exports.getFieldOptionsJsType = exports.packedType = exports.toReaderCall = exports.basicTypeName = exports.basicLongWireType = exports.basicWireType = void 0;
-exports.isJsTypeFieldOption = void 0;
+exports.basicWireType = basicWireType;
+exports.basicLongWireType = basicLongWireType;
+exports.basicTypeName = basicTypeName;
+exports.toReaderCall = toReaderCall;
+exports.packedType = packedType;
+exports.getFieldOptionsJsType = getFieldOptionsJsType;
+exports.defaultValue = defaultValue;
+exports.notDefaultCheck = notDefaultCheck;
+exports.createTypeMap = createTypeMap;
+exports.isScalar = isScalar;
+exports.isOptionalProperty = isOptionalProperty;
+exports.isPrimitive = isPrimitive;
+exports.isBytes = isBytes;
+exports.isMessage = isMessage;
+exports.isEnum = isEnum;
+exports.isWithinOneOf = isWithinOneOf;
+exports.isWithinOneOfThatShouldBeUnion = isWithinOneOfThatShouldBeUnion;
+exports.isRepeated = isRepeated;
+exports.isLong = isLong;
+exports.isWholeNumber = isWholeNumber;
+exports.isMapType = isMapType;
+exports.isObjectId = isObjectId;
+exports.isTimestamp = isTimestamp;
+exports.isValueType = isValueType;
+exports.isAnyValueType = isAnyValueType;
+exports.isAnyValueTypeName = isAnyValueTypeName;
+exports.isBytesValueType = isBytesValueType;
+exports.isFieldMaskType = isFieldMaskType;
+exports.isFieldMaskTypeName = isFieldMaskTypeName;
+exports.isListValueType = isListValueType;
+exports.isListValueTypeName = isListValueTypeName;
+exports.isStructType = isStructType;
+exports.isStructTypeName = isStructTypeName;
+exports.isLongValueType = isLongValueType;
+exports.isEmptyType = isEmptyType;
+exports.valueTypeName = valueTypeName;
+exports.wrapperTypeName = wrapperTypeName;
+exports.messageToTypeName = messageToTypeName;
+exports.getEnumMethod = getEnumMethod;
+exports.toTypeName = toTypeName;
+exports.shouldGenerateJSMapType = shouldGenerateJSMapType;
+exports.detectMapType = detectMapType;
+exports.rawRequestType = rawRequestType;
+exports.observableType = observableType;
+exports.requestType = requestType;
+exports.responseType = responseType;
+exports.responsePromise = responsePromise;
+exports.responseObservable = responseObservable;
+exports.responsePromiseOrObservable = responsePromiseOrObservable;
+exports.detectBatchMethod = detectBatchMethod;
+exports.isJsTypeFieldOption = isJsTypeFieldOption;
 const ts_poet_1 = require("ts-poet");
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
 const case_1 = require("./case");
@@ -44,7 +93,6 @@ function basicWireType(type) {
             throw new Error("Invalid type " + type);
     }
 }
-exports.basicWireType = basicWireType;
 function basicLongWireType(type) {
     switch (type) {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_INT64:
@@ -58,7 +106,6 @@ function basicLongWireType(type) {
             return undefined;
     }
 }
-exports.basicLongWireType = basicLongWireType;
 /** Returns the type name without any repeated/required/etc. labels. */
 function basicTypeName(ctx, field, typeOptions = {}) {
     const { options } = ctx;
@@ -100,7 +147,6 @@ function basicTypeName(ctx, field, typeOptions = {}) {
             return (0, ts_poet_1.code) `${field.typeName}`;
     }
 }
-exports.basicTypeName = basicTypeName;
 /** Returns the Reader method for the primitive's read/write call. */
 function toReaderCall(field) {
     switch (field.type) {
@@ -139,7 +185,6 @@ function toReaderCall(field) {
             throw new Error(`Not a primitive field ${field}`);
     }
 }
-exports.toReaderCall = toReaderCall;
 function packedType(type) {
     switch (type) {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_DOUBLE:
@@ -167,7 +212,6 @@ function packedType(type) {
             return undefined;
     }
 }
-exports.packedType = packedType;
 function getFieldOptionsJsType(field, options) {
     if (!options.useJsTypeOverride || field.options?.jstype === undefined) {
         return;
@@ -184,7 +228,6 @@ function getFieldOptionsJsType(field, options) {
             return;
     }
 }
-exports.getFieldOptionsJsType = getFieldOptionsJsType;
 function defaultValue(ctx, field) {
     const { typeMap, options, utils, currentFile } = ctx;
     if (options.noDefaultsForOptionals) {
@@ -261,7 +304,6 @@ function defaultValue(ctx, field) {
             return (0, utils_1.nullOrUndefined)(options);
     }
 }
-exports.defaultValue = defaultValue;
 /** Creates code that checks that the field is not the default value. Supports scalars and enums. */
 function notDefaultCheck(ctx, field, messageOptions, place) {
     const { typeMap, options, currentFile } = ctx;
@@ -319,7 +361,6 @@ function notDefaultCheck(ctx, field, messageOptions, place) {
             throw new Error("Not implemented for the given type.");
     }
 }
-exports.notDefaultCheck = notDefaultCheck;
 /** Scans all of the proto files in `request` and builds a map of proto typeName -> TS module/name. */
 function createTypeMap(request, options) {
     const typeMap = new Map();
@@ -336,7 +377,6 @@ function createTypeMap(request, options) {
     }
     return typeMap;
 }
-exports.createTypeMap = createTypeMap;
 /** A "Scalar Value Type" as defined in https://developers.google.com/protocol-buffers/docs/proto3#scalar */
 function isScalar(field) {
     const scalarTypes = [
@@ -358,7 +398,6 @@ function isScalar(field) {
     ];
     return scalarTypes.includes(field.type);
 }
-exports.isScalar = isScalar;
 // When useOptionals='messages', non-scalar fields are translated into optional
 // properties.
 // When useOptionals='all', all fields are translated into
@@ -384,42 +423,33 @@ function isOptionalProperty(field, messageOptions, options, isProto3Syntax) {
         isWithinOneOf(field) ||
         field.proto3Optional);
 }
-exports.isOptionalProperty = isOptionalProperty;
 /** This includes all scalars, enums and the [groups type](https://developers.google.com/protocol-buffers/docs/reference/java/com/google/protobuf/DescriptorProtos.FieldDescriptorProto.Type.html#TYPE_GROUP) */
 function isPrimitive(field) {
     return !isMessage(field);
 }
-exports.isPrimitive = isPrimitive;
 function isBytes(field) {
     return field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BYTES;
 }
-exports.isBytes = isBytes;
 function isMessage(field) {
     return field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE || field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_GROUP;
 }
-exports.isMessage = isMessage;
 function isEnum(field) {
     return field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_ENUM;
 }
-exports.isEnum = isEnum;
 function isWithinOneOf(field) {
     return field.hasOwnProperty("oneofIndex");
 }
-exports.isWithinOneOf = isWithinOneOf;
 function isWithinOneOfThatShouldBeUnion(options, field) {
     return (isWithinOneOf(field) &&
         (options.oneof === options_1.OneofOption.UNIONS || options.oneof === options_1.OneofOption.UNIONS_VALUE) &&
         !field.proto3Optional);
 }
-exports.isWithinOneOfThatShouldBeUnion = isWithinOneOfThatShouldBeUnion;
 function isRepeated(field) {
     return field.label === ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED;
 }
-exports.isRepeated = isRepeated;
 function isLong(field) {
     return basicLongWireType(field.type) !== undefined;
 }
-exports.isLong = isLong;
 function isWholeNumber(field) {
     return (field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_INT32 ||
         field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_INT64 ||
@@ -432,68 +462,52 @@ function isWholeNumber(field) {
         field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED32 ||
         field.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED64);
 }
-exports.isWholeNumber = isWholeNumber;
 function isMapType(ctx, messageDesc, field) {
     return detectMapType(ctx, messageDesc, field) !== undefined;
 }
-exports.isMapType = isMapType;
 function isObjectId(field) {
     // need to use endsWith instead of === because objectid could be imported from an external proto file
     return field.typeName.endsWith(".ObjectId");
 }
-exports.isObjectId = isObjectId;
 function isTimestamp(field) {
     return field.typeName === ".google.protobuf.Timestamp";
 }
-exports.isTimestamp = isTimestamp;
 function isValueType(ctx, field) {
     return valueTypeName(ctx, field.typeName) !== undefined;
 }
-exports.isValueType = isValueType;
 function isAnyValueType(field) {
     return isAnyValueTypeName(field.typeName);
 }
-exports.isAnyValueType = isAnyValueType;
 function isAnyValueTypeName(typeName) {
     return typeName === "google.protobuf.Value" || typeName === ".google.protobuf.Value";
 }
-exports.isAnyValueTypeName = isAnyValueTypeName;
 function isBytesValueType(field) {
     return field.typeName === ".google.protobuf.BytesValue";
 }
-exports.isBytesValueType = isBytesValueType;
 function isFieldMaskType(field) {
     return isFieldMaskTypeName(field.typeName);
 }
-exports.isFieldMaskType = isFieldMaskType;
 function isFieldMaskTypeName(typeName) {
     return typeName === "google.protobuf.FieldMask" || typeName === ".google.protobuf.FieldMask";
 }
-exports.isFieldMaskTypeName = isFieldMaskTypeName;
 function isListValueType(field) {
     return isListValueTypeName(field.typeName);
 }
-exports.isListValueType = isListValueType;
 function isListValueTypeName(typeName) {
     return typeName === "google.protobuf.ListValue" || typeName === ".google.protobuf.ListValue";
 }
-exports.isListValueTypeName = isListValueTypeName;
 function isStructType(field) {
     return isStructTypeName(field.typeName);
 }
-exports.isStructType = isStructType;
 function isStructTypeName(typeName) {
     return typeName === "google.protobuf.Struct" || typeName === ".google.protobuf.Struct";
 }
-exports.isStructTypeName = isStructTypeName;
 function isLongValueType(field) {
     return field.typeName === ".google.protobuf.Int64Value" || field.typeName === ".google.protobuf.UInt64Value";
 }
-exports.isLongValueType = isLongValueType;
 function isEmptyType(typeName) {
     return typeName === ".google.protobuf.Empty";
 }
-exports.isEmptyType = isEmptyType;
 function valueTypeName(ctx, typeName) {
     switch (typeName) {
         case ".google.protobuf.StringValue":
@@ -535,7 +549,6 @@ function valueTypeName(ctx, typeName) {
             return undefined;
     }
 }
-exports.valueTypeName = valueTypeName;
 function wrapperTypeName(typeName) {
     switch (typeName) {
         case ".google.protobuf.StringValue":
@@ -556,7 +569,6 @@ function wrapperTypeName(typeName) {
             return undefined;
     }
 }
-exports.wrapperTypeName = wrapperTypeName;
 function longTypeName(ctx) {
     const { options, utils } = ctx;
     if (options.forceLong === options_1.LongOption.LONG) {
@@ -610,7 +622,6 @@ function messageToTypeName(ctx, protoType, typeOptions = {}) {
     const [module, type] = toModuleAndType(typeMap, protoType);
     return (0, ts_poet_1.code) `${(0, utils_1.impProto)(options, module, type)}`;
 }
-exports.messageToTypeName = messageToTypeName;
 /** Breaks `.some_proto_namespace.Some.Message` into `['some_proto_namespace', 'Some_Message', Descriptor]. */
 function toModuleAndType(typeMap, protoType) {
     return typeMap.get(protoType) || (0, utils_1.fail)(`No type found for ${protoType}`);
@@ -619,7 +630,6 @@ function getEnumMethod(ctx, enumProtoType, methodSuffix) {
     const [module, type] = toModuleAndType(ctx.typeMap, enumProtoType);
     return (0, utils_1.impProto)(ctx.options, module, `${(0, case_1.uncapitalize)(type)}${methodSuffix}`);
 }
-exports.getEnumMethod = getEnumMethod;
 /** Return the TypeName for any field (primitive/message/etc.) as exposed in the interface. */
 function toTypeName(ctx, messageDesc, field, ensureOptional = false) {
     function finalize(type, isOptional) {
@@ -668,7 +678,6 @@ function toTypeName(ctx, messageDesc, field, ensureOptional = false) {
         (isWithinOneOf(field) && field.proto3Optional) ||
         ensureOptional);
 }
-exports.toTypeName = toTypeName;
 /**
  * For a protobuf map field, if the generated code should use the javascript Map type.
  *
@@ -692,7 +701,6 @@ function shouldGenerateJSMapType(ctx, message, field) {
     return (mapType.keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL ||
         (isLong(mapType.keyField) && ctx.options.forceLong === options_1.LongOption.LONG));
 }
-exports.shouldGenerateJSMapType = shouldGenerateJSMapType;
 function detectMapType(ctx, messageDesc, fieldDesc) {
     const { typeMap } = ctx;
     if (fieldDesc.label === ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED &&
@@ -708,11 +716,9 @@ function detectMapType(ctx, messageDesc, fieldDesc) {
     }
     return undefined;
 }
-exports.detectMapType = detectMapType;
 function rawRequestType(ctx, methodDesc, typeOptions = {}) {
     return messageToTypeName(ctx, methodDesc.inputType, typeOptions);
 }
-exports.rawRequestType = rawRequestType;
 function observableType(ctx, asType = false) {
     if (ctx.options.useAsyncIterable) {
         return (0, ts_poet_1.code) `AsyncIterable`;
@@ -724,7 +730,6 @@ function observableType(ctx, asType = false) {
         return (0, ts_poet_1.code) `${(0, ts_poet_1.imp)("Observable@rxjs")}`;
     }
 }
-exports.observableType = observableType;
 function requestType(ctx, methodDesc, partial = false) {
     let typeName = rawRequestType(ctx, methodDesc, { keepValueType: true });
     if (partial) {
@@ -735,19 +740,15 @@ function requestType(ctx, methodDesc, partial = false) {
     }
     return typeName;
 }
-exports.requestType = requestType;
 function responseType(ctx, methodDesc, typeOptions = {}) {
     return messageToTypeName(ctx, methodDesc.outputType, { keepValueType: true });
 }
-exports.responseType = responseType;
 function responsePromise(ctx, methodDesc) {
     return (0, ts_poet_1.code) `Promise<${responseType(ctx, methodDesc, { keepValueType: true })}>`;
 }
-exports.responsePromise = responsePromise;
 function responseObservable(ctx, methodDesc) {
     return (0, ts_poet_1.code) `${observableType(ctx)}<${responseType(ctx, methodDesc, { keepValueType: true })}>`;
 }
-exports.responseObservable = responseObservable;
 function responsePromiseOrObservable(ctx, methodDesc) {
     const { options } = ctx;
     if (options.returnObservable || methodDesc.serverStreaming) {
@@ -755,7 +756,6 @@ function responsePromiseOrObservable(ctx, methodDesc) {
     }
     return responsePromise(ctx, methodDesc);
 }
-exports.responsePromiseOrObservable = responsePromiseOrObservable;
 function detectBatchMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     const { typeMap } = ctx;
     const nameMatches = methodDesc.name.startsWith("Batch");
@@ -790,7 +790,6 @@ function detectBatchMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     }
     return undefined;
 }
-exports.detectBatchMethod = detectBatchMethod;
 function hasSingleRepeatedField(messageDesc) {
     return messageDesc.field.length == 1 && messageDesc.field[0].label === ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED;
 }
@@ -798,4 +797,3 @@ function isJsTypeFieldOption(options, field) {
     return (options.useJsTypeOverride &&
         (field.options?.jstype === ts_proto_descriptors_1.FieldOptions_JSType.JS_NUMBER || field.options?.jstype === ts_proto_descriptors_1.FieldOptions_JSType.JS_STRING));
 }
-exports.isJsTypeFieldOption = isJsTypeFieldOption;

package/build/{utils.d.ts → src/utils.d.ts}

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Code, Import } from "ts-poet";
 import { CodeGeneratorRequest, FieldDescriptorProto, FileDescriptorProto, MethodDescriptorProto, MethodOptions } from "ts-proto-descriptors";
 import ReadStream = NodeJS.ReadStream;

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

@@ -1,6 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersions = exports.withAndMaybeCheckIsNull = exports.withAndMaybeCheckIsNotNull = exports.withOrMaybeCheckIsNull = exports.withOrMaybeCheckIsNotNull = exports.oneofValueName = exports.maybeCheckIsNull = exports.maybeCheckIsNotNull = exports.nullOrUndefined = exports.arrowFunction = exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0;
+exports.FormattedMethodDescriptor = void 0;
+exports.protoFilesToGenerate = protoFilesToGenerate;
+exports.generateIndexFiles = generateIndexFiles;
+exports.readToBuffer = readToBuffer;
+exports.fail = fail;
+exports.singular = singular;
+exports.lowerFirst = lowerFirst;
+exports.upperFirst = upperFirst;
+exports.maybeAddComment = maybeAddComment;
+exports.maybePrefixPackage = maybePrefixPackage;
+exports.assertInstanceOf = assertInstanceOf;
+exports.getFieldJsonName = getFieldJsonName;
+exports.getFieldName = getFieldName;
+exports.safeAccessor = safeAccessor;
+exports.getPropertyAccessor = getPropertyAccessor;
+exports.impFile = impFile;
+exports.impProto = impProto;
+exports.tryCatchBlock = tryCatchBlock;
+exports.arrowFunction = arrowFunction;
+exports.nullOrUndefined = nullOrUndefined;
+exports.maybeCheckIsNotNull = maybeCheckIsNotNull;
+exports.maybeCheckIsNull = maybeCheckIsNull;
+exports.oneofValueName = oneofValueName;
+exports.withOrMaybeCheckIsNotNull = withOrMaybeCheckIsNotNull;
+exports.withOrMaybeCheckIsNull = withOrMaybeCheckIsNull;
+exports.withAndMaybeCheckIsNotNull = withAndMaybeCheckIsNotNull;
+exports.withAndMaybeCheckIsNull = withAndMaybeCheckIsNull;
+exports.getVersions = getVersions;
 const path = require("path");
 const ts_poet_1 = require("ts-poet");
 const options_1 = require("./options");
@@ -8,7 +35,6 @@ const case_1 = require("./case");
 function protoFilesToGenerate(request) {
     return request.protoFile.filter((f) => request.fileToGenerate.includes(f.name));
 }
-exports.protoFilesToGenerate = protoFilesToGenerate;
 function generateIndexFiles(files, options) {
     const packageTree = {
         index: "index.ts",
@@ -42,7 +68,6 @@ function generateIndexFiles(files, options) {
     }
     return indexFiles;
 }
-exports.generateIndexFiles = generateIndexFiles;
 function readToBuffer(stream) {
     return new Promise((resolve) => {
         const ret = [];
@@ -59,23 +84,18 @@ function readToBuffer(stream) {
         });
     });
 }
-exports.readToBuffer = readToBuffer;
 function fail(message) {
     throw new Error(message);
 }
-exports.fail = fail;
 function singular(name) {
     return name.substring(0, name.length - 1); // drop the 's', which is extremely naive
 }
-exports.singular = singular;
 function lowerFirst(name) {
     return name.substring(0, 1).toLowerCase() + name.substring(1);
 }
-exports.lowerFirst = lowerFirst;
 function upperFirst(name) {
     return name.substring(0, 1).toUpperCase() + name.substring(1);
 }
-exports.upperFirst = upperFirst;
 // Since we don't know what form the comment originally took, it may contain closing block comments.
 const CloseComment = /\*\//g;
 /** Removes potentially harmful characters from comments and pushes it into chunks. */
@@ -115,12 +135,10 @@ function maybeAddComment(options, desc, chunks, deprecated, prefix = "") {
         chunks.push((0, ts_poet_1.code) `\n\n${comment}\n\n`);
     }
 }
-exports.maybeAddComment = maybeAddComment;
 function maybePrefixPackage(fileDesc, rest) {
     const prefix = fileDesc.package === "" ? "" : `${fileDesc.package}.`;
     return `${prefix}${rest}`;
 }
-exports.maybePrefixPackage = maybePrefixPackage;
 /**
  * Asserts that an object is an instance of a certain class
  * @param obj The object to check
@@ -131,7 +149,6 @@ function assertInstanceOf(obj, constructor) {
         throw new Error(`Expected instance of ${constructor.name}`);
     }
 }
-exports.assertInstanceOf = assertInstanceOf;
 /**
  * A MethodDescriptorProto subclass that adds formatted properties
  */
@@ -194,14 +211,12 @@ function getFieldJsonName(field, options) {
         return isJsonNameSet ? field.jsonName : field.name;
     }
 }
-exports.getFieldJsonName = getFieldJsonName;
 function getFieldName(field, options) {
     if (options.useJsonName) {
         return field.jsonName;
     }
     return (0, case_1.maybeSnakeToCamel)(field.name, options);
 }
-exports.getFieldName = getFieldName;
 /**
  * https://github.com/eslint-community/eslint-plugin-security/blob/main/docs/the-dangers-of-square-bracket-notation.md
  */
@@ -212,7 +227,6 @@ function isValidIdentifier(propertyName) {
 function safeAccessor(propertyName) {
     return isValidIdentifier(propertyName) ? propertyName : JSON.stringify(propertyName);
 }
-exports.safeAccessor = safeAccessor;
 /**
  * Returns a snippet for reading an object's property, such as `foo.bar`, or `foo['bar']` if the property name contains unusual characters.
  * For simplicity, we don't match the ECMA 5/6 rules for valid identifiers exactly, and return array syntax liberally.
@@ -225,11 +239,9 @@ function getPropertyAccessor(objectName, propertyName, optional = false) {
         ? `${objectName}${optional ? "?" : ""}.${propertyName}`
         : `${objectName}${optional ? "?." : ""}[${safeAccessor(propertyName)}]`;
 }
-exports.getPropertyAccessor = getPropertyAccessor;
 function impFile(options, spec) {
     return (0, ts_poet_1.imp)(`${spec}${options.importSuffix}`);
 }
-exports.impFile = impFile;
 function impProto(options, module, type) {
     const prefix = options.onlyTypes ? "t:" : "";
     const protoFile = `${module}.proto`;
@@ -238,7 +250,6 @@ function impProto(options, module, type) {
     }
     return (0, ts_poet_1.imp)(`${prefix}${type}@./${module}${options.fileSuffix}${options.importSuffix}`);
 }
-exports.impProto = impProto;
 function tryCatchBlock(tryBlock, handleErrorBlock) {
     return (0, ts_poet_1.code) `try {
     ${tryBlock}
@@ -246,46 +257,36 @@ function tryCatchBlock(tryBlock, handleErrorBlock) {
     ${handleErrorBlock}
   }`;
 }
-exports.tryCatchBlock = tryCatchBlock;
 function arrowFunction(params, body, isOneLine = true) {
     if (isOneLine) {
         return (0, ts_poet_1.code) `(${params}) => ${body}`;
     }
     return (0, ts_poet_1.code) `(${params}) => { ${body} }`;
 }
-exports.arrowFunction = arrowFunction;
 function nullOrUndefined(options, hasProto3Optional = false) {
     return options.useNullAsOptional ? `null ${hasProto3Optional ? "| undefined" : ""}` : "undefined";
 }
-exports.nullOrUndefined = nullOrUndefined;
 function maybeCheckIsNotNull(options, typeName, prefix) {
     return options.useNullAsOptional ? ` ${prefix} ${typeName} !== null` : "";
 }
-exports.maybeCheckIsNotNull = maybeCheckIsNotNull;
 function maybeCheckIsNull(options, typeName, prefix) {
     return options.useNullAsOptional ? ` ${prefix} ${typeName} === null` : "";
 }
-exports.maybeCheckIsNull = maybeCheckIsNull;
 function oneofValueName(fieldName, options) {
     return options.oneof === options_1.OneofOption.UNIONS ? fieldName : "value";
 }
-exports.oneofValueName = oneofValueName;
 function withOrMaybeCheckIsNotNull(options, typeName) {
     return maybeCheckIsNotNull(options, typeName, "||");
 }
-exports.withOrMaybeCheckIsNotNull = withOrMaybeCheckIsNotNull;
 function withOrMaybeCheckIsNull(options, typeName) {
     return maybeCheckIsNull(options, typeName, "||");
 }
-exports.withOrMaybeCheckIsNull = withOrMaybeCheckIsNull;
 function withAndMaybeCheckIsNotNull(options, typeName) {
     return maybeCheckIsNotNull(options, typeName, "&&");
 }
-exports.withAndMaybeCheckIsNotNull = withAndMaybeCheckIsNotNull;
 function withAndMaybeCheckIsNull(options, typeName) {
     return maybeCheckIsNotNull(options, typeName, "&&");
 }
-exports.withAndMaybeCheckIsNull = withAndMaybeCheckIsNull;
 async function getVersions(request) {
     let protocVersion = "unknown";
     if (request.compilerVersion) {
@@ -300,4 +301,3 @@ async function getVersions(request) {
         tsProtoVersion,
     };
 }
-exports.getVersions = getVersions;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.visitServices = exports.visit = void 0;
+exports.visit = visit;
+exports.visitServices = visitServices;
 const sourceInfo_1 = require("./sourceInfo");
 const case_1 = require("./case");
 function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPrefix = "", protoPrefix = "") {
@@ -29,7 +30,6 @@ function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPref
         visit(message, nestedSourceInfo, messageFn, options, enumFn, tsFullName + delim, protoFullName + ".");
     });
 }
-exports.visit = visit;
 const builtInNames = ["Date"];
 /** Potentially suffixes `Message` to names to avoid conflicts, i.e. with `Date`. */
 function messageName(message) {
@@ -42,4 +42,3 @@ function visitServices(proto, sourceInfo, serviceFn) {
         serviceFn(serviceDesc, nestedSourceInfo);
     });
 }
-exports.visitServices = visitServices;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ts-proto",
-  "version": "1.181.2",
+  "version": "2.0.1",
   "description": "",
-  "main": "build/plugin.js",
+  "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",
   "bin": {
     "protoc-gen-ts_proto": "./protoc-gen-ts_proto"
@@ -36,17 +36,18 @@
     "@nestjs/core": "^9.4.3",
     "@nestjs/microservices": "^9.4.3",
     "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^10.0.1",
+    "@semantic-release/commit-analyzer": "^13.0.0",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^9.0.3",
-    "@semantic-release/npm": "^10.0.4",
-    "@semantic-release/release-notes-generator": "^11.0.4",
+    "@semantic-release/github": "^10.1.6",
+    "@semantic-release/npm": "^12.0.1",
+    "@semantic-release/release-notes-generator": "^14.0.1",
     "@tsconfig/strictest": "^2.0.1",
     "@types/jest": "^29.5.3",
     "@types/node": "^16.18.38",
     "@types/object-hash": "^3.0.2",
     "chokidar": "^3.5.3",
+    "conventional-changelog-conventionalcommits": "^8.0.0",
     "dataloader": "^2.2.2",
     "jest": "^29.6.1",
     "jest-ts-webcompat-resolver": "^1.0.0",
@@ -55,20 +56,21 @@
     "nice-grpc": "^2.1.4",
     "object-hash": "^3.0.0",
     "prettier": "^2.8.8",
+    "protobufjs": "^7.2.4",
     "protobufjs-cli": "^1.1.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
-    "semantic-release": "^21.0.7",
+    "semantic-release": "^24.0.0",
     "ts-jest": "^29.1.1",
-    "tsx": "^4.11.2",
-    "typescript": "^5.1.6",
+    "tsx": "^4.17.0",
+    "typescript": "^5.5.4",
     "uglify-js": "^3.17.4"
   },
   "dependencies": {
+    "@bufbuild/protobuf": "^2.0.0",
     "case-anything": "^2.1.13",
-    "protobufjs": "^7.2.4",
     "ts-poet": "^6.7.0",
     "ts-proto-descriptors": "1.16.0"
   },
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@4.4.0"
 }

package/protoc-gen-ts_proto

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./build/plugin')
+require('./build/src/plugin')