prostgles-server 4.1.73 → 4.1.75

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 (13) hide show
  1. package/README.md +1 -2
  2. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +2 -2
  3. package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
  4. package/dist/DboBuilder/ViewHandler/ViewHandler.js +5 -5
  5. package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
  6. package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map +1 -1
  7. package/dist/DboBuilder/ViewHandler/prepareSortItems.js +0 -3
  8. package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
  9. package/lib/DboBuilder/ViewHandler/ViewHandler.ts +7 -5
  10. package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +0 -3
  11. package/package.json +1 -1
  12. package/tests/client/PID.txt +1 -1
  13. package/tests/server/package-lock.json +1 -1
package/README.md CHANGED
@@ -4,8 +4,7 @@
4
4
 
5
5
  [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/prostgles/prostgles-server-js/blob/master/LICENSE)
6
6
  [![npm version](https://img.shields.io/npm/v/prostgles-server.svg?style=flat)](https://www.npmjs.com/package/prostgles-server)
7
- ![tests](https://github.com/prostgles/prostgles-server-js/workflows/tests/badge.svg?branch=master)
8
-
7
+ ![Tests](https://github.com/prostgles/prostgles-server-js/actions/workflows/main.yml/badge.svg)
9
8
 
10
9
  ### New: JSONB schema runtime validation and TS types
11
10
  <img src="https://prostgles.com/tsdef2.png" width="600px" style="max-width: 90vw; " />
package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts CHANGED
@@ -67,8 +67,8 @@ export declare class ViewHandler {
67
67
  unsubscribe: () => any;
68
68
  }>;
69
69
  subscribeOne(filter: Filter, params: SubscribeParams, localFunc: undefined, table_rules: TableRule, localParams: LocalParams): Promise<string>;
70
- count(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<number>;
71
- size(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<string>;
70
+ count(_filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<number>;
71
+ size(_filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<string>;
72
72
  getAllowedSelectFields(selectParams: FieldFilter | undefined, allowed_cols: FieldFilter, allow_empty?: boolean): string[];
73
73
  /**
74
74
  * Parses group or simple filter
package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
package/dist/DboBuilder/ViewHandler/ViewHandler.js CHANGED
@@ -255,13 +255,13 @@ class ViewHandler {
255
255
  //@ts-ignore
256
256
  return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
257
257
  }
258
- async count(filter, selectParams, param3_unused, table_rules, localParams) {
259
- filter = filter || {};
258
+ async count(_filter, selectParams, param3_unused, table_rules, localParams) {
259
+ const filter = _filter || {};
260
260
  try {
261
261
  await this._log({ command: "count", localParams, data: { filter } });
262
262
  return await this.find(filter, { select: "", limit: 0 }, undefined, table_rules, localParams)
263
263
  .then(async (_allowed) => {
264
- const q = await this.find(filter, { ...selectParams, limit: selectParams?.limit ?? Number.MAX_SAFE_INTEGER }, undefined, table_rules, { ...localParams, returnQuery: "noRLS" });
264
+ const q = await this.find(filter, selectParams, undefined, table_rules, { ...localParams, returnQuery: "noRLS" });
265
265
  const query = [
266
266
  (0, DboBuilder_1.withUserRLS)(localParams, ""),
267
267
  "SELECT COUNT(*) FROM (",
@@ -277,8 +277,8 @@ class ViewHandler {
277
277
  throw (0, DboBuilder_1.parseError)(e, `dbo.${this.name}.count()`);
278
278
  }
279
279
  }
280
- async size(filter, selectParams, param3_unused, table_rules, localParams) {
281
- filter = filter || {};
280
+ async size(_filter, selectParams, param3_unused, table_rules, localParams) {
281
+ const filter = _filter || {};
282
282
  try {
283
283
  await this._log({ command: "size", localParams, data: { filter, selectParams } });
284
284
  return await this.find(filter, { ...selectParams, limit: 2 }, undefined, table_rules, localParams)
package/dist/DboBuilder/ViewHandler/ViewHandler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAe,MAAM,8BAA8B,CAAC;AAG9F,eAAO,MAAM,gBAAgB,eACf,OAAO,GAAG,SAAS,gBACjB,MAAM,EAAE,cACV,MAAM,GAAG,SAAS,UACtB,mBAAmB,EAAE,eAChB,YAAY,EAAE,KAC1B,QAAQ,EA6GV,CAAA"}
1
+ {"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAe,MAAM,8BAA8B,CAAC;AAG9F,eAAO,MAAM,gBAAgB,eACf,OAAO,GAAG,SAAS,gBACjB,MAAM,EAAE,cACV,MAAM,GAAG,SAAS,UACtB,mBAAmB,EAAE,eAChB,YAAY,EAAE,KAC1B,QAAQ,EA0GV,CAAA"}
package/dist/DboBuilder/ViewHandler/prepareSortItems.js CHANGED
@@ -55,9 +55,6 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
55
55
  if (nestedField) {
56
56
  const { table, selectItem, joinAlias } = nestedField;
57
57
  const comparableDataTypeCast = ["uuid", "xml"].includes(selectItem.column_udt_type ?? "") ? "::TEXT" : "";
58
- if (nulls === "first") {
59
- throw "Nested nulls sorting not supported";
60
- }
61
58
  const sortItemAlias = (0, dist_1.asName)(`prostgles_nested_sort_${selectItem.alias}`);
62
59
  return {
63
60
  key,
package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prepareSortItems.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"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"}
package/lib/DboBuilder/ViewHandler/ViewHandler.ts CHANGED
@@ -27,6 +27,7 @@ import { ColSet } from "./ColSet";
27
27
  import { prepareWhere } from "./prepareWhere";
28
28
  import { getInfo } from "./getInfo";
29
29
  import { validateViewRules } from "./validateViewRules";
30
+ import { omitKeys } from "../../PubSubManager/PubSubManager";
30
31
 
31
32
  export type JoinPaths = {
32
33
  t1: string;
@@ -315,14 +316,15 @@ export class ViewHandler {
315
316
  return this.subscribe(filter, { ...params, limit: 2 }, func, table_rules, localParams);
316
317
  }
317
318
 
318
- async count(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<number> {
319
- filter = filter || {};
319
+ async count(_filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<number> {
320
+ const filter = _filter || {};
320
321
  try {
321
322
  await this._log({ command: "count", localParams, data: { filter } });
322
323
  return await this.find(filter, { select: "", limit: 0 }, undefined, table_rules, localParams)
323
324
  .then(async _allowed => {
324
325
  const q: string = await this.find(
325
- filter, { ...selectParams, limit: selectParams?.limit ?? Number.MAX_SAFE_INTEGER },
326
+ filter,
327
+ selectParams,
326
328
  undefined,
327
329
  table_rules,
328
330
  { ...localParams, returnQuery: "noRLS" }
@@ -341,8 +343,8 @@ export class ViewHandler {
341
343
  }
342
344
  }
343
345
 
344
- async size(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<string> {
345
- filter = filter || {};
346
+ async size(_filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<string> {
347
+ const filter = _filter || {};
346
348
  try {
347
349
  await this._log({ command: "size", localParams, data: { filter, selectParams } });
348
350
  return await this.find(filter, { ...selectParams, limit: 2 }, undefined, table_rules, localParams)
package/lib/DboBuilder/ViewHandler/prepareSortItems.ts CHANGED
@@ -65,9 +65,6 @@ export const prepareSortItems = (
65
65
  const { table, selectItem, joinAlias } = nestedField;
66
66
 
67
67
  const comparableDataTypeCast = ["uuid", "xml"].includes(selectItem.column_udt_type ?? "")? "::TEXT" : "";
68
- if(nulls === "first"){
69
- throw "Nested nulls sorting not supported";
70
- }
71
68
  const sortItemAlias = asName(`prostgles_nested_sort_${selectItem.alias}`)
72
69
 
73
70
  return {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.1.73",
3
+ "version": "4.1.75",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/tests/client/PID.txt CHANGED
@@ -1 +1 @@
1
- 172314
1
+ 445505
package/tests/server/package-lock.json CHANGED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "4.1.72",
24
+ "version": "4.1.74",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@types/express": "^4.17.13",