prostgles-server 4.2.326 → 4.2.328

package/dist/runClientRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":";;;AAAA,qDAOyB;AAIzB,gFAA6E;AAC7E,gDAAgD;AAIhD,MAAM,aAAa,GAAG;IACpB,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,CAAC;IACT,WAAW,EAAE,CAAC;IACd,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,SAAS,EAAE,CAAC;IACZ,YAAY,EAAE,CAAC;IACf,UAAU,EAAE,CAAC;IACb,OAAO,EAAE,CAAC;IACV,IAAI,EAAE,CAAC;CAC8E,CAAC;AAExF,MAAM,kBAAkB,GAAG,IAAA,yBAAO,EAAC,aAAa,CAAC,CAAC;AAClD,MAAM,oBAAoB,GAAG;IAC3B,WAAW;IACX,cAAc;IACd,MAAM;CACsC,CAAC;AAkBxC,MAAM,gBAAgB,GAAG,KAAK,WAEnC,IAAU,EACV,SAA4B,EAC5B,KAAkC;IAElC,gGAAgG;IAChG,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;QACrC,MAAM,uCAAuC,CAAC;IAChD,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,mBAAmB,CAAC,EAAE,CAAC;QAC/D,MAAM,oBAAoB,mBAAmB,uBAAuB,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACvG,CAAC;IACD,MAAM,OAAO,GAAG,mBAAyC,CAAC;IAC1D,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,EAAE,CAAC;QACzE,MAAM,CACJ,8EAA8E;YAC9E,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAChC,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAC/E,IAAI,UAAU,KAAK,sBAAsB,EAAE,CAAC;QAC1C,MAAM,UAAU,CAAC;IACnB,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,CACjE,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,EACjC,UAAU,EACV,KAAK,CACN,CAAC;IAEF,uEAAuE;IACvE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,kCAAkC,SAAS,IAAI,OAAO,GAAG,CAAC;IAClE,CAAC;IAED,MAAM,WAAW,GACf,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACjB,SAAS;QACX,CAAC,CAAC;YACE,GAAG,IAAA,mCAAgB;YACjB,YAAY;YACZ,UAAU,CAAC,aAAa,IAAI,EAAE,EAC9B,KAAK,EACL,IAAA,yBAAO,EAAC,UAAU,CAAC,IAAI,CAAC,CACzB;YACD,GAAI,IAAA,0BAAQ,EAAC,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAc;SAC3D,CAAC;IACN,MAAM,WAAW,GAAgB;QAC/B,SAAS;QACT,eAAe,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;KACvC,CAAC;IACF,IAAI,MAAM,IAAK,MAAsB,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACnD,IAAI,SAAS,EAAE,CAAC;YACd,WAAW,CAAC,WAAW,GAAI,MAAsB,CAAC,WAAW,CAAC;QAChE,CAAC;aAAM,CAAC;YACN,MAAM,+CAA+C,CAAC;QACxD,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,YAAY;QAAE,MAAM,qBAAqB,SAAS,WAAW,CAAC;IAEjG;;OAEG;IACH,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAEf,CAAC;IAC/C,IAAI,CAAC,YAAY;QAAE,MAAM,2CAA2C,OAAO,EAAE,CAAC;IAC9E,OAAQ,IAAI,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,OAAO,CAAgD,CAClF,MAAM,EACN,MAAM,EACN,MAAM,EACN,UAAU,EACV,WAAW,CACa,CAAC;IAC3B,oCAAoC;IACpC,sIAAsI;IACtI,iBAAiB;AACnB,CAAC,CAAC;AAlFW,QAAA,gBAAgB,oBAkF3B;AAEF,wFAAwF;AACxF,uFAAuF;AAEhF,MAAM,sBAAsB,GAAG,KAAK,WAEzC,SAA4B;IAE5B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;QAC9E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACvC,CAAC;IACD,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;QAC3B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,qBAAqB,CAAC;QAC9B,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACvF,MAAM,eAAe,GAAG,aAAa,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QAC1F,OAAO,eAAe,KAAK,IAAI,IAAI,eAAe,KAAK,GAAG,CAAC;IAC7D,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,SAAS,EAAE,CAAC;IAClC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AACzC,CAAC,CAAC;AAlBW,QAAA,sBAAsB,0BAkBjC;AAEK,MAAM,mBAAmB,GAAG,KAAK,WAEtC,OAAmB,EACnB,SAA4B;IAE5B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,8BAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,4BAA4B,CAAC;IACrC,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG;QAAE,MAAM,qCAAqC,CAAC;IAChE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;AAC7D,CAAC,CAAC;AAZW,QAAA,mBAAmB,uBAY9B;AAMK,MAAM,eAAe,GAAG,KAAK,WAElC,OAAmB,EACnB,SAA4B;IAE5B,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAElF,MAAM,SAAS,GAAG,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3B,MAAM,4BAA4B,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,KAAK,GACT,CACE,OAAO,SAAS,KAAK,UAAU;QAC/B,OAAQ,SAAsC,CAAC,IAAI,KAAK,UAAU,CACnE,CAAC,CAAC;QACA,SAA6C;QAChD,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC;IAClB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,MAAM,CAAC,CAAC;IACnC,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAtBW,QAAA,eAAe,mBAsB1B"}

