prostgles-server 4.2.567 → 4.2.569

package/lib/TableConfig/getTableColumnQueries.ts

@@ -3,7 +3,7 @@ import { CREATE_VALIDATE_SCHEMA_FUNCTION_SQL } from "../JSONBSchemaValidation/va
 import type { DB, DBHandlerServer } from "../Prostgles";
 import { getColumnSQLDefinitionQuery, getTableColumns } from "./getColumnSQLDefinitionQuery";
 import { getFutureTableSchema } from "./getFutureTableSchema";
-import type { TableConfig } from "./TableConfig";
+import type { TableConfig } from "./TableConfigTypes";
 
 type Args = {
   db: DB;
@@ -30,7 +30,7 @@ export const getTableColumnQueries = async ({
       isCreate: boolean;
     }
 > => {
-  let newColumnDefs: string[] = [];
+  const newColumnDefinitions: string[] = [];
   const droppedColNames: string[] = [];
   const alteredColQueries: string[] = [];
   let fullQuery = "";
@@ -62,7 +62,7 @@ export const getTableColumnQueries = async ({
     return typeof colDef === "string" || !("joinDef" in colDef);
   });
 
-  const colDefs: { name: string; def: string }[] = [];
+  const columnDefinitions: { name: string; def: string }[] = [];
 
   for (const [colName, colConf] of columns) {
     /* Get column definition */
@@ -73,25 +73,25 @@ export const getTableColumnQueries = async ({
       table: tableName,
     });
     if (colDef) {
-      colDefs.push({ name: colName.toString(), def: colDef });
+      columnDefinitions.push({ name: colName.toString(), def: colDef });
     }
   }
-  const columnDefs = colDefs.map((c) => c.def);
+  const columnDefs = columnDefinitions.map((c) => c.def);
 
-  if (!colDefs.length) {
+  if (!columnDefinitions.length) {
     return undefined;
   }
 
-  const ALTERQ = `ALTER TABLE ${asName(tableName)}`;
+  const alterTableQuery = `ALTER TABLE ${asName(tableName)}`;
   if (!tableHandler) {
-    newColumnDefs.push(...colDefs.map((c) => c.def));
+    columnDefinitions.map((c) => newColumnDefinitions.push(c.def));
   } else {
     const currCols = await getTableColumns({ db, table: tableName });
 
     /** Add new columns */
-    newColumnDefs = colDefs
+    columnDefinitions
       .filter((nc) => !tableHandler.columns.some((c) => nc.name === c.name))
-      .map((c) => c.def);
+      .forEach((c) => newColumnDefinitions.push(c.def));
 
     /** Altered/Dropped columns */
     const { cols: futureCols } = await getFutureTableSchema({
@@ -106,14 +106,14 @@ export const getTableColumnQueries = async ({
         droppedColNames.push(c.column_name);
       } else if (newCol.nullable !== c.nullable) {
         alteredColQueries.push(
-          `${ALTERQ} ALTER COLUMN ${asName(c.column_name)} ${newCol.nullable ? "DROP" : "SET"} NOT NULL;`,
+          `${alterTableQuery} ALTER COLUMN ${asName(c.column_name)} ${newCol.nullable ? "DROP" : "SET"} NOT NULL;`,
         );
       } else if (newCol.udt_name !== c.udt_name) {
         alteredColQueries.push(
-          `${ALTERQ} ALTER COLUMN ${asName(c.column_name)} TYPE ${newCol.udt_name} USING ${asName(c.column_name)}::${newCol.udt_name};`,
+          `${alterTableQuery} ALTER COLUMN ${asName(c.column_name)} TYPE ${newCol.udt_name} USING ${asName(c.column_name)}::${newCol.udt_name};`,
         );
       } else if (newCol.column_default !== c.column_default) {
-        const colConfig = colDefs.find((cd) => cd.name === c.column_name);
+        const colConfig = columnDefinitions.find((cd) => cd.name === c.column_name);
         if (
           ["serial", "bigserial"].some((t) => colConfig?.def.toLowerCase().includes(` ${t}`)) &&
           c.column_default?.toLowerCase().includes("nextval")
@@ -121,7 +121,7 @@ export const getTableColumnQueries = async ({
           /** Ignore SERIAL/BIGSERIAL <> nextval mismatch */
         } else {
           alteredColQueries.push(
-            `${ALTERQ} ALTER COLUMN ${asName(c.column_name)} ${newCol.column_default === null ? "DROP DEFAULT" : `SET DEFAULT ${newCol.column_default}`};`,
+            `${alterTableQuery} ALTER COLUMN ${asName(c.column_name)} ${newCol.column_default === null ? "DROP DEFAULT" : `SET DEFAULT ${newCol.column_default}`};`,
           );
         }
       }
@@ -130,10 +130,10 @@ export const getTableColumnQueries = async ({
 
   if (!tableHandler || tableConf.dropIfExists || tableConf.dropIfExistsCascade) {
     isCreate = true;
-    const DROPQ = `DROP TABLE IF EXISTS ${asName(tableName)}`;
+    const dropTableQuery = `DROP TABLE IF EXISTS ${asName(tableName)}`;
     fullQuery = [
-      ...(tableConf.dropIfExists ? [`${DROPQ};`]
-      : tableConf.dropIfExistsCascade ? [`${DROPQ} CASCADE;`]
+      ...(tableConf.dropIfExists ? [`${dropTableQuery};`]
+      : tableConf.dropIfExistsCascade ? [`${dropTableQuery} CASCADE;`]
       : []),
       `CREATE TABLE ${asName(tableName)} (`,
       columnDefs.join(", \n"),
@@ -141,8 +141,10 @@ export const getTableColumnQueries = async ({
     ].join("\n");
   } else {
     fullQuery = [
-      ...droppedColNames.map((c) => `${ALTERQ} DROP COLUMN ${asName(c)};`),
-      ...newColumnDefs.map((c) => `${ALTERQ} ADD COLUMN ${c};`),
+      // ...droppedColNames.map((c) => `${alterTableQuery} DROP COLUMN ${asName(c)};`),
+      ...newColumnDefinitions.map(
+        (columnDefinition) => `${alterTableQuery} ADD COLUMN ${columnDefinition};`,
+      ),
       ...alteredColQueries,
     ].join("\n");
   }
@@ -151,6 +153,6 @@ export const getTableColumnQueries = async ({
     fullQuery,
     columnDefs,
     isCreate,
-    newColumnDefs,
+    newColumnDefs: newColumnDefinitions,
   };
 };

package/lib/TableConfig/getTableConfigSchemaQueries.ts

@@ -1,32 +1,31 @@
 import { as } from "pg-promise";
 import { isDefined } from "prostgles-types";
-import { getFileManagerSchema } from "../FileManager/initFileManager";
 import type { DB } from "../initProstgles";
 import { getColumnSQLDefinitionQuery } from "./getColumnSQLDefinitionQuery";
 import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
 import { tableConfigWithMigrations, type SchemaRelatedOptions } from "./getCreateSchemaQueries";
-import type { TableConfig } from "./TableConfig";
+import type { TableConfig } from "./TableConfigTypes";
 import type { getSchemaUtils } from "./tableConfigSchemaUtils";
 
 export const getTableConfigSchemaQueries = async (
   opts: SchemaRelatedOptions,
-  { asName, db }: Pick<Awaited<ReturnType<typeof getSchemaUtils>>, "asName" | "db">
+  { asName, db }: Pick<Awaited<ReturnType<typeof getSchemaUtils>>, "asName" | "db">,
 ) => {
-  const fileTableSchema = getFileManagerSchema(opts);
-  const fileTableSchemaQuery = fileTableSchema?.queries.join("\n") ?? "";
-  const migrations = await tableConfigWithMigrations(db, opts, fileTableSchemaQuery);
+  // const fileTableSchema = getFileTableConfig(opts);
+  // const fileTableSchemaQuery = fileTableSchema?.queries.join("\n") ?? "";
+  const migrations = await tableConfigWithMigrations(db, opts, "");
 
   const config: TableConfig = migrations.config ?? {};
 
   const uniqueColumnAndTableNames = Array.from(
     new Set(
-      Object.entries(config).flatMap(([tname, tableConf]) => {
+      Object.entries(config).flatMap(([tableName, tableConf]) => {
         if ("columns" in tableConf && tableConf.columns) {
-          return [tname, ...Object.keys(tableConf.columns)];
+          return [tableName, ...Object.keys(tableConf.columns)];
         }
-        return [tname];
-      })
-    )
+        return [tableName];
+      }),
+    ),
   );
 
   /** Avoid using double quotes when not required to ensure the jsonb validation checks do not include unnecessary quotes */
@@ -34,10 +33,10 @@ export const getTableConfigSchemaQueries = async (
     escapedTableNameMapObj: Record<string, string>;
   }>(
     `
-    SELECT jsonb_object_agg(tblname, quote_ident(tblname)) as "escapedTableNameMapObj"
-    FROM unnest(ARRAY[\${keys:csv}]) as tblname
+    SELECT jsonb_object_agg(table_name, quote_ident(table_name)) as "escapedTableNameMapObj"
+    FROM unnest(ARRAY[\${keys:csv}]) as table_name
     `,
-    { keys: uniqueColumnAndTableNames.concat("prevent_empty_array_error") }
+    { keys: uniqueColumnAndTableNames.concat("prevent_empty_array_error") },
   );
 
   let triggerQueries: string[] = [];
@@ -55,7 +54,7 @@ export const getTableConfigSchemaQueries = async (
       tableConf,
       asName,
       escapedTableNameMapObj,
-      db
+      db,
     );
     if (_tableQueries) {
       tableQueries = [...tableQueries, ..._tableQueries.queries];
@@ -77,7 +76,6 @@ export const getTableConfigSchemaQueries = async (
 
   return {
     dropTableQueries,
-    fileTableSchemaQuery,
     tableQueries,
     constraintQueries,
     indexQueries,
@@ -91,7 +89,7 @@ const getTableQueries = async (
   tableConf: TableConfig[string],
   asName: (v: string) => string,
   escapedTableNameMapObj: Record<string, string>,
-  db: DB
+  db: DB,
 ) => {
   if ("isLookupTable" in tableConf && Object.keys(tableConf.isLookupTable.values).length) {
     const { isLookupTable } = tableConf;
@@ -100,7 +98,7 @@ const getTableQueries = async (
       ([id, otherColumns]) => ({
         id,
         ...otherColumns,
-      })
+      }),
     );
 
     const allColumns = Object.keys(rows[0]!);
@@ -122,7 +120,7 @@ const getTableQueries = async (
       return as.format(
         `INSERT INTO ${tableName}  (${allColumns.map((t) => asName(t)).join(", ")})  ` +
           " VALUES (${values:csv}) ON CONFLICT DO NOTHING;",
-        { values }
+        { values },
       );
     });
     const queries = [createQuery, ...dataQuerys];
@@ -169,7 +167,7 @@ const getConstraintQueries = (tableName: string, tableConf: TableConfig[string])
 const getIndexQueries = (
   tableName: string,
   tableConf: TableConfig[string],
-  asName: (v: string) => string
+  asName: (v: string) => string,
 ) => {
   if ("indexes" in tableConf && tableConf.indexes) {
     /*
@@ -199,7 +197,7 @@ const getIndexQueries = (
           return [`DROP INDEX IF EXISTS ${asName(indexName)};`, query];
         }
         return [query];
-      }
+      },
     );
   }
   return [];
@@ -207,7 +205,7 @@ const getIndexQueries = (
 const getTriggerQueries = (
   tableName: string,
   tableConfig: TableConfig[string],
-  asName: (v: string) => string
+  asName: (v: string) => string,
 ) => {
   const { triggers } = tableConfig;
   if (!triggers) return [];

package/lib/TableConfig/indexes/getIndexesQueries.ts

@@ -4,7 +4,7 @@ import type { DB } from "../../initProstgles";
 import { asValue } from "../../PubSubManager/PubSubManagerUtils";
 import { executeSqlWithRollback } from "../getFutureTableSchema";
 import { getPGIndexes } from "../getPGIndexes";
-import type { TableConfig } from "../TableConfig";
+import type { TableConfig } from "../TableConfigTypes";
 
 /**
  * Keep Postgres indexes in sync with table configuration

package/lib/TableConfig/initTableConfig.ts

@@ -5,15 +5,13 @@ import {
   log,
 } from "../PubSubManager/PubSubManagerUtils";
 import type { OnReadyCallbackBasic } from "../initProstgles";
-import type TableConfigurator from "./TableConfig";
-import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
 import { fetchTableConstraints } from "./fetchTableConstraints";
+import { getConstraintDefinitionQueries } from "./getConstraintDefinitionQueries";
 import { getFutureTableSchema } from "./getFutureTableSchema";
-import { getPGIndexes } from "./getPGIndexes";
 import { getTableColumnQueries } from "./getTableColumnQueries";
-import { runMigrations } from "./runMigrations";
-import { md5 } from "prostgles-types/dist/md5";
 import { getIndexesQueries } from "./indexes/getIndexesQueries";
+import { runMigrations } from "./runMigrations";
+import type { TableConfigurator } from "./TableConfigurator";
 
 export const initTableConfig = async function (this: TableConfigurator) {
   this.initialising = true;
@@ -86,8 +84,9 @@ export const initTableConfig = async function (this: TableConfigurator) {
   const MAX_IDENTIFIER_LENGTH = +(
     await this.db.one<{ max_identifier_length: number }>("SHOW max_identifier_length;")
   ).max_identifier_length;
-  if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
+  if (!Number.isFinite(MAX_IDENTIFIER_LENGTH)) {
     throw `Could not obtain a valid max_identifier_length`;
+  }
   const asName = (v: string) => {
     if (v.length > MAX_IDENTIFIER_LENGTH) {
       throw `The identifier name provided (${v}) is longer than the allowed limit (max_identifier_length = ${MAX_IDENTIFIER_LENGTH} characters )\n Longest allowed: ${_asName(v.slice(0, MAX_IDENTIFIER_LENGTH))} `;
@@ -351,4 +350,6 @@ export const initTableConfig = async function (this: TableConfigurator) {
 
   await this.prostgles.refreshDBO();
   await this.setTableOnMounts();
+  /** Needed in case some onMounts change schema */
+  await this.prostgles.refreshDBO();
 };

package/lib/WebsocketAPI/getClientSchema.ts

@@ -42,7 +42,13 @@ export async function getClientSchema(
     const tablesWithSelectRules = new Set(
       fullSchema?.tables.filter((t) => t.publishInfo.select).map((t) => t.name) ?? [],
     );
-    const { tables = [], tableSchemaErrors = {} } = fullSchema ?? {};
+    const { tables: rawTables = [] } = fullSchema ?? {};
+    const { tableSchemaErrors = {} } = fullSchema ?? {};
+    const { modifyClientSchema } = this.opts;
+    const tables =
+      modifyClientSchema ?
+        await Promise.all(rawTables.map(async (t) => modifyClientSchema(t, userData)))
+      : rawTables;
     const joinTables2: string[][] = [];
     if (this.opts.joins) {
       const _joinTables2 = this.dboBuilder

package/lib/index.ts

@@ -16,9 +16,10 @@ export * from "./Auth/AuthTypes";
 export type { PublishParams } from "./PublishParser/publishTypesAndUtils";
 export type { DBOFullyTyped } from "./DBSchemaBuilder/DBSchemaBuilder";
 export type { DBHandlerServer } from "./Prostgles";
-export type { CloudClient, LocalConfig } from "./FileManager/FileManager";
+export type { StorageClient as CloudClient, LocalConfig } from "./FileManager/FileManager";
+export * from "./FileManager/getLocalStorageClient";
 export type { DB } from "./initProstgles";
-export type * from "./TableConfig/TableConfig";
+export type * from "./TableConfig/TableConfigTypes";
 export * from "./Auth/utils/upsertNamedExpressMiddleware";
 export type { RequestWithUser } from "./Auth/middleware/userContextMiddleware";
 export default prostgles;

package/lib/initProstgles.ts

@@ -111,10 +111,7 @@ export const initProstgles = async function (
   reason: OnInitReason,
 ): Promise<InitResult> {
   this.loaded = false;
-  const expressApp =
-    this.opts.fileTable?.expressApp ??
-    this.opts.restApi?.expressApp ??
-    this.opts.auth?.loginSignupConfig?.app;
+  const expressApp = this.opts.expressApp ?? this.opts.auth?.loginSignupConfig?.app;
 
   /** Crucial in ensuring the runtime version of express works as expected */
   if (expressApp) {
@@ -193,7 +190,7 @@ export const initProstgles = async function (
     await runSQLFile(this);
     await this.refreshDBO();
     await this.initTableConfig(reason);
-    await this.initFileTable();
+    await this.refreshDBO();
     this.initRestApi();
 
     this.schemaWatch = await SchemaWatch.create(this.dboBuilder);
@@ -274,7 +271,6 @@ export const initProstgles = async function (
             this.opts.io.engine.close();
           }
         }
-        this.fileManager?.destroy();
         await this.dboBuilder.destroy();
         this.authHandler.destroy();
         await this.tableConfigurator?.destroy();

package/lib/runClientRequest.ts

@@ -132,7 +132,7 @@ export const runClientRequest = async function (
     );
   const localParams: LocalParams = {
     clientReq,
-    isRemoteRequest: { user: sessionUser },
+    isRemoteRequest: { user: sessionUser, clientInfo },
     scope,
   };
 

package/lib/updateConfiguration.ts

@@ -24,9 +24,6 @@ export const updateConfiguration = async <DBSchema, UserSchema extends SessionUs
     return;
   }
 
-  if (includes(optionsThatChanged, "fileTable")) {
-    await prgl.initFileTable();
-  }
   if (includes(optionsThatChanged, "restApi")) {
     prgl.initRestApi();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.567",
+  "version": "4.2.569",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -57,7 +57,7 @@
     "pg": "^8.21.0",
     "pg-cursor": "^2.21.0",
     "pg-promise": "^12.7.0",
-    "prostgles-types": "^4.0.271"
+    "prostgles-types": "^4.0.273"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",
@@ -69,7 +69,6 @@
     "@types/pg-cursor": "^2.7.2",
     "@types/sharp": "^0.30.5",
     "eslint": "^9.39.5",
-    "eslint-plugin-security": "^3.0.1",
     "prettier": "^3.9.5",
     "socket.io": "^4.8.3",
     "typescript": "^5.9.3",

package/dist/FileManager/initFileManager.d.ts

@@ -1,18 +0,0 @@
-import type { Prostgles } from "../Prostgles";
-import type { SchemaRelatedOptions } from "../TableConfig/getCreateSchemaQueries";
-import type { FileManager } from "./FileManager";
-export declare const getFileManagerSchema: ({ fileTable, tableConfig, }: Pick<SchemaRelatedOptions, "fileTable" | "tableConfig">) => {
-    fileTable: import("../ProstglesTypes").FileTableConfig;
-    fileTableName: string;
-    fileTableQuery: string;
-    referencedTables: {
-        [tableName: string]: {
-            type: "column";
-            referenceColumns: Record<string, import("prostgles-types").FileColumnConfig>;
-        };
-    };
-    referencedTablesQueries: string[];
-    queries: string[];
-} | undefined;
-export declare function initFileManager(this: FileManager, prg: Prostgles): Promise<void>;
-//# sourceMappingURL=initFileManager.d.ts.map

package/dist/FileManager/initFileManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAElF,OAAO,KAAK,EAAE,WAAW,EAAe,MAAM,eAAe,CAAC;AAI9D,eAAO,MAAM,oBAAoB,GAAI,6BAGlC,IAAI,CAAC,oBAAoB,EAAE,WAAW,GAAG,aAAa,CAAC;;;;;;;;;;;;aAsDzD,CAAC;AAEF,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,iBAqLtE"}