app/components/pages/events/event-card.vue

@@ -108,7 +108,7 @@ import { computed  } from 'vue'
 
 import { useI18n } from '#i18n'
 import DistanceDisplay from '~/components/pages/events/event-distance.vue'
-import type { Event } from '~~/graphql/generated/operations'
+import type { Event } from '~~/graphql/generated/schema'
 
 const props = defineProps({
   event: {

app/components/pages/events/event-distance.vue

@@ -17,7 +17,7 @@
 import type { PropType } from 'vue'
 import { computed  } from 'vue'
 
-import type { DanceHallDistance } from '~~/graphql/generated/operations'
+import type { DanceHallDistance } from '~~/graphql/generated/schema'
 
 const props = defineProps({
   distance: {

app/components/pages/events/event-list.vue

@@ -15,7 +15,7 @@
 <script setup lang='ts'>
 import type { PropType } from 'vue'
 
-import type { Event } from '~~/graphql/generated/operations'
+import type { Event } from '~~/graphql/generated/schema'
 
 import EventCard from './event-card.vue'
 

app/store/index.ts

@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
-import { Range } from '~~/graphql/generated/operations'
+import { Range } from '~~/graphql/generated/schema'
 
 export const useState = defineStore(
   'state',

codegen.yml

@@ -1,13 +1,15 @@
 schema: http://localhost:6080/query
 documents: './graphql/**/*.graphql'
 generates:
-  ./graphql/generated/operations.ts:
+  # Schema types (objects, inputs, enums) — the single owner of these
+  # declarations. operations.ts imports them via `importSchemaTypesFrom`
+  # instead of re-declaring them; typescript-operations v7 emits every schema
+  # type used in a document, so keeping both plugins in one output produces
+  # duplicate identifiers.
+  ./graphql/generated/schema.ts:
     plugins:
     - typescript
-    - typescript-operations
+    config: &config
-    - typescript-vue-apollo
-    - fragment-matcher
-    config:
       gqlImport: '@/utils/gql#gql'
       fetcher: fetch
       avoidOptionals:
@@ -21,3 +23,11 @@ generates:
         LocalDate: string
         LocalDateTime: string
       vueCompositionApiImportFrom: vue
+  ./graphql/generated/operations.ts:
+    plugins:
+    - typescript-operations
+    - typescript-vue-apollo
+    - fragment-matcher
+    config:
+      <<: *config
+      importSchemaTypesFrom: './graphql/generated/schema'

graphql/generated/operations.ts

@@ -1,248 +1,90 @@
+/** Internal type. DO NOT USE DIRECTLY. */
 import * as VueApolloComposable from '@vue/apollo-composable'
 import type * as VueCompositionApi from 'vue'
 
 import { gql } from '@/utils/gql'
-export type Maybe<T> = T | null | undefined
+
-export type InputMaybe<T> = T | null | undefined
+import type * as Types from './schema'
-export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] }
+type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] }
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> }
+/** Internal type. DO NOT USE DIRECTLY. */
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> }
-export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never }
 export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never }
 export type ReactiveFunction<TParam> = () => TParam
