@takaro/db 0.0.19 → 0.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config.d.ts +7 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +6 -0
- package/dist/config.js.map +1 -1
- package/dist/knex.d.ts +1 -13
- package/dist/knex.d.ts.map +1 -1
- package/dist/knex.js +1 -0
- package/dist/knex.js.map +1 -1
- package/package.json +1 -1
- package/src/config.ts +7 -0
- package/src/knex.ts +2 -1
package/dist/config.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Config, IBaseConfig } from '@takaro/config';
|
|
2
2
|
export interface IDbConfig extends IBaseConfig {
|
|
3
3
|
postgres: {
|
|
4
|
+
connectionString: string;
|
|
4
5
|
host: string;
|
|
5
6
|
port: number;
|
|
6
7
|
user: string;
|
|
@@ -21,6 +22,12 @@ export interface IDbConfig extends IBaseConfig {
|
|
|
21
22
|
}
|
|
22
23
|
export declare const configSchema: {
|
|
23
24
|
postgres: {
|
|
25
|
+
connectionString: {
|
|
26
|
+
doc: string;
|
|
27
|
+
format: StringConstructor;
|
|
28
|
+
default: string;
|
|
29
|
+
env: string;
|
|
30
|
+
};
|
|
24
31
|
host: {
|
|
25
32
|
doc: string;
|
|
26
33
|
format: StringConstructor;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAqB,MAAM,gBAAgB,CAAC;AAExE,MAAM,WAAW,SAAU,SAAQ,WAAW;IAC5C,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,GAAG,EAAE,OAAO,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAqB,MAAM,gBAAgB,CAAC;AAExE,MAAM,WAAW,SAAU,SAAQ,WAAW;IAC5C,QAAQ,EAAE;QACR,gBAAgB,EAAE,MAAM,CAAC;QACzB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,GAAG,EAAE,OAAO,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+FxB,CAAC;AAEF,eAAO,MAAM,MAAM,mBAA2D,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import { Config, baseConfigConvict } from '@takaro/config';
|
|
2
2
|
export const configSchema = {
|
|
3
3
|
postgres: {
|
|
4
|
+
connectionString: {
|
|
5
|
+
doc: 'The Postgres connection string to use',
|
|
6
|
+
format: String,
|
|
7
|
+
default: '',
|
|
8
|
+
env: 'POSTGRES_CONNECTION_STRING',
|
|
9
|
+
},
|
|
4
10
|
host: {
|
|
5
11
|
doc: 'The Postgres host to connect to',
|
|
6
12
|
format: String,
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwBxE,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE;QACR,gBAAgB,EAAE;YAChB,GAAG,EAAE,uCAAuC;YAC5C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE;YACX,GAAG,EAAE,4BAA4B;SAClC;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,iCAAiC;YACtC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,WAAW;YACpB,GAAG,EAAE,eAAe;SACrB;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,iCAAiC;YACtC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI;YACb,GAAG,EAAE,eAAe;SACrB;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,iCAAiC;YACtC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,eAAe;SACrB;QACD,QAAQ,EAAE;YACR,GAAG,EAAE,8BAA8B;YACnC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,mBAAmB;SACzB;QACD,QAAQ,EAAE;YACR,GAAG,EAAE,8BAA8B;YACnC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,aAAa;SACnB;QACD,GAAG,EAAE;YACH,GAAG,EAAE,uCAAuC;YAC5C,MAAM,EAAE,OAAO;YACf,OAAO,EAAE,KAAK;YACd,GAAG,EAAE,cAAc;SACpB;QACD,EAAE,EAAE;YACF,GAAG,EAAE,+CAA+C;YACpD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE;YACX,GAAG,EAAE,aAAa;SACnB;KACF;IACD,KAAK,EAAE;QACL,IAAI,EAAE;YACJ,GAAG,EAAE,8BAA8B;YACnC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,WAAW;YACpB,GAAG,EAAE,YAAY;SAClB;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,8BAA8B;YACnC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI;YACb,GAAG,EAAE,YAAY;SAClB;QACD,QAAQ,EAAE;YACR,GAAG,EAAE,kCAAkC;YACvC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE;YACX,GAAG,EAAE,gBAAgB;SACtB;QACD,QAAQ,EAAE;YACR,GAAG,EAAE,kCAAkC;YACvC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE;YACX,GAAG,EAAE,gBAAgB;SACtB;KACF;IACD,YAAY,EAAE;QACZ,GAAG,EAAE,gFAAgF;QACrF,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,QAAQ;QACjB,GAAG,EAAE,wBAAwB;KAC9B;IACD,gBAAgB,EAAE;QAChB,GAAG,EAAE,gEAAgE;QACrE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,SAAS;QAClB,GAAG,EAAE,6BAA6B;KACnC;IACD,aAAa,EAAE;QACb,GAAG,EAAE,mDAAmD;QACxD,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,IAAI;QACb,GAAG,EAAE,yBAAyB;KAC/B;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAY,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC"}
|
package/dist/knex.d.ts
CHANGED
|
@@ -1,19 +1,7 @@
|
|
|
1
1
|
import knexPkg from 'knex';
|
|
2
2
|
import { TakaroModel } from './TakaroModel.js';
|
|
3
3
|
type KnexClient = knexPkg.Knex<TakaroModel, unknown[]>;
|
|
4
|
-
export declare function getKnexOptions(extra?: Record<string, unknown>):
|
|
5
|
-
client: string;
|
|
6
|
-
connection: {
|
|
7
|
-
host: string;
|
|
8
|
-
port: number;
|
|
9
|
-
user: string;
|
|
10
|
-
password: string;
|
|
11
|
-
database: string;
|
|
12
|
-
ssl: boolean | {
|
|
13
|
-
ca: string;
|
|
14
|
-
};
|
|
15
|
-
};
|
|
16
|
-
};
|
|
4
|
+
export declare function getKnexOptions(extra?: Record<string, unknown>): knexPkg.Knex.Config<any>;
|
|
17
5
|
export declare function getKnex(): Promise<KnexClient>;
|
|
18
6
|
export declare function isDbAvailable(): Promise<boolean>;
|
|
19
7
|
export declare function disconnectKnex(): Promise<void>;
|
package/dist/knex.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.d.ts","sourceRoot":"","sources":["../src/knex.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,MAAM,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C,KAAK,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;AAEvD,wBAAgB,cAAc,CAAC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM
|
|
1
|
+
{"version":3,"file":"knex.d.ts","sourceRoot":"","sources":["../src/knex.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,MAAM,CAAC;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAM/C,KAAK,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;AAEvD,wBAAgB,cAAc,CAAC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,4BAejE;AAID,wBAAsB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,CAUnD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAStD;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAKpD"}
|
package/dist/knex.js
CHANGED
|
@@ -7,6 +7,7 @@ export function getKnexOptions(extra = {}) {
|
|
|
7
7
|
const opts = {
|
|
8
8
|
client: 'pg',
|
|
9
9
|
connection: {
|
|
10
|
+
connectionString: config.get('postgres.connectionString'),
|
|
10
11
|
host: config.get('postgres.host'),
|
|
11
12
|
port: config.get('postgres.port'),
|
|
12
13
|
user: config.get('postgres.user'),
|
package/dist/knex.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knex.js","sourceRoot":"","sources":["../src/knex.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,MAAM,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG9C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;AAE1B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;AAIrC,MAAM,UAAU,cAAc,CAAC,QAAiC,EAAE;IAChE,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"knex.js","sourceRoot":"","sources":["../src/knex.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,MAAM,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG9C,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;AAE1B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;AAIrC,MAAM,UAAU,cAAc,CAAC,QAAiC,EAAE;IAChE,MAAM,IAAI,GAAwB;QAChC,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE;YACV,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC;YACzD,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;YACjC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;YACjC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;YACjC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC;YACzC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC;YACzC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK;SAC5E;QACD,GAAG,KAAK;KACT,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,IAAI,UAAU,GAAsB,IAAI,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,IAAI,UAAU;QAAE,OAAO,UAAU,CAAC;IAElC,GAAG,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC,CAAC;IAC1C,UAAU,GAAG,IAAI,CAAC;IAElB,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEzC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,IAAI,CAAC,UAAU;QAAE,OAAO;IACxB,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;IAC3B,UAAU,GAAG,IAAI,CAAC;IAClB,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;AAChC,CAAC"}
|
package/package.json
CHANGED
package/src/config.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Config, IBaseConfig, baseConfigConvict } from '@takaro/config';
|
|
|
2
2
|
|
|
3
3
|
export interface IDbConfig extends IBaseConfig {
|
|
4
4
|
postgres: {
|
|
5
|
+
connectionString: string;
|
|
5
6
|
host: string;
|
|
6
7
|
port: number;
|
|
7
8
|
user: string;
|
|
@@ -23,6 +24,12 @@ export interface IDbConfig extends IBaseConfig {
|
|
|
23
24
|
|
|
24
25
|
export const configSchema = {
|
|
25
26
|
postgres: {
|
|
27
|
+
connectionString: {
|
|
28
|
+
doc: 'The Postgres connection string to use',
|
|
29
|
+
format: String,
|
|
30
|
+
default: '',
|
|
31
|
+
env: 'POSTGRES_CONNECTION_STRING',
|
|
32
|
+
},
|
|
26
33
|
host: {
|
|
27
34
|
doc: 'The Postgres host to connect to',
|
|
28
35
|
format: String,
|
package/src/knex.ts
CHANGED
|
@@ -10,9 +10,10 @@ const { knex: createKnex } = knexPkg;
|
|
|
10
10
|
type KnexClient = knexPkg.Knex<TakaroModel, unknown[]>;
|
|
11
11
|
|
|
12
12
|
export function getKnexOptions(extra: Record<string, unknown> = {}) {
|
|
13
|
-
const opts = {
|
|
13
|
+
const opts: knexPkg.Knex.Config = {
|
|
14
14
|
client: 'pg',
|
|
15
15
|
connection: {
|
|
16
|
+
connectionString: config.get('postgres.connectionString'),
|
|
16
17
|
host: config.get('postgres.host'),
|
|
17
18
|
port: config.get('postgres.port'),
|
|
18
19
|
user: config.get('postgres.user'),
|