prostgles-server 4.2.465 → 4.2.467

package/lib/WebsocketAPI/getClientHandlers.ts

@@ -54,17 +54,12 @@ export const getClientHandlers = async <S = void>(
       throw new Error("Transactions are not allowed in client handlers");
     },
   };
-  const sqlPermission = scope?.sql;
   const clientSql = ((query: string, params?: AnyObject, options?: SQLOptions) => {
-    if (!sqlPermission) {
+    if (!scope?.allowSql) {
       throw new Error("SQL is dissallowed by PermissionScope");
     }
 
-    if (sqlPermission === "commited") {
-      return sqlHandler(query, params, options);
-    }
-
-    return sqlHandler(query, params, { ...options, returnType: "default-with-rollback" });
+    return sqlHandler(query, params, options);
   }) as SQLHandler;
   const clientDb = {
     ...tableHandlers,

package/lib/initProstgles.ts

@@ -100,6 +100,8 @@ export type InitResult<S = void, SUser extends SessionUser = SessionUser> = {
     clientReq: AuthClientRequest,
     scope: PermissionScope | undefined,
   ) => ReturnType<typeof getClientHandlers<S>>;
+
+  getFieldsWithTypes: typeof DboBuilder.prototype.getDetailedFieldInfo;
 };
 
 export const initProstgles = async function (
@@ -248,6 +250,7 @@ export const initProstgles = async function (
       update: async (...args) => {
         await updateConfiguration(this, onReady, ...args);
       },
+      getFieldsWithTypes: this.dboBuilder.getDetailedFieldInfo,
       restart: () => this.init(onReady, { type: "prgl.restart" }),
       destroy: async () => {
         console.log("destroying prgl instance");

package/lib/runClientRequest.ts

@@ -10,7 +10,7 @@ import type { AuthClientRequest } from "./Auth/AuthTypes";
 import type { LocalParams } from "./DboBuilder/DboBuilder";
 import type { TableHandler as TableHandlerServer } from "./DboBuilder/TableHandler/TableHandler";
 import { parseFieldFilter } from "./DboBuilder/ViewHandler/parseFieldFilter";
-import { canRunSQL } from "./DboBuilder/runSQL";
+import { canRunSQL } from "./DboBuilder/runSql/runSQL";
 import type { Prostgles } from "./Prostgles";
 import type {
   Awaitable,

package/package.json

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

package/dist/DboBuilder/runSQL.d.ts

@@ -1,26 +0,0 @@
-import type pg from "pg-promise/typescript/pg-subset";
-import type { SQLOptions } from "prostgles-types";
-import type { DB, Prostgles } from "../Prostgles";
-import type { DboBuilder, LocalParams } from "./DboBuilder";
-import type { AuthClientRequest } from "../Auth/AuthTypes";
-export declare function runSQL(this: DboBuilder, queryWithoutRLS: string, args: unknown, options: SQLOptions | undefined, localParams: LocalParams | undefined): Promise<any>;
-export declare function cacheDBTypes(this: DboBuilder, force?: boolean): Promise<void>;
-export declare function getDetailedFieldInfo(this: DboBuilder, fields: pg.IColumn[]): {
-    tsDataType: "string" | "number" | "boolean" | "any" | "number[]" | "boolean[]" | "string[]" | "any[]";
-    dataType: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
-    udt_name: import("prostgles-types").PG_COLUMN_UDT_DATA_TYPE;
-    tableName: string | undefined;
-    tableSchema: string | undefined;
-    columnName: string | undefined;
-    name: string;
-    oid: number;
-    dataTypeID: number;
-    tableID: number;
-    columnID: number;
-    dataTypeSize: number;
-    dataTypeModifier: number;
-    format: string;
-}[];
-export declare const canRunSQL: (prostgles: Prostgles, clientReq: AuthClientRequest | undefined) => Promise<boolean>;
-export declare const canCreateTables: (db: DB) => Promise<boolean>;
-//# sourceMappingURL=runSQL.d.ts.map

package/dist/DboBuilder/runSQL.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"runSQL.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACtD,OAAO,KAAK,EAAa,UAAU,EAA4B,MAAM,iBAAiB,CAAC;AAEvF,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,wBAAsB,MAAM,CAC1B,IAAI,EAAE,UAAU,EAChB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,OAAO,EACb,OAAO,EAAE,UAAU,GAAG,SAAS,EAC/B,WAAW,EAAE,WAAW,GAAG,SAAS,gBAuGrC;AAyBD,wBAAsB,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,UAAQ,iBA8BjE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,EAAE;;;;;;;;;;;;;;;IAmB1E;AAED,eAAO,MAAM,SAAS,GACpB,WAAW,SAAS,EACpB,WAAW,iBAAiB,GAAG,SAAS,KACvC,OAAO,CAAC,OAAO,CAMjB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,IAAI,EAAE,KAAG,OAAO,CAAC,OAAO,CAI7D,CAAC"}

package/dist/DboBuilder/runSQL.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"runSQL.js","sourceRoot":"","sources":["../../lib/DboBuilder/runSQL.ts"],"names":[],"mappings":"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"}