prostgles-server 4.2.467 → 4.2.469

package/lib/DboBuilder/runSql/runSqlUtils.ts

@@ -3,11 +3,11 @@ import { postgresToTsType, type PG_COLUMN_UDT_DATA_TYPE } from "prostgles-types"
 import type { DB } from "../../Prostgles";
 
 export const getDbTypes = async (db: DB) => {
-  const DATA_TYPES = await db.any<{
+  const dataTypes = await db.any<{
     oid: number;
     typname: PG_COLUMN_UDT_DATA_TYPE;
   }>("SELECT oid, typname FROM pg_type");
-  const USER_TABLES = await db.any<{
+  const userTables = await db.any<{
     relid: number;
     relname: string;
     schemaname: string;
@@ -29,7 +29,9 @@ export const getDbTypes = async (db: DB) => {
     ON t.relid = c.table_oid
     GROUP BY relid, relname, schemaname
   `);
-  const USER_TABLE_COLUMNS = await db.any<{
+  const dataTypesMap = new Map(dataTypes.map((dt) => [Number(dt.oid), dt]));
+  const userTablesMap = new Map(userTables.map((t) => [Number(t.relid), t]));
+  const userTableColumns = await db.any<{
     relid: number;
     schemaname: string;
     relname: string;
@@ -42,19 +44,20 @@ export const getDbTypes = async (db: DB) => {
     INNER JOIN pg_catalog.pg_statio_user_tables t
     ON  c.table_schema = t.schemaname AND c.table_name = t.relname 
   `);
-  return { DATA_TYPES, USER_TABLES, USER_TABLE_COLUMNS };
+  const userTableColumnsMap = new Map(
+    userTableColumns.map((c) => [[c.relid, c.ordinal_position].join("-"), c]),
+  );
+  return { dataTypesMap, userTablesMap, userTableColumnsMap };
 };
 
 export const getDetailedFieldInfo = (
-  { DATA_TYPES, USER_TABLES, USER_TABLE_COLUMNS }: Awaited<ReturnType<typeof getDbTypes>>,
+  { dataTypesMap, userTablesMap, userTableColumnsMap }: Awaited<ReturnType<typeof getDbTypes>>,
   fields: pg.IColumn[],
 ) => {
   return fields.map((f) => {
-    const dataType = DATA_TYPES.find((dt) => +dt.oid === +f.dataTypeID)?.typname ?? "text",
-      table = USER_TABLES.find((t) => +t.relid === +f.tableID),
-      column = USER_TABLE_COLUMNS.find(
-        (c) => +c.relid === +f.tableID && c.ordinal_position === f.columnID,
-      ),
+    const dataType = dataTypesMap.get(+f.dataTypeID)?.typname ?? "text",
+      table = userTablesMap.get(+f.tableID),
+      column = userTableColumnsMap.get([f.tableID, f.columnID].join("-")),
       tsDataType = postgresToTsType(dataType);
 
     return {

package/lib/DboBuilder/uploadFile.ts

@@ -7,11 +7,11 @@ import type { TableHandler } from "./TableHandler/TableHandler";
 export const isFile = (row: any): row is { data: Buffer; name: string } => {
   return Boolean(
     row &&
-      isObject(row) &&
-      getKeys(row).sort().join() === ["name", "data"].sort().join() &&
-      row.data &&
-      (typeof row.data === "string" || Buffer.isBuffer(row.data)) &&
-      typeof row.name === "string",
+    isObject(row) &&
+    getKeys(row).sort().join() === ["name", "data"].sort().join() &&
+    row.data &&
+    (typeof row.data === "string" || Buffer.isBuffer(row.data)) &&
+    typeof row.name === "string",
   );
 };
 
@@ -66,6 +66,8 @@ export async function uploadFile(
       row: media,
       dbx: this.getFinalDbo(localParams),
       localParams,
+      command: "insert",
+      data: media,
     });
     const missingKeys = parsedMediaKeys.filter((k) => !parsedMedia[k]);
     if (missingKeys.length) {

package/lib/PublishParser/publishTypesAndUtils.ts

@@ -177,12 +177,22 @@ export type UpdateRequestData<R extends AnyObject = AnyObject> =
   | UpdateRequestDataOne<R>
   | UpdateRequestDataBatch<R>;
 
-export type ValidateRowArgs<R = AnyObject, DBX = DBHandlerServer> = {
+export type ValidateRowArgsCommon<R = AnyObject, DBX = DBHandlerServer> = {
   row: R;
   dbx: DBX;
   tx: pgPromise.ITask<{}> | DB;
   localParams: LocalParams;
-};
+} & (
+  | {
+      command: "insert";
+      data: R | R[];
+    }
+  | {
+      command: "update";
+      data: R | Partial<R>;
+    }
+);
+
 export type ValidateUpdateRowArgs<U = Partial<AnyObject>, F = Filter, DBX = DBHandlerServer> = {
   update: U;
   filter: F;
@@ -190,13 +200,13 @@ export type ValidateUpdateRowArgs<U = Partial<AnyObject>, F = Filter, DBX = DBHa
   localParams: LocalParams;
 };
 export type ValidateRow<R extends AnyObject = AnyObject, S = void> = (
-  args: ValidateRowArgs<R, DBOFullyTyped<S>>,
+  args: ValidateRowArgsCommon<R, DBOFullyTyped<S>>,
 ) => R | Promise<R>;
 export type PostValidateRow<R extends AnyObject = AnyObject, S = void> = (
-  args: ValidateRowArgs<R, DBOFullyTyped<S>>,
+  args: ValidateRowArgsCommon<R, DBOFullyTyped<S>>,
 ) => void | Promise<void>;
-export type PostValidateRowBasic = (args: ValidateRowArgs) => void | Promise<void>;
-export type ValidateRowBasic = (args: ValidateRowArgs) => AnyObject | Promise<AnyObject>;
+export type PostValidateRowBasic = (args: ValidateRowArgsCommon) => void | Promise<void>;
+export type ValidateRowBasic = (args: ValidateRowArgsCommon) => AnyObject | Promise<AnyObject>;
 export type ValidateUpdateRow<R extends AnyObject = AnyObject, S extends DBSchema | void = void> = (
   args: ValidateUpdateRowArgs<Partial<R>, FullFilter<R, S>, DBOFullyTyped<S>>,
 ) => Partial<R> | Promise<Partial<R>>;

package/lib/TableConfig/TableConfig.ts

@@ -12,7 +12,7 @@ import type { JoinInfo, LocalParams } from "../DboBuilder/DboBuilder";
 import type { TableHandler } from "../DboBuilder/TableHandler/TableHandler";
 import { uploadFile } from "../DboBuilder/uploadFile";
 import type { DB, DBHandlerServer, Prostgles } from "../Prostgles";
-import type { InsertRule, ValidateRowArgs } from "../PublishParser/PublishParser";
+import type { InsertRule, ValidateRowArgsCommon } from "../PublishParser/PublishParser";
 import { initTableConfig } from "./initTableConfig";
 
 type ColExtraInfo = {
@@ -317,7 +317,7 @@ export type TableDefinition<LANG_IDS> = {
   };
 };
 
-type GetPreInsertRowArgs = Omit<ValidateRowArgs, "localParams"> & {
+type GetPreInsertRowArgs = Omit<ValidateRowArgsCommon, "localParams"> & {
   // preValidate: InsertRule["preValidate"];
   validate: InsertRule["validate"];
   localParams: LocalParams | undefined;
@@ -486,7 +486,10 @@ export default class TableConfigurator {
 
   getPreInsertRow = async (
     tableHandler: TableHandler,
-    args: Pick<GetPreInsertRowArgs, "localParams" | "row" | "validate" | "dbx" | "tx">,
+    args: Pick<
+      GetPreInsertRowArgs,
+      "localParams" | "row" | "validate" | "dbx" | "tx" | "command" | "data"
+    >,
   ): Promise<AnyObject> => {
     const tableHook = this.config[tableHandler.name]?.hooks?.getPreInsertRow;
     if (tableHandler.is_media) {

package/package.json

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