Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ NEW: typeDefsStyle #272

Merged
merged 1 commit into from
Nov 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/khaki-bees-remember.md
@@ -0,0 +1,5 @@
---
'@kitql/all-in': patch
---

experiemental - add typeDefsStyle config string | gql
2 changes: 1 addition & 1 deletion packages/all-in/src/lib/hooks/graphql.ts
Expand Up @@ -27,7 +27,7 @@ export type KitQLHandleGraphQL<TUserContext, TServerContext extends Record<strin
* If you want to use your own schema, you can pass it here.
* let's have a look at the type only after Yoga v3 is out!
*/
schema: any
schema?: any

/**
* THE context.
Expand Down
2 changes: 1 addition & 1 deletion packages/all-in/src/lib/modules/_enums/index.ts
Expand Up @@ -2,7 +2,7 @@ import { createModule } from 'graphql-modules'

import { typeDefs } from './$kitql/typedefs'

export const _enumsModule = createModule({
export const _enumsModule = createModule({
id: 'enums-module',
typeDefs
})
5 changes: 5 additions & 0 deletions packages/all-in/src/lib/vite/KitQLVite.ts
Expand Up @@ -22,4 +22,9 @@ export type KitQLVite = {
* @deprecated for library development only
*/
localDev?: boolean

/**
* @experimental to generate as string or gql (default to gql)
*/
typeDefsStyle?: 'string' | 'gql'
}
8 changes: 6 additions & 2 deletions packages/all-in/src/lib/vite/actionEnum.ts
Expand Up @@ -62,11 +62,15 @@ export function actionEnum(

// Index
const enumFileData = []
enumFileData.push(`import { createModule } from ${localDev ? `'graphql-modules'` : `'@kitql/all-in'`}`)
enumFileData.push(
`import { ${localDev ? `createModule` : `kitqlModules`} } from ${
localDev ? `'graphql-modules'` : `'@kitql/all-in'`
}`
)
enumFileData.push(``)
enumFileData.push(`import { typeDefs } from './${moduleOutputFolder}/typedefs'`)
enumFileData.push(``)
enumFileData.push(`export const _enumsModule = createModule({`)
enumFileData.push(`export const _enumsModule = ${localDev ? `createModule` : `kitqlModules`}({`)
enumFileData.push(`\tid: 'enums-module',`)
enumFileData.push(`\ttypeDefs`)
enumFileData.push(`})`)
Expand Down
19 changes: 14 additions & 5 deletions packages/all-in/src/lib/vite/actionTypeDefs.ts
Expand Up @@ -3,20 +3,29 @@ import { join } from 'path'
import { createFolderIfNotExists, getFiles } from './fileFolder.js'
import { read, write } from './readWrite.js'

export function actionTypeDefs(moduleFolder: string, moduleOutputFolder: string, localDev: boolean) {
export function actionTypeDefs(
moduleFolder: string,
moduleOutputFolder: string,
localDev: boolean,
typeDefsStyle: 'string' | 'gql'
) {
const typedefsFolder = 'typedefs'

const typedefsFiles = getFiles(join(moduleFolder, typedefsFolder))

const dataTypedefs = []
const prefix = typeDefsStyle === 'gql' ? 'gql' : ''

if (typedefsFiles.length > 0) {
dataTypedefs.push(`import { gql } from ${localDev ? `'graphql-modules'` : `'@kitql/all-in'`}`)
dataTypedefs.push(``)
dataTypedefs.push(`export const typeDefs = gql${'`'}`)
if (typeDefsStyle === 'gql') {
dataTypedefs.push(`import { gql } from ${localDev ? `'graphql-modules'` : `'@kitql/all-in'`}`)
dataTypedefs.push(``)
}
dataTypedefs.push(`export const typeDefs = ${prefix}\``)
typedefsFiles.forEach(typedefs => {
dataTypedefs.push(read(join(moduleFolder, typedefsFolder, typedefs)))
})
dataTypedefs.push(`${'`'};`)
dataTypedefs.push(`\`;`)
} else {
dataTypedefs.push(`// No typedefs!`)
dataTypedefs.push(``)
Expand Down
5 changes: 3 additions & 2 deletions packages/all-in/src/lib/vite/generate.ts
Expand Up @@ -17,12 +17,13 @@ import { updateModuleTypes } from './updateModuleTypes.js'
export function generate(log: Log, config?: KitQLVite) {
const providersFolder = 'providers' as const

const { outputFolder, moduleOutputFolder, importBaseTypesFrom, modules, localDev } = {
const { outputFolder, moduleOutputFolder, importBaseTypesFrom, modules, localDev, typeDefsStyle } = {
outputFolder: 'src/lib/graphql/$kitql',
moduleOutputFolder: '$kitql',
importBaseTypesFrom: '$graphql/$kitql/graphqlTypes',
modules: ['src/lib/modules/*'],
localDev: false,
typeDefsStyle: 'gql' as KitQLVite['typeDefsStyle'],
...config,
}

Expand Down Expand Up @@ -86,7 +87,7 @@ export function generate(log: Log, config?: KitQLVite) {

// TypeDefs
if (mergeModuleTypedefs) {
typedefsFilesLength = actionTypeDefs(directory, moduleOutputFolder, localDev)
typedefsFilesLength = actionTypeDefs(directory, moduleOutputFolder, localDev, typeDefsStyle)
}

// Resolvers
Expand Down
10 changes: 9 additions & 1 deletion packages/all-in/vite.config.ts
Expand Up @@ -6,7 +6,15 @@ import { kitql } from './src/lib/vite/plugin.js'
// import { kitql } from '@kitql/all-in'

const config: UserConfig = {
plugins: [kitql({ projectName: 'myPrj', localDev: true, prismaFileForEnums: './prisma/schema.prisma' }), sveltekit()],
plugins: [
kitql({
projectName: 'myPrj',
prismaFileForEnums: './prisma/schema.prisma',
typeDefsStyle: 'gql',
localDev: true,
}),
sveltekit(),
],

optimizeDeps: {
include: ['safe-stable-stringify'],
Expand Down