oneof field outer comment small fix & yarn proto2ts

stephenh · Nov 14, 2024 · b2e7853 · b2e7853
1 parent e55fd99
commit b2e7853
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 44 deletions.
diff --git a/integration/oneof-unions-snake/google/protobuf/struct.ts b/integration/oneof-unions-snake/google/protobuf/struct.ts
@@ -69,7 +69,8 @@ export interface Struct_FieldsEntry {
  * The JSON representation for `Value` is JSON value.
  */
 export interface Value {
-  /** The kind of value. */ kind?:
+  /** The kind of value. */
+  kind?:
     | //
     /** Represents a null value. */
     { $case: "null_value"; null_value: NullValue }

diff --git a/integration/oneof-unions-value/google/protobuf/struct.ts b/integration/oneof-unions-value/google/protobuf/struct.ts
@@ -69,7 +69,8 @@ export interface Struct_FieldsEntry {
  * The JSON representation for `Value` is JSON value.
  */
 export interface Value {
-  /** The kind of value. */ kind?:
+  /** The kind of value. */
+  kind?:
     | //
     /** Represents a null value. */
     { $case: "nullValue"; value: NullValue }

diff --git a/integration/oneof-unions-value/oneof.ts b/integration/oneof-unions-value/oneof.ts
@@ -12,7 +12,8 @@ export interface PleaseChoose {
   /**
    * Please to be choosing one of the fields within this oneof clause.
    * This text exists to ensure we transpose comments correctly.
-   */ choice?:
+   */
+  choice?:
     | //
     /**
      * Use this if you want a number. Numbers are great. Who doesn't

diff --git a/integration/oneof-unions/google/protobuf/struct.ts b/integration/oneof-unions/google/protobuf/struct.ts
@@ -69,7 +69,8 @@ export interface Struct_FieldsEntry {
  * The JSON representation for `Value` is JSON value.
  */
 export interface Value {
-  /** The kind of value. */ kind?:
+  /** The kind of value. */
+  kind?:
     | //
     /** Represents a null value. */
     { $case: "nullValue"; nullValue: NullValue }

diff --git a/integration/oneof-unions/oneof.ts b/integration/oneof-unions/oneof.ts
@@ -12,7 +12,8 @@ export interface PleaseChoose {
   /**
    * Please to be choosing one of the fields within this oneof clause.
    * This text exists to ensure we transpose comments correctly.
-   */ choice?:
+   */
+  choice?:
     | //
     /**
      * Use this if you want a number. Numbers are great. Who doesn't

diff --git a/integration/use-readonly-types/google/protobuf/struct.ts b/integration/use-readonly-types/google/protobuf/struct.ts
@@ -69,7 +69,8 @@ export interface Struct_FieldsEntry {
  * The JSON representation for `Value` is JSON value.
  */
 export interface Value {
-  /** The kind of value. */ readonly kind?:
+  /** The kind of value. */
+  readonly kind?:
     | //
     /** Represents a null value. */
     { readonly $case: "nullValue"; readonly nullValue: NullValue }

diff --git a/src/main.ts b/src/main.ts
@@ -664,9 +664,8 @@ function makeDeepPartial(options: Options, longs: ReturnType<typeof makeLongUtil
 
   const Builtin = conditionalOutput(
     "Builtin",
-    code`type Builtin = Date | Function | Uint8Array | string | number | boolean |${
-      options.forceLong === LongOption.BIGINT ? " bigint |" : ""
-    } undefined;`,
+    code`type Builtin = Date | Function | Uint8Array | string | number | boolean |${options.forceLong === LongOption.BIGINT ? " bigint |" : ""
+      } undefined;`,
   );
 
   // Based on https://github.com/sindresorhus/type-fest/pull/259
@@ -843,9 +842,8 @@ function makeMessageFns(
     code`
       ${maybeExport} interface FieldMaskWrapperFns {
         wrap(paths: ${options.useReadonlyTypes ? "readonly" : ""} string[]): FieldMask;
-        unwrap(message: ${options.useReadonlyTypes ? "any" : "FieldMask"}): string[] ${
-      options.useOptionals === "all" ? "| undefined" : ""
-    };
+        unwrap(message: ${options.useReadonlyTypes ? "any" : "FieldMask"}): string[] ${options.useOptionals === "all" ? "| undefined" : ""
+      };
       }
     `,
   );
@@ -943,7 +941,7 @@ function makeTimestampMethods(
           }
         `
       : options.useDate === DateOption.STRING_NANO
-      ? code`
+        ? code`
           function toTimestamp(dateStr: string): ${Timestamp} {
             const nanoDate = new ${NanoDate}(dateStr);
 
@@ -959,7 +957,7 @@ function makeTimestampMethods(
             return { ${maybeTypeField} seconds, nanos };
           }
         `
-      : code`
+        : code`
           function toTimestamp(date: Date): ${Timestamp} {
             const seconds = ${seconds};
             const nanos = (date.getTime() % 1_000) * 1_000_000;
@@ -979,7 +977,7 @@ function makeTimestampMethods(
           }
         `
       : options.useDate === DateOption.STRING_NANO
-      ? code`
+        ? code`
           function fromTimestamp(t: ${Timestamp}): string {
             const seconds = ${toNumberCode} || 0;
             const nanos = (t.nanos || 0) % 1_000;
@@ -994,7 +992,7 @@ function makeTimestampMethods(
             return nanoDate.toISOStringFull();
           }
         `
-      : code`
+        : code`
           function fromTimestamp(t: ${Timestamp}): Date {
             let millis = (${toNumberCode} || 0) * 1_000;
             millis += (t.nanos || 0) / 1_000_000;
@@ -1192,20 +1190,13 @@ function generateOneofProperty(
       let fieldComments: Code[] = [];
       maybeAddComment(options, fieldInfo, fieldComments);
 
-      const combinedComments = fieldComments.join('\n');
+      const combinedComments = fieldComments.join("\n");
       return code`| // \n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
-    })
+    }),
   );
 
   const name = maybeSnakeToCamel(messageDesc.oneofDecl[oneofIndex].name, options);
-  return joinCode(
-    [
-      ...outerComments,
-      code`${mbReadonly}${name}?:`,
-      unionType,
-      code`| ${nullOrUndefined(options)},`,
-    ]
-  );
+  return joinCode([...outerComments, code`${mbReadonly}${name}?:`, unionType, code`| ${nullOrUndefined(options)},`], { on: "\n" });
 }
 
 // Create a function that constructs 'base' instance with default values for decode to use as a prototype
@@ -1246,12 +1237,12 @@ function generateBaseInstanceFactory(
     const val = isWithinOneOf(field)
       ? nullOrUndefined(options)
       : isMapType(ctx, messageDesc, field)
-      ? shouldGenerateJSMapType(ctx, messageDesc, field)
-        ? "new Map()"
-        : "{}"
-      : isRepeated(field)
-      ? "[]"
-      : defaultValue(ctx, field);
+        ? shouldGenerateJSMapType(ctx, messageDesc, field)
+          ? "new Map()"
+          : "{}"
+        : isRepeated(field)
+          ? "[]"
+          : defaultValue(ctx, field);
 
     fields.push(code`${fieldKey}: ${val}`);
   }
@@ -1431,11 +1422,10 @@ function generateDecode(ctx: Context, fullName: string, messageDesc: DescriptorP
           options,
           `${varName}.value`,
         )}`;
-        const maybeIfKeyCheck = `${
-          options.noDefaultsForOptionals
+        const maybeIfKeyCheck = `${options.noDefaultsForOptionals
             ? ` && ${varName}.key !== undefined ${withAndMaybeCheckIsNotNull(options, `${varName}.key`)}`
             : ""
-        }`;
+          }`;
 
         chunks.push(code`
           ${tagCheck}
@@ -1754,9 +1744,8 @@ function generateEncode(ctx: Context, fullName: string, messageDesc: DescriptorP
                 writer.uint32(${tag}).fork();
                 for (const v of ${messageProperty}) {
                   if (BigInt.asIntN(64, v) !== v) {
-                    throw new ${
-                      utils.globalThis
-                    }.Error('a value provided in array field ${fieldName} of type ${fieldType} is too large');
+                    throw new ${utils.globalThis
+                }.Error('a value provided in array field ${fieldName} of type ${fieldType} is too large');
                   }
                   writer.${toReaderCall(field)}(${rhs("v")});
                 }
@@ -1769,9 +1758,8 @@ function generateEncode(ctx: Context, fullName: string, messageDesc: DescriptorP
                 writer.uint32(${tag}).fork();
                 for (const v of ${messageProperty}) {
                   if (BigInt.asUintN(64, v) !== v) {
-                    throw new ${
-                      utils.globalThis
-                    }.Error('a value provided in array field ${fieldName} of type ${fieldType} is too large');
+                    throw new ${utils.globalThis
+                }.Error('a value provided in array field ${fieldName} of type ${fieldType} is too large');
                   }
                   writer.${toReaderCall(field)}(${rhs("v")});
                 }
@@ -2302,9 +2290,8 @@ function generateFromJson(ctx: Context, fullName: string, fullTypeName: string,
         } else {
           // Explicit `any` type required to make TS with noImplicitAny happy. `object` is also `any` here.
           chunks.push(code`
-            ${fieldKey}: ${
-            ctx.utils.globalThis
-          }.Array.isArray(${jsonPropertyOptional}) ? ${jsonProperty}.map((e: any) => ${readSnippet("e")}): ${fallback},
+            ${fieldKey}: ${ctx.utils.globalThis
+            }.Array.isArray(${jsonPropertyOptional}) ? ${jsonProperty}.map((e: any) => ${readSnippet("e")}): ${fallback},
           `);
         }
       }