-/** All built-in and custom scalars, mapped to their actual values */
-export type Scalars = {
-  ID: { input: string; output: string }
-  String: { input: string; output: string }
-  Boolean: { input: boolean; output: boolean }
-  Int: { input: number; output: number }
-  Float: { input: number; output: number }
-  LocalDate: { input: string; output: string }
-  LocalDateTime: { input: string; output: string }
-}
-
-/** Band */
-export type Band = {
-  __typename?: 'Band'
-  created: Scalars['LocalDateTime']['output']
-  id: Maybe<Scalars['String']['output']>
-  name: Scalars['String']['output']
-}
-
-/** DanceHall */
-export type DanceHall = {
-  __typename?: 'DanceHall'
-  city: Maybe<Scalars['String']['output']>
-  created: Scalars['LocalDateTime']['output']
-  id: Maybe<Scalars['String']['output']>
-  latitude: Maybe<Scalars['Float']['output']>
-  longitude: Maybe<Scalars['Float']['output']>
-  municipality: Maybe<Scalars['String']['output']>
-  name: Maybe<Scalars['String']['output']>
-  state: Maybe<Scalars['String']['output']>
-}
-
-/** DanceHallDistance */
-export type DanceHallDistance = {
-  __typename?: 'DanceHallDistance'
-  distance: Scalars['Int']['output']
-  duration: Scalars['String']['output']
-  origin: Scalars['String']['output']
-}
-
-/** Event */
-export type Event = {
-  __typename?: 'Event'
-  /** The band of the event */
-  band: Maybe<Band>
-  created: Scalars['LocalDateTime']['output']
-  /** The place of the event */
-  danceHall: Maybe<DanceHall>
-  /** The date of the event */
-  date: Scalars['LocalDate']['output']
-  /** The driving distances and driving durations to the event from the provided origins */
-  distances: Array<DanceHallDistance>
-  /** Additional information regarding the event */
-  extraInfo: Maybe<Scalars['String']['output']>
-  id: Maybe<Scalars['String']['output']>
-  /** The time of the event */
-  time: Maybe<Scalars['String']['output']>
-}
-
-export type Mutation = {
-  __typename?: 'Mutation'
-  /** Remove provided origin from authenticated user */
-  RemoveOrigin: Scalars['Boolean']['output']
-  /** Save provided origin for authenticated user */
-  SaveOrigin: Scalars['Boolean']['output']
-  /** Toggle band in ignore list */
-  ToggleIgnoreBand: Scalars['Boolean']['output']
-  /** Toggle city in ignore list */
-  ToggleIgnoreCity: Scalars['Boolean']['output']
-  /** Toggle dance hall in ignore list */
-  ToggleIgnoreDanceHall: Scalars['Boolean']['output']
-  /** Toggle municipality in ignore list */
-  ToggleIgnoreMunicipality: Scalars['Boolean']['output']
-  /** Toggle state in ignore list */
-  ToggleIgnoreState: Scalars['Boolean']['output']
-}
-
-
-export type MutationRemoveOriginArgs = {
-  origin: Scalars['String']['input']
-}
-
-
-export type MutationSaveOriginArgs = {
-  origin: Scalars['String']['input']
-}
-
-
-export type MutationToggleIgnoreBandArgs = {
-  name: Scalars['String']['input']
-}
-
-
-export type MutationToggleIgnoreCityArgs = {
-  name: Scalars['String']['input']
-}
-
-
-export type MutationToggleIgnoreDanceHallArgs = {
-  name: Scalars['String']['input']
-}
-
-
-export type MutationToggleIgnoreMunicipalityArgs = {
-  name: Scalars['String']['input']
-}
-
-
-export type MutationToggleIgnoreStateArgs = {
-  name: Scalars['String']['input']
-}
-
-export type Query = {
-  __typename?: 'Query'
-  /** Fetch address for provided lat/long */
-  AddressFromLatLng: Scalars['String']['output']
-  /** Find bands given provided criteria */
-  Bands: Array<Band>
-  /** Find dance halls given provided criteria */
-  DanceHalls: Array<DanceHall>
-  /** Find events given provided criteria */
-  Events: Array<Event>
-  /** Fetch ignored bands for authenticated user */
-  IgnoredBands: Array<Scalars['String']['output']>
-  /** Fetch ignored cities for authenticated user */
-  IgnoredCities: Array<Scalars['String']['output']>
-  /** Fetch ignored dance halls for authenticated user */
-  IgnoredDanceHalls: Array<Scalars['String']['output']>
-  /** Fetch ignored municipalities for authenticated user */
-  IgnoredMunicipalities: Array<Scalars['String']['output']>
-  /** Fetch ignored states for authenticated user */
-  IgnoredStates: Array<Scalars['String']['output']>
-  /** Fetch origins for authenticated user */
-  Origins: Array<Scalars['String']['output']>
-}
-
-
-export type QueryAddressFromLatLngArgs = {
-  latlng: Scalars['String']['input']
-}
-
-
-export type QueryEventsArgs = {
-  includeHidden?: InputMaybe<Scalars['Boolean']['input']>
-  origins?: InputMaybe<Array<Scalars['String']['input']>>
-  range?: InputMaybe<Range>
-  search?: InputMaybe<Scalars['String']['input']>
-}
-
-export enum Range {
-  OneMonth = 'ONE_MONTH',
-  OneQuarter = 'ONE_QUARTER',
-  OneWeek = 'ONE_WEEK',
-  OneYear = 'ONE_YEAR',
-  TwoWeeks = 'TWO_WEEKS'
-}
-
 export type RemoveOriginMutationVariables = Exact<{
-  origin: Scalars['String']['input']
+  origin: string
 }>
 
 
