Merge pull request #237 from proto-graphql/izumin5210/fix-input-ref-type

fix(protoc-gen-pothos): tweak input type definition for avoiding type error

Author: izumin5210

.changeset/itchy-dolphins-cry.md

@@ -0,0 +1,7 @@
+---
+"@proto-graphql/codegen-core": patch
+"@testapis/proto": patch
+"protoc-gen-pothos": patch
+---
+
+tweak input type definition for avoiding type error

packages/@proto-graphql/codegen-core/src/types/InputObjectType.ts

@@ -5,7 +5,14 @@ import { InputObjectField } from "./InputObjectField";
 import { ScalarType } from "./ScalarType";
 import { TypeBase } from "./TypeBase";
 import { getInputObjectFieldType } from "./types";
-import { createProtoFullName, FullName, gqlTypeName, isIgnoredField, isOutputOnlyField } from "./util";
+import {
+  createProtoFullName,
+  FullName,
+  gqlTypeName,
+  isIgnoredField,
+  isOutputOnlyField,
+  modulesWithUniqueImportAlias,
+} from "./util";
 
 export class InputObjectType extends TypeBase<ProtoMessage> {
   /**
@@ -32,7 +39,11 @@ export class InputObjectType extends TypeBase<ProtoMessage> {
    * @override
    */
   override get importModules(): { alias: string; module: string; type: "namespace" | "named" }[] {
-    return [...super.importModules, ...this.fields.flatMap((f) => f.importModules)];
+    const modules = [...super.importModules, ...this.fields.flatMap((f) => f.importModules)];
+    if (this.options.dsl === "pothos") {
+      modules.push(...modulesWithUniqueImportAlias(["@pothos/core"]));
+    }
+    return modules;
   }
 
   public hasPartialInput(): boolean {

packages/protoc-gen-pothos/src/__tests__/__snapshots__/customTypes.test.ts.snap

@@ -6,6 +6,7 @@ exports[`custom types generates pothos DSLs: custom_types/date.pb.pothos.ts 1`]
 
 /* eslint-disable */
 
+import * as $$pothos$core from \\"@pothos/core\\";
 import { builder } from \\"../../builder\\";
 import * as _$testapis$custom_types$date from \\"./testapis/custom_types/date\\";
 export const Date$Ref = builder.objectRef<_$testapis$custom_types$date.Date>(\\"Date\\");
@@ -61,8 +62,7 @@ export type DateInput$Shape = {
     month: _$testapis$custom_types$date.Date[\\"month\\"];
     day: _$testapis$custom_types$date.Date[\\"day\\"];
 };
-export const DateInput$Ref = builder.inputRef<DateInput$Shape>(\\"DateInput\\");
-DateInput$Ref.implement({
+export const DateInput$Ref: $$pothos$core.InputObjectRef<DateInput$Shape> = builder.inputRef<DateInput$Shape>(\\"DateInput\\").implement({
     fields: t => ({
         year: t.field({
             type: \\"Int\\",
@@ -112,6 +112,7 @@ exports[`custom types generates pothos DSLs: custom_types/post.pb.pothos.ts 1`]
 
 /* eslint-disable */
 
+import * as $$pothos$core from \\"@pothos/core\\";
 import { builder } from \\"../../builder\\";
 import * as _$testapis$custom_types$post from \\"./testapis/custom_types/post\\";
 export const Post$Ref = builder.objectRef<_$testapis$custom_types$post.Post>(\\"Post\\");
@@ -158,8 +159,7 @@ export type PostInput$Shape = {
     title: _$testapis$custom_types$post.Post[\\"title\\"];
     publishedDate?: _$testapis$custom_types$post.Post[\\"publishedDate\\"] | null;
 };
-export const PostInput$Ref = builder.inputRef<PostInput$Shape>(\\"PostInput\\");
-PostInput$Ref.implement({
+export const PostInput$Ref: $$pothos$core.InputObjectRef<PostInput$Shape> = builder.inputRef<PostInput$Shape>(\\"PostInput\\").implement({
     fields: t => ({
         title: t.field({
             type: \\"String\\",

packages/protoc-gen-pothos/src/__tests__/__snapshots__/edgecases.test.ts.snap

@@ -6,6 +6,7 @@ exports[`import squashed union with ts-proto generates pothos DSLs: edgecases/im
 
 /* eslint-disable */
 
+import * as $$pothos$core from \\"@pothos/core\\";
 import { builder } from \\"../../../../builder\\";
 import * as _$testapis$edgecases$import_squashed_union$pkg1$types from \\"./testapis/edgecases/import_squashed_union/pkg1/types\\";
 export const OneofMessage1$Ref = builder.objectRef<_$testapis$edgecases$import_squashed_union$pkg1$types.OneofMessage1>(\\"OneofMessage1\\");
@@ -39,8 +40,7 @@ builder.objectType(OneofMessage1$Ref, {
 export type OneofMessage1Input$Shape = {
     body: _$testapis$edgecases$import_squashed_union$pkg1$types.OneofMessage1[\\"body\\"];
 };
-export const OneofMessage1Input$Ref = builder.inputRef<OneofMessage1Input$Shape>(\\"OneofMessage1Input\\");
-OneofMessage1Input$Ref.implement({
+export const OneofMessage1Input$Ref: $$pothos$core.InputObjectRef<OneofMessage1Input$Shape> = builder.inputRef<OneofMessage1Input$Shape>(\\"OneofMessage1Input\\").implement({
     fields: t => ({
         body: t.field({
             type: \\"String\\",
@@ -64,8 +64,7 @@ OneofMessage1Input$Ref.implement({
 export type SquashedOneofInput$Shape = {
     msg1?: OneofMessage1Input$Shape | null;
 };
-export const SquashedOneofInput$Ref = builder.inputRef<SquashedOneofInput$Shape>(\\"SquashedOneofInput\\");
-SquashedOneofInput$Ref.implement({
+export const SquashedOneofInput$Ref: $$pothos$core.InputObjectRef<SquashedOneofInput$Shape> = builder.inputRef<SquashedOneofInput$Shape>(\\"SquashedOneofInput\\").implement({
     fields: t => ({
         msg1: t.field({
             type: OneofMessage1Input$Ref,
@@ -113,6 +112,7 @@ exports[`import squashed union with ts-proto generates pothos DSLs: edgecases/im
 
 /* eslint-disable */
 
+import * as $$pothos$core from \\"@pothos/core\\";
 import { builder } from \\"../../../../builder\\";
 import * as __$pkg1$types_pb_pothos from \\"../pkg1/types.pb.pothos\\";
 import { SquashedOneof$Ref } from \\"../pkg1/types.pb.pothos\\";
@@ -155,8 +155,7 @@ builder.objectType(Message$Ref, {
 export type MessageInput$Shape = {
     msg?: SquashedOneofInput$Shape | null;
 };
-export const MessageInput$Ref = builder.inputRef<MessageInput$Shape>(\\"MessageInput\\");
-MessageInput$Ref.implement({
+export const MessageInput$Ref: $$pothos$core.InputObjectRef<MessageInput$Shape> = builder.inputRef<MessageInput$Shape>(\\"MessageInput\\").implement({
     fields: t => ({
         msg: t.field({
             type: SquashedOneofInput$Ref,

packages/protoc-gen-pothos/src/__tests__/__snapshots__/extensions.test.ts.snap

@@ -6,6 +6,7 @@ exports[`field_nullability generates pothos DSLs with partial inputs: extensions
 
 /* eslint-disable */
 
+import * as $$pothos$core from \\"@pothos/core\\";
 import { builder } from \\"../../../builder\\";
 import * as _$testapis$extensions$field_nullability$nullability from \\"./testapis/extensions/field_nullability/nullability\\";
 export const Message$Ref = builder.objectRef<_$testapis$extensions$field_nullability$nullability.Message>(\\"Message\\");
@@ -70,8 +71,7 @@ export type MessageInput$Shape = {
     body: _$testapis$extensions$field_nullability$nullability.Message[\\"body\\"];
     status?: _$testapis$extensions$field_nullability$nullability.Message[\\"status\\"] | null;
 };
-export const MessageInput$Ref = builder.inputRef<MessageInput$Shape>(\\"MessageInput\\");
-MessageInput$Ref.implement({
+export const MessageInput$Ref: $$pothos$core.InputObjectRef<MessageInput$Shape> = builder.inputRef<MessageInput$Shape>(\\"MessageInput\\").implement({
     fields: t => ({
         userId: t.field({
             type: \\"String\\",
@@ -120,8 +120,7 @@ export type MessagePartialInput$Shape = {
     body?: _$testapis$extensions$field_nullability$nullability.Message[\\"body\\"] | null;
     status?: _$testapis$extensions$field_nullability$nullability.Message[\\"status\\"] | null;
 };
-export const MessagePartialInput$Ref = builder.inputRef<MessagePartialInput$Shape>(\\"MessagePartialInput\\");
-MessagePartialInput$Ref.implement({
+export const MessagePartialInput$Ref: $$pothos$core.InputObjectRef<MessagePartialInput$Shape> = builder.inputRef<MessagePartialInput$Shape>(\\"MessagePartialInput\\").implement({
     fields: t => ({
         userId: t.field({
             type: \\"String\\",
@@ -201,6 +200,7 @@ exports[`no_partial generates pothos DSLs with partial inputs: extensions/no_par
 
 /* eslint-disable */
 
+import * as $$pothos$core from \\"@pothos/core\\";
 import { builder } from \\"../../../builder\\";
 import * as _$testapis$extensions$no_partial$no_partial from \\"./testapis/extensions/no_partial/no_partial\\";
 export const ParentMessage$Ref = builder.objectRef<_$testapis$extensions$no_partial$no_partial.ParentMessage>(\\"ParentMessage\\");
@@ -333,8 +333,7 @@ export type ParentMessageInput$Shape = {
     partialableInputMessage: PartialableInputMessageInput$Shape;
     noPartialInputMessage: NoPartialInputMessageInput$Shape;
 };
-export const ParentMessageInput$Ref = builder.inputRef<ParentMessageInput$Shape>(\\"ParentMessageInput\\");
-ParentMessageInput$Ref.implement({
+export const ParentMessageInput$Ref: $$pothos$core.InputObjectRef<ParentMessageInput$Shape> = builder.inputRef<ParentMessageInput$Shape>(\\"ParentMessageInput\\").implement({
     fields: t => ({
         partialableInputMessage: t.field({
             type: PartialableInputMessageInput$Ref,
@@ -371,8 +370,7 @@ export type ParentMessagePartialInput$Shape = {
     partialableInputMessage?: PartialableInputMessagePartialInput$Shape | null;
     noPartialInputMessage?: NoPartialInputMessageInput$Shape | null;
 };
-export const ParentMessagePartialInput$Ref = builder.inputRef<ParentMessagePartialInput$Shape>(\\"ParentMessagePartialInput\\");
-ParentMessagePartialInput$Ref.implement({
+export const ParentMessagePartialInput$Ref: $$pothos$core.InputObjectRef<ParentMessagePartialInput$Shape> = builder.inputRef<ParentMessagePartialInput$Shape>(\\"ParentMessagePartialInput\\").implement({
     fields: t => ({
         partialableInputMessage: t.field({
             type: PartialableInputMessagePartialInput$Ref,
@@ -409,8 +407,7 @@ export type PartialableInputMessageInput$Shape = {
     id: _$testapis$extensions$no_partial$no_partial.PartialableInputMessage[\\"id\\"];
     body: _$testapis$extensions$no_partial$no_partial.PartialableInputMessage[\\"body\\"];
 };
-export const PartialableInputMessageInput$Ref = builder.inputRef<PartialableInputMessageInput$Shape>(\\"PartialableInputMessageInput\\");
-PartialableInputMessageInput$Ref.implement({
+export const PartialableInputMessageInput$Ref: $$pothos$core.InputObjectRef<PartialableInputMessageInput$Shape> = builder.inputRef<PartialableInputMessageInput$Shape>(\\"PartialableInputMessageInput\\").implement({
     fields: t => ({
         id: t.field({
             type: \\"String\\",
@@ -447,8 +444,7 @@ export type PartialableInputMessagePartialInput$Shape = {
     id?: _$testapis$extensions$no_partial$no_partial.PartialableInputMessage[\\"id\\"] | null;
     body?: _$testapis$extensions$no_partial$no_partial.PartialableInputMessage[\\"body\\"] | null;
 };
-export const PartialableInputMessagePartialInput$Ref = builder.inputRef<PartialableInputMessagePartialInput$Shape>(\\"PartialableInputMessagePartialInput\\");
-PartialableInputMessagePartialInput$Ref.implement({
+export const PartialableInputMessagePartialInput$Ref: $$pothos$core.InputObjectRef<PartialableInputMessagePartialInput$Shape> = builder.inputRef<PartialableInputMessagePartialInput$Shape>(\\"PartialableInputMessagePartialInput\\").implement({
     fields: t => ({
         id: t.field({
             type: \\"String\\",
@@ -485,8 +481,7 @@ export type NoPartialInputMessageInput$Shape = {
     id: _$testapis$extensions$no_partial$no_partial.NoPartialInputMessage[\\"id\\"];
     body: _$testapis$extensions$no_partial$no_partial.NoPartialInputMessage[\\"body\\"];
 };
-export const NoPartialInputMessageInput$Ref = builder.inputRef<NoPartialInputMessageInput$Shape>(\\"NoPartialInputMessageInput\\");
-NoPartialInputMessageInput$Ref.implement({
+export const NoPartialInputMessageInput$Ref: $$pothos$core.InputObjectRef<NoPartialInputMessageInput$Shape> = builder.inputRef<NoPartialInputMessageInput$Shape>(\\"NoPartialInputMessageInput\\").implement({
     fields: t => ({
         id: t.field({
             type: \\"String\\",