ts-proto 2.2.3 → 2.2.5

package/build/src/schema.js

@@ -188,8 +188,8 @@ function encodedOptionsToOptions(ctx, extendee, encodedOptions) {
     const resultOptions = [];
     for (const key in encodedOptions) {
         const value = encodedOptions[key];
-        const extension = extensionCache[extendee][parseInt(key, 10) >>> 3];
-        if (shouldAddOptionDefinition(ctx, extension)) {
+        const extension = extensionCache[extendee]?.[parseInt(key, 10) >>> 3];
+        if (extension && shouldAddOptionDefinition(ctx, extension)) {
             // todo: we should be able to create an option definition ALWAYS, however,
             // we currently cannot do that because the if the extension is a sub-message
             // (and thus, not just a straightforward value), we don't have an JSON object

package/build/src/visit.js

@@ -12,7 +12,7 @@ function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPref
         const protoFullName = protoPrefix + enumDesc.name;
         // I.e. FooBar_ZazInner
         const tsFullName = tsPrefix + (0, case_1.maybeSnakeToCamel)(enumDesc.name, options);
-        const tsFullNameWithAffixes = `${options.typePrefix}${tsFullName}${options.typeSuffix}`;
+        const tsFullNameWithAffixes = messageName(`${options.typePrefix}${tsFullName}${options.typeSuffix}`);
         const nestedSourceInfo = sourceInfo.open(childEnumType, index);
         enumFn(tsFullNameWithAffixes, enumDesc, nestedSourceInfo, protoFullName);
     });
@@ -22,8 +22,8 @@ function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPref
         // I.e. Foo_Bar.Zaz_Inner
         const protoFullName = protoPrefix + message.name;
         // I.e. FooBar_ZazInner
-        const tsFullName = tsPrefix + (0, case_1.maybeSnakeToCamel)(messageName(message), options);
-        const tsFullNameWithAffixes = `${options.typePrefix}${tsFullName}${options.typeSuffix}`;
+        const tsFullName = tsPrefix + (0, case_1.maybeSnakeToCamel)(message.name, options);
+        const tsFullNameWithAffixes = messageName(`${options.typePrefix}${tsFullName}${options.typeSuffix}`);
         const nestedSourceInfo = sourceInfo.open(childType, index);
         messageFn(tsFullNameWithAffixes, message, nestedSourceInfo, protoFullName);
         const delim = options.useSnakeTypeName ? "_" : "";
@@ -32,8 +32,7 @@ function visit(proto, sourceInfo, messageFn, options, enumFn = () => { }, tsPref
 }
 const builtInNames = ["Date", "Function"];
 /** Potentially suffixes `Message` to names to avoid conflicts, i.e. with `Date`. */
-function messageName(message) {
-    const { name } = message;
+function messageName(name) {
     return builtInNames.includes(name) ? `${name}Message` : name;
 }
 function visitServices(proto, sourceInfo, serviceFn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "",
   "main": "build/src/plugin.js",
   "repository": "github:stephenh/ts-proto",