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

+2-1
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

+10-9
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

+3-3
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

+3-3
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

+3-3
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

+3-3
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

+3-3
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

+4-4
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

+16-16
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

+3-3
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/publications.ts

+3-3
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/query.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { FastifyInstance, FastifyRequest } from 'fastify'
2-
import { PostgresMeta } from '../../lib'
3-
import * as Parser from '../../lib/Parser'
4-
import { DEFAULT_POOL_CONFIG } from '../constants'
5-
import { extractRequestForLogging, translateErrorToResponseCode } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import * as Parser from '../../lib/Parser.js'
4+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
5+
import { extractRequestForLogging, translateErrorToResponseCode } from '../utils.js'
66

77
const errorOnEmptyQuery = (request: FastifyRequest) => {
88
if (!(request.body as any).query) {

‎src/server/routes/roles.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
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
import {
66
PostgresRoleCreate,
77
PostgresRoleUpdate,
88
postgresRoleSchema,
99
postgresRoleCreateSchema,
1010
postgresRoleUpdateSchema,
11-
} from '../../lib/types'
11+
} from '../../lib/types.js'
1212
import { Type } from '@sinclair/typebox'
1313
export default async (fastify: FastifyInstance) => {
1414
fastify.get<{

‎src/server/routes/schemas.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { Type } from '@sinclair/typebox'
22
import { FastifyInstance } from 'fastify'
3-
import { PostgresMeta } from '../../lib'
3+
import { PostgresMeta } from '../../lib/index.js'
44
import {
55
PostgresSchemaCreate,
66
PostgresSchemaUpdate,
77
postgresSchemaSchema,
88
postgresSchemaCreateSchema,
99
postgresSchemaUpdateSchema,
10-
} from '../../lib/types'
11-
import { DEFAULT_POOL_CONFIG } from '../constants'
12-
import { extractRequestForLogging } from '../utils'
10+
} from '../../lib/types.js'
11+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
12+
import { extractRequestForLogging } from '../utils.js'
1313

1414
export default async (fastify: FastifyInstance) => {
1515
fastify.get<{

‎src/server/routes/tables.ts

+3-3
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, translateErrorToResponseCode } from '../utils'
2+
import { PostgresMeta } from '../../lib/index.js'
3+
import { DEFAULT_POOL_CONFIG } from '../constants.js'
4+
import { extractRequestForLogging, translateErrorToResponseCode } from '../utils.js'
55

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

‎src/server/routes/triggers.ts

+3-3
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/types.ts

+3-3
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/views.ts

+3-3
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/templates/typescript.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type {
55
PostgresTable,
66
PostgresType,
77
PostgresView,
8-
} from '../../lib'
8+
} from '../../lib/index.js'
99

1010
export const apply = ({
1111
schemas,

‎src/server/utils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { parse } from 'pg-connection-string'
1+
import pgcs from 'pg-connection-string'
22
import { FastifyRequest } from 'fastify'
33

44
export const extractRequestForLogging = (request: FastifyRequest) => {
55
let pg: string = 'unknown'
66
try {
77
if (request.headers.pg) {
8-
pg = parse(request.headers.pg as string).host || pg
8+
pg = pgcs.parse(request.headers.pg as string).host || pg
99
}
1010
} catch (e: any) {
1111
console.warn('failed to parse PG connstring for ' + request.url)

0 commit comments

Comments
 (0)