prostgles-server 2.0.174 → 2.0.175

package/lib/QueryBuilder.ts

@@ -5,8 +5,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { pgp, Filter, LocalParams, isPlainObject, TableHandler, ViewHandler, postgresToTsType } from "./DboBuilder";
-import { TableRule } from "./Prostgles";
-import { SelectParamsBasic as SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, isObject } from "prostgles-types";
+import { TableRule } from "./PublishParser";
+import { SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, ColumnInfo, PG_COLUMN_UDT_DATA_TYPE, isObject, Select } from "prostgles-types";
 import { get } from "./utils";
 
 
@@ -200,7 +200,7 @@ const FTS_Funcs: FunctionSpec[] =
       if(isPlainObject(qVal)){
         const keys = Object.keys(qVal);
         if(!keys.length) throw "Bad arg";
-        if(keys.length !==1 || !searchTypes.includes(keys[0])) throw "Expecting a an object with a single key named one of: " + searchTypes.join(", ");
+        if(keys.length !==1 || !searchTypes.includes(keys[0] as any)) throw "Expecting a an object with a single key named one of: " + searchTypes.join(", ");
         qType = keys[0];
         qVal = asValue(qVal[qType]);
 
@@ -1094,7 +1094,7 @@ export class SelectItemBuilder {
     });
   }
 
