prostgles-server 4.2.187 → 4.2.188

package/lib/TableConfig/getConstraintDefinitionQueries.ts

@@ -24,9 +24,6 @@ export const getConstraintDefinitionQueries = ({
 }: Args): ConstraintDef[] | undefined => {
   if ("constraints" in tableConf && tableConf.constraints) {
     const { constraints } = tableConf;
-    if (!constraints) {
-      return undefined;
-    }
 
     if (Array.isArray(constraints)) {
       return constraints.map((c) => ({
@@ -38,9 +35,7 @@ export const getConstraintDefinitionQueries = ({
       return constraintNames.map((constraintName) => {
         const _cnstr = constraints[constraintName]!;
         const constraintDef =
-          typeof _cnstr === "string"
-            ? _cnstr
-            : `${_cnstr.type} (${_cnstr.content})`;
+          typeof _cnstr === "string" ? _cnstr : `${_cnstr.type} (${_cnstr.content})`;
 
         /** Drop constraints with the same name */
         // const existingConstraint = constraints.some(c => c.conname === constraintName);
@@ -97,8 +92,7 @@ export const getColConstraintsQuery = ({
   `;
   if (table) query += `\nAND "table" = ${asValue(table)}`;
   if (column) query += `\nAND cols @> ARRAY[${asValue(column)}]`;
-  if (types?.length)
-    query += `\nAND type IN (${types.map((v) => asValue(v)).join(", ")})`;
+  if (types?.length) query += `\nAND type IN (${types.map((v) => asValue(v)).join(", ")})`;
   return query;
 };
 export const getColConstraints = ({

package/lib/TableConfig/getFutureTableSchema.ts

@@ -2,11 +2,7 @@ import { asName } from "prostgles-types";
 import { pgp } from "../DboBuilder/DboBuilder";
 import { DB } from "../Prostgles";
 import { ColumnMinimalInfo, getTableColumns } from "./getColumnDefinitionQuery";
-import {
-  ColConstraint,
-  ConstraintDef,
-  getColConstraints,
-} from "./getConstraintDefinitionQueries";
+import { ColConstraint, ConstraintDef, getColConstraints } from "./getConstraintDefinitionQueries";
 
 type Args = {
   db: DB;
@@ -32,25 +28,23 @@ export const getFutureTableSchema = async ({
 
   let constraints: ColConstraint[] = [];
   let cols: ColumnMinimalInfo[] = [];
-  const ROLLBACK = "Rollback";
-  try {
-    const txMode = new TransactionMode({
-      tiLevel: isolationLevel.serializable,
-    });
-    await db.tx({ mode: txMode }, async (t) => {
-      /** To prevent deadlocks we use a random table name -> Not feasible because named constraints cannot be recreated without dropping the existing ones from actual table */
-      // const tableEsc = asName(tableName.slice(0, 12) + (await t.oneOrNone(`SELECT md5(now()::text) as md5`)).md5);
+  const txMode = new TransactionMode({
+    tiLevel: isolationLevel.serializable,
+  });
+  await db.tx({ mode: txMode }, async (t) => {
+    /** To prevent deadlocks we use a random table name -> Not feasible because named constraints cannot be recreated without dropping the existing ones from actual table */
+    // const tableEsc = asName(tableName.slice(0, 12) + (await t.oneOrNone(`SELECT md5(now()::text) as md5`)).md5);
 
-      const tableEsc = asName(tableName);
+    const tableEsc = asName(tableName);
 
-      const consQueries = constraintDefs
-        .map(
-          (c) =>
-            `ALTER TABLE ${tableEsc} ADD ${c.name ? ` CONSTRAINT ${asName(c.name)}` : ""} ${c.content};`,
-        )
-        .join("\n");
+    const consQueries = constraintDefs
+      .map(
+        (c) =>
+          `ALTER TABLE ${tableEsc} ADD ${c.name ? ` CONSTRAINT ${asName(c.name)}` : ""} ${c.content};`
+      )
+      .join("\n");
 
-      const query = `
+    const query = `
         DROP TABLE IF EXISTS ${tableEsc} CASCADE;
         CREATE TABLE ${tableEsc} (
           ${columnDefs.join(",\n")}
@@ -58,21 +52,13 @@ export const getFutureTableSchema = async ({
         ${consQueries}
       `;
 
-      await t.any(query);
+    await t.any(query);
 
-      constraints = await getColConstraints({ db: t, table: tableName });
-      cols = await getTableColumns({ db: t, table: tableName });
+    constraints = await getColConstraints({ db: t, table: tableName });
+    cols = await getTableColumns({ db: t, table: tableName });
 
-      /** Rollback */
-      return Promise.reject(new Error(ROLLBACK));
-    });
-  } catch (e: any) {
-    if (e instanceof Error && e.message === ROLLBACK) {
-      // Ignore
-    } else {
-      throw e;
-    }
-  }
+    return t.any("ROLLBACK");
+  });
 
   return { cols, constraints };
 };

package/lib/TableConfig/getTableColumnQueries.ts

@@ -1,16 +1,7 @@
-import {
-  getKeys,
-  asName as _asName,
-  isObject,
-  asName,
-  getObjectEntries,
-} from "prostgles-types";
+import { getKeys, asName as _asName, isObject, asName, getObjectEntries } from "prostgles-types";
 import { DB, DBHandlerServer } from "../Prostgles";
 import { validate_jsonb_schema_sql } from "../JSONBValidation/validate_jsonb_schema_sql";
-import {
-  getColumnDefinitionQuery,
-  getTableColumns,
-} from "./getColumnDefinitionQuery";
+import { getColumnDefinitionQuery, getTableColumns } from "./getColumnDefinitionQuery";
 import { TableConfig } from "./TableConfig";
 import { getFutureTableSchema } from "./getFutureTableSchema";
 
@@ -51,9 +42,7 @@ export const getTableColumnQueries = async ({
 
   const hasJSONBValidation = getKeys(tableConf.columns).some((c) => {
     const cConf = tableConf.columns?.[c];
-    return (
-      cConf && isObject(cConf) && (cConf.jsonbSchema || cConf.jsonbSchemaType)
-    );
+    return cConf && isObject(cConf) && (cConf.jsonbSchema || cConf.jsonbSchemaType);
   });
 
   /** Must install validation function */
@@ -61,10 +50,7 @@ export const getTableColumnQueries = async ({
     try {
       await db.any(validate_jsonb_schema_sql);
     } catch (err: any) {
-      console.error(
-        "Could not install the jsonb validation function due to error: ",
-        err,
-      );
+      console.error("Could not install the jsonb validation function due to error: ", err);
       throw err;
     }
   }
@@ -97,7 +83,7 @@ export const getTableColumnQueries = async ({
   const ALTERQ = `ALTER TABLE ${asName(tableName)}`;
   if (!tableHandler) {
     newColumnDefs.push(...colDefs.map((c) => c.def));
-  } else if (tableHandler) {
+  } else {
     const currCols = await getTableColumns({ db, table: tableName });
 
     /** Add new columns */
@@ -118,43 +104,35 @@ 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;`,
+          `${ALTERQ} 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};`,
+          `${ALTERQ} 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);
         if (
-          ["serial", "bigserial"].some((t) =>
-            colConfig?.def.toLowerCase().includes(` ${t}`),
-          ) &&
+          ["serial", "bigserial"].some((t) => colConfig?.def.toLowerCase().includes(` ${t}`)) &&
           c.column_default?.toLowerCase().includes("nextval")
         ) {
           /** 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}`};`,
+            `${ALTERQ} ALTER COLUMN ${asName(c.column_name)} ${newCol.column_default === null ? "DROP DEFAULT" : `SET DEFAULT ${newCol.column_default}`};`
           );
         }
       }
     });
   }
 
-  if (
-    !tableHandler ||
-    tableConf.dropIfExists ||
-    tableConf.dropIfExistsCascade
-  ) {
+  if (!tableHandler || tableConf.dropIfExists || tableConf.dropIfExistsCascade) {
     isCreate = true;
     const DROPQ = `DROP TABLE IF EXISTS ${asName(tableName)}`;
     fullQuery = [
-      ...(tableConf.dropIfExists
-        ? [`${DROPQ};`]
-        : tableConf.dropIfExistsCascade
-          ? [`${DROPQ} CASCADE;`]
-          : []),
+      ...(tableConf.dropIfExists ? [`${DROPQ};`]
+      : tableConf.dropIfExistsCascade ? [`${DROPQ} CASCADE;`]
+      : []),
       `CREATE TABLE ${asName(tableName)} (`,
       columnDefs.join(", \n"),
       `);`,

package/lib/TableConfig/initTableConfig.ts

@@ -55,9 +55,8 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
     throw "pgp missing";
   }
 
-  const MAX_IDENTIFIER_LENGTH = +(
-    (await this.db.one("SHOW max_identifier_length;")) as any
-  ).max_identifier_length;
+  const MAX_IDENTIFIER_LENGTH = +((await this.db.one("SHOW max_identifier_length;")) as any)
+    .max_identifier_length;
   if (!Number.isFinite(MAX_IDENTIFIER_LENGTH))
     throw `Could not obtain a valid max_identifier_length`;
   const asName = (v: string) => {
@@ -81,9 +80,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
     `);
     migrations = { version, table: versionTableName };
     const maxVersion = +(
-      await this.db.oneOrNone(
-        `SELECT MAX(id) as v FROM ${asName(versionTableName)}`,
-      )
+      await this.db.oneOrNone(`SELECT MAX(id) as v FROM ${asName(versionTableName)}`)
     ).v;
     const latestVersion = Number.isFinite(maxVersion) ? maxVersion : undefined;
 
@@ -91,7 +88,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
       const isLatest = (
         await this.db.oneOrNone(
           `SELECT table_config = \${table_config} as v FROM ${asName(versionTableName)} WHERE id = \${version}`,
-          { version, table_config: this.config },
+          { version, table_config: this.config }
         )
       ).v;
       if (isLatest) {
@@ -115,10 +112,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
   for (const [tableNameRaw, tableConf] of Object.entries(this.config)) {
     const tableName = asName(tableNameRaw);
 
-    if (
-      "isLookupTable" in tableConf &&
-      Object.keys(tableConf.isLookupTable?.values).length
-    ) {
+    if ("isLookupTable" in tableConf && Object.keys(tableConf.isLookupTable.values).length) {
       const { dropIfExists = false, dropIfExistsCascade = false } = tableConf;
       const isDropped = dropIfExists || dropIfExistsCascade;
 
@@ -128,24 +122,26 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
         queries.push(`DROP TABLE IF EXISTS ${tableName};`);
       }
 
-      const rows = Object.entries(tableConf.isLookupTable?.values).map(
-        ([id, otherColumns]) => ({ id, ...otherColumns }),
-      );
-      const lookupTableHandler = this.dbo?.[tableNameRaw];
+      const rows = Object.entries(tableConf.isLookupTable.values).map(([id, otherColumns]) => ({
+        id,
+        ...otherColumns,
+      }));
+      const lookupTableHandler = this.dbo[tableNameRaw];
       const columnNames = Object.keys(rows[0]!).filter((k) => k !== "id");
       if (isDropped || !lookupTableHandler) {
         queries.push(
           `CREATE TABLE IF NOT EXISTS ${tableName} (
             id  TEXT PRIMARY KEY
             ${columnNames.length ? ", " + columnNames.map((k) => asName(k) + " TEXT ").join(", ") : ""}
-          );`,
+          );`
         );
       }
       if (rows.length) {
-        const existingValues: { id: any }[] = !lookupTableHandler
-          ? []
+        const existingValues: { id: any }[] =
+          !lookupTableHandler ?
+            []
           : await this.db.any(
-              `SELECT id FROM ${tableName} WHERE id IN (${rows.map((r) => asValue(r.id)).join(", ")});`,
+              `SELECT id FROM ${tableName} WHERE id IN (${rows.map((r) => asValue(r.id)).join(", ")});`
             );
         rows
           .filter((r) => !existingValues.some((ev) => ev.id === r.id))
@@ -156,8 +152,8 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
               this.prostgles.pgp!.as.format(
                 `INSERT INTO ${tableName}  (${allColumns.map((t) => asName(t)).join(", ")})  ` +
                   " VALUES (${values:csv});",
-                { values },
-              ),
+                { values }
+              )
             );
           });
       }
@@ -177,14 +173,14 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
 
     /* isLookupTable table has already been created */
     const coldef =
-      "isLookupTable" in tableConf
-        ? undefined
-        : await getTableColumnQueries({
-            db: this.db,
-            tableConf,
-            tableHandler,
-            tableName,
-          });
+      "isLookupTable" in tableConf ? undefined : (
+        await getTableColumnQueries({
+          db: this.db,
+          tableConf,
+          tableHandler,
+          tableName,
+        })
+      );
 
     if (coldef) {
       queries.push(coldef.fullQuery);
@@ -220,9 +216,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
       currCons.forEach((c) => {
         if (
           !futureCons.some(
-            (nc) =>
-              nc.definition === c.definition &&
-              (!nc.isNamed || nc.name === c.name),
+            (nc) => nc.definition === c.definition && (!nc.isNamed || nc.name === c.name)
           )
         ) {
           queries.push(`${ALTER_TABLE_Q} DROP CONSTRAINT ${asName(c.name)};`);
@@ -234,9 +228,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
         if (c.name && !currCons.some((cc) => cc.name === c.name)) {
           const fc = futureCons.find((nc) => nc.name === c.name);
           if (fc) {
-            queries.push(
-              `${ALTER_TABLE_Q} ADD CONSTRAINT ${asName(c.name)} ${c.content};`,
-            );
+            queries.push(`${ALTER_TABLE_Q} ADD CONSTRAINT ${asName(c.name)} ${c.content};`);
           }
         }
       });
@@ -261,14 +253,8 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
       */
       const currIndexes = await getPGIndexes(this.db, tableName, "public");
       Object.entries(tableConf.indexes).forEach(
-        ([
-          indexName,
-          { columns, concurrently, replace, unique, using, where = "" },
-        ]) => {
-          if (
-            replace ||
-            (typeof replace !== "boolean" && tableConf.replaceUniqueIndexes)
-          ) {
+        ([indexName, { columns, concurrently, replace, unique, using, where = "" }]) => {
+          if (replace || (typeof replace !== "boolean" && tableConf.replaceUniqueIndexes)) {
             queries.push(`DROP INDEX IF EXISTS ${asName(indexName)};`);
           }
           if (!currIndexes.some((idx) => idx.indexname === indexName)) {
@@ -283,10 +269,10 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
                 where && `WHERE ${where}`,
               ]
                 .filter((v) => v)
-                .join(" ") + ";",
+                .join(" ") + ";"
             );
           }
-        },
+        }
       );
     }
 
@@ -303,7 +289,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
             ORDER BY event_object_table
           `,
         { tableName },
-        { returnType: "rows" },
+        { returnType: "rows" }
       )) as { trigger_name: string }[];
 
       // const existingTriggerFuncs = await this.dbo.sql!(`
@@ -338,24 +324,15 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
 
           const triggerActionNameParsed = asName(triggerActionName);
           if (isDropped) {
-            queries.push(
-              `DROP TRIGGER IF EXISTS ${triggerActionNameParsed} ON ${tableName};`,
-            );
+            queries.push(`DROP TRIGGER IF EXISTS ${triggerActionNameParsed} ON ${tableName};`);
           }
 
-          if (
-            isDropped ||
-            !existingTriggers.some((t) => t.trigger_name === triggerActionName)
-          ) {
+          if (isDropped || !existingTriggers.some((t) => t.trigger_name === triggerActionName)) {
             addFuncDef();
-            const newTableName =
-              action !== "delete" ? "NEW TABLE AS new_table" : "";
-            const oldTableName =
-              action !== "insert" ? "OLD TABLE AS old_table" : "";
+            const newTableName = action !== "delete" ? "NEW TABLE AS new_table" : "";
+            const oldTableName = action !== "insert" ? "OLD TABLE AS old_table" : "";
             const transitionTables =
-              trigger.forEach === "row"
-                ? ""
-                : `REFERENCING ${newTableName} ${oldTableName}`;
+              trigger.forEach === "row" ? "" : `REFERENCING ${newTableName} ${oldTableName}`;
             queries.push(`
                 CREATE TRIGGER ${triggerActionNameParsed}
                 ${trigger.type} ${action} ON ${tableName}
@@ -381,9 +358,7 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
       if (err.position) {
         const pos = +err.position;
         if (Number.isInteger(pos)) {
-          return Promise.reject(
-            err.toString() + "\n At:" + q.slice(pos - 50, pos + 50),
-          );
+          return Promise.reject(err.toString() + "\n At:" + q.slice(pos - 50, pos + 50));
         }
       }
 
@@ -393,10 +368,11 @@ export const initTableConfig = async function (this: TableConfigurator<any>) {
 
   if (migrations) {
     await this.db.any(
-      `INSERT INTO ${migrations.table}(id, table_config) VALUES (${asValue(migrations.version)}, ${asValue(this.config)}) ON CONFLICT DO NOTHING;`,
+      `INSERT INTO ${migrations.table}(id, table_config) VALUES (${asValue(migrations.version)}, ${asValue(this.config)}) ON CONFLICT DO NOTHING;`
     );
   }
   this.initialising = false;
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if (changedSchema && !failedQueries.length) {
     if (!this.prevInitQueryHistory) {
       this.prevInitQueryHistory = queryHistory;

package/lib/initProstgles.ts

@@ -250,7 +250,7 @@ export const initProstgles = async function (
           }
         }
         this.fileManager?.destroy();
-        this.dboBuilder?.destroy();
+        this.dboBuilder.destroy();
         this.authHandler?.destroy();
         await this.tableConfigurator?.destroy();
         this.dbo = undefined;

package/lib/onSocketConnected.ts

@@ -36,11 +36,9 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
         });
       } catch (error) {
         const connectionError =
-          error instanceof Error
-            ? error.message
-            : typeof error === "string"
-              ? error
-              : JSON.stringify(error);
+          error instanceof Error ? error.message
+          : typeof error === "string" ? error
+          : JSON.stringify(error);
         socket.emit(CHANNELS.CONNECTION, { connectionError });
         socket.disconnect();
         return;
@@ -54,7 +52,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
         args: SocketRequestParams,
         cb = (..._callback: any[]) => {
           /* Empty */
-        },
+        }
       ) => {
         runClientRequest
           .bind(this)({ ...args, type: "socket", socket })
@@ -64,15 +62,13 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
           .catch((err) => {
             cb(err);
           });
-      },
+      }
     );
 
     socket.on("disconnect", () => {
       this.dbEventsManager?.removeNotice(socket);
       this.dbEventsManager?.removeNotify(undefined, socket);
-      this.connectedSockets = this.connectedSockets.filter(
-        (s) => s.id !== socket.id,
-      );
+      this.connectedSockets = this.connectedSockets.filter((s) => s.id !== socket.id);
       this.dboBuilder.queryStreamer.onDisconnect(socket.id);
       this.opts.onLog?.({
         type: "disconnect",
@@ -96,7 +92,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
         { method, params }: SocketMethodRequest,
         cb = (..._callback: any) => {
           /* Empty */
-        },
+        }
       ) => {
         runClientMethod
           .bind(this)({
@@ -111,7 +107,7 @@ export async function onSocketConnected(this: Prostgles, socket: PRGLIOSocket) {
           .catch((err) => {
             makeSocketError(cb, err);
           });
-      },
+      }
     );
 
     this.pushSocketSchema(socket);