Skip to content

Commit 87835ca

Browse files
committed
refactor: fix TS not recognizing files as modules
There was no top level import/export in these files, so TS wasn't able to infer that these are modules and spits out `RunQuery` redeclare errors.
1 parent cf62bfd commit 87835ca

File tree

8 files changed

+21
-29
lines changed

8 files changed

+21
-29
lines changed

src/api/columns.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { columns } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55

src/api/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { config } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55

src/api/extensions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { extensions } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55

src/api/query.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const RunQuery = require('../lib/connectionPool')
44

55
router.post('/', async (req, res) => {

src/api/roles.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { roles } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants/schemas'
@@ -25,13 +25,12 @@ router.get('/', async (req, res) => {
2525
}
2626
})
2727

28-
2928
const removeSystemSchemas = (data: Roles.Role[]) => {
30-
return data.map(role => {
29+
return data.map((role) => {
3130
let grants = role.grants.filter((x) => !DEFAULT_SYSTEM_SCHEMAS.includes(x.schema))
3231
return {
3332
...role,
34-
grants
33+
grants,
3534
}
3635
})
3736
}

src/api/schemas.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { schemas } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants/schemas'
@@ -25,11 +25,8 @@ router.get('/', async (req, res) => {
2525
}
2626
})
2727

28-
2928
const removeSystemSchemas = (data: Schemas.Schema[]) => {
3029
return data.filter((x) => !DEFAULT_SYSTEM_SCHEMAS.includes(x.name))
3130
}
3231

33-
34-
35-
module.exports = router
32+
module.exports = router

src/api/tables.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { tables } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants/schemas'
@@ -35,4 +35,4 @@ namespace Fetch {
3535
export interface QueryParams {
3636
includeSystemSchemas: boolean
3737
}
38-
}
38+
}

src/api/types.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { Router } = require('express')
2-
const router = new Router()
1+
import { Router } from 'express'
2+
const router = Router()
33
const { types } = require('../lib/sql')
44
const RunQuery = require('../lib/connectionPool')
55
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants/schemas'
@@ -18,16 +18,12 @@ router.get('/', async (req, res) => {
1818
}
1919
})
2020

21-
2221
const removeSystemSchemas = (data: Types.Type[]) => {
2322
return data.filter((x) => !DEFAULT_SYSTEM_SCHEMAS.includes(x.schema))
2423
}
2524

26-
27-
2825
module.exports = router
2926

30-
3127
/**
3228
* Types
3329
*/
@@ -39,4 +35,4 @@ namespace Fetch {
3935
export interface QueryParams {
4036
includeSystemSchemas: boolean
4137
}
42-
}
38+
}

0 commit comments

Comments
 (0)