Skip to content

Commit

Permalink
feat: single export for server modules under alias '#edgedb/server' (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
juni0r authored Nov 23, 2023
1 parent d18d1ed commit ed3dccb
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 19 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ Network Trash Folder
Temporary Items
.apdisk

# Asdf
.tool-versions

# EdgeDB
**/*.edgeql.ts
**/dbschema/queries.*
Expand Down
1 change: 1 addition & 0 deletions playground/server/api/blogpost/[id].ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { H3Error, defineEventHandler, getRouterParams } from 'h3'
import { useEdgeDb } from '#edgedb/server'
import type { BlogPost } from '#edgedb/interfaces'

export default defineEventHandler(async (req) => {
Expand Down
1 change: 1 addition & 0 deletions playground/server/api/blogpost/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { defineEventHandler, isMethod, readBody } from 'h3'
import { useEdgeDbQueries } from '#edgedb/server'

export default defineEventHandler(async (req) => {
if (isMethod(req, 'POST')) {
Expand Down
11 changes: 6 additions & 5 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,12 @@ export default defineNuxtModule<ModuleOptions>({
nuxt.hook(
'nitro:config',
(config) => {
if (!config.imports)
config.imports = {}
if (!config.imports.dirs)
config.imports.dirs = []
config.imports.dirs.push(resolveLocal('./runtime/server'))
config.externals ??= {}
config.externals.inline ??= []
config.externals.inline.push(resolveLocal('./runtime'))

config.alias ??= { }
config.alias['#edgedb/server'] = resolveLocal('./runtime/server')
},
)
}
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/api/auth/authorize.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { H3Error, defineEventHandler, getRequestURL } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbPKCE } from '../../server/useEdgeDbPKCE'
import { useEdgeDbEnv, useEdgeDbPKCE } from '../../server'

/**
* Redirects OAuth requests to EdgeDB Auth OAuth authorize redirect
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/api/auth/callback.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { H3Error, defineEventHandler, getCookie, getRequestURL, setHeaders } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbEnv } from '../../server'

/**
* Handles the PKCE callback and exchanges the `code` and `verifier`
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/api/auth/identity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineEventHandler, deleteCookie, getCookie } from 'h3'
import { useEdgeDb } from '../../server/useEdgeDb'
import { useEdgeDb } from '../../server'

export default defineEventHandler(async (req) => {
const token = getCookie(req, 'edgedb-auth-token')
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/api/auth/login.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { H3Error, defineEventHandler, readBody, setHeaders } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbPKCE } from '../../server/useEdgeDbPKCE'
import { useEdgeDbEnv, useEdgeDbPKCE } from '../../server'

export default defineEventHandler(async (req) => {
const pkce = useEdgeDbPKCE()
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/api/auth/providers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineEventHandler } from 'h3'
import { useEdgeDb } from '../../server/useEdgeDb'
import { useEdgeDb } from '../../server'

export default defineEventHandler(async () => {
const client = useEdgeDb()
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/api/auth/reset-password-ui.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineEventHandler, getQuery } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbEnv } from '../../server'

/**
* Render a simple reset password UI
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/api/auth/reset-password.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { H3Error, defineEventHandler, getCookie, readBody, setHeaders } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbEnv } from '../../server'

/**
* Send new password with reset token to EdgeDB Auth.
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/api/auth/send-password-reset-email.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { H3Error, defineEventHandler, readBody, setHeaders } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbPKCE } from '../../server/useEdgeDbPKCE'
import { useEdgeDbEnv, useEdgeDbPKCE } from '../../server'

/**
* Request a password reset for an email.
Expand Down
3 changes: 1 addition & 2 deletions src/runtime/api/auth/signup.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { H3Error, defineEventHandler, readBody, setHeaders } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbPKCE } from '../../server/useEdgeDbPKCE'
import { useEdgeDbEnv, useEdgeDbPKCE } from '../../server'

/**
* Handles sign up with email and password.
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/api/auth/verify.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { H3Error, defineEventHandler, getCookie, getRequestURL, setHeaders } from 'h3'
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
import { useEdgeDbEnv } from '../../server'

/**
* Handles the link in the email verification flow.
Expand Down
5 changes: 5 additions & 0 deletions src/runtime/server/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export { useEdgeDb } from './useEdgeDb'
export { useEdgeDbEnv } from './useEdgeDbEnv'
export { useEdgeDbPKCE } from './useEdgeDbPKCE'
export { useEdgeDbQueries } from './useEdgeDbQueries'
export { useEdgeDbQueryBuilder } from './useEdgeDbQueryBuilder'

0 comments on commit ed3dccb

Please sign in to comment.