package/lib/DboBuilder/TableHandler/DataValidator.ts

@@ -1,6 +1,5 @@
 import {
   AnyObject,
-  ColumnInfo,
   FieldFilter,
   asName,
   getKeys,
@@ -288,43 +287,43 @@ const getValidatedRowFieldData = async (
   return rowFieldData;
 };
 
-const getTextPatch = (c: TableSchemaColumn, fieldValue: any) => {
-  if (
-    c.data_type === "text" &&
-    fieldValue &&
-    isObject(fieldValue) &&
-    !["from", "to"].find((key) => typeof fieldValue[key] !== "number")
-  ) {
-    const unrecProps = Object.keys(fieldValue).filter(
-      (k) => !["from", "to", "text", "md5"].includes(k)
-    );
-    if (unrecProps.length) {
-      throw "Unrecognised params in textPatch field: " + unrecProps.join(", ");
-    }
-    const patchedTextData: {
-      fieldName: string;
-      from: number;
-      to: number;
-      text: string;
-      md5: string;
-    } = {
-      ...fieldValue,
-      fieldName: c.name,
-    } as any;
-
-    // if (tableRules && !tableRules.select) throw "Select needs to be permitted to patch data";
-    // const rows = await this.find(filter, { select: patchedTextData.reduce((a, v) => ({ ...a, [v.fieldName]: 1 }), {}) }, undefined, tableRules);
-
-    // if (rows.length !== 1) {
-    //   throw "Cannot patch data within a filter that affects more/less than 1 row";
-    // }
-    // return unpatchText(rows[0][p.fieldName], patchedTextData);
-    const rawValue = `OVERLAY(${asName(c.name)} PLACING ${asValue(patchedTextData.text)} FROM ${asValue(patchedTextData.from)} FOR ${asValue(patchedTextData.to - patchedTextData.from + 1)})`;
-    return rawValue;
-  }
-
-  return undefined;
-};
+// const getTextPatch = (c: TableSchemaColumn, fieldValue: any) => {
+//   if (
+//     c.data_type === "text" &&
+//     fieldValue &&
+//     isObject(fieldValue) &&
+//     !["from", "to"].find((key) => typeof fieldValue[key] !== "number")
+//   ) {
+//     const unrecProps = Object.keys(fieldValue).filter(
+//       (k) => !["from", "to", "text", "md5"].includes(k)
+//     );
+//     if (unrecProps.length) {
+//       throw "Unrecognised params in textPatch field: " + unrecProps.join(", ");
+//     }
+//     const patchedTextData: {
+//       fieldName: string;
+//       from: number;
+//       to: number;
+//       text: string;
+//       md5: string;
+//     } = {
+//       ...fieldValue,
+//       fieldName: c.name,
+//     } as any;
+
+//     // if (tableRules && !tableRules.select) throw "Select needs to be permitted to patch data";
+//     // const rows = await this.find(filter, { select: patchedTextData.reduce((a, v) => ({ ...a, [v.fieldName]: 1 }), {}) }, undefined, tableRules);
+
+//     // if (rows.length !== 1) {
+//     //   throw "Cannot patch data within a filter that affects more/less than 1 row";
+//     // }
+//     // return unpatchText(rows[0][p.fieldName], patchedTextData);
+//     const rawValue = `OVERLAY(${asName(c.name)} PLACING ${asValue(patchedTextData.text)} FROM ${asValue(patchedTextData.from)} FOR ${asValue(patchedTextData.to - patchedTextData.from + 1)})`;
+//     return rawValue;
+//   }
+
+//   return undefined;
+// };
 
 const getParsedRowFieldDataFunction = (rowPart: RowFieldDataFunction, args: ParseDataArgs) => {
   const func = convertionFuncs.find((f) => `$${f.name}` === rowPart.funcName);
@@ -407,88 +406,3 @@ const convertionFuncs: ConvertionFunc[] = [
     },
   },
 ];
