Skip to content

Commit 0dbbe31

Browse files
committed
feat(generate): fix paths injection when automatic generation disabled
1 parent cee28e5 commit 0dbbe31

3 files changed

Lines changed: 15 additions & 20 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ export default defineNuxtConfig({
8585
queriesDir: 'queries',
8686
// dbschema/ dir (you should not touch this)
8787
queryBuilderDir: 'dbschema/query-builder',
88-
// Toggles typings generation (@db/interfaces)
88+
// Toggles typings generation (#db/interfaces)
8989
generateInterfaces: true,
90-
// Toggles typings generation (@db/queries)
90+
// Toggles typings generation (#db/queries)
9191
generateQueries: true,
92-
// Toggles typings generation (@db/builder)
92+
// Toggles typings generation (#db/builder)
9393
generateQueryBuilder: true,
9494
// Toggles logging messages on code generation
9595
generateQuiet: true,
@@ -170,11 +170,11 @@ export default defineEventHandler(async (req) => {
170170
})
171171
```
172172

173-
You can still import [queries](https://www.edgedb.com/docs/clients/js/queries) directly from `@db/queries` and pass them the client from `useEdgeDb()`.
173+
You can still import [queries](https://www.edgedb.com/docs/clients/js/queries) directly from `#db/queries` and pass them the client from `useEdgeDb()`.
174174

175175
```typescript
176176
// server/api/blogpost/[id].ts
177-
import { getBlogPost } from '@db/queries'
177+
import { getBlogPost } from '#db/queries'
178178
import { defineEventHandler, getRouterParams } from 'h3'
179179

180180
export default defineEventHandler(async (req) => {

src/module.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -390,20 +390,15 @@ export default defineNuxtModule<ModuleOptions>({
390390
})
391391
}
392392

393-
if (options.generateInterfaces || options.generateQueries || options.generateQueryBuilder) {
394-
const nuxtOptions = nuxt.options
395-
396-
if (options.generateQueries)
397-
nuxtOptions.alias['@db/queries'] = join(dbschemaDir, '/queries.ts')
398-
if (options.generateInterfaces)
399-
nuxtOptions.alias['@db/interfaces'] = join(dbschemaDir, '/interfaces.ts')
400-
if (options.generateQueryBuilder)
401-
nuxtOptions.alias['@db/builder'] = join(dbschemaDir, '/query-builder/index.ts')
402-
403-
await generateInterfaces()
404-
await generateQueries()
405-
await generateQueryBuilder()
406-
}
393+
// Inject aliases
394+
const nuxtOptions = nuxt.options
395+
nuxtOptions.alias['#db/queries'] = join(dbschemaDir, '/queries.ts')
396+
nuxtOptions.alias['#db/interfaces'] = join(dbschemaDir, '/interfaces.ts')
397+
nuxtOptions.alias['#db/builder'] = join(dbschemaDir, '/query-builder/index.ts')
398+
399+
await generateInterfaces()
400+
await generateQueries()
401+
await generateQueryBuilder()
407402

408403
if (options.composables) {
409404
// Add server-side auto-imports

src/runtime/server/useEdgeDbQueries.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import * as queries from '@db/queries'
21
import type { EventHandlerRequest, H3Event } from 'h3'
32
import { useEdgeDb } from './useEdgeDb'
3+
import * as queries from '#db/queries'
44

55
export function useEdgeDbQueries(
66
req: H3Event<EventHandlerRequest> | undefined = undefined,

0 commit comments

Comments
 (0)