-export type RemoveOriginMutation = { __typename?: 'Mutation'; removed: boolean }
+export type RemoveOriginMutation = { removed: boolean }
 
 export type SaveOriginMutationVariables = Exact<{
-  origin: Scalars['String']['input']
+  origin: string
 }>
 
 
-export type SaveOriginMutation = { __typename?: 'Mutation'; saved: boolean }
+export type SaveOriginMutation = { saved: boolean }
 
 export type ToggleIgnoreBandMutationVariables = Exact<{
-  name: Scalars['String']['input']
+  name: string
 }>
 
 
-export type ToggleIgnoreBandMutation = { __typename?: 'Mutation'; ignore: boolean }
+export type ToggleIgnoreBandMutation = { ignore: boolean }
 
 export type ToggleIgnoreCityMutationVariables = Exact<{
-  name: Scalars['String']['input']
+  name: string
 }>
 
 
-export type ToggleIgnoreCityMutation = { __typename?: 'Mutation'; ignore: boolean }
+export type ToggleIgnoreCityMutation = { ignore: boolean }
 
 export type ToggleIgnoreDanceHallMutationVariables = Exact<{
-  name: Scalars['String']['input']
+  name: string
 }>
 
 
-export type ToggleIgnoreDanceHallMutation = { __typename?: 'Mutation'; ignore: boolean }
+export type ToggleIgnoreDanceHallMutation = { ignore: boolean }
 
 export type ToggleIgnoreMunicipalityMutationVariables = Exact<{
-  name: Scalars['String']['input']
+  name: string
 }>
 
 
-export type ToggleIgnoreMunicipalityMutation = { __typename?: 'Mutation'; ignore: boolean }
+export type ToggleIgnoreMunicipalityMutation = { ignore: boolean }
 
 export type ToggleIgnoreStateMutationVariables = Exact<{
-  name: Scalars['String']['input']
+  name: string
 }>
 
 
-export type ToggleIgnoreStateMutation = { __typename?: 'Mutation'; ignore: boolean }
+export type ToggleIgnoreStateMutation = { ignore: boolean }
 
 export type FetchAddressQueryVariables = Exact<{
-  latlng: Scalars['String']['input']
+  latlng: string
 }>
 
 
-export type FetchAddressQuery = { __typename?: 'Query'; address: string }
+export type FetchAddressQuery = { address: string }
 
 export type FetchFiltersQueryVariables = Exact<{ [key: string]: never }>
 
 
-export type FetchFiltersQuery = { __typename?: 'Query'; bands: Array<string>; cities: Array<string>; states: Array<string>; danceHalls: Array<string>; municipalities: Array<string> }
+export type FetchFiltersQuery = { bands: Array<string>; cities: Array<string>; states: Array<string>; danceHalls: Array<string>; municipalities: Array<string> }
 
 export type FindEventsQueryVariables = Exact<{
-  range?: InputMaybe<Range>
+  range?: Types.Range | null | undefined
-  origins?: InputMaybe<Array<Scalars['String']['input']> | Scalars['String']['input']>
+  origins?: Array<string> | string | null | undefined
-  includeOrigins: Scalars['Boolean']['input']
+  includeOrigins: boolean
-  search?: InputMaybe<Scalars['String']['input']>
+  search?: string | null | undefined
-  includeHidden?: InputMaybe<Scalars['Boolean']['input']>
+  includeHidden?: boolean | null | undefined
 }>
 
 