-
-export class ColSet {
-  opts: {
-    columns: ColumnInfo[];
-    tableName: string;
-    colNames: string[];
-  };
-
-  constructor(columns: ColumnInfo[], tableName: string) {
-    this.opts = { columns, tableName, colNames: columns.map((c) => c.name) };
-  }
-
-  // private async getRow(data: any, allowedCols: string[], dbTx: DBHandlerServer, validate: ValidateRow | undefined, command: "update" | "insert", localParams: LocalParams | undefined): Promise<ParsedRowFieldData[]> {
-  //   const badCol = allowedCols.find(c => !this.opts.colNames.includes(c))
-  //   if (!allowedCols || badCol) {
-  //     throw "Missing or unexpected columns: " + badCol;
-  //   }
-
-  //   if (command === "update" && isEmpty(data)) {
-  //     throw "No data provided for update";
-  //   }
-
-  //   let row = pickKeys(data, allowedCols);
-  //   if (validate) {
-  //     if (!localParams) throw "localParams missing"
-  //     row = await validate({ row, dbx: dbTx, localParams });
-  //   }
-
-  //   return Object.entries(row).map(([fieldName, fieldValue]) => {
-  //     const col = this.opts.columns.find(c => c.name === fieldName);
-  //     if (!col) throw "Unexpected missing col name";
-
-  //     /**
-  //      * Add conversion functions for PostGIS data
-  //      */
-  //     let escapedVal = "";
-  //     if ((col.udt_name === "geometry" || col.udt_name === "geography") && isObject(fieldValue)) {
-
-  //       const dataKeys = Object.keys(fieldValue);
-  //       const funcName = dataKeys[0]!;
-  //       const func = convertionFuncs.find(f => f.name === funcName);
-  //       const funcArgs = fieldValue?.[funcName]
-  //       if (dataKeys.length !== 1 || !func || !Array.isArray(funcArgs)) {
-  //         throw `Expecting only one function key (${convertionFuncs.join(", ")}) \nwith an array of arguments \n within column (${fieldName}) data but got: ${JSON.stringify(fieldValue)} \nExample: { geo_col: { ST_GeomFromText: ["POINT(-71.064544 42.28787)", 4326] } }`;
-  //       }
-  //       escapedVal = func.getQuery(funcArgs);
-  //     } else if (col.udt_name === "text") {
-
-  //     } else {
-  //       /** Prevent pg-promise formatting jsonb */
-  //       const colIsJSON = ["json", "jsonb"].includes(col.data_type);
-  //       escapedVal = pgp.as.format(colIsJSON ? "$1:json" : "$1", [fieldValue])
-  //     }
-
-  //     /**
-  //      * Cast to type to avoid array errors (they do not cast automatically)
-  //      */
-  //     escapedVal += `::${col.udt_name}`
-
-  //     return {
-  //       escapedCol: asName(fieldName),
-  //       escapedVal,
-  //     }
-  //   });
-
-  // }
-
-  // async getInsertQuery(data: AnyObject[], allowedCols: string[], dbTx: DBHandlerServer, validate: ValidateRowBasic | undefined, localParams: LocalParams | undefined) {
-  //   const inserts = (await Promise.all(data.map(async d => {
-  //     const rowParts = await this.getRow(d, allowedCols, dbTx, validate, "insert", localParams);
-  //     return Object.fromEntries(rowParts.map(rp => [rp.escapedCol, rp.escapedVal]));
-  //   })));
-  //   const uniqueColumns = Array.from(new Set(inserts.flatMap(row => Object.keys(row))))
-  //   const values = inserts.map(row => `(${uniqueColumns.map(colName => row[colName] ?? 'DEFAULT')})`).join(",\n");
-  //   const whatToInsert = !uniqueColumns.length ? "DEFAULT VALUES" : `(${uniqueColumns}) VALUES ${values}`
-  //   return `INSERT INTO ${this.opts.tableName} ${whatToInsert} `;
-  // }
-  // async getUpdateQuery(data: AnyObject | AnyObject[], allowedCols: string[], dbTx: DBHandlerServer, validate: ValidateRowBasic | undefined, localParams: LocalParams | undefined): Promise<string> {
-  //   const res = (await Promise.all((Array.isArray(data) ? data : [data]).map(async d => {
-  //     const rowParts = await this.getRow(d, allowedCols, dbTx, validate, "update", localParams);
-  //     return `UPDATE ${this.opts.tableName} SET ` + rowParts.map(r => `${r.escapedCol} = ${r.escapedVal} `).join(",\n")
-  //   }))).join(";\n") + " ";
-  //   return res;
-  // }
-}

