fix: codegen (#3568)

assimhabeek · webberwang · web-flow · commit fcf8ca135e9c · 2025-01-30T05:40:16.000-08:00
* fix: codegen

* fix: codegen

* fix: tsc checks

* feat: update package version

* fix: rebase

---------

Co-authored-by: Webber Wang &lt;webber@codelab.app&gt;
diff --git a/apps/api/webpack.config.js b/apps/api/webpack.config.js
@@ -12,7 +12,7 @@ const withRawCypherFiles = (config, ctx) => {
 }
 
 // Nx plugins for webpack.
-module.exports = composePlugins(withNx(), withRawCypherFiles, (config) => {
+module.exports = composePlugins(withNx({}), withRawCypherFiles, (config) => {
   // Update the webpack config as needed here.
   // e.g. `config.plugins.push(new MyPlugin())`
 
diff --git a/dist/apps/cli/main.js b/dist/apps/cli/main.js
@@ -1539,7 +1539,7 @@ const bootstrap = async () => {
 void bootstrap();
 
 var __webpack_export_target__ = exports;
-for(var i in __webpack_exports__) __webpack_export_target__[i] = __webpack_exports__[i];
+for(var __webpack_i__ in __webpack_exports__) __webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];
 if(__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, "__esModule", { value: true });
 /******/ })()
 ;
diff --git a/knip.json b/knip.json
@@ -8,7 +8,7 @@
   },
   "ignore": [
     "dist",
-    "libs/shared/infra/gql/**",
+    "libs/shared/infra/gqlgen/**",
     "libs/backend/abstract/codegen/**",
     "libs/shared/abstract/core/**"
   ],
diff --git a/libs/backend/application/auth/src/user.decorator.ts b/libs/backend/application/auth/src/user.decorator.ts
@@ -1,25 +1,23 @@
-import type { Auth0IdToken, IUserDto } from '@codelab/shared/abstract/core'
+import type { Auth0IdToken } from '@codelab/shared/abstract/core'
 import type { ExecutionContext } from '@nestjs/common'
 
 import { User } from '@codelab/backend/domain/user'
 import { createParamDecorator } from '@nestjs/common'
 import { GqlExecutionContext } from '@nestjs/graphql'
 
-export const CurrentUser = createParamDecorator<
-  unknown,
-  ExecutionContext,
-  IUserDto
->((data: unknown, ctx: ExecutionContext) => {
-  const gqlContext = GqlExecutionContext.create(ctx)
+export const CurrentUser = createParamDecorator<unknown, ExecutionContext>(
+  (data: unknown, ctx: ExecutionContext) => {
+    const gqlContext = GqlExecutionContext.create(ctx)
 
-  // Check if it's a GraphQL execution context
-  if (gqlContext.getContext().req && gqlContext.getContext().res) {
-    return gqlContext.getContext().user
-  }
+    // Check if it's a GraphQL execution context
+    if (gqlContext.getContext().req && gqlContext.getContext().res) {
+      return gqlContext.getContext().user
+    }
 
-  // Otherwise assume it's a CLI execution context
-  const httpContext = ctx.switchToHttp().getRequest()
-  const userSession = httpContext.user as Auth0IdToken
+    // Otherwise assume it's a CLI execution context
+    const httpContext = ctx.switchToHttp().getRequest()
+    const userSession = httpContext.user as Auth0IdToken
 
-  return User.fromSession(userSession)
-})
+    return User.fromSession(userSession)
+  },
+)
diff --git a/libs/frontend/domain/app/src/repositories/app.repository.ts b/libs/frontend/domain/app/src/repositories/app.repository.ts
@@ -1,9 +1,5 @@
 import type { IAppDto, IRef } from '@codelab/shared/abstract/core'
-import type {
-  AppOptions,
-  AppUniqueWhere,
-  AppWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { AppOptions, AppWhere } from '@codelab/shared/infra/gqlgen'
 
 import {
   CACHE_TAGS,
@@ -54,7 +50,8 @@ export const appRepository: IAppRepository = withTracingMethods('app', {
     )
   },
 
-  findOne: async (where: AppUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: AppWhere) => {
     return (await appRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/atom/src/repositories/atom.repository.ts b/libs/frontend/domain/atom/src/repositories/atom.repository.ts
@@ -1,11 +1,7 @@
 import type { IAtomRepository } from '@codelab/frontend/abstract/domain'
 import type { IAtomDto, IRef } from '@codelab/shared/abstract/core'
 import type { NextFetchOptions } from '@codelab/shared/abstract/types'
-import type {
-  AtomOptions,
-  AtomUniqueWhere,
-  AtomWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { AtomOptions, AtomWhere } from '@codelab/shared/infra/gqlgen'
 
 import {
   CACHE_TAGS,
@@ -61,7 +57,8 @@ export const atomRepository: IAtomRepository = withTracingMethods('atom', {
     return await AtomList({ options, where }, { tags: [CACHE_TAGS.ATOM_LIST] })
   },
 
-  findOne: async (where: AtomUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: AtomWhere) => {
     return (await atomRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/auth-guard/src/repositories/auth-guard.repository.ts b/libs/frontend/domain/auth-guard/src/repositories/auth-guard.repository.ts
@@ -1,7 +1,6 @@
 import type { IAuthGuardDto, IRef } from '@codelab/shared/abstract/core'
 import type {
   AuthGuardOptions,
-  AuthGuardUniqueWhere,
   AuthGuardWhere,
 } from '@codelab/shared/infra/gqlgen'
 
@@ -55,7 +54,8 @@ export const authGuardRepository: IAuthGuardRepository = {
     )
   },
 
-  findOne: async (where: AuthGuardUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: AuthGuardWhere) => {
     return (await authGuardRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/component/src/repositories/component.repository.ts b/libs/frontend/domain/component/src/repositories/component.repository.ts
@@ -2,7 +2,6 @@ import type { IComponentRepository } from '@codelab/frontend/abstract/domain'
 import type { IComponentDto, IRef } from '@codelab/shared/abstract/core'
 import type {
   ComponentOptions,
-  ComponentUniqueWhere,
   ComponentWhere,
 } from '@codelab/shared/infra/gqlgen'
 
@@ -55,7 +54,8 @@ export const componentRepository: IComponentRepository = {
     )
   },
 
-  findOne: async (where: ComponentUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: ComponentWhere) => {
     return (await componentRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/domain/src/repositories/domain.repository.ts b/libs/frontend/domain/domain/src/repositories/domain.repository.ts
@@ -1,9 +1,5 @@
 import type { IDomainDto, IRef } from '@codelab/shared/abstract/core'
-import type {
-  DomainOptions,
-  DomainUniqueWhere,
-  DomainWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { DomainOptions, DomainWhere } from '@codelab/shared/infra/gqlgen'
 
 import {
   CACHE_TAGS,
@@ -56,7 +52,8 @@ export const domainRepository: IDomainRepository = {
     return DomainList({ options, where }, { tags: [CACHE_TAGS.DOMAIN_LIST] })
   },
 
-  findOne: async (where: DomainUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: DomainWhere) => {
     return (await domainRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/element/src/repositories/element.repository.ts b/libs/frontend/domain/element/src/repositories/element.repository.ts
@@ -3,11 +3,7 @@ import type {
   IElementRepository,
 } from '@codelab/frontend/abstract/domain'
 import type { IElementDto } from '@codelab/shared/abstract/core'
-import type {
-  ElementOptions,
-  ElementUniqueWhere,
-  ElementWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { ElementOptions, ElementWhere } from '@codelab/shared/infra/gqlgen'
 
 import { disconnectAll, disconnectManyAll } from '@codelab/shared/domain/orm'
 import { Validator } from '@codelab/shared/infra/typebox'
@@ -51,11 +47,13 @@ export const elementRepository: IElementRepository = {
     return await ElementList({ options, where })
   },
 
-  findOne: async (where: ElementUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: ElementWhere) => {
     return (await elementRepository.find(where)).items[0]
   },
 
-  update: async (where: ElementUniqueWhere, element: IElementDto) => {
+  // FIXME: make a unique where
+  update: async (where: ElementWhere, element: IElementDto) => {
     console.debug(elementMapper.toUpdateInput(element))
 
     // Disconnect here first for pre/post, issue with generated cypher query
diff --git a/libs/frontend/domain/page/src/repositories/page.repository.ts b/libs/frontend/domain/page/src/repositories/page.repository.ts
@@ -1,9 +1,5 @@
 import type { IPageDto, IRef } from '@codelab/shared/abstract/core'
-import type {
-  PageOptions,
-  PageUniqueWhere,
-  PageWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { PageOptions, PageWhere } from '@codelab/shared/infra/gqlgen'
 
 import {
   CACHE_TAGS,
@@ -48,7 +44,8 @@ export const pageRepository: IPageRepository = {
     return PageList({ options, where })
   },
 
-  findOne: async (where: PageUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: PageWhere) => {
     return (await pageRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/preference/src/repositories/preference.repository.ts b/libs/frontend/domain/preference/src/repositories/preference.repository.ts
@@ -5,7 +5,6 @@ import type {
 import type { IPreferenceDto, IRef } from '@codelab/shared/abstract/core'
 import type {
   PreferenceOptions,
-  PreferenceUniqueWhere,
   PreferenceWhere,
 } from '@codelab/shared/infra/gqlgen'
 
@@ -54,7 +53,8 @@ export const preferenceRepository: IPreferenceRepository = {
     return await GetPreferences({ options, where })
   },
 
-  findOne: async (where: PreferenceUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: PreferenceWhere) => {
     return (await preferenceRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/prop/src/repositories/prop.repository.ts b/libs/frontend/domain/prop/src/repositories/prop.repository.ts
@@ -1,10 +1,6 @@
 import type { IPropRepository } from '@codelab/frontend/abstract/domain'
 import type { IPropDto, IRef } from '@codelab/shared/abstract/core'
-import type {
-  PropOptions,
-  PropUniqueWhere,
-  PropWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { PropOptions, PropWhere } from '@codelab/shared/infra/gqlgen'
 
 import { Validator } from '@codelab/shared/infra/typebox'
 import {
@@ -43,7 +39,8 @@ export const propRepository: IPropRepository = {
     return await GetProps({ options, where })
   },
 
-  findOne: async (where: PropUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: PropWhere) => {
     return (await propRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/resource/src/repositories/resource.repository.ts b/libs/frontend/domain/resource/src/repositories/resource.repository.ts
@@ -1,7 +1,6 @@
 import type { IRef, IResourceDto } from '@codelab/shared/abstract/core'
 import type {
   ResourceOptions,
-  ResourceUniqueWhere,
   ResourceWhere,
 } from '@codelab/shared/infra/gqlgen'
 
@@ -56,7 +55,8 @@ export const resourceRepository: IResourceRepository = {
     )
   },
 
-  findOne: async (where: ResourceUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: ResourceWhere) => {
     return (await resourceRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/store/src/repositories/store.repository.ts b/libs/frontend/domain/store/src/repositories/store.repository.ts
@@ -1,9 +1,5 @@
 import type { IRef, IStoreDto } from '@codelab/shared/abstract/core'
-import type {
-  StoreOptions,
-  StoreUniqueWhere,
-  StoreWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { StoreOptions, StoreWhere } from '@codelab/shared/infra/gqlgen'
 
 import {
   CACHE_TAGS,
@@ -53,7 +49,8 @@ export const storeRepository: IStoreRepository = withTracingMethods('store', {
     )
   },
 
-  findOne: async (where: StoreUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: StoreWhere) => {
     return (await storeRepository.find(where)).items[0]
   },
 
diff --git a/libs/frontend/domain/type/src/repositories/field.repository.ts b/libs/frontend/domain/type/src/repositories/field.repository.ts
@@ -3,11 +3,7 @@ import type {
   IFieldRepository,
 } from '@codelab/frontend/abstract/domain'
 import type { IFieldDto, IRef } from '@codelab/shared/abstract/core'
-import type {
-  FieldOptions,
-  FieldUniqueWhere,
-  FieldWhere,
-} from '@codelab/shared/infra/gqlgen'
+import type { FieldOptions, FieldWhere } from '@codelab/shared/infra/gqlgen'
 
 import { Validator } from '@codelab/shared/infra/typebox'
 import {
@@ -49,7 +45,8 @@ export const fieldRepository: IFieldRepository = {
     return await GetFields({ options, where })
   },
 
-  findOne: async (where: FieldUniqueWhere) => {
+  // FIXME: make a unique where
+  findOne: async (where: FieldWhere) => {
     return (await fieldRepository.find(where)).items[0]
   },
 
diff --git a/libs/shared/abstract/types/src/graphql/where.ts b/libs/shared/abstract/types/src/graphql/where.ts
@@ -1,4 +1,4 @@
-export type BaseUniqueWhere =
+export type BaseWhere =
   | {
       [key: string]: unknown
     }
@@ -7,16 +7,14 @@ export type BaseUniqueWhere =
     }
 
 export type BaseTypeUniqueWhere =
-  | BaseUniqueWhere
+  | BaseWhere
   | {
       name: string
     }
 
 export type UserWhere =
-  | BaseUniqueWhere
+  | BaseTypeUniqueWhere
   | { auth0Id: string }
   | { email: string }
 
-export type BaseTypeUniqueWhereCallback<T, R = BaseTypeUniqueWhere> = (
-  data: T,
-) => R
+export type BaseTypeWhereCallback<T, R = BaseTypeUniqueWhere> = (data: T) => R
diff --git a/libs/shared/domain/module/component/src/component.mapper.ts b/libs/shared/domain/module/component/src/component.mapper.ts
@@ -33,10 +33,6 @@ export const componentMapper: IMapper<
       id,
       owner: connectOwner(owner),
       props: {
-        // connectOrCreate: {
-        //   onCreate: { node: propMapper.toCreateInput(props) },
-        //   where: { node: { id: props.id } },
-        // },
         create: {
           node: propMapper.toCreateInput(props),
         },
diff --git a/libs/shared/domain/module/element/src/element.mapper.ts b/libs/shared/domain/module/element/src/element.mapper.ts
@@ -66,12 +66,6 @@ export const elementMapper: IMapper<
       //   : undefined,
       prevSibling: connectNodeId(prevSibling?.id),
       props: {
-        // connectOrCreate: {
-        //   onCreate: {
-        //     node: propMapper.toCreateInput(props),
-        //   },
-        //   where: { node: { id: props.id } },
-        // },
         create: {
           node: propMapper.toCreateInput(props),
         },
diff --git a/libs/shared/infra/gqlgen/src/gql/graphql.ts b/libs/shared/infra/gqlgen/src/gql/graphql.ts
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/codegen/.eslintrc.json b/scripts/codegen/.eslintrc.json
diff --git a/scripts/codegen/codegen.ts b/scripts/codegen/codegen.ts

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const withRawCypherFiles = (config, ctx) => {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`// Nx plugins for webpack.`
`15`		`-module.exports = composePlugins(withNx(), withRawCypherFiles, (config) => {`
	`15`	`+module.exports = composePlugins(withNx({}), withRawCypherFiles, (config) => {`
`16`	`16`	`// Update the webpack config as needed here.`
`17`	`17`	// e.g. `config.plugins.push(new MyPlugin())`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -1539,7 +1539,7 @@ const bootstrap = async () => {`
`1539`	`1539`	`void bootstrap();`
`1540`	`1540`
`1541`	`1541`	`var __webpack_export_target__ = exports;`
`1542`		`-for(var i in __webpack_exports__) __webpack_export_target__[i] = __webpack_exports__[i];`
	`1542`	`+for(var __webpack_i__ in __webpack_exports__) __webpack_export_target__[__webpack_i__] = __webpack_exports__[__webpack_i__];`
`1543`	`1543`	`if(__webpack_exports__.__esModule) Object.defineProperty(__webpack_export_target__, "__esModule", { value: true });`
`1544`	`1544`	`/******/ })()`
`1545`	`1545`	`;`