joist-utils 1.181.0 → 1.181.2

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.
@@ -8,6 +8,7 @@ type DbSettingsEnv = {
8
8
  DB_HOST: string;
9
9
  DB_DATABASE: string;
10
10
  DB_PORT: string;
11
+ DB_SSL?: string;
11
12
  };
12
13
  export type ConnectionEnv = DatabaseUrlEnv | DbSettingsEnv;
13
14
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAI5D,KAAK,cAAc,GAAG;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAC/C,KAAK,aAAa,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErH,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC,GAAG;IACzF,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,CAAC,EAAE,aAAa,GAAG,gBAAgB,CA0B3E"}
1
+ {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,IAAI,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAI5D,KAAK,cAAc,GAAG;IAAE,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAC/C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;AAE3D;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC,GAAG;IACzF,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,CAAC,EAAE,aAAa,GAAG,gBAAgB,CA4B3E"}
@@ -28,6 +28,7 @@ function newPgConnectionConfig(env) {
28
28
  database: database ?? undefined,
29
29
  host: host ?? undefined,
30
30
  port: port ? Number(port) : undefined,
31
+ ssl: options.ssl === true,
31
32
  };
32
33
  }
33
34
  else if (process.env.DB_DATABASE || (env && "DB_DATABASE" in env)) {
@@ -38,6 +39,7 @@ function newPgConnectionConfig(env) {
38
39
  database: e.DB_DATABASE,
39
40
  host: e.DB_HOST,
40
41
  port: e.DB_PORT ? Number(e.DB_PORT) : undefined,
42
+ ssl: e.DB_SSL === "1" || e.DB_SSL === "true",
41
43
  };
42
44
  }
43
45
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;AAkCA,sDA0BC;AA3DD,+DAA6C;AAC7C,6DAA0D;AAoB1D;;;;;;;;;;;GAWG;AACH,SAAgB,qBAAqB,CAAC,GAAmB;IACvD,IAAA,uCAAkB,GAAE,CAAC;IACrB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,IAAI,cAAc,IAAI,GAAG,CAAC,EAAE,CAAC;QAC/D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAK,GAAsB,CAAC,YAAY,CAAC;QAC7E,8DAA8D;QAC9D,MAAM,OAAO,GAAG,IAAA,4BAAK,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QACzD,OAAO;YACL,IAAI;YACJ,QAAQ;YACR,QAAQ,EAAE,QAAQ,IAAI,SAAS;YAC/B,IAAI,EAAE,IAAI,IAAI,SAAS;YACvB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SACtC,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,IAAI,aAAa,IAAI,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAE,GAAqB,CAAC;QACzE,OAAO;YACL,IAAI,EAAE,CAAC,CAAC,OAAO;YACf,QAAQ,EAAE,CAAC,CAAC,WAAW;YACvB,QAAQ,EAAE,CAAC,CAAC,WAAW;YACvB,IAAI,EAAE,CAAC,CAAC,OAAO;YACf,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;SAChD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;AAyCA,sDA4BC;AApED,+DAA6C;AAC7C,6DAA0D;AA2B1D;;;;;;;;;;;GAWG;AACH,SAAgB,qBAAqB,CAAC,GAAmB;IACvD,IAAA,uCAAkB,GAAE,CAAC;IACrB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,GAAG,IAAI,cAAc,IAAI,GAAG,CAAC,EAAE,CAAC;QAC/D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAK,GAAsB,CAAC,YAAY,CAAC;QAC7E,8DAA8D;QAC9D,MAAM,OAAO,GAAG,IAAA,4BAAK,EAAC,GAAG,CAAC,CAAC;QAC3B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QACzD,OAAO;YACL,IAAI;YACJ,QAAQ;YACR,QAAQ,EAAE,QAAQ,IAAI,SAAS;YAC/B,IAAI,EAAE,IAAI,IAAI,SAAS;YACvB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;YACrC,GAAG,EAAE,OAAO,CAAC,GAAG,KAAK,IAAI;SAC1B,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,CAAC,GAAG,IAAI,aAAa,IAAI,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAE,GAAqB,CAAC;QACzE,OAAO;YACL,IAAI,EAAE,CAAC,CAAC,OAAO;YACf,QAAQ,EAAE,CAAC,CAAC,WAAW;YACvB,QAAQ,EAAE,CAAC,CAAC,WAAW;YACvB,IAAI,EAAE,CAAC,CAAC,OAAO;YACf,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;YAC/C,GAAG,EAAE,CAAC,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM;SAC7C,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC"}
@@ -10,6 +10,7 @@ describe("connection", () => {
10
10
  password: "local",
11
11
  port: 5432,
12
12
  user: "joist",
13
+ ssl: false,
13
14
  });
14
15
  });
15
16
  it("should parse multiple DB variables", () => {
@@ -19,15 +20,27 @@ describe("connection", () => {
19
20
  DB_DATABASE: "joist",
20
21
  DB_HOST: "db",
21
22
  DB_PORT: "5432",
23
+ DB_SSL: "true",
22
24
  });
23
25
  expect(info).toEqual({
24
26
  database: "joist",
25
27
  host: "db",
26
28
  password: "local",
27
29
  port: 5432,
28
- ssl: undefined,
30
+ ssl: true,
29
31
  user: "joist",
30
32
  });
31
33
  });
34
+ it("should parse a DATABASE_URL with ssl=true", () => {
35
+ const info = (0, connection_1.newPgConnectionConfig)({ DATABASE_URL: "postgres://joist:local@db:5432/joist?ssl=true" });
36
+ expect(info).toEqual({
37
+ database: "joist",
38
+ host: "db",
39
+ password: "local",
40
+ port: 5432,
41
+ user: "joist",
42
+ ssl: true,
43
+ });
44
+ });
32
45
  });
33
46
  //# sourceMappingURL=connection.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../src/connection.test.ts"],"names":[],"mappings":";;AAAA,6CAAqD;AAErD,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,IAAI,GAAG,IAAA,kCAAqB,EAAC,EAAE,YAAY,EAAE,sCAAsC,EAAE,CAAC,CAAC;QAC7F,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,IAAI,GAAG,IAAA,kCAAqB,EAAC;YACjC,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,OAAO;YACpB,WAAW,EAAE,OAAO;YACpB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"connection.test.js","sourceRoot":"","sources":["../src/connection.test.ts"],"names":[],"mappings":";;AAAA,6CAAqD;AAErD,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,IAAI,GAAG,IAAA,kCAAqB,EAAC,EAAE,YAAY,EAAE,sCAAsC,EAAE,CAAC,CAAC;QAC7F,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,KAAK;SACX,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,IAAI,GAAG,IAAA,kCAAqB,EAAC;YACjC,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,OAAO;YACpB,WAAW,EAAE,OAAO;YACpB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACnD,MAAM,IAAI,GAAG,IAAA,kCAAqB,EAAC,EAAE,YAAY,EAAE,+CAA+C,EAAE,CAAC,CAAC;QACtG,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,OAAO;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,OAAO;YACb,GAAG,EAAE,IAAI;SACV,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "joist-utils",
3
- "version": "1.181.0",
3
+ "version": "1.181.2",
4
4
  "license": "MIT",
5
5
  "main": "build/index.js",
6
6
  "types": "build/index.d.ts",