Skip to content

Commit 25e5b08

Browse files
sweatybridgesweatybridge
committed
chore: fix server imports and types
1 parent a1b1985 commit 25e5b08

20 files changed

+80
-78
lines changed

‎src/server/admin-app.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import fastify, { FastifyInstance, FastifyServerOptions } from 'fastify'
1+
import { fastify, FastifyInstance, FastifyServerOptions } from 'fastify'
22

33
import FastifyMetrics from 'fastify-metrics'
44

55
export function build(opts: FastifyServerOptions = {}): FastifyInstance {
66
const app = fastify(opts)
7+
// @ts-ignore fastify-metrics doesn't work with NodeNext resolution
78
app.register(FastifyMetrics, {
89
endpoint: '/metrics',
910
routeMetrics: { enabled: false },

‎src/server/app.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import fastify from 'fastify'
21
import swagger from '@fastify/swagger'
32
import cors from '@fastify/cors'
4-
import { PostgresMeta } from '../lib'
3+
import { fastify } from 'fastify'
4+
import { pino } from 'pino'
5+
import { PostgresMeta } from '../lib/index.js'
56
import {
67
DEFAULT_POOL_CONFIG,
78
EXPORT_DOCS,
@@ -11,13 +12,13 @@ import {
1112
PG_META_HOST,
1213
PG_META_PORT,
1314
PG_META_REQ_HEADER,
14-
} from './constants'
15-
import routes from './routes'
16-
import { apply as applyTypescriptTemplate } from './templates/typescript'
17-
import { extractRequestForLogging } from './utils'
18-
import pino from 'pino'
19-
import pkg from '../../package.json'
20-
import { build as buildAdminApp } from './admin-app'
15+
} from './constants.js'
16+
import routes from './routes/index.js'
17+
import { apply as applyTypescriptTemplate } from './templates/typescript.js'
18+
import { extractRequestForLogging } from './utils.js'
19+
import { build as buildAdminApp } from './admin-app.js'
20+
// Pseudo package declared only for this module
21+
import pkg from '#package.json' assert { type: 'json' }
2122

2223
const logger = pino({
2324
formatters: {

‎src/server/routes/columns.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../constants'
4-
import { extractRequestForLogging } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging } from '../utils.js'
55

66
export default async (fastify: FastifyInstance) => {
77
fastify.get<{

‎src/server/routes/config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../constants'
4-
import { extractRequestForLogging } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging } from '../utils.js'
55

66
export default async (fastify: FastifyInstance) => {
77
fastify.get<{

‎src/server/routes/extensions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../constants'
4-
import { extractRequestForLogging } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging } from '../utils.js'
55

66
export default async (fastify: FastifyInstance) => {
77
fastify.get<{

‎src/server/routes/foreign-tables.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../constants'
4-
import { extractRequestForLogging } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging } from '../utils.js'
55

66
export default async (fastify: FastifyInstance) => {
77
fastify.get<{

‎src/server/routes/functions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../constants'
4-
import { extractRequestForLogging } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging } from '../utils.js'
55

66
export default async (fastify: FastifyInstance) => {
77
fastify.get<{

‎src/server/routes/generators/typescript.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../../constants'
4-
import { extractRequestForLogging } from '../../utils'
5-
import { apply as applyTypescriptTemplate } from '../../templates/typescript'
2+
import { PostgresMeta } from '../../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../../constants.js'
4+
import { extractRequestForLogging } from '../../utils.js'
5+
import { apply as applyTypescriptTemplate } from '../../templates/typescript.js'
66

77
export default async (fastify: FastifyInstance) => {
88
fastify.get<{

‎src/server/routes/index.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import CryptoJS from 'crypto-js'
22
import { FastifyInstance } from 'fastify'
3-
import { PG_CONNECTION, CRYPTO_KEY } from '../constants'
4-
import ColumnRoute from './columns'
5-
import ConfigRoute from './config'
6-
import ExtensionsRoute from './extensions'
7-
import ForeignTablesRoute from './foreign-tables'
8-
import FunctionsRoute from './functions'
9-
import PoliciesRoute from './policies'
10-
import PublicationsRoute from './publications'
11-
import QueryRoute from './query'
12-
import SchemasRoute from './schemas'
13-
import RolesRoute from './roles'
14-
import TablesRoute from './tables'
15-
import TriggersRoute from './triggers'
16-
import TypesRoute from './types'
17-
import ViewsRoute from './views'
18-
import TypeGenRoute from './generators/typescript'
3+
import ColumnRoute from './columns.js'
4+
import ConfigRoute from './config.js'
5+
import ExtensionsRoute from './extensions.js'
6+
import ForeignTablesRoute from './foreign-tables.js'
7+
import FunctionsRoute from './functions.js'
8+
import PoliciesRoute from './policies.js'
9+
import PublicationsRoute from './publications.js'
10+
import QueryRoute from './query.js'
11+
import SchemasRoute from './schemas.js'
12+
import RolesRoute from './roles.js'
13+
import TablesRoute from './tables.js'
14+
import TriggersRoute from './triggers.js'
15+
import TypesRoute from './types.js'
16+
import ViewsRoute from './views.js'
17+
import TypeGenRoute from './generators/typescript.js'
18+
import { PG_CONNECTION, CRYPTO_KEY } from '../constants.js'
1919

2020
export default async (fastify: FastifyInstance) => {
2121
// Adds a "pg" object to the request if it doesn't exist

‎src/server/routes/policies.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FastifyInstance } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import { DEFAULT_POOL_CONFIG } from '../constants'
4-
import { extractRequestForLogging } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging } from '../utils.js'
55

66
export default async (fastify: FastifyInstance) => {
77
fastify.get<{

0 commit comments

Comments
 (0)