prostgles-server 4.2.631 → 4.2.634

package/dist/TableConfig/getTableColumnQueries.js.map

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

package/lib/DboBuilder/DboBuilder.ts

@@ -24,7 +24,6 @@ import type {
 import { QueryStreamer } from "./runSql/QueryStreamer";
 import { TableHandler } from "./TableHandler/TableHandler";
 import type { JoinPaths } from "./ViewHandler/ViewHandler";
-import { parseJoinPath } from "./ViewHandler/parseJoinPath";
 import type { PGConstraint } from "./dboBuilderUtils";
 import {
   getCanExecute,
@@ -198,7 +197,7 @@ export class DboBuilder {
 
   _joins?: Join[];
   get joins(): Join[] {
-    return clone(this._joins ?? []).filter((j) => j.tables[0] !== j.tables[1]);
+    return clone(this._joins ?? []);
   }
 
   set joins(j: Join[]) {
@@ -406,20 +405,6 @@ export class DboBuilder {
     target: string,
   ): JoinPaths[number] | undefined => {
     const source = viewHandler.name;
-    if (source === target) {
-      parseJoinPath({
-        rawPath: target,
-        rootTable: source,
-        viewHandler,
-      });
-
-      return {
-        t1: source,
-        t2: target,
-        path: [source],
-      };
-    }
-
     const jp = this.shortestJoinPaths.find((jp) => jp.t1 === source && jp.t2 === target);
     return jp;
   };

package/lib/DboBuilder/TableHandler/TableHandler.ts

@@ -67,7 +67,7 @@ export class TableHandler extends ViewHandler {
     config: TableDefinition<any> | undefined;
     hooks: TableHooksDefinition<AnyObject, TableHandlers, any> | undefined;
     tx?: { t: pgPromise.ITask<{}>; dbTX: TableHandlers };
-    joinPaths?: JoinPaths;
+    joinPaths: JoinPaths;
   }) {
     super({ db, tableOrViewInfo, dboBuilder, config, hooks, tx, joinPaths });
 

package/lib/DboBuilder/TableHandler/updateFile.ts

@@ -61,12 +61,12 @@ const getFileUpdateId = (filter: AnyObject): string => {
     filter,
     "filter",
     undefined,
-    { allowExtraProperties: false },
+    { allowExtraProperties: true },
   );
   const existingMediaId = validFilter?.id;
   if (!existingMediaId) {
     throw new Error(
-      `Updating the file table with file data can only be done by providing a single id filter. E.g. { id: "9ea4e23c-2b1a-4e33-8ec0-c15919bb45ec" } `,
+      `Updating the file table with file data can only be done by providing a filter that contains "id" and targets a single row`,
     );
   }
 

package/lib/DboBuilder/ViewHandler/ViewHandler.ts

@@ -51,7 +51,7 @@ export class ViewHandler {
   tsColumnDefs: string[] = [];
   joins: Join[];
   joinGraph?: Graph;
-  joinPaths?: JoinPaths;
+  joinPaths: JoinPaths;
   dboBuilder: DboBuilder;
   config: TableDefinition<any> | undefined;
   hooks: TableHooksDefinition<AnyObject, TableHandlers, any> | undefined;
@@ -84,7 +84,7 @@ export class ViewHandler {
     config: TableDefinition<any> | undefined;
     hooks: TableHooksDefinition<AnyObject, TableHandlers, any> | undefined;
     tx?: { t: pgPromise.ITask<{}>; dbTX: TableHandlers };
-    joinPaths?: JoinPaths;
+    joinPaths: JoinPaths;
   }) {
     this.config = config;
     this.hooks = hooks;

package/lib/DboBuilder/ViewHandler/parseJoinPath.ts

@@ -1,6 +1,7 @@
-import type { JoinPath, RawJoinPath} from "prostgles-types";
+import type { JoinPath, RawJoinPath } from "prostgles-types";
 import { reverseJoinOn } from "prostgles-types";
 import type { ViewHandler } from "./ViewHandler";
+import type { JoinInfo } from "../DboBuilder";
 
 type parseJoinPathArgs = {
   rawPath: RawJoinPath;
@@ -39,10 +40,10 @@ export const parseJoinPath = ({
 
       joinInfo.paths.forEach((path) => {
         /** Check if join tables are valid */
-        if (!viewHandler.dboBuilder.dbo[path.table]) {
+        if (!viewHandler.dboBuilder.dboMap.get(path.table)) {
           throw {
             stack: ["prepareExistCondition()"],
-            message: `Invalid or dissallowed table in join path: ${path.table}`,
+            message: `Invalid or disallowed table in join path: ${path.table}`,
           };
         }
         result.push({
@@ -70,8 +71,6 @@ export const parseJoinPath = ({
   return result;
 };
 
-import type { JoinInfo } from "../DboBuilder";
-
 type Opts = {
   allowMultiOrJoin?: boolean;
   getShortestJoin?: boolean;
@@ -81,12 +80,12 @@ type Opts = {
  * Returns all tables and fields required to join from source table to target table
  * Respecting the path.on condition
  */
-function getJoins(
+const getJoins = (
   viewHandler: ViewHandler,
   source: string,
   path: JoinPath[],
-  { allowMultiOrJoin = true, getShortestJoin }: Opts = {}
-): JoinInfo {
+  { allowMultiOrJoin = true, getShortestJoin }: Opts = {},
+): JoinInfo => {
   const [lastItem] = path;
   if (!lastItem) {
     throw `Empty path`;
@@ -95,80 +94,27 @@ function getJoins(
     throw `getShortestJoin requires exactly 1 path item`;
   }
   const target = lastItem.table;
-  if (!viewHandler.joinPaths) {
-    throw `Join info missing`;
-  }
-
-  /* Self join */
-  if (source === target) {
-    const tableHandler = viewHandler.dboBuilder.tablesOrViews?.find((t) => t.name === source);
-    if (!tableHandler) throw `Table not found for joining ${source}`;
-
-    const fcols = tableHandler.columns.filter((c) =>
-      c.references?.some(({ ftable }) => ftable === viewHandler.name)
-    );
-    if (!fcols.length) {
-      throw `There is no self-join foreign key relationship for table ${JSON.stringify(target)}`;
-    }
-    let allOnJoins: [string, string][][] = [];
-    fcols.forEach((fc) => {
-      fc.references!.forEach(({ fcols, cols }) => {
-        const fieldArr = fcols.map((fcol, i) => [fcol, cols[i]!] as [string, string]);
-        allOnJoins.push(fieldArr);
-      });
-    });
-    allOnJoins = [
-      ...allOnJoins,
-      /** Reverse as well */
-      ...allOnJoins.map((constraint) =>
-        constraint.map(([left, right]) => [right, left] as [string, string])
-      ),
-    ];
-    return {
-      paths: [
-        {
-          source,
-          target,
-          table: target,
-          on: getValidOn(
-            lastItem.on,
-            allOnJoins.map((v) => Object.fromEntries(v))
-          ),
-        },
-      ],
-      expectOne: false,
-    };
-  }
 
   /* Find the join path between tables */
-  const tableConfigJoinInfo = viewHandler.dboBuilder.prostgles.tableConfigurator?.getJoinInfo(
-    source,
-    target
-  );
-  if (tableConfigJoinInfo) return tableConfigJoinInfo;
-
-  const actualPath =
-    getShortestJoin ?
-      viewHandler.joinPaths
+  const actualPath = getShortestJoin
+    ? viewHandler.joinPaths
         .find((j) => {
           return j.t1 === source && j.t2 === target;
         })
         ?.path.map((table) => ({ table, on: undefined }))
         .slice(1)
-    : (
-      viewHandler.joinPaths.find((j) => {
-        return j.path.join() === [{ table: source }, ...path].map((p) => p.table).join();
-      })
-    ) ?
-      path
-    : undefined;
+    : viewHandler.joinPaths.find((j) => {
+          return j.path.join() === [{ table: source }, ...path].map((p) => p.table).join();
+        })
+      ? path
+      : undefined;
 
   if (getShortestJoin && actualPath?.length && lastItem.on?.length) {
     actualPath[actualPath.length - 1]!.on = lastItem.on;
   }
 
   if (!actualPath) {
-    throw `Joining ${source} <-...-> ${target} dissallowed or missing`;
+    throw `Joining ${source} <-...-> ${target} disallowed or missing`;
   }
 
   /* Make the join chain info */
@@ -178,11 +124,13 @@ function getJoins(
     const t1 = i === 0 ? source : prevTable.table;
 
     /* Get join options */
-    const join = viewHandler.joins.find(
-      (j) => j.tables.includes(t1) && j.tables.includes(tablePath.table)
-    );
+    const join = viewHandler.joins.find(({ tables: [left, right] }) => {
+      return (
+        (left === t1 && right === tablePath.table) || (right === t1 && left === tablePath.table)
+      );
+    });
     if (!join) {
-      throw `Joining ${t1} <-> ${tablePath.table} dissallowed or missing`;
+      throw `Joining ${t1} <-> ${tablePath.table} disallowed or missing`;
     }
     const isLtr = join.tables[0] === t1;
     const joinOn = isLtr ? join.on : reverseJoinOn(join.on);
@@ -196,17 +144,6 @@ function getJoins(
     });
   });
   const expectOne = false;
-  // paths.map(({ source, target, on }, i) => {
-  // if(expectOne && on.length === 1){
-  //     const sourceCol = on[0][1];
-  //     const targetCol = on[0][0];
-
-  //     const sCol = this.dboBuilder.dbo[source].columns.find(c => c.name === sourceCol)
-  //     const tCol = this.dboBuilder.dbo[target].columns.find(c => c.name === targetCol)
-  //     console.log({ sourceCol, targetCol, sCol, source, tCol, target, on})
-  //     expectOne = sCol.is_pkey && tCol.is_pkey
-  // }
-  // })
 
   const isMultiOrJoin = paths.find((p) => p.on.length > 1);
   if (!allowMultiOrJoin && isMultiOrJoin) {
@@ -216,7 +153,7 @@ function getJoins(
     paths,
     expectOne,
   };
-}
+};
 
 const getValidOn = (requested: JoinPath["on"], possible: ParsedJoinPath["on"]) => {
   if (!requested) {
@@ -227,7 +164,7 @@ const getValidOn = (requested: JoinPath["on"], possible: ParsedJoinPath["on"]) =
   }
   const isValid = requested.every((requestedConstraint) => {
     return possible.some((possibleConstraint) =>
-      conditionsMatch(possibleConstraint, requestedConstraint)
+      conditionsMatch(possibleConstraint, requestedConstraint),
     );
   });
 
@@ -241,5 +178,7 @@ const getValidOn = (requested: JoinPath["on"], possible: ParsedJoinPath["on"]) =
 const conditionsMatch = (c1: Record<string, string>, c2: Record<string, string>) => {
   const keys1 = Object.keys(c1);
   const keys2 = Object.keys(c2);
-  return keys1.sort().join() === keys2.sort().join() && keys1.every((key) => c1[key] === c2[key]);
+  return (
+    keys1.toSorted().join() === keys2.toSorted().join() && keys1.every((key) => c1[key] === c2[key])
+  );
 };

package/lib/DboBuilder/joins/prepareShortestJoinPaths.ts

@@ -15,19 +15,18 @@ type Result = {
 };
 
 export const prepareShortestJoinPaths = (dboBuilder: DboBuilder): Result => {
-  if (!dboBuilder.prostgles.opts.joins) {
+  const { joins: joinConfigFromOpts } = dboBuilder.prostgles.opts;
+  if (!joinConfigFromOpts) {
     return {
       joins: [],
       shortestJoinPaths: [],
     };
   }
-
-  let joinConfig = dboBuilder.prostgles.opts.joins;
-  if (Array.isArray(joinConfig)) {
-    joinConfig.forEach((join, index, configured) => {
+  if (Array.isArray(joinConfigFromOpts)) {
+    joinConfigFromOpts.forEach((join, index, configured) => {
       const duplicate = configured
         .slice(0, index)
-        .some((existing) => isEqual(existing.tables.toSorted(), join.tables.toSorted()));
+        .some((existing) => sortedArraysMatch(existing.tables, join.tables));
       if (duplicate) {
         throw new Error(
           `Duplicate configured join for table pair ${JSON.stringify(join.tables)}. Combine conditions in a single Join.on.`,
@@ -35,10 +34,13 @@ export const prepareShortestJoinPaths = (dboBuilder: DboBuilder): Result => {
       }
     });
   }
+
   if (!dboBuilder.tablesOrViews) {
     throw new Error("Could not create join config. this.tablesOrViews missing");
   }
 
+  let joinConfig = joinConfigFromOpts;
+
   // The initial DBO is needed by tableConfig before its tables/columns exist.
   // Defer only joins that cannot be resolved yet; the final rebuild validates all.
   if (Array.isArray(joinConfig) && dboBuilder.prostgles.preparingTableConfig) {
@@ -57,6 +59,7 @@ export const prepareShortestJoinPaths = (dboBuilder: DboBuilder): Result => {
       }),
     );
   }
+
   const inferredJoins = getInferredJoins(dboBuilder.tablesOrViews);
   if (joinConfig === "inferred") {
     joinConfig = inferredJoins;
@@ -69,7 +72,14 @@ export const prepareShortestJoinPaths = (dboBuilder: DboBuilder): Result => {
         JSON.stringify(joinConfig),
     );
   }
-  const joins = JSON.parse(JSON.stringify(joinConfig)) as Join[];
+  const joins = structuredClone(joinConfig).map((join) => {
+    if (join.tables[0] !== join.tables[1]) return join;
+
+    return {
+      ...join,
+      on: getUniqueJoinConditions([...join.on, ...reverseJoinOn(join.on)]),
+    };
+  });
 
   // Validate joins
   try {
@@ -136,7 +146,13 @@ export const prepareShortestJoinPaths = (dboBuilder: DboBuilder): Result => {
     joinGraph[t2][t1] = 1;
   });
   const tables = Array.from(new Set(joins.flatMap((t) => t.tables)));
-  const shortestJoinPaths: JoinPaths = [];
+  const shortestJoinPaths: JoinPaths = joins
+    .filter(({ tables: [t1, t2] }) => t1 === t2)
+    .map(({ tables: [table] }) => ({
+      t1: table,
+      t2: table,
+      path: [table, table],
+    }));
   tables.forEach((t1) => {
     tables.forEach((t2) => {
       /** Prevent recursion */
@@ -182,18 +198,13 @@ export const prepareShortestJoinPaths = (dboBuilder: DboBuilder): Result => {
 const mergeJoins = (inferred: Join[], configured: Join[]): Join[] => {
   const joins = [...inferred];
   configured.forEach((join) => {
-    const index = joins.findIndex((existing) =>
-      isEqual(existing.tables.toSorted(), join.tables.toSorted()),
-    );
+    const index = joins.findIndex((existing) => sortedArraysMatch(existing.tables, join.tables));
     const existing = joins[index];
     const previousOn =
       !existing || join.override ? []
       : existing.tables[0] === join.tables[0] ? existing.on
       : reverseJoinOn(existing.on);
-    const on = [...previousOn, ...join.on].filter(
-      (condition, index, conditions) =>
-        conditions.findIndex((candidate) => isEqual(candidate, condition)) === index,
-    );
+    const on = getUniqueJoinConditions([...previousOn, ...join.on]);
     const merged = { ...join, on };
     if (existing) {
       joins[index] = merged;
@@ -203,3 +214,9 @@ const mergeJoins = (inferred: Join[], configured: Join[]): Join[] => {
   });
   return joins;
 };
+
+const getUniqueJoinConditions = (conditions: Join["on"]): Join["on"] =>
+  conditions.filter(
+    (condition, index) =>
+      conditions.findIndex((candidate) => isEqual(candidate, condition)) === index,
+  );

package/lib/StorageClient/getFileTableConfig.ts

@@ -1,4 +1,4 @@
-import { asName, omitKeys } from "prostgles-types";
+import { asName, getKeys, isEmpty, omitKeys, pickKeys } from "prostgles-types";
 import { md5 } from "prostgles-types/dist/md5";
 import { onDeleteFromFileTable } from "../DboBuilder/TableHandler/onDeleteFromFileTable";
 import { updateFile } from "../DboBuilder/TableHandler/updateFile";
@@ -58,6 +58,7 @@ export const getFileTableConfig = (
     ...FILE_TABLE_COLUMN_DEFINITIONS,
     ...(fileTable.versioning && FILE_TABLE_VERSION_COLUMN_DEFINITIONS),
   };
+  const fileColumnDefinitionsColumnNames = getKeys(fileColumnDefinitions);
   const userFileTableConfig = tableConfig?.[fileTableName];
   if (userFileTableConfig) {
     if ("isLookupTable" in userFileTableConfig) {
@@ -144,7 +145,7 @@ export const getFileTableConfig = (
             update: 1,
           },
           validate: async ({
-            data: insertData,
+            data: insertOrUpdateData,
             localParams,
             command,
             filter,
@@ -154,9 +155,20 @@ export const getFileTableConfig = (
           }) => {
             const tableHandler = dbx[fileTableName];
             if (!tableHandler) throw "Storage tableHandler not found";
-            assertFileObjectValid(insertData);
+            const fileData = pickKeys(insertOrUpdateData, fileColumnDefinitionsColumnNames);
 
-            const { data: dataBlob, original_name, id, original_last_modified = null } = insertData;
+            /**
+             * File table config can be extended with extra columns.
+             * Allow updates that only target those columns without affecting the core file data
+             */
+            const extraData = omitKeys(insertOrUpdateData, fileColumnDefinitionsColumnNames);
+
+            if (command === "update" && isEmpty(fileData)) {
+              return;
+            }
+            assertFileObjectValid(fileData);
+
+            const { data: dataBlob, original_name, id, original_last_modified = null } = fileData;
             const data = dataBlob as unknown as Buffer;
             if (command === "update") {
               const { newData } = await updateFile(tableHandler, fileTable, {
@@ -169,7 +181,7 @@ export const getFileTableConfig = (
                 original_last_modified,
               });
               return {
-                row: newData,
+                row: { ...newData, ...extraData },
                 hookContext: {
                   data,
                 },
@@ -187,7 +199,7 @@ export const getFileTableConfig = (
             });
 
             return {
-              row: media,
+              row: { ...media, ...extraData },
               hookContext: {
                 data,
               },

package/lib/TableConfig/TableConfigTypes.ts

@@ -5,7 +5,6 @@ import type {
   MaybePromise,
   StrictUnion,
 } from "prostgles-types";
-import type { JoinInfo } from "../DboBuilder/DboBuilder";
 import type { DB, DBHandlerServer } from "../Prostgles";
 import type { SyncConfig } from "../PublishParser/PublishParser";
 
@@ -154,20 +153,6 @@ type ReferencedColumn = BaseColumnTypes & {
   };
 };
 
-type JoinDef = {
-  sourceTable: string;
-  targetTable: string;
-  on: JoinInfo["paths"][number]["on"];
-};
-
-/**
- * Used in specifying a join path to a table. This column name can then be used in select
- */
-type NamedJoinColumn = {
-  label?: string;
-  joinDef: JoinDef[];
-};
-
 type Enum<T extends string | number = any> = {
   enum: T[] | readonly T[];
   nullable?: boolean;
@@ -177,7 +162,6 @@ type Enum<T extends string | number = any> = {
 export type ColumnConfig<LANG_IDS = { en: 1 }> =
   | string
   | StrictUnion<
-      | NamedJoinColumn
       | MediaColumn
       | (BaseColumn<LANG_IDS> &
           (SQLDefColumn | ReferencedColumn | TextColumn | JSONBColumnDef | Enum))
@@ -185,7 +169,6 @@ export type ColumnConfig<LANG_IDS = { en: 1 }> =
 
 export type ColumnConfigs<LANG_IDS = { en: 1 }> = {
   sql: string | (BaseColumn<LANG_IDS> & SQLDefColumn);
-  join: BaseColumn<LANG_IDS> & NamedJoinColumn;
   media: BaseColumn<LANG_IDS> & MediaColumn;
   referenced: BaseColumn<LANG_IDS> & ReferencedColumn;
   text: BaseColumn<LANG_IDS> & TextColumn;

package/lib/TableConfig/TableConfigurator.ts

@@ -1,6 +1,5 @@
 import type { ColumnInfo } from "prostgles-types";
 import { isObject } from "prostgles-types";
-import type { JoinInfo } from "../DboBuilder/DboBuilder";
 import type { DB, DBHandlerServer, Prostgles } from "../Prostgles";
 import {
   DEFAULT_SYNC_BATCH_SIZE,
@@ -130,31 +129,6 @@ export class TableConfigurator {
     }
   };
 
-  getJoinInfo = (sourceTable: string, targetTable: string): JoinInfo | undefined => {
-    const sourceTableConfig = this.config[sourceTable];
-    if (sourceTableConfig && "columns" in sourceTableConfig) {
-      const targetColConfig = sourceTableConfig.columns?.[targetTable];
-      if (targetColConfig) {
-        if (isObject(targetColConfig) && "joinDef" in targetColConfig) {
-          if (!targetColConfig.joinDef) throw "targetColConfig.joinDef missing";
-          const { joinDef } = targetColConfig;
-          const res: JoinInfo = {
-            expectOne: false,
-            paths: joinDef.map(({ sourceTable, targetTable: table, on }) => ({
-              source: sourceTable,
-              target: targetTable,
-              table,
-              on,
-            })),
-          };
-
-          return res;
-        }
-      }
-    }
-    return undefined;
-  };
-
   prevInitQueryHistory?: string[];
   initialising = false;
   init = initTableConfig.bind(this);

package/lib/TableConfig/getTableColumnQueries.ts

@@ -57,10 +57,7 @@ export const getTableColumnQueries = async ({
     }
   }
 
-  const columns = getObjectEntries(tableConf.columns).filter(([_, colDef]) => {
-    /** Exclude NamedJoinColumn  */
-    return typeof colDef === "string" || !("joinDef" in colDef);
-  });
+  const columns = getObjectEntries(tableConf.columns);
 
   const columnDefinitions: { name: string; def: string }[] = [];
 

package/package.json

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