Merge branch 'master' into test-release

Author: eddeee888

.changeset/khaki-games-dream.md

@@ -0,0 +1,5 @@
+---
+'@eddeee888/gcg-typescript-resolver-files': minor
+---
+
+add importExtension configuration option

package.json

@@ -15,9 +15,9 @@
     "@eddeee888/nx-graphql-code-generator": "2.0.0",
     "@eslint/eslintrc": "3.3.1",
     "@graphql-codegen/add": "6.0.0",
-    "@graphql-codegen/cli": "6.0.0",
+    "@graphql-codegen/cli": "6.1.0",
     "@graphql-codegen/near-operation-file-preset": "3.1.0",
-    "@graphql-codegen/plugin-helpers": "6.0.0",
+    "@graphql-codegen/plugin-helpers": "6.1.0",
     "@graphql-codegen/schema-ast": "5.0.0",
     "@graphql-codegen/typescript": "5.0.1",
     "@graphql-codegen/typescript-react-apollo": "4.3.3",

packages/typescript-resolver-files-e2e/project.json

@@ -174,6 +174,13 @@
             "rimraf -g \"{projectRoot}/src/test-complex-synth-generic-wrapper/**/*.generated.*\""
           ],
           "parallel": false
+        },
+        "test-import-extension-ts": {
+          "commands": [
+            "rimraf -g \"{projectRoot}/src/test-import-extension-ts/**/resolvers/\"",
+            "rimraf -g \"{projectRoot}/src/test-import-extension-ts/**/*.generated.*\""
+          ],
+          "parallel": false
         }
       }
     },
@@ -202,7 +209,8 @@
           "nx graphql-codegen typescript-resolver-files-e2e -c test-federation --verbose",
           "nx graphql-codegen typescript-resolver-files-e2e -c test-deep-modules --verbose",
           "nx graphql-codegen typescript-resolver-files-e2e -c test-module-naming-mode-all --verbose",
-          "nx graphql-codegen typescript-resolver-files-e2e -c test-complex-synth-generic-wrapper --verbose"
+          "nx graphql-codegen typescript-resolver-files-e2e -c test-complex-synth-generic-wrapper --verbose",
+          "nx graphql-codegen typescript-resolver-files-e2e -c test-import-extension-ts --verbose"
         ],
         "parallel": false
       },
@@ -286,6 +294,9 @@
         },
         "test-complex-synth-generic-wrapper": {
           "configFile": "{projectRoot}/src/test-complex-synth-generic-wrapper/codegen.ts"
+        },
+        "test-import-extension-ts": {
+          "configFile": "{projectRoot}/src/test-import-extension-ts/codegen.ts"
         }
       },
       "dependsOn": ["prepare-e2e-modules"]

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/codegen.ts

@@ -0,0 +1,18 @@
+import type { CodegenConfig } from '@graphql-codegen/cli';
+import { defineConfig } from '@eddeee888/gcg-typescript-resolver-files';
+
+const config: CodegenConfig = {
+  schema: [
+    'packages/typescript-resolver-files-e2e/src/test-import-extension-ts/**/*.graphqls',
+    'packages/typescript-resolver-files-e2e/src/test-import-extension-ts/**/*.graphqls.ts',
+  ],
+  hooks: {
+    afterAllFileWrite: ['prettier --write'],
+  },
+  generates: {
+    'packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema':
+      defineConfig({ importExtension: '.ts' }),
+  },
+};
+
+export default config;

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema/base/base.graphqls

@@ -0,0 +1,32 @@
+type Query
+type Mutation
+type Subscription
+
+interface Error {
+  error: ErrorType!
+}
+
+type PayloadError implements Error {
+  error: ErrorType!
+}
+
+enum ErrorType {
+  NOT_FOUND
+  INPUT_VALIDATION_ERROR
+  FORBIDDEN_ERROR
+  UNEXPECTED_ERROR
+}
+
+input PaginationInput {
+  recordsPerPage: Int
+  page: Int
+}
+
+type PaginationResult {
+  currentPage: Int!
+  recordsPerPage: Int!
+  totalPageCount: Int!
+}
+
+scalar DateTime
+scalar SomeRandomScalar

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema/base/resolvers/PaginationResult.ts

@@ -0,0 +1,4 @@
+import type { PaginationResultResolvers } from './../../types.generated.ts';
+export const PaginationResult: PaginationResultResolvers = {
+  /* Implement PaginationResult resolver logic here */
+};

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema/base/resolvers/PayloadError.ts

@@ -0,0 +1,4 @@
+import type { PayloadErrorResolvers } from './../../types.generated.ts';
+export const PayloadError: PayloadErrorResolvers = {
+  /* Implement PayloadError resolver logic here */
+};

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema/base/resolvers/SomeRandomScalar.ts

@@ -0,0 +1,14 @@
+import { GraphQLScalarType } from 'graphql';
+export const SomeRandomScalar = new GraphQLScalarType({
+  name: 'SomeRandomScalar',
+  description: 'SomeRandomScalar description',
+  serialize: (value) => {
+    /* Implement logic to turn the returned value from resolvers to a value that can be sent to clients */
+  },
+  parseValue: (value) => {
+    /* Implement logic to parse input that was sent to the server as variables */
+  },
+  parseLiteral: (ast) => {
+    /* Implement logic to parse input that was sent to the server as literal values (string, number, or boolean) */
+  },
+});

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema/resolvers.generated.ts