package/lib/DboBuilder/TableHandler/insert/insert.ts

@@ -1,16 +1,11 @@
-import { AnyObject, InsertParams, asName, isObject } from "prostgles-types";
+import { AnyObject, InsertParams, asName, getSerialisableError, isObject } from "prostgles-types";
 import { ParsedTableRule, ValidateRowBasic } from "../../../PublishParser/PublishParser";
-import {
-  LocalParams,
-  getErrorAsObject,
-  getSerializedClientErrorFromPGError,
-  withUserRLS,
-} from "../../DboBuilder";
-import { insertNestedRecords } from "./insertNestedRecords";
+import { LocalParams, getSerializedClientErrorFromPGError, withUserRLS } from "../../DboBuilder";
 import { prepareNewData } from "../DataValidator";
 import { TableHandler } from "../TableHandler";
 import { insertTest } from "../insertTest";
 import { runInsertUpdateQuery } from "../runInsertUpdateQuery";
+import { insertNestedRecords } from "./insertNestedRecords";
 
 export async function insert(
   this: TableHandler,
@@ -66,7 +61,7 @@ export async function insert(
       }
     }
     const isMultiInsert = Array.isArray(rowOrRows);
-    const rows = isMultiInsert ? rowOrRows : [rowOrRows];
+    const rows = isMultiInsert ? (rowOrRows as AnyObject[]) : [rowOrRows];
 
     requiredNestedInserts?.forEach(({ ftable, maxRows, minRows }) => {
       if (this.column_names.includes(ftable))
@@ -106,7 +101,7 @@ export async function insert(
           if (!localParams) throw "localParams missing for insert preValidate";
           row = await preValidate({
             row,
-            dbx: (this.tx?.dbTX || this.dboBuilder.dbo) as any,
+            dbx: this.tx?.dbTX || this.dboBuilder.dbo,
             localParams,
           });
         }
@@ -133,29 +128,28 @@ export async function insert(
 
     const pkeyNames = this.columns.filter((c) => c.is_pkey).map((c) => c.name);
     const getInsertQuery = async (_rows: AnyObject[]) => {
-      const validatedData = await Promise.all(
-        _rows.map(async (_row) => {
-          const row = { ..._row };
+      const validatedData = _rows.map((_row) => {
+        const row = { ..._row };
 
-          if (!isObject(row)) {
-            throw (
-              "\nInvalid insert data provided. Expected an object but received: " +
-              JSON.stringify(row)
-            );
-          }
+        if (!isObject(row)) {
+          throw (
+            "\nInvalid insert data provided. Expected an object but received: " +
+            JSON.stringify(row)
+          );
+        }
+
+        const { data: validatedRow, allowedCols } = prepareNewData({
+          row,
+          forcedData,
+          allowedFields: fields,
+          tableRules,
+          removeDisallowedFields,
+          tableConfigurator: this.dboBuilder.prostgles.tableConfigurator,
+          tableHandler: this,
+        });
+        return { validatedRow, allowedCols };
+      });
 
-          const { data: validatedRow, allowedCols } = await prepareNewData({
-            row,
-            forcedData,
-            allowedFields: fields,
-            tableRules,
-            removeDisallowedFields,
-            tableConfigurator: this.dboBuilder.prostgles.tableConfigurator,
-            tableHandler: this,
-          });
-          return { validatedRow, allowedCols };
-        })
-      );
       const validatedRows = validatedData.map((d) => d.validatedRow);
       const allowedCols = Array.from(new Set(validatedData.flatMap((d) => d.allowedCols)));
       const dbTx = finalDBtx || this.dboBuilder.dbo;
@@ -163,7 +157,7 @@ export async function insert(
         validate: validate as ValidateRowBasic,
         localParams,
       };
-      // const query = await this.colSet.getInsertQuery(validatedRows, allowedCols, dbTx, validate, localParams);
+
       const query = (
         await this.dataValidator.parse({
           command: "insert",
@@ -234,7 +228,7 @@ export async function insert(
       localParams,
       data: { rowOrRows, param2: insertParams },
       duration: Date.now() - start,
-      error: getErrorAsObject(e),
+      error: getSerialisableError(e),
     });
     throw getSerializedClientErrorFromPGError(e, {
       type: "tableMethod",

package/lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts

@@ -99,7 +99,7 @@ export async function insertNestedRecords(
         const colInserts = getReferenceColumnInserts(this, row);
 
         /* Ensure we're using the same transaction */
-        const _this = this.tx ? this : (dbTX![this.name] as TableHandler);
+        const tableHandler = this.tx ? this : (dbTX![this.name] as TableHandler);
 
         const omitedKeys = extraKeys.concat(colInserts.map((c) => c.insertedFieldName));
 
@@ -126,7 +126,7 @@ export async function insertNestedRecords(
               },
             };
             const colRows = await referencedInsert(
-              _this,
+              tableHandler,
               dbTX,
               newLocalParams,
               colInsert.tableName,
@@ -157,7 +157,7 @@ export async function insertNestedRecords(
           }
         }
 
-        const fullRootResult = (await _this.insert(
+        const fullRootResult = (await tableHandler.insert(
           rootData,
           { returning: "*" },
           undefined,
@@ -235,7 +235,7 @@ export async function insertNestedRecords(
               }
 
               insertedChildren = await childInsert(
-                childDataItems.map((d: AnyObject) => {
+                childDataItems.map((d) => {
                   const result = { ...d };
                   colsRefT1.map((col) => {
                     result[col.references![0]!.cols[0]!] =
@@ -262,14 +262,14 @@ export async function insertNestedRecords(
               if (
                 !(
                   cols2.filter((c) => c.references?.[0]?.ftable === fileTable).length === 1 &&
-                  cols2.filter((c) => c.references?.[0]?.ftable === _this.name).length === 1
+                  cols2.filter((c) => c.references?.[0]?.ftable === tableHandler.name).length === 1
                 )
               ) {
                 console.log({
                   tbl1,
                   tbl2,
                   tbl3,
-                  name: _this.name,
+                  name: tableHandler.name,
                   tthisName: this.name,
                 });
                 throw (
@@ -293,7 +293,7 @@ export async function insertNestedRecords(
                     tbl2Row[col.name] = fullRootResult[col.references![0]!.fcols[0]!];
                   });
 
-                  await childInsert(tbl2Row, tbl2!); //.then(() => {});
+                  await childInsert(tbl2Row, tbl2!);
                 })
               );
             } else {

package/lib/FileManager/initFileManager.ts

@@ -207,7 +207,8 @@ export async function initFileManager(this: FileManager, prg: Prostgles) {
         {
           res,
           httpReq: req,
-        }
+        },
+        undefined
       )) as Required<Media> | undefined;
 
       if (!media) {

package/lib/PublishParser/PublishParser.ts

@@ -1,4 +1,4 @@
-import { Method, getObjectEntries, isObject, type ClientSchema } from "prostgles-types";
+import { Method, getObjectEntries, isObject } from "prostgles-types";
 import { AuthClientRequest, AuthResultWithSID, SessionUser } from "../Auth/AuthTypes";
 import { DBOFullyTyped } from "../DBSchemaBuilder";
 import { DB, DBHandlerServer, Prostgles } from "../Prostgles";
@@ -13,11 +13,12 @@ import {
   DboTableCommand,
   ParsedTableRule,
   PublishMethods,
-  type PublishMethodsV2,
-  type PublishObject,
   PublishParams,
   RULE_TO_METHODS,
   parsePublishTableRule,
+  type PublishMethodsV2,
+  type PublishObject,
+  type PermissionScope,
 } from "./publishTypesAndUtils";
 
 export class PublishParser {
@@ -59,7 +60,8 @@ export class PublishParser {
       db: this.db,
       clientReq,
       tables: this.prostgles.dboBuilder.tables,
-      getClientDBHandlers: () => getClientHandlers(this.prostgles, clientReq),
+      getClientDBHandlers: (scope: PermissionScope | undefined) =>
+        getClientHandlers(this.prostgles, clientReq, scope),
     };
   }
 
@@ -135,21 +137,33 @@ export class PublishParser {
     if (clientInfo === "new-session-redirect") {
       throw "new-session-redirect";
     }
-    const rules = await this.getValidatedRequestRule({ tableName, command, clientReq }, clientInfo);
+    const rules = await this.getValidatedRequestRule(
+      { tableName, command, clientReq },
+      clientInfo,
+      undefined
+    );
     return rules;
   }
 
   async getValidatedRequestRule(
     { tableName, command, clientReq }: DboTableCommand,
-    clientInfo: AuthResultWithSID | undefined
+    clientInfo: AuthResultWithSID | undefined,
+    scope: PermissionScope | undefined
   ): Promise<ParsedTableRule> {
     if (!command || !tableName) throw "command OR tableName are missing";
 
-    const rtm = RULE_TO_METHODS.find((rtms) => rtms.methods.some((v) => v === command));
-    if (!rtm) {
+    const rule = RULE_TO_METHODS.find((rtms) => rtms.methods.some((v) => v === command));
+    if (!rule) {
       throw "Invalid command: " + command;
     }
 
+    if (scope) {
+      const tableScope = scope.tables;
+      if (!tableScope?.[tableName] || !tableScope[tableName]?.[rule.sqlRule]) {
+        throw `Invalid or disallowed command: ${tableName}.${command}. The PermissionsScope does not allow this command.`;
+      }
+    }
+
     /* Must be local request -> allow everything */
     if (!clientReq) {
       return RULE_TO_METHODS.reduce(
@@ -185,7 +199,7 @@ export class PublishParser {
       }
     }
 
-    if (!tableRule[rtm.rule]) {
+    if (!tableRule[rule.rule]) {
       throw {
         stack: ["getValidatedRequestRule()"],
         message: `Invalid or disallowed command: ${tableName}.${command}`,

package/lib/PublishParser/getSchemaFromPublish.ts

@@ -14,7 +14,7 @@ import { AuthClientRequest, AuthResultWithSID } from "../Auth/AuthTypes";
 import { getErrorAsObject } from "../DboBuilder/DboBuilder";
 import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
 import { TABLE_METHODS } from "../Prostgles";
-import { type PublishObject, PublishParser } from "./PublishParser";
+import { type PermissionScope, type PublishObject, PublishParser } from "./PublishParser";
 
 type Args = AuthClientRequest & {
   userData: AuthResultWithSID | undefined;
@@ -23,7 +23,8 @@ const SUBSCRIBE_METHODS = ["subscribe", "subscribeOne", "sync", "unsubscribe", "
 
 export async function getSchemaFromPublish(
   this: PublishParser,
-  { userData, ...clientReq }: Args
+  { userData, ...clientReq }: Args,
+  scope: PermissionScope | undefined
 ): Promise<{
   schema: TableSchemaForClient;
   tables: DBSchemaTable[];
@@ -118,7 +119,8 @@ export async function getSchemaFromPublish(
                           command: method,
                           clientReq,
                         },
-                        clientInfo
+                        clientInfo,
+                        scope
                       );
                       if (this.prostgles.opts.testRulesOnConnect) {
                         await (this.dbo[tableName] as TableHandler)[method](
@@ -150,7 +152,8 @@ export async function getSchemaFromPublish(
                   if (method === "getInfo" || method === "getColumns") {
                     const tableRules = await this.getValidatedRequestRule(
                       { tableName, command: method, clientReq },
-                      clientInfo
+                      clientInfo,
+                      scope
                     );
                     const res = await (this.dbo[tableName] as TableHandler)[method](
                       undefined,

package/lib/PublishParser/publishTypesAndUtils.ts

@@ -506,6 +506,11 @@ export type DbTableInfo = {
   info: TableOrViewInfo;
   columns: TableSchemaColumn[];
 };
+export type PermissionScope = {
+  sql?: true;
+  tables?: Record<string, Partial<Record<"select" | "update" | "delete" | "insert", true>>>;
+  methods?: Record<string, true>;
+};
 export type PublishParams<S = void, SUser extends SessionUser = SessionUser> = {
   sid: string | undefined;
   dbo: DBOFullyTyped<S>;
@@ -513,7 +518,12 @@ export type PublishParams<S = void, SUser extends SessionUser = SessionUser> = {
   user?: SUser["user"];
   clientReq: AuthClientRequest;
   tables: DbTableInfo[];
-  getClientDBHandlers: () => Promise<ClientHandlers<S>>;
+  getClientDBHandlers: (
+    /**
+     * Used to filter permissions
+     */
+    scope: PermissionScope | undefined
+  ) => Promise<ClientHandlers<S>>;
 };
 export type RequestParams = { dbo?: DBHandlerServer; socket?: any };
 export type PublishAllOrNothing = boolean | "*" | null;

package/lib/RestApi.ts

@@ -102,7 +102,7 @@ export class RestApi {
   };
   onPostSchema = async (req: ExpressReq, res: ExpressRes) => {
     try {
-      const data = await this.prostgles.getClientSchema({ httpReq: req, res });
+      const data = await this.prostgles.getClientSchema({ httpReq: req, res }, undefined);
       res.json(data);
     } catch (rawError) {
       const error = getSerializedClientErrorFromPGError(rawError, {
@@ -161,7 +161,8 @@ export class RestApi {
         {
           httpReq: req,
           res,
-        }
+        },
+        undefined
       );
       res.json(data);
     } catch (rawError) {

package/lib/TableConfig/getSchemaForTableConfig.ts

@@ -41,6 +41,9 @@ export const getSchemaForTableConfig = async (t: pgPromise.ITask<{}>) => {
           column_name: string;
           column_name_escaped: string;
           column_default: string | null;
+          character_maximum_length: number | null;
+          numeric_precision: number | null;
+          numeric_scale: number | null;
           udt_name: string;
           is_nullable: boolean;
           ordinal_position: number;
@@ -74,6 +77,9 @@ export const getSchemaForTableConfig = async (t: pgPromise.ITask<{}>) => {
           udt_name,
           is_nullable = 'YES' as is_nullable,
           column_default,
+          character_maximum_length, 
+          numeric_precision, 
+          numeric_scale,
           c.ordinal_position
         FROM
           information_schema.columns c
@@ -130,7 +136,7 @@ export const getSchemaForTableConfig = async (t: pgPromise.ITask<{}>) => {
         AND t.table_schema = nsp.nspname
     ) con ON TRUE
     LEFT JOIN LATERAL (
-      SELECT jsonb_agg(to_jsonb(c.*)) as indexes
+      SELECT jsonb_agg(jsonb_strip_nulls(to_jsonb(c.*))) as indexes
       FROM (SELECT indexname, indexdef FROM pg_indexes)
       WHERE t.table_schema = schemaname 
       AND t.table_name = tablename

package/lib/WebsocketAPI/getClientHandlers.ts

@@ -11,16 +11,18 @@ import type { DBOFullyTyped } from "../DBSchemaBuilder";
 import type { Prostgles } from "../Prostgles";
 import { runClientMethod, runClientRequest, runClientSqlRequest } from "../runClientRequest";
 import { getClientSchema } from "./getClientSchema";
+import type { PermissionScope } from "../PublishParser/publishTypesAndUtils";
 
 export const getClientHandlers = async <S = void>(
   prostgles: Prostgles,
-  clientReq: AuthClientRequest
+  clientReq: AuthClientRequest,
+  scope: PermissionScope | undefined
 ): Promise<{
   clientDb: DBOFullyTyped<S, false>;
   clientMethods: Record<string, Method>;
 }> => {
   const clientSchema =
-    clientReq.socket?.prostgles ?? (await getClientSchema.bind(prostgles)(clientReq));
+    clientReq.socket?.prostgles ?? (await getClientSchema.bind(prostgles)(clientReq, scope));
   const sql: SQLHandler | undefined = ((query: string, params?: unknown, options?: SQLOptions) =>
     runClientSqlRequest.bind(prostgles)({ query, params, options }, clientReq)) as SQLHandler;
   const tableHandlers = Object.fromEntries(
@@ -31,7 +33,8 @@ export const getClientHandlers = async <S = void>(
           const method = (param1: unknown, param2: unknown, param3: unknown) =>
             runClientRequest.bind(prostgles)(
               { command, tableName: table.name, param1, param2, param3 },
-              clientReq
+              clientReq,
+              scope
             );
           return [command, method];
         })
@@ -48,17 +51,25 @@ export const getClientHandlers = async <S = void>(
   const clientDb = {
     ...tableHandlers,
     ...txNotAllowed,
-    sql,
+    sql:
+      scope && !scope.sql ?
+        () => {
+          throw new Error("SQL is dissallowed by PermissionScope");
+        }
+      : sql,
   } as DBOFullyTyped<S, false>;
 
   const clientMethods: Record<string, Method> = Object.fromEntries(
     clientSchema.methods.map((method) => {
       const methodName = typeof method === "string" ? method : method.name;
-      return [
-        methodName,
-        (...params: any[]) =>
-          runClientMethod.bind(prostgles)({ method: methodName, params }, clientReq),
-      ];
+      const methodHandler =
+        scope && !scope.methods?.[methodName] ?
+          () => {
+            throw new Error(`Method ${methodName} is not allowed by PermissionScope`);
+          }
+        : (...params: any[]) =>
+            runClientMethod.bind(prostgles)({ method: methodName, params }, clientReq);
+      return [methodName, methodHandler];
     })
   );