prostgles-server 2.0.114 → 2.0.118

package/lib/Prostgles.ts

@@ -1093,20 +1093,25 @@ type DboTableCommand = Request & DboTable & {
 const RULE_TO_METHODS = [
     { 
         rule: "getColumns",
+        sqlRule: "select",
         methods: ["getColumns"], 
         no_limits: true, 
         allowed_params: [],
+        table_only: false,
         hint: ` expecting false | true | undefined`
     },
     { 
         rule: "getInfo",
+        sqlRule: "select",
         methods: ["getInfo"], 
         no_limits: true, 
         allowed_params: [],
+        table_only: false,
         hint: ` expecting false | true | undefined`
     },
    { 
        rule: "insert",
+       sqlRule: "insert",
        methods: ["insert", "upsert"], 
        no_limits: <SelectRule>{ fields: "*" }, 
        table_only: true,
@@ -1115,6 +1120,7 @@ const RULE_TO_METHODS = [
     },
    { 
        rule: "update", 
+       sqlRule: "update",
        methods: ["update", "upsert", "updateBatch"], 
        no_limits: <UpdateRule>{ fields: "*", filterFields: "*", returningFields: "*"  },
        table_only: true, 
@@ -1123,13 +1129,16 @@ const RULE_TO_METHODS = [
     },
    { 
        rule: "select", 
+       sqlRule: "select",
        methods: ["findOne", "find", "count"], 
        no_limits: <SelectRule>{ fields: "*", filterFields: "*" }, 
+       table_only: false,
        allowed_params: <Array<keyof SelectRule>>["fields", "filterFields", "forcedFilter", "validate", "maxLimit"] ,
        hint: ` expecting "*" | true | { fields: ( string | string[] | {} )  }`
     },
    { 
        rule: "delete", 
+       sqlRule: "delete",
        methods: ["delete", "remove"], 
        no_limits: <DeleteRule>{ filterFields: "*" } , 
        table_only: true,
@@ -1137,20 +1146,24 @@ const RULE_TO_METHODS = [
        hint: ` expecting "*" | true | { filterFields: ( string | string[] | {} ) } \n Will use "select", "update", "delete" and "insert" rules`
     },
     { 
-       rule: "sync", methods: ["sync", "unsync"], 
+       rule: "sync", 
+       sqlRule: "select",
+       methods: ["sync", "unsync"], 
        no_limits: null,
        table_only: true,
        allowed_params: <Array<keyof SyncRule>>["id_fields", "synced_field", "sync_type", "allow_delete", "throttle", "batch_size"],
        hint: ` expecting "*" | true | { id_fields: string[], synced_field: string }`
     },
     { 
-        rule: "subscribe", methods: ["unsubscribe", "subscribe", "subscribeOne"], 
+        rule: "subscribe", 
+        sqlRule: "select",
+        methods: ["unsubscribe", "subscribe", "subscribeOne"], 
         no_limits: <SubscribeRule>{  throttle: 0  },
         table_only: true,
         allowed_params: <Array<keyof SubscribeRule>>["throttle"],
         hint: ` expecting "*" | true | { throttle: number } \n Will use "select" rules`
     }
-];
+] as const;
 // const ALL_PUBLISH_METHODS = ["update", "upsert", "delete", "insert", "find", "findOne", "subscribe", "unsubscribe", "sync", "unsync", "remove"];
 // const ALL_PUBLISH_METHODS = RULE_TO_METHODS.map(r => r.methods).flat();
 
@@ -1239,7 +1252,7 @@ export class PublishParser {
 
         if(!command || !tableName) throw "command OR tableName are missing";
 
-        let rtm = RULE_TO_METHODS.find(rtms => rtms.methods.includes(command));
+        let rtm = RULE_TO_METHODS.find(rtms => (rtms.methods as any).includes(command));
         if(!rtm){
             throw "Invalid command: " + command;
         }
@@ -1285,7 +1298,9 @@ export class PublishParser {
             let table_rules = _publish[tableName];// applyParamsIfFunc(_publish[tableName],  localParams, this.dbo, this.db, user);
 
             /* Get view or table specific rules */
-            const is_view = (this.dbo[tableName] as TableHandler | ViewHandler).is_view,
+            const tHandler = (this.dbo[tableName] as TableHandler | ViewHandler);
+            
+            const is_view = tHandler.is_view,
                 MY_RULES = RULE_TO_METHODS.filter(r => !is_view || !r.table_only);
 
             // if(tableName === "various") console.warn(1033, MY_RULES)
@@ -1295,7 +1310,14 @@ export class PublishParser {
                 if([true, "*"].includes(table_rules as any)){
                     table_rules = {};
                     MY_RULES.map(r => {
-                        table_rules[r.rule] = { ...r.no_limits };
+                        /** Check PG User privileges */
+                        if(
+                            tHandler.tableOrViewInfo.privileges[r.sqlRule]
+                        ){
+                            table_rules[r.rule] = { ...r.no_limits };
+                        }
+                        
+
                     });
                     // if(tableName === "various") console.warn(1042, table_rules)
                 }
@@ -1315,7 +1337,7 @@ export class PublishParser {
 
                     if(table_rules[r.rule]){
                         /* Add implied methods if not falsy */
-                        r.methods.map(method => {
+                        (r.methods as any).map(method => {
                             if(table_rules[method] === undefined){
                                 const publishedTable = (table_rules as PublishTable);
                                 if(method === "updateBatch" && !publishedTable.update){
@@ -1340,11 +1362,17 @@ export class PublishParser {
                     
                     ruleKeys.filter(m => table_rules[m])
                         .find(method => {
-                            let rm = MY_RULES.find(r => r.rule === method || r.methods.includes(method));
+                            let rm = MY_RULES.find(r => r.rule === method || (r.methods as any).includes(method));
                             if(!rm){
                                 throw `Invalid rule in publish.${tableName} -> ${method} \nExpecting any of: ${flat(MY_RULES.map(r => [r.rule, ...r.methods])).join(", ")}`;
                             }
 
+                            /** Check user privileges */
+                            if(!tHandler.tableOrViewInfo.privileges[rm.sqlRule]){
+                                delete table_rules[method];
+                                return;
+                            }
+
                             /* Check RULES for invalid params */
                             /* Methods do not have params -> They use them from rules */
                             if(method === rm.rule){

package/lib/QueryBuilder.ts

@@ -4,7 +4,7 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { pgp, Filter, LocalParams, isPlainObject, TableHandler, ViewHandler } from "./DboBuilder";
+import { pgp, Filter, LocalParams, isPlainObject, TableHandler, ViewHandler, postgresToTsType } from "./DboBuilder";
 import { TableRule, flat } from "./Prostgles";
 import { SelectParamsBasic as SelectParams, isEmpty, FieldFilter, asName, TextFilter_FullTextSearchFilterKeys, TS_PG_Types, ColumnInfo } from "prostgles-types";
 import { get } from "./utils";
@@ -698,19 +698,38 @@ export const FUNCTIONS: FunctionSpec[] = [
       //   res = `CASE WHEN position(${term} IN ${col}) > 0 THEN TRUE ELSE FALSE END`;
 
       } else if(returnType === "object" || returnType === "boolean"){
+        const hasChars = Boolean(term &&  /[a-z]/i.test(term));
+        const _cols = cols.map(c => {
+          const colInfo = allColumns.find(ac => ac.name === c);
+          return {
+            key: c,
+            colInfo
+          }
+        })
+        .filter(c => !c.colInfo || c.colInfo.udt_name !== "bytea")
+        .filter(c => 
+          /** Exclude numeric columns when the search tern contains a character */
+          !hasChars ||  
+          c.colInfo?.udt_name && 
+          postgresToTsType(c.colInfo.udt_name) !== "number"
+        );
+        if(!_cols.length){
+          return (returnType === "boolean")? "FALSE" : "NULL"
+        }
         res = `CASE 
-          ${cols.map(c => {
-            const colInfo = allColumns.find(ac => ac.name === c);
-            const colNameEscaped = asNameAlias(c, tableAlias)
+          ${_cols
+           .map(c => {
+            const colNameEscaped = asNameAlias(c.key, tableAlias)
             let colSelect = `${colNameEscaped}::TEXT`;
-            const isTstamp = colInfo?.udt_name.startsWith("timestamp");
-            if(isTstamp || colInfo?.udt_name === "date"){
-              colSelect = `( CASE WHEN ${colNameEscaped} IS NULL THEN '' ELSE concat_ws(' ', 
+            const isTstamp = c.colInfo?.udt_name.startsWith("timestamp");
+            if(isTstamp || c.colInfo?.udt_name === "date"){
+              colSelect = `( CASE WHEN ${colNameEscaped} IS NULL THEN '' 
+              ELSE concat_ws(' ', 
               ${colNameEscaped}::TEXT, 
-              ${isTstamp? `'TZ' || to_char(${colNameEscaped}, 'OF'), `: ''}
-                to_char(${colNameEscaped}, ' Day Month '), 
-                'Q' || to_char(${colNameEscaped}, 'Q'),
-                'WK' || to_char(${colNameEscaped}, 'WW')
+              ${isTstamp? `'TZ' || trim(to_char(${colNameEscaped}, 'OF')), `: ''}
+                trim(to_char(${colNameEscaped}, 'Day Month')), 
+                'Q' || trim(to_char(${colNameEscaped}, 'Q')),
+                'WK' || trim(to_char(${colNameEscaped}, 'WW'))
               ) END)`
             }
             let colTxt = `COALESCE(${colSelect}, '')`; //  position(${term} IN ${colTxt}) > 0
@@ -723,7 +742,7 @@ export const FUNCTIONS: FunctionSpec[] = [
             return ` 
               WHEN  ${colTxt} ${matchCase? "LIKE" : "ILIKE"} ${asValue('%' + rawTerm + '%')}
                 THEN json_build_object(
-                  ${asValue(c)}, 
+                  ${asValue(c.key)}, 
                   ${makeTextMatcherArray(
                     colTxt, 
                     term

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "2.0.114",
+  "version": "2.0.118",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-14839
+14900

package/tests/client/package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "@types/node": "^14.14.16",
         "@types/socket.io-client": "^1.4.35",
-        "prostgles-client": "^1.5.127",
+        "prostgles-client": "^1.5.130",
         "prostgles-types": "^1.5.68",
         "socket.io-client": "^4.2.0"
       }
@@ -114,22 +114,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.127",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.127.tgz",
-      "integrity": "sha512-2iA5CD6hH9UGh1q7FEtmSUjmzUHHUHtskf60ik2d0i9oML+6yN8dxZSn7AZuWA+DRIm85wYDS2hfFzumJgUeCQ==",
+      "version": "1.5.130",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.130.tgz",
+      "integrity": "sha512-Dd3b1JY7avcZ2oS5avCQ5KyzLaQTaYDzDE/q9bIiY7R5JJsesGKoRsqJISuNWyGYeVCY93n+r/EN88v0Jsj48A==",
       "dependencies": {
-        "prostgles-types": "^1.5.120"
+        "prostgles-types": "^1.5.121"
       }
     },
-    "node_modules/prostgles-client/node_modules/prostgles-types": {
-      "version": "1.5.120",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.120.tgz",
-      "integrity": "sha512-dWrXMJFhYmTKsiIBzYHTsCKXN6GoJGJe/lTohnkg9+drAhXbJvUrJ5nZ8LwYgkzG+wbWBwW82KIBGK6Zg4OqLw=="
-    },
     "node_modules/prostgles-types": {
-      "version": "1.5.105",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.105.tgz",
-      "integrity": "sha512-k87FnawwTuyPpnoOPDWMeu7QDevuNhOr9x7xoQ2GxF84Y7W66FPrdE/jh6kD7oqzIZtsV/WEVd0WtX+BC2uwEg=="
+      "version": "1.5.121",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.121.tgz",
+      "integrity": "sha512-9fzF/3tISjv1P6B0uV2ubZRKqblUvDG8K7+9INdcR8di2UOVD2vONgCgvFe7ZH12FyUC5q1OM1PUm41dgo9cqQ=="
     },
     "node_modules/socket.io-client": {
       "version": "4.2.0",
@@ -280,24 +275,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "prostgles-client": {
-      "version": "1.5.127",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.127.tgz",
-      "integrity": "sha512-2iA5CD6hH9UGh1q7FEtmSUjmzUHHUHtskf60ik2d0i9oML+6yN8dxZSn7AZuWA+DRIm85wYDS2hfFzumJgUeCQ==",
+      "version": "1.5.130",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.130.tgz",
+      "integrity": "sha512-Dd3b1JY7avcZ2oS5avCQ5KyzLaQTaYDzDE/q9bIiY7R5JJsesGKoRsqJISuNWyGYeVCY93n+r/EN88v0Jsj48A==",
       "requires": {
-        "prostgles-types": "^1.5.120"
-      },
-      "dependencies": {
-        "prostgles-types": {
-          "version": "1.5.120",
-          "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.120.tgz",
-          "integrity": "sha512-dWrXMJFhYmTKsiIBzYHTsCKXN6GoJGJe/lTohnkg9+drAhXbJvUrJ5nZ8LwYgkzG+wbWBwW82KIBGK6Zg4OqLw=="
-        }
+        "prostgles-types": "^1.5.121"
       }
     },
     "prostgles-types": {
-      "version": "1.5.105",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.105.tgz",
-      "integrity": "sha512-k87FnawwTuyPpnoOPDWMeu7QDevuNhOr9x7xoQ2GxF84Y7W66FPrdE/jh6kD7oqzIZtsV/WEVd0WtX+BC2uwEg=="
+      "version": "1.5.121",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.121.tgz",
+      "integrity": "sha512-9fzF/3tISjv1P6B0uV2ubZRKqblUvDG8K7+9INdcR8di2UOVD2vONgCgvFe7ZH12FyUC5q1OM1PUm41dgo9cqQ=="
     },
     "socket.io-client": {
       "version": "4.2.0",

package/tests/client/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@types/node": "^14.14.16",
     "@types/socket.io-client": "^1.4.35",
-    "prostgles-client": "^1.5.127",
+    "prostgles-client": "^1.5.130",
     "prostgles-types": "^1.5.68",
     "socket.io-client": "^4.2.0"
   }

package/tests/server/package-lock.json

@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.113",
+      "version": "2.0.117",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.32.0",