-  parseUserSelect = async (userSelect: FieldFilter, joinParse?: (key: string, val: any, throwErr: (msg: string) => any) => any) => {
+  parseUserSelect = async (userSelect: Select, joinParse?: (key: string, val: any, throwErr: (msg: string) => any) => any) => {
 
     /* Array select */
     if(Array.isArray(userSelect)){
@@ -1113,7 +1113,8 @@ export class SelectItemBuilder {
       return [];
     } else if(userSelect === "*"){
       this.allowedFields.map(key => this.addColumn(key, true) );
-    } else if(isPlainObject(userSelect) && !isEmpty(userSelect as object)){
+
+    } else if(isPlainObject(userSelect) && !isEmpty(userSelect)){
       const selectKeys = Object.keys(userSelect),
         selectValues = Object.values(userSelect);
   

package/lib/TableConfig.ts

@@ -1,7 +1,7 @@
 import { getKeys, asName } from "prostgles-types";
 import { JoinInfo } from "./DboBuilder";
 import { ALLOWED_EXTENSION, ALLOWED_CONTENT_TYPE } from "./FileManager";
-import { DB, DbHandler, Prostgles } from "./Prostgles";
+import { DB, DBHandlerServer, Prostgles } from "./Prostgles";
 import { asValue } from "./PubSubManager";
 
 type ColExtraInfo = {
@@ -184,7 +184,7 @@ export type TableConfig<LANG_IDS = { en: 1 }> = {
 export default class TableConfigurator {
 
     config?: TableConfig;
-    get dbo(): DbHandler {
+    get dbo(): DBHandlerServer {
         if(!this.prostgles.dbo) throw "this.prostgles.dbo missing"
         return this.prostgles.dbo 
     };

package/lib/index.ts

@@ -1,11 +1,12 @@
 import { Prostgles, ProstglesInitOptions } from "./Prostgles";
-import { DbHandler, TableHandler, ViewHandler } from "./DboBuilder";
+import { DBSchema } from "prostgles-types";
 
-function prostgles<DBObj = DbHandler>(params: ProstglesInitOptions<DBObj>){
+function prostgles<S extends DBSchema = any>(params: ProstglesInitOptions<S>){
 
-    let prgl = new Prostgles<DBObj>(params as any);
+    let prgl = new Prostgles<S>(params as any);
     return prgl.init(params.onReady);
 }
+export = prostgles;//{ , TableHandler, ViewHandler };
 
 
 // declare const init (params: InitOptions) => {
@@ -13,7 +14,6 @@ function prostgles<DBObj = DbHandler>(params: ProstglesInitOptions<DBObj>){
 //     prgl.init(params.isReady);
 // }
 
-export = prostgles;//{ , TableHandler, ViewHandler };
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.174",
+  "version": "2.0.175",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,7 +29,7 @@
     "bluebird": "^3.7.2",
     "file-type": "^16.5.3",
     "pg-promise": "^10.11.1",
-    "prostgles-types": "^1.5.140",
+    "prostgles-types": "^1.5.153",
     "sharp": "^0.30.5"
   },
   "devDependencies": {

package/tests/client/PID.txt

@@ -1 +1 @@
-23576
+77066

package/tests/client/package-lock.json

@@ -10,7 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "@types/node": "^14.14.16",
-        "prostgles-client": "^1.5.150",
+        "prostgles-client": "^1.5.153",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.5.1"
       }
@@ -67,17 +67,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.150",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.150.tgz",
-      "integrity": "sha512-ocdd0We0xjB6vmlT87hWhx33Y9+beydgDkFGGiJWLV3kLCNV5obURon4sGZuI4/qi1Am4EkgCzktFoWzaNPrmQ==",
+      "version": "1.5.153",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.153.tgz",
+      "integrity": "sha512-kveb392Ye8XNgcWGmaMUg9PTQFVdb+f1RegK9TNVLLFG1b03hmsaVBAXCQvO5VvmGkW4rgQ5fZvfsEre5t+flg==",
       "dependencies": {
-        "prostgles-types": "^1.5.140"
+        "prostgles-types": "^1.5.153"
       }
     },
     "node_modules/prostgles-types": {
-      "version": "1.5.140",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.140.tgz",
-      "integrity": "sha512-nJcrL2yjB2dY4M6whIlIpDDb9USgdfxTwylqUUCMx6Bt+DsSPEMHKD76Ao55WJ6BZAhxNfo6aqg6aOGprY7vRA=="
+      "version": "1.5.153",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.153.tgz",
+      "integrity": "sha512-TIPtsMFBGH3M01zGXMT1m7aVkr9cJgFryE8mOotJGTZUcaTaNA3s21wwGo4tbOVnyNqnyEgBolItb1s1DuNexg=="
     },
     "node_modules/socket.io-client": {
       "version": "4.5.1",
@@ -176,17 +176,17 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "prostgles-client": {
-      "version": "1.5.150",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.150.tgz",
-      "integrity": "sha512-ocdd0We0xjB6vmlT87hWhx33Y9+beydgDkFGGiJWLV3kLCNV5obURon4sGZuI4/qi1Am4EkgCzktFoWzaNPrmQ==",
+      "version": "1.5.153",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.153.tgz",
+      "integrity": "sha512-kveb392Ye8XNgcWGmaMUg9PTQFVdb+f1RegK9TNVLLFG1b03hmsaVBAXCQvO5VvmGkW4rgQ5fZvfsEre5t+flg==",
       "requires": {
-        "prostgles-types": "^1.5.140"
+        "prostgles-types": "^1.5.153"
       }
     },
     "prostgles-types": {
-      "version": "1.5.140",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.140.tgz",
-      "integrity": "sha512-nJcrL2yjB2dY4M6whIlIpDDb9USgdfxTwylqUUCMx6Bt+DsSPEMHKD76Ao55WJ6BZAhxNfo6aqg6aOGprY7vRA=="
+      "version": "1.5.153",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.153.tgz",
+      "integrity": "sha512-TIPtsMFBGH3M01zGXMT1m7aVkr9cJgFryE8mOotJGTZUcaTaNA3s21wwGo4tbOVnyNqnyEgBolItb1s1DuNexg=="
     },
     "socket.io-client": {
       "version": "4.5.1",

package/tests/client/package.json

@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/node": "^14.14.16",
-    "prostgles-client": "^1.5.150",
+    "prostgles-client": "^1.5.153",
     "prostgles-types": "^1.5.68",
     "socket.io-client": "^4.5.1"
   }

package/tests/isomorphic_queries.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from 'assert';
 
-import { DbHandler} from "../dist/Prostgles";
+import { DBHandlerServer} from "../dist/Prostgles";
 import { DBHandlerClient } from "./client/index";
 import * as fs from "fs";
 
@@ -29,7 +29,7 @@ export function tryRunP(desc: string, func: (resolve: any, reject: any) => any,
   });
 }
 
-export default async function isomorphic(db: Partial<DbHandler> | Partial<DBHandlerClient>) {
+export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<DBHandlerClient>) {
   console.log("Starting isomorphic queries");
 
   if(await db.items.count()){