-export type FindEventsQuery = { __typename?: 'Query'; origins?: Array<string>; events: Array<{ __typename?: 'Event'; date: string; time: string | null | undefined; extraInfo: string | null | undefined; band: { __typename?: 'Band'; name: string } | null | undefined; danceHall: { __typename?: 'DanceHall'; name: string | null | undefined; city: string | null | undefined; municipality: string | null | undefined; state: string | null | undefined } | null | undefined; distances: Array<{ __typename?: 'DanceHallDistance'; origin: string; distance: number; duration: string }> }> }
+export type FindEventsQuery = { origins?: Array<string>; events: Array<{ date: string; time: string | null | undefined; extraInfo: string | null | undefined; band: { name: string } | null | undefined; danceHall: { name: string | null | undefined; city: string | null | undefined; municipality: string | null | undefined; state: string | null | undefined } | null | undefined; distances: Array<{ origin: string; distance: number; duration: string }> }> }
 
 export type FindOriginsQueryVariables = Exact<{ [key: string]: never }>
 
 
-export type FindOriginsQuery = { __typename?: 'Query'; origins: Array<string> }
+export type FindOriginsQuery = { origins: Array<string> }
 
 
 export const RemoveOriginDocument = gql`
@@ -572,7 +414,6 @@ export function useFindOriginsLazyQuery(options: VueApolloComposable.UseQueryOpt
   return VueApolloComposable.useLazyQuery<FindOriginsQuery, FindOriginsQueryVariables>(FindOriginsDocument, {}, options)
 }
 export type FindOriginsQueryCompositionFunctionResult = VueApolloComposable.UseQueryReturn<FindOriginsQuery, FindOriginsQueryVariables>
-
 export interface PossibleTypesResultData {
   possibleTypes: {
     [key: string]: string[]
@@ -582,4 +423,3 @@ const result: PossibleTypesResultData = {
   'possibleTypes': {},
 }
 export default result
-    

graphql/generated/schema.ts

@@ -0,0 +1,158 @@
+export type Maybe<T> = T | null | undefined
+export type InputMaybe<T> = T | null | undefined
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: { input: string; output: string }
+  String: { input: string; output: string }
+  Boolean: { input: boolean; output: boolean }
+  Int: { input: number; output: number }
+  Float: { input: number; output: number }
+  LocalDate: { input: string; output: string }
+  LocalDateTime: { input: string; output: string }
+}
+
+/** Band */
+export type Band = {
+  __typename?: 'Band'
+  created: Scalars['LocalDateTime']['output']
+  id: Maybe<Scalars['String']['output']>
+  name: Scalars['String']['output']
+}
+
+/** DanceHall */
+export type DanceHall = {
+  __typename?: 'DanceHall'
+  city: Maybe<Scalars['String']['output']>
+  created: Scalars['LocalDateTime']['output']
+  id: Maybe<Scalars['String']['output']>
+  latitude: Maybe<Scalars['Float']['output']>
+  longitude: Maybe<Scalars['Float']['output']>
+  municipality: Maybe<Scalars['String']['output']>
+  name: Maybe<Scalars['String']['output']>
+  state: Maybe<Scalars['String']['output']>
+}
+
+/** DanceHallDistance */
+export type DanceHallDistance = {
+  __typename?: 'DanceHallDistance'
+  distance: Scalars['Int']['output']
+  duration: Scalars['String']['output']
+  origin: Scalars['String']['output']
+}
+
+/** Event */
+export type Event = {
+  __typename?: 'Event'
+  /** The band of the event */
+  band: Maybe<Band>
+  created: Scalars['LocalDateTime']['output']
+  /** The place of the event */
+  danceHall: Maybe<DanceHall>
+  /** The date of the event */
+  date: Scalars['LocalDate']['output']
+  /** The driving distances and driving durations to the event from the provided origins */
+  distances: Array<DanceHallDistance>
+  /** Additional information regarding the event */
+  extraInfo: Maybe<Scalars['String']['output']>
+  id: Maybe<Scalars['String']['output']>
+  /** The time of the event */
+  time: Maybe<Scalars['String']['output']>
+}
+
+export type Mutation = {
+  __typename?: 'Mutation'
+  /** Remove provided origin from authenticated user */
+  RemoveOrigin: Scalars['Boolean']['output']
+  /** Save provided origin for authenticated user */
+  SaveOrigin: Scalars['Boolean']['output']
+  /** Toggle band in ignore list */
+  ToggleIgnoreBand: Scalars['Boolean']['output']
+  /** Toggle city in ignore list */
+  ToggleIgnoreCity: Scalars['Boolean']['output']
+  /** Toggle dance hall in ignore list */
+  ToggleIgnoreDanceHall: Scalars['Boolean']['output']
+  /** Toggle municipality in ignore list */
+  ToggleIgnoreMunicipality: Scalars['Boolean']['output']
+  /** Toggle state in ignore list */
+  ToggleIgnoreState: Scalars['Boolean']['output']
+}
+
+
+export type MutationRemoveOriginArgs = {
+  origin: Scalars['String']['input']
+}
+
+
+export type MutationSaveOriginArgs = {
+  origin: Scalars['String']['input']
+}
+
+
+export type MutationToggleIgnoreBandArgs = {
+  name: Scalars['String']['input']
+}
+
+
+export type MutationToggleIgnoreCityArgs = {
+  name: Scalars['String']['input']
+}
+
+
+export type MutationToggleIgnoreDanceHallArgs = {
+  name: Scalars['String']['input']
+}
+
+
+export type MutationToggleIgnoreMunicipalityArgs = {
+  name: Scalars['String']['input']
+}
+
+
+export type MutationToggleIgnoreStateArgs = {
+  name: Scalars['String']['input']
+}
+
+export type Query = {
+  __typename?: 'Query'
+  /** Fetch address for provided lat/long */
+  AddressFromLatLng: Scalars['String']['output']
+  /** Find bands given provided criteria */
+  Bands: Array<Band>
+  /** Find dance halls given provided criteria */
+  DanceHalls: Array<DanceHall>
+  /** Find events given provided criteria */
+  Events: Array<Event>
+  /** Fetch ignored bands for authenticated user */
+  IgnoredBands: Array<Scalars['String']['output']>
+  /** Fetch ignored cities for authenticated user */
+  IgnoredCities: Array<Scalars['String']['output']>
+  /** Fetch ignored dance halls for authenticated user */
+  IgnoredDanceHalls: Array<Scalars['String']['output']>
+  /** Fetch ignored municipalities for authenticated user */
+  IgnoredMunicipalities: Array<Scalars['String']['output']>
+  /** Fetch ignored states for authenticated user */
+  IgnoredStates: Array<Scalars['String']['output']>
+  /** Fetch origins for authenticated user */
+  Origins: Array<Scalars['String']['output']>
+}
+
+
+export type QueryAddressFromLatLngArgs = {
+  latlng: Scalars['String']['input']
+}
+
+
+export type QueryEventsArgs = {
+  includeHidden?: InputMaybe<Scalars['Boolean']['input']>
+  origins?: InputMaybe<Array<Scalars['String']['input']>>
+  range?: InputMaybe<Range>
+  search?: InputMaybe<Scalars['String']['input']>
+}
+
+export enum Range {
+  OneMonth = 'ONE_MONTH',
+  OneQuarter = 'ONE_QUARTER',
+  OneWeek = 'ONE_WEEK',
+  OneYear = 'ONE_YEAR',
+  TwoWeeks = 'TWO_WEEKS'
+}

package.json

@@ -18,11 +18,11 @@
   "devDependencies": {
     "@commitlint/cli": "21.2.4",
     "@commitlint/config-conventional": "21.2.4",
-    "@graphql-codegen/cli": "7.4.6",
+    "@graphql-codegen/cli": "8.0.0",
-    "@graphql-codegen/fragment-matcher": "7.1.1",
+    "@graphql-codegen/fragment-matcher": "8.0.0",
-    "@graphql-codegen/typescript": "6.1.2",
+    "@graphql-codegen/typescript": "7.0.0",
-    "@graphql-codegen/typescript-operations": "6.2.0",
+    "@graphql-codegen/typescript-operations": "7.0.0",
-    "@graphql-codegen/typescript-vue-apollo": "5.0.1",
+    "@graphql-codegen/typescript-vue-apollo": "6.0.0",
     "@nuxt/devtools": "4.1.0",
     "@nuxt/eslint": "1.17.0",
     "@nuxtjs/i18n": "10.6.0",