@@ -0,0 +1,46 @@
+/* This file was automatically generated. DO NOT UPDATE MANUALLY. */
+import type { Resolvers } from './types.generated.ts';
+import { me as Query_me } from './user/resolvers/Query/me.ts';
+import { topicById as Query_topicById } from './topic/resolvers/Query/topicById.ts';
+import { topicsCreatedByUser as Query_topicsCreatedByUser } from './topic/resolvers/Query/topicsCreatedByUser.ts';
+import { userByAccountName as Query_userByAccountName } from './user/resolvers/Query/userByAccountName.ts';
+import { topicCreate as Mutation_topicCreate } from './topic/resolvers/Mutation/topicCreate.ts';
+import { topicEdit as Mutation_topicEdit } from './topic/resolvers/Mutation/topicEdit.ts';
+import { profileChanges as Subscription_profileChanges } from './user/resolvers/Subscription/profileChanges.ts';
+import { PaginationResult } from './base/resolvers/PaginationResult.ts';
+import { PayloadError } from './base/resolvers/PayloadError.ts';
+import { Profile } from './user/resolvers/Profile.ts';
+import { Topic } from './topic/resolvers/Topic.ts';
+import { TopicByIdResult } from './topic/resolvers/TopicByIdResult.ts';
+import { TopicCreateResult } from './topic/resolvers/TopicCreateResult.ts';
+import { TopicEditResult } from './topic/resolvers/TopicEditResult.ts';
+import { TopicsCreatedByUserResult } from './topic/resolvers/TopicsCreatedByUserResult.ts';
+import { User } from './user/resolvers/User.ts';
+import { UserResult } from './user/resolvers/UserResult.ts';
+import { SomeRandomScalar } from './base/resolvers/SomeRandomScalar.ts';
+import { DateTimeResolver } from 'graphql-scalars';
+export const resolvers: Resolvers = {
+  Query: {
+    me: Query_me,
+    topicById: Query_topicById,
+    topicsCreatedByUser: Query_topicsCreatedByUser,
+    userByAccountName: Query_userByAccountName,
+  },
+  Mutation: {
+    topicCreate: Mutation_topicCreate,
+    topicEdit: Mutation_topicEdit,
+  },
+  Subscription: { profileChanges: Subscription_profileChanges },
+  PaginationResult: PaginationResult,
+  PayloadError: PayloadError,
+  Profile: Profile,
+  Topic: Topic,
+  TopicByIdResult: TopicByIdResult,
+  TopicCreateResult: TopicCreateResult,
+  TopicEditResult: TopicEditResult,
+  TopicsCreatedByUserResult: TopicsCreatedByUserResult,
+  User: User,
+  UserResult: UserResult,
+  SomeRandomScalar: SomeRandomScalar,
+  DateTime: DateTimeResolver,
+};

packages/typescript-resolver-files-e2e/src/test-import-extension-ts/schema/schema.generated.graphqls

@@ -0,0 +1,116 @@
+scalar DateTime
+
+interface Error {
+  error: ErrorType!
+}
+
+enum ErrorType {
+  FORBIDDEN_ERROR
+  INPUT_VALIDATION_ERROR
+  NOT_FOUND
+  UNEXPECTED_ERROR
+}
+
+type Mutation {
+  topicCreate(input: TopicCreateInput!): TopicCreatePayload!
+  topicEdit(input: TopicEditInput!): TopicEditPayload!
+}
+
+input PaginationInput {
+  page: Int
+  recordsPerPage: Int
+}
+
+type PaginationResult {
+  currentPage: Int!
+  recordsPerPage: Int!
+  totalPageCount: Int!
+}
+
+type PayloadError implements Error {
+  error: ErrorType!
+}
+
+type Profile {
+  id: ID!
+  user: User!
+}
+
+type Query {
+  me: UserPayload!
+  topicById(id: ID!): TopicByIdPayload!
+  topicsCreatedByUser(
+    input: TopicsCreatedByUserInput!
+  ): TopicsCreatedByUserPayload!
+  userByAccountName(accountName: String!): UserPayload!
+}
+
+scalar SomeRandomScalar
+
+type Subscription {
+  profileChanges: Profile!
+}
+
+type Topic {
+  createdAt: DateTime!
+  creator: User!
+  id: ID!
+  name: String!
+  url: String
+}
+
+union TopicByIdPayload = PayloadError | TopicByIdResult
+
+type TopicByIdResult {
+  result: Topic
+}
+
+input TopicCreateInput {
+  name: String!
+  url: String
+}
+
+union TopicCreatePayload = PayloadError | TopicCreateResult
+
+type TopicCreateResult {
+  result: Topic!
+}
+
+input TopicEditInput {
+  id: ID!
+  name: String!
+  url: String
+}
+
+union TopicEditPayload = PayloadError | TopicEditResult
+
+type TopicEditResult {
+  result: Topic!
+}
+
+input TopicsCreatedByUserInput {
+  userId: ID!
+}
+
+union TopicsCreatedByUserPayload = PayloadError | TopicsCreatedByUserResult
+
+type TopicsCreatedByUserResult {
+  result: [Topic!]!
+}
+
+type User {
+  accountGitHub: String
+  accountLinkedIn: String
+  accountName: String!
+  accountTwitter: String
+  accountWebsite: String
+  avatar: String
+  id: ID!
+  name: String
+}
+
+union UserPayload = PayloadError | UserResult
+
+type UserResult {
+  result: User
+}