Skip to content

Commit a1b1985

Browse files
sweatybridgesweatybridge
committed
chore: fix library imports and types
1 parent e7d3028 commit a1b1985

19 files changed

+103
-100
lines changed

‎src/lib/Parser.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { FormatterOptions } from './types'
2-
const { parse, deparse } = require('pgsql-parser')
3-
import prettier from 'prettier/standalone'
1+
import prettier from 'prettier/standalone.js'
42
import SqlFormatter from 'prettier-plugin-sql'
3+
// @ts-ignore library does not export types yet
4+
// Related: https://github.com/pyramation/pgsql-parser/issues/22
5+
import { parse, deparse } from 'pgsql-parser'
6+
import { FormatterOptions } from './types.js'
57

68
const DEFAULT_FORMATTER_OPTIONS = {
79
plugins: [SqlFormatter],

‎src/lib/PostgresMeta.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { PoolConfig } from 'pg'
2-
import * as Parser from './Parser'
3-
import PostgresMetaColumns from './PostgresMetaColumns'
4-
import PostgresMetaConfig from './PostgresMetaConfig'
5-
import PostgresMetaExtensions from './PostgresMetaExtensions'
6-
import PostgresMetaForeignTables from './PostgresMetaForeignTables'
7-
import PostgresMetaFunctions from './PostgresMetaFunctions'
8-
import PostgresMetaPolicies from './PostgresMetaPolicies'
9-
import PostgresMetaPublications from './PostgresMetaPublications'
10-
import PostgresMetaRoles from './PostgresMetaRoles'
11-
import PostgresMetaSchemas from './PostgresMetaSchemas'
12-
import PostgresMetaTables from './PostgresMetaTables'
13-
import PostgresMetaTriggers from './PostgresMetaTriggers'
14-
import PostgresMetaTypes from './PostgresMetaTypes'
15-
import PostgresMetaVersion from './PostgresMetaVersion'
16-
import PostgresMetaViews from './PostgresMetaViews'
17-
import { init } from './db'
18-
import { PostgresMetaResult } from './types'
2+
import * as Parser from './Parser.js'
3+
import PostgresMetaColumns from './PostgresMetaColumns.js'
4+
import PostgresMetaConfig from './PostgresMetaConfig.js'
5+
import PostgresMetaExtensions from './PostgresMetaExtensions.js'
6+
import PostgresMetaForeignTables from './PostgresMetaForeignTables.js'
7+
import PostgresMetaFunctions from './PostgresMetaFunctions.js'
8+
import PostgresMetaPolicies from './PostgresMetaPolicies.js'
9+
import PostgresMetaPublications from './PostgresMetaPublications.js'
10+
import PostgresMetaRoles from './PostgresMetaRoles.js'
11+
import PostgresMetaSchemas from './PostgresMetaSchemas.js'
12+
import PostgresMetaTables from './PostgresMetaTables.js'
13+
import PostgresMetaTriggers from './PostgresMetaTriggers.js'
14+
import PostgresMetaTypes from './PostgresMetaTypes.js'
15+
import PostgresMetaVersion from './PostgresMetaVersion.js'
16+
import PostgresMetaViews from './PostgresMetaViews.js'
17+
import { init } from './db.js'
18+
import { PostgresMetaResult } from './types.js'
1919

2020
export default class PostgresMeta {
2121
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaColumns.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ident, literal } from 'pg-format'
2-
import PostgresMetaTables from './PostgresMetaTables'
3-
import { DEFAULT_SYSTEM_SCHEMAS } from './constants'
4-
import { columnsSql } from './sql'
5-
import { PostgresMetaResult, PostgresColumn } from './types'
6-
import { filterByList } from './helpers'
2+
import PostgresMetaTables from './PostgresMetaTables.js'
3+
import { DEFAULT_SYSTEM_SCHEMAS } from './constants.js'
4+
import { columnsSql } from './sql/index.js'
5+
import { PostgresMetaResult, PostgresColumn } from './types.js'
6+
import { filterByList } from './helpers.js'
77

88
export default class PostgresMetaColumns {
99
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { configSql } from './sql'
2-
import { PostgresMetaResult, PostgresConfig } from './types'
1+
import { configSql } from './sql/index.js'
2+
import { PostgresMetaResult, PostgresConfig } from './types.js'
33

44
export default class PostgresMetaConfig {
55
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaExtensions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ident, literal } from 'pg-format'
2-
import { extensionsSql } from './sql'
3-
import { PostgresMetaResult, PostgresExtension } from './types'
2+
import { extensionsSql } from './sql/index.js'
3+
import { PostgresMetaResult, PostgresExtension } from './types.js'
44

55
export default class PostgresMetaExtensions {
66
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaForeignTables.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { coalesceRowsToArray } from './helpers'
2-
import { columnsSql, foreignTablesSql } from './sql'
3-
import { PostgresMetaResult, PostgresForeignTable } from './types'
1+
import { coalesceRowsToArray } from './helpers.js'
2+
import { columnsSql, foreignTablesSql } from './sql/index.js'
3+
import { PostgresMetaResult, PostgresForeignTable } from './types.js'
44

55
export default class PostgresMetaForeignTables {
66
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaFunctions.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ident, literal } from 'pg-format'
2-
import { DEFAULT_SYSTEM_SCHEMAS } from './constants'
3-
import { filterByList } from './helpers'
4-
import { functionsSql } from './sql'
5-
import { PostgresMetaResult, PostgresFunction, PostgresFunctionCreate } from './types'
2+
import { DEFAULT_SYSTEM_SCHEMAS } from './constants.js'
3+
import { filterByList } from './helpers.js'
4+
import { functionsSql } from './sql/index.js'
5+
import { PostgresMetaResult, PostgresFunction, PostgresFunctionCreate } from './types.js'
66

77
export default class PostgresMetaFunctions {
88
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaPolicies.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ident, literal } from 'pg-format'
2-
import { DEFAULT_SYSTEM_SCHEMAS } from './constants'
3-
import { filterByList } from './helpers'
4-
import { policiesSql } from './sql'
5-
import { PostgresMetaResult, PostgresPolicy } from './types'
2+
import { DEFAULT_SYSTEM_SCHEMAS } from './constants.js'
3+
import { filterByList } from './helpers.js'
4+
import { policiesSql } from './sql/index.js'
5+
import { PostgresMetaResult, PostgresPolicy } from './types.js'
66

77
export default class PostgresMetaPolicies {
88
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaPublications.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ident, literal } from 'pg-format'
2-
import { publicationsSql } from './sql'
3-
import { PostgresMetaResult, PostgresPublication, PostgresTable } from './types'
2+
import { publicationsSql } from './sql/index.js'
3+
import { PostgresMetaResult, PostgresPublication, PostgresTable } from './types.js'
44

55
export default class PostgresMetaPublications {
66
query: (sql: string) => Promise<PostgresMetaResult<any>>

‎src/lib/PostgresMetaRoles.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ident, literal } from 'pg-format'
2-
import { DEFAULT_ROLES } from './constants'
3-
import { rolesSql } from './sql'
4-
import { PostgresMetaResult, PostgresRole, PostgresRoleCreate, PostgresRoleUpdate } from './types'
2+
import { DEFAULT_ROLES } from './constants.js'
3+
import { rolesSql } from './sql/index.js'
4+
import { PostgresMetaResult, PostgresRole, PostgresRoleCreate, PostgresRoleUpdate } from './types.js'
55
export function changeRoleConfig2Object(config: string[]) {
66
if (!config) {
77
return null

0 commit comments

Comments
 (0)