@opengis/fastify-table 2.0.125 → 2.0.126

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.
Files changed (8) hide show
  1. package/dist/server/plugins/crud/funcs/dataDelete.js +6 -6
  2. package/dist/server/plugins/crud/funcs/dataInsert.d.ts.map +1 -1
  3. package/dist/server/plugins/crud/funcs/dataInsert.js +13 -13
  4. package/dist/server/plugins/crud/funcs/dataUpdate.js +6 -6
  5. package/dist/server/plugins/crud/funcs/dataUpsert.js +6 -6
  6. package/dist/server/types/core.d.ts +1 -0
  7. package/dist/server/types/core.d.ts.map +1 -1
  8. package/package.json +1 -1
package/dist/server/plugins/crud/funcs/dataDelete.js CHANGED
@@ -10,12 +10,12 @@ const rclient = getRedis();
10
10
  export default async function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, }) {
11
11
  const pg = pg1 || getPG({ name: "client" });
12
12
  // pg client single transaction support
13
- if (!pg?.pk && config.pg) {
14
- pg.options = pgClients.client?.options;
15
- pg.tlist = pgClients.client?.tlist;
16
- pg.pgType = pgClients.client?.pgType;
17
- pg.relkinds = pgClients.client?.relkinds;
18
- pg.pk = pgClients.client?.pk;
13
+ if (pg && !pg?.pk && pg.connectionParameters) {
14
+ pg.options = pg.connectionParameters;
15
+ pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
16
+ pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
17
+ pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
18
+ pg.pk = pgClients[pg.options?.database || "client"]?.pk;
19
19
  }
20
20
  const table = pg.pk?.[table1] ? table1 : table1.replace(/"/g, "");
21
21
  if (!table)
package/dist/server/plugins/crud/funcs/dataInsert.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataInsert.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataInsert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,OAAO,EACP,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,EACH,SAAc,GACf,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC,gBAyJA"}
1
+ {"version":3,"file":"dataInsert.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataInsert.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,EAAE,EACF,KAAK,EAAE,MAAM,EACb,OAAO,EACP,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,EACH,SAAc,GACf,EAAE;IACD,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC,gBA2JA"}
package/dist/server/plugins/crud/funcs/dataInsert.js CHANGED
@@ -10,15 +10,16 @@ import extraData from "../../extra/extraData.js";
10
10
  const rclient = getRedis();
11
11
  export default async function dataInsert({ id, table: table1, referer, data, pg: pg1, uid, tokenData = {}, }) {
12
12
  const pg = pg1 || getPG({ name: "client" });
13
- if (!pg)
13
+ if (!pg) {
14
14
  return null;
15
+ }
15
16
  // pg client single transaction support
16
- if (!pg?.pk && config.pg) {
17
- pg.options = pgClients.client?.options;
18
- pg.tlist = pgClients.client?.tlist;
19
- pg.pgType = pgClients.client?.pgType;
20
- pg.relkinds = pgClients.client?.relkinds;
21
- pg.pk = pgClients.client?.pk;
17
+ if (pg && !pg?.pk && pg.connectionParameters) {
18
+ pg.options = pg.connectionParameters;
19
+ pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
20
+ pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
21
+ pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
22
+ pg.pk = pgClients[pg.options?.database || "client"]?.pk;
22
23
  }
23
24
  const { unittest } = tokenData || {};
24
25
  if (config.trace || unittest)
@@ -31,14 +32,12 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
31
32
  id,
32
33
  uid,
33
34
  })) || {};
34
- if (!insertQuery || !args.length)
35
+ if (!insertQuery || !args.length) {
35
36
  return null;
37
+ }
36
38
  // for transactions
37
39
  const isClient = typeof pg.query === "function" && typeof pg.release === "function";
38
40
  const client = (isClient ? pg : await pg.connect());
39
- if (!isClient) {
40
- // client.caller = 'dataInsert';
41
- }
42
41
  if (isClient || !client.pk) {
43
42
  client.options = pg.options;
44
43
  client.tlist = pg.tlist;
@@ -54,8 +53,9 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
54
53
  .query(insertQuery, args)
55
54
  .then((el) => el || {});
56
55
  const id1 = res.rows?.[0]?.[pg.pk?.[table] || ""];
57
- if (!id1)
56
+ if (!id1) {
58
57
  return null;
58
+ }
59
59
  await extraData({
60
60
  table,
61
61
  form: tokenData?.form,
@@ -109,7 +109,7 @@ export default async function dataInsert({ id, table: table1, referer, data, pg:
109
109
  if (!isClient) {
110
110
  await client.query("commit;");
111
111
  }
112
- return { ...res, id: id1, data: res.rows[0] };
112
+ return { ...res, id: id1, data: res.rows[0], ...res.rows[0] };
113
113
  }
114
114
  catch (err) {
115
115
  logger.file("crud/insert", {
package/dist/server/plugins/crud/funcs/dataUpdate.js CHANGED
@@ -28,12 +28,12 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
28
28
  return null;
29
29
  }
30
30
  // pg client single transaction support
31
- if (!pg?.pk && config.pg) {
32
- pg.options = pgClients.client?.options;
33
- pg.tlist = pgClients.client?.tlist;
34
- pg.pgType = pgClients.client?.pgType;
35
- pg.relkinds = pgClients.client?.relkinds;
36
- pg.pk = pgClients.client?.pk;
31
+ if (pg && !pg?.pk && pg.connectionParameters) {
32
+ pg.options = pg.connectionParameters;
33
+ pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
34
+ pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
35
+ pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
36
+ pg.pk = pgClients[pg.options?.database || "client"]?.pk;
37
37
  }
38
38
  const { columns, pk } = await getMeta({ pg, table });
39
39
  if (!columns) {
package/dist/server/plugins/crud/funcs/dataUpsert.js CHANGED
@@ -13,12 +13,12 @@ export default async function dataUpsert({ id, table: table1, referer, data, pg:
13
13
  if (!pg)
14
14
  return null;
15
15
  // pg client single transaction support
16
- if (!pg?.pk && config.pg) {
17
- pg.options = pgClients.client?.options;
18
- pg.tlist = pgClients.client?.tlist;
19
- pg.pgType = pgClients.client?.pgType;
20
- pg.relkinds = pgClients.client?.relkinds;
21
- pg.pk = pgClients.client?.pk;
16
+ if (pg && !pg?.pk && pg.connectionParameters) {
17
+ pg.options = pg.connectionParameters;
18
+ pg.tlist = pgClients[pg.options?.database || "client"]?.tlist;
19
+ pg.pgType = pgClients[pg.options?.database || "client"]?.pgType;
20
+ pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
21
+ pg.pk = pgClients[pg.options?.database || "client"]?.pk;
22
22
  }
23
23
  if (config.trace)
24
24
  console.log("form", tokenData?.form);
package/dist/server/types/core.d.ts CHANGED
@@ -3,6 +3,7 @@ import { type FastifySessionObject } from "@fastify/session";
3
3
  import { Pool } from "pg";
4
4
  declare let Database: any;
5
5
  export interface ExtendedPG extends Pool {
6
+ connectionParameters?: any;
6
7
  readonly?: any;
7
8
  connect: any;
8
9
  query: any;
package/dist/server/types/core.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAM1B,QAAA,IAAI,QAAQ,EAAE,GAAG,CAAC;AASlB,MAAM,WAAW,UAAW,SAAQ,IAAI;IACtC,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;CACjE;AAYD,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,eAAgB,SAAQ,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;IACzB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,KAAK,EAAE,GAAG,CAAC;IACX,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG;QAC7C,MAAM,EAAE,0BAA0B,CAAC;KACpC,CAAC;CACH;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,CAAC,OAAO,QAAQ,CAAC;IACnE,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB"}
1
+ {"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "2.0.125",
3
+ "version": "2.0.126",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "keywords": [