@prostgles/prostgles 2.3.6-dev.1786615880 → 2.3.6-dev.1786992729

package/dist/server/src/ConnectionManager/getConnectionServerFunctions.js

@@ -2,66 +2,108 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConnectionServerFunctions = void 0;
 const connectionManagerUtils_1 = require("./connectionManagerUtils");
-const startConnection_1 = require("./startConnection");
 const getConnectionServerFunctions = async ({ databaseConfig, dbs, connection, connectionManager, }) => {
     const connectionFunctions = await dbs.published_methods.find({
         connection_id: connection.id,
+    }, {
+        select: {
+            "*": 1,
+            user_types: {
+                $leftJoin: [
+                    "access_control_methods",
+                    "access_control",
+                    "access_control_user_types",
+                ],
+                select: { user_type: 1 },
+            },
+        },
     });
-    const publishMethods = async (params) => {
-        const result = {};
-        const authContext = await (async () => {
-            if (!params)
-                return;
-            const { user } = params;
-            /** Admin has access to all methods */
-            if (user?.type === "admin") {
-                return { ...params, user, type: "admin" };
-            }
-            else {
-                const ac = await (0, startConnection_1.getAccessRule)(dbs, user, databaseConfig.id, connection.id);
-                if (ac) {
-                    const allowedMethods = await dbs.access_control_methods.find({
-                        access_control_id: ac.id,
-                    });
-                    const allowedFunctions = new Set(allowedMethods.map((m) => m.published_method_id));
-                    return {
-                        ...params,
-                        user,
-                        type: "access-rule",
-                        allowedFunctions,
-                    };
-                }
-            }
-        })();
-        connectionFunctions.forEach((m) => {
-            const isAllowedToRunFunction = authContext?.type === "admin" ||
-                authContext?.allowedFunctions.has(m.id);
-            const run = !isAllowedToRunFunction || !authContext ?
-                undefined
-                : async (validatedArgs) => {
-                    const user = authContext.user;
-                    const method = (0, connectionManagerUtils_1.getEvaledExports)(m.run)?.run;
-                    if (!method)
-                        throw "Published method must export a run function";
-                    const activeConnection = connectionManager.getActiveConnection(connection.id);
-                    return method(validatedArgs, {
-                        dbo: activeConnection.prgl.db,
-                        db: activeConnection.prgl._db,
-                        sql: activeConnection.prgl.sql,
-                        tables: activeConnection.prgl.getSchema(),
-                        reason: { type: "prgl.restart" },
-                        user,
-                    });
-                };
-            result[m.name] = {
-                input: !m.arguments.length ?
-                    undefined
-                    : m.arguments.reduce((a, v) => ({ ...a, [v.name]: v }), {}),
-                run,
-            };
-        });
-        return result;
-    };
+    const publishMethods = {};
+    /** Combine all userFilter with admin into unique groups */
+    connectionFunctions.forEach((m) => {
+        const userTypesList = Array.from(new Set([
+            "admin",
+            ...(m.user_types?.map((r) => r.user_type) ?? []),
+        ])).toSorted();
+        const userFilter = {
+            type: { $in: userTypesList },
+        };
+        const groupName = userTypesList.join(",");
+        publishMethods[groupName] ??= {
+            userFilter,
+            functions: {},
+        };
+        const method = (0, connectionManagerUtils_1.getEvaledExports)(m.run).run;
+        publishMethods[groupName].functions[m.name] = {
+            input: m.arguments.reduce((a, v) => ({ ...a, [v.name]: v }), {}),
+            run: method,
+        };
+    });
+    // const authContext = await (async () => {
+    //   if (!params) return;
+    //   const { user } = params;
+    //   /** Admin has access to all methods */
+    //   if (user?.type === "admin") {
+    //     return { ...params, user, type: "admin" as const };
+    //   } else {
+    //     const accessRule = await getAccessRule(
+    //       dbs,
+    //       user,
+    //       databaseConfig.id,
+    //       connection.id,
+    //     );
+    //     if (accessRule) {
+    //       const allowedMethods = await dbs.access_control_methods.find({
+    //         access_control_id: accessRule.id,
+    //       });
+    //       const allowedFunctions = new Set(
+    //         allowedMethods.map((m) => m.published_method_id),
+    //       );
+    //       return {
+    //         ...params,
+    //         user,
+    //         type: "access-rule" as const,
+    //         allowedFunctions,
+    //       };
+    //     }
+    //   }
+    // })();
+    // connectionFunctions.forEach((m) => {
+    //   const isAllowedToRunFunction =
+    //     authContext?.type === "admin" ||
+    //     authContext?.allowedFunctions.has(m.id);
+    //   const run =
+    //     !isAllowedToRunFunction || !authContext ?
+    //       undefined
+    //     : async (validatedArgs?: Record<string, unknown>) => {
+    //         const user = authContext.user;
+    //         const method = getEvaledExports<{
+    //           run?: (
+    //             args: Record<string, unknown> | undefined,
+    //             params: OnReadyParams<void> & { user: typeof user },
+    //           ) => Promise<unknown>;
+    //         }>(m.run)?.run;
+    //         if (!method) throw "Published method must export a run function";
+    //         const activeConnection = connectionManager.getActiveConnection(
+    //           connection.id,
+    //         );
+    //         return method(validatedArgs, {
+    //           dbo: activeConnection.prgl.db,
+    //           db: activeConnection.prgl._db,
+    //           sql: activeConnection.prgl.sql,
+    //           tables: activeConnection.prgl.getSchema(),
+    //           reason: { type: "prgl.restart" },
+    //           user,
+    //         });
+    //       };
+    //   result[m.name] = {
+    //     input:
+    //       !m.arguments.length ?
+    //         undefined
+    //       : m.arguments.reduce((a, v) => ({ ...a, [v.name]: v }), {}),
+    //     run,
+    //   };
+    // });
     return publishMethods;
 };
 exports.getConnectionServerFunctions = getConnectionServerFunctions;

package/dist/server/src/ConnectionManager/getConnectionServerFunctions.js.map

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

package/dist/server/src/ConnectionManager/getHotReloadConfigs.d.ts

@@ -6,7 +6,7 @@ import type { ConnectionManager } from "./ConnectionManager";
 import type { CONNECTION_HOT_RELOAD_COLUMNS } from "./initConnectionManager";
 import type { RequiredKeepUndefined } from "../../../common/utils";
 import type { ServerFunctionDefinitions } from "prostgles-server";
-export type HotReloadConfigOptions = RequiredKeepUndefined<Pick<UpdatableOptions<void, SUser>, "fileTable" | "restApi" | "schemaFilter" | "auth" | "io" | "tableConfig" | "functions" | "tsGeneratedTypesDir" | "modifyClientSchema">>;
+export type HotReloadConfigOptions = RequiredKeepUndefined<Pick<UpdatableOptions<void, SUser>, "fileTable" | "restApi" | "schemaFilter" | "auth" | "io" | "tableConfig" | "tableHooks" | "functions" | "tsGeneratedTypesDir" | "modifyClientSchema">>;
 export type ConnectionHotReloadProperties = Pick<Connections, (typeof CONNECTION_HOT_RELOAD_COLUMNS)[number]>;
 export declare const getHotReloadConfigs: ({ dbs, _dbs, connection, databaseConfig, connectionManager, stateDatabaseConfig, }: {
     connectionManager: ConnectionManager;
@@ -20,93 +20,21 @@ export declare const getHotReloadConfigs: ({ dbs, _dbs, connection, databaseConf
         io: import("socket.io").Server<import("socket.io").DefaultEventsMap, import("socket.io").DefaultEventsMap, import("socket.io").DefaultEventsMap, any>;
         restApi: import("prostgles-server/dist/RestApi").RestApiConfig | undefined;
         fileTable: import("prostgles-server/dist/ProstglesTypes").FileTableConfig | undefined;
-        tableConfig: {
-            [table_name: string]: import("prostgles-server").TableDefinition<{
-                en: 1;
-            }, import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer> | ({
-                info?: {
-                    label?: string | import("prostgles-server").LangToTranslation;
-                };
-                dropIfExistsCascade?: boolean;
-                dropIfExists?: boolean;
-                syncConfig?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").SyncConfig;
-                hooks?: {
-                    getPreInsertRow?: (args: Omit<import("prostgles-server/dist/PublishParser/publishTypesAndUtils").ValidateRowArgsCommon, "localParams"> & {
-                        validate: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").InsertRule["validate"];
-                        localParams: import("prostgles-server/dist/DboBuilder/DboBuilderTypes").LocalParams | undefined;
-                    }) => Promise<{
-                        row: import("prostgles-types").AnyObject;
-                        onInserted: Promise<void>;
-                    }>;
-                    beforeEach?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").BeforeEachTsTrigger<import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer>[] | undefined;
-                    afterEach?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").AfterEachTsTrigger<import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer>[] | undefined;
-                    afterAll?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").AfterAllTsTrigger<import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer>[] | undefined;
-                    onInsteadOfDelete?: ((args: {
-                        dbx: import("prostgles-server").DBHandlerServer;
-                        tx: import("pg-promise").ITask<{}>;
-                        returningQuery: string;
-                        isOneOrNone: boolean;
-                        queryType: "any" | "none";
-                        filterOpts: {
-                            where: string;
-                            filter: import("prostgles-types").AnyObject;
-                        };
-                    }) => Promise<import("prostgles-types").AnyObject[]>) | undefined;
-                } | undefined;
-                triggers?: {
-                    [triggerName: string]: {
-                        type: "before" | "after" | "instead of";
-                        actions: ("insert" | "update" | "delete")[];
-                        forEach: "statement" | "row";
-                        query: string;
-                    };
-                };
-            } & {
-                isLookupTable: {
-                    values: {
-                        [id_value: string]: {} | {
-                            en: string;
-                        };
-                    };
-                };
-            });
-        } | undefined;
+        tableConfig: import("prostgles-server").TableConfig | undefined;
+        tableHooks: Record<string, import("prostgles-server").TableHooksDefinition<import("prostgles-types").AnyObject, import("prostgles-server/dist/DboBuilder/DboBuilderTypes").DbTxTableHandlers>> | undefined;
         auth: any;
         schemaFilter: Record<string, 1> | Record<string, 0>;
         tsGeneratedTypesDir: string | undefined;
         functions: ServerFunctionDefinitions<void, SUser>;
         modifyClientSchema: (table: import("prostgles-types").DBSchemaTable, tableConfig: import("prostgles-server").TableDefinition<{
             en: 1;
-        }, import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer> | ({
+        }> | ({
             info?: {
                 label?: string | import("prostgles-server").LangToTranslation;
             };
             dropIfExistsCascade?: boolean;
             dropIfExists?: boolean;
             syncConfig?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").SyncConfig;
-            hooks?: {
-                getPreInsertRow?: (args: Omit<import("prostgles-server/dist/PublishParser/publishTypesAndUtils").ValidateRowArgsCommon, "localParams"> & {
-                    validate: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").InsertRule["validate"];
-                    localParams: import("prostgles-server/dist/DboBuilder/DboBuilderTypes").LocalParams | undefined;
-                }) => Promise<{
-                    row: import("prostgles-types").AnyObject;
-                    onInserted: Promise<void>;
-                }>;
-                beforeEach?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").BeforeEachTsTrigger<import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer>[] | undefined;
-                afterEach?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").AfterEachTsTrigger<import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer>[] | undefined;
-                afterAll?: import("prostgles-server/dist/PublishParser/publishTypesAndUtils").AfterAllTsTrigger<import("prostgles-types").AnyObject, import("prostgles-server").DBHandlerServer>[] | undefined;
-                onInsteadOfDelete?: ((args: {
-                    dbx: import("prostgles-server").DBHandlerServer;
-                    tx: import("pg-promise").ITask<{}>;
-                    returningQuery: string;
-                    isOneOrNone: boolean;
-                    queryType: "any" | "none";
-                    filterOpts: {
-                        where: string;
-                        filter: import("prostgles-types").AnyObject;
-                    };
-                }) => Promise<import("prostgles-types").AnyObject[]>) | undefined;
-            } | undefined;
             triggers?: {
                 [triggerName: string]: {
                     type: "before" | "after" | "instead of";

package/dist/server/src/ConnectionManager/getHotReloadConfigs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getHotReloadConfigs.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAIlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAKlE,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CACxD,IAAI,CACF,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,EAC3B,WAAW,GACX,SAAS,GACT,cAAc,GACd,MAAM,GACN,IAAI,GACJ,aAAa,GACb,WAAW,GACX,qBAAqB,GACrB,oBAAoB,CACvB,CACF,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,WAAW,EACX,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAC/C,CAAC;AAcF,eAAO,MAAM,mBAAmB,GAAU,oFAOvC;IACD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,6BAA6B,CAAC;IAC1C,cAAc,EAAE,eAAe,CAAC;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,EAAE,CAAC;CACV;;;;;;;;;;yBAtDgB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAAD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAqJkpS,CAAC;;;;;;;;;;;;;;;;;;;oCAA39C,CAAC;;;;oCAA4E,CAAC;;;;;;;;;0BAAqI,CAAC;;;;;;;;;;kCAA4J,CAAC;uCAA2B,CAAC;;;;;mCAAmG,CAAC;;;;;;;;;;;mCAA+M,CAAC;;;;;;;;iCAAkK,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;iCAA0E,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;gCAA8B,CAAC;iCAAc,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;6BAA7T,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;6BAA0E,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;6BAA6C,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAhqC,CAAC;;;;gCAA4E,CAAC;;;;;;;;;;;;;;;;;;;8BAAkS,CAAC;mCAA2B,CAAC;;;;;+BAAmG,CAAC;;;;;;;;;;;+BAA+M,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAD14Q,CAAC"}
+{"version":3,"file":"getHotReloadConfigs.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/getHotReloadConfigs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAIlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAKlE,MAAM,MAAM,sBAAsB,GAAG,qBAAqB,CACxD,IAAI,CACF,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,EAC3B,WAAW,GACX,SAAS,GACT,cAAc,GACd,MAAM,GACN,IAAI,GACJ,aAAa,GACb,YAAY,GACZ,WAAW,GACX,qBAAqB,GACrB,oBAAoB,CACvB,CACF,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,IAAI,CAC9C,WAAW,EACX,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAC/C,CAAC;AAeF,eAAO,MAAM,mBAAmB,GAAU,oFAOvC;IACD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,UAAU,EAAE,6BAA6B,CAAC;IAC1C,cAAc,EAAE,eAAe,CAAC;IAChC,mBAAmB,EAAE,eAAe,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC;IACT,IAAI,EAAE,EAAE,CAAC;CACV;;;;;;;;;;;;;;;qBA7DoD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BA6JmjS,CAAC;;;;;;;;;;;;;;;;;;;oCAA39C,CAAC;;;;oCAA4E,CAAC;;;;;;;;;0BAAqI,CAAC;;;;;;;;;;kCAA4J,CAAC;uCAA2B,CAAC;;;;;mCAAmG,CAAC;;;;;;;;;;;mCAA+M,CAAC;;;;;;;;iCAAkK,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;iCAA0E,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;gCAA8B,CAAC;iCAAc,CAAC;iCAAoB,CAAC;iCAAoB,CAAC;mCAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;6BAA7T,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;6BAA0E,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;6BAA6C,CAAC;6BAAoB,CAAC;6BAAoB,CAAC;+BAAsB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAhqC,CAAC;;;;gCAA4E,CAAC;;;;;;;;;;;;;;;;;;;8BAAkS,CAAC;mCAA2B,CAAC;;;;;+BAAmG,CAAC;;;;;;;;;;;+BAA+M,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAD/0Q,CAAC"}

package/dist/server/src/ConnectionManager/getHotReloadConfigs.js

@@ -15,11 +15,11 @@ const cliUtils_1 = require("../cli/cliUtils");
 const mergeFunctions = (schemaFunctions, connectionFunctions) => {
     if (!schemaFunctions)
         return connectionFunctions;
-    return async (params) => ({
-        ...(await schemaFunctions(params)),
+    return {
+        ...schemaFunctions,
         /** Connection-managed functions retain precedence on name collisions. */
-        ...(await connectionFunctions(params)),
-    });
+        ...connectionFunctions,
+    };
 };
 const getHotReloadConfigs = async ({ dbs, _dbs, connection, databaseConfig, connectionManager, stateDatabaseConfig, }) => {
     const loadedSchemaConfig = (0, getSchemaConfig_1.getSchemaConfig)(databaseConfig.config_sync);
@@ -40,7 +40,7 @@ const getHotReloadConfigs = async ({ dbs, _dbs, connection, databaseConfig, conn
     });
     const { app } = connectionServers;
     const restApi = (0, connectionManagerUtils_1.getRestApiConfig)(app, configuredConnection, configuredDatabaseConfig);
-    const { fileTable, tableConfig } = await (0, parseTableConfig_1.parseTableConfig)({
+    const { fileTable, tableConfig, tableHooks } = await (0, parseTableConfig_1.parseTableConfig)({
         type: "saved",
         dbs,
         con: configuredConnection,
@@ -76,6 +76,7 @@ const getHotReloadConfigs = async ({ dbs, _dbs, connection, databaseConfig, conn
             restApi,
             fileTable,
             tableConfig,
+            tableHooks,
             auth,
             schemaFilter: schemaConfig?.schemaFilter ??
                 db_schema_filter ?? { public: 1 },

package/dist/server/src/ConnectionManager/getHotReloadConfigs.js.map

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

package/dist/server/src/ConnectionManager/parseTableConfig.d.ts

@@ -1,5 +1,5 @@
 import type e from "express";
-import type { TableConfig } from "prostgles-server";
+import type { TableConfig, TableHooks } from "prostgles-server";
 import type { FileTableConfig } from "prostgles-server/dist/ProstglesTypes";
 import type { DatabaseConfigs, DBS } from "..";
 import type { ConnectionManager } from "./ConnectionManager";
@@ -20,6 +20,7 @@ type ParseTableConfigArgs = {
 export declare const parseTableConfig: ({ con, conMgr, app, dbs, type, newTableConfig, databaseConfig, }: ParseTableConfigArgs) => Promise<{
     fileTable?: FileTableConfig;
     tableConfig: TableConfig | undefined;
+    tableHooks: TableHooks | undefined;
 }>;
 export {};
 //# sourceMappingURL=parseTableConfig.d.ts.map

package/dist/server/src/ConnectionManager/parseTableConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseTableConfig.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/parseTableConfig.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAGV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAE/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAE3E,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,iBAAiB,CAAC;IAC1B,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC;IACf,GAAG,EAAE,6BAA6B,CAAC;IACnC,cAAc,EAAE,eAAe,CAAC;CACjC,GAAG,CACA;IACE,IAAI,EAAE,OAAO,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,cAAc,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;CACtD,CACJ,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,kEAQpC,oBAAoB,KAAG,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;CACtC,CAsLA,CAAC"}
+{"version":3,"file":"parseTableConfig.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/parseTableConfig.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAGV,WAAW,EACX,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAE/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uBAAuB,CAAC;AAI3E,KAAK,oBAAoB,GAAG;IAC1B,GAAG,EAAE,GAAG,CAAC;IACT,MAAM,EAAE,iBAAiB,CAAC;IAC1B,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC;IACf,GAAG,EAAE,6BAA6B,CAAC;IACnC,cAAc,EAAE,eAAe,CAAC;CACjC,GAAG,CACA;IACE,IAAI,EAAE,OAAO,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,CAAC;CAC5B,GACD;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,cAAc,EAAE,eAAe,CAAC,mBAAmB,CAAC,CAAC;CACtD,CACJ,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,kEAQpC,oBAAoB,KAAG,OAAO,CAAC;IAChC,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;CACpC,CAgMA,CAAC"}

package/dist/server/src/ConnectionManager/parseTableConfig.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTableConfig = void 0;
 const managedTableSchema_1 = require("../../../common/managedTableSchema");
 const utils_1 = require("../../../common/utils");
-const ServiceManager_1 = require("../ServiceManager/ServiceManager");
 const documents_service_1 = require("../ServiceManager/services/documents/documents.service");
 const prostgles_server_1 = require("prostgles-server");
 const cloudClients_1 = require("../cloudClients/cloudClients");
-const connectionManagerUtils_1 = require("./connectionManagerUtils");
+const getSchemaConfig_1 = require("./getSchemaConfig");
+const prostglesOnReady_1 = require("../init/prostglesOnReady");
 const parseTableConfig = async ({ con, conMgr, app, dbs, type, newTableConfig, databaseConfig, }) => {
     const connectionId = con.id;
     let fileTableConfig = null;
@@ -52,7 +52,84 @@ const parseTableConfig = async ({ con, conMgr, app, dbs, type, newTableConfig, d
             storageClient,
             referencedTables: fileTableConfig.referencedTables,
         };
-    const tableConfig = (0, connectionManagerUtils_1.getTableConfig)(databaseConfig);
+    const { tableHooks, tableConfig } = (0, getSchemaConfig_1.getSchemaConfig)(databaseConfig.config_sync)?.config ?? {};
+    const fileTableHooksMerged = fileTable && fileTableConfig?.annotationsTable ?
+        {
+            [fileTable.tableName]: {
+                beforeEach: [
+                    {
+                        commands: { insert: 1, update: 1 },
+                        validate: async ({ data: fileRow, hookContext }) => {
+                            const { original_name, content_type } = fileRow;
+                            const buffer = hookContext?.data;
+                            const isImageOrPdf = content_type &&
+                                ["image/", "application/pdf"].some((prefix) => content_type.startsWith(prefix));
+                            if (!isImageOrPdf || !original_name) {
+                                return;
+                            }
+                            const db = conMgr.getActiveConnectionSilentFail(connectionId)?.prgl.db;
+                            const documentService = await (0, prostglesOnReady_1.getServiceManager)()
+                                .getServiceWithRetries("documents")
+                                .catch((err) => {
+                                console.error("Failed to get documents service", err);
+                                return null;
+                            });
+                            if (!db || !documentService) {
+                                return {
+                                    row: {
+                                        ...fileRow,
+                                        extraction_status: !db || !documentService ?
+                                            {
+                                                phase: "error",
+                                                error: !db ?
+                                                    "Internal error: Database handler not found for extraction"
+                                                    : "Internal error: Documents service could not be initialized for extraction. Check service logs for details.",
+                                            }
+                                            : {
+                                                phase: "pending",
+                                            },
+                                    },
+                                };
+                            }
+                            const blobWithType = new Blob([buffer], {
+                                type: content_type,
+                            });
+                            const doclingResult = await documentService.endpoints["/v1/convert/file"]({
+                                files: [blobWithType],
+                                ...documents_service_1.CONVERT_DOCUMENT_DEFAULT_OPTIONS,
+                                // image_export_mode: "embedded",
+                                image_export_mode: "placeholder",
+                                to_formats: ["json", "text"],
+                            })
+                                .then((result) => ({ success: true, result }))
+                                .catch((error) => ({ success: false, error }));
+                            return {
+                                row: {
+                                    ...fileRow,
+                                    extraction_status: doclingResult.success ?
+                                        {
+                                            phase: "success",
+                                        }
+                                        : {
+                                            phase: "error",
+                                            error: doclingResult.error ||
+                                                "Unknown error during document extraction",
+                                        },
+                                    docling_metadata: doclingResult.success ?
+                                        doclingResult.result.document.json_content
+                                        : null,
+                                    text_content: doclingResult.success ?
+                                        doclingResult.result.document.text_content
+                                        // doclingResult.result.document.md_content
+                                        : null,
+                                },
+                            };
+                        },
+                    },
+                ],
+            },
+        }
+        : undefined;
     const fileTableConfigMerged = fileTable && fileTableConfig?.annotationsTable ?
         {
             [fileTable.tableName]: {
@@ -67,79 +144,6 @@ const parseTableConfig = async ({ con, conMgr, app, dbs, type, newTableConfig, d
                         },
                     },
                 },
-                hooks: {
-                    beforeEach: [
-                        {
-                            commands: { insert: 1, update: 1 },
-                            validate: async ({ data: fileRow, hookContext }) => {
-                                const { original_name, content_type } = fileRow;
-                                const buffer = hookContext?.data;
-                                const isImageOrPdf = content_type &&
-                                    ["image/", "application/pdf"].some((prefix) => content_type.startsWith(prefix));
-                                if (!isImageOrPdf || !original_name) {
-                                    return;
-                                }
-                                const db = conMgr.getActiveConnectionSilentFail(connectionId)?.prgl.db;
-                                const documentService = await (0, ServiceManager_1.getServiceManager)(dbs)
-                                    .getServiceWithRetries("documents")
-                                    .catch((err) => {
-                                    console.error("Failed to get documents service", err);
-                                    return null;
-                                });
-                                if (!db || !documentService) {
-                                    return {
-                                        row: {
-                                            ...fileRow,
-                                            extraction_status: !db || !documentService ?
-                                                {
-                                                    phase: "error",
-                                                    error: !db ?
-                                                        "Internal error: Database handler not found for extraction"
-                                                        : "Internal error: Documents service could not be initialized for extraction. Check service logs for details.",
-                                                }
-                                                : {
-                                                    phase: "pending",
-                                                },
-                                        },
-                                    };
-                                }
-                                const blobWithType = new Blob([buffer], {
-                                    type: content_type,
-                                });
-                                const doclingResult = await documentService.endpoints["/v1/convert/file"]({
-                                    files: [blobWithType],
-                                    ...documents_service_1.CONVERT_DOCUMENT_DEFAULT_OPTIONS,
-                                    // image_export_mode: "embedded",
-                                    image_export_mode: "placeholder",
-                                    to_formats: ["json", "text"],
-                                })
-                                    .then((result) => ({ success: true, result }))
-                                    .catch((error) => ({ success: false, error }));
-                                return {
-                                    row: {
-                                        ...fileRow,
-                                        extraction_status: doclingResult.success ?
-                                            {
-                                                phase: "success",
-                                            }
-                                            : {
-                                                phase: "error",
-                                                error: doclingResult.error ||
-                                                    "Unknown error during document extraction",
-                                            },
-                                        docling_metadata: doclingResult.success ?
-                                            doclingResult.result.document.json_content
-                                            : null,
-                                        text_content: doclingResult.success ?
-                                            doclingResult.result.document.text_content
-                                            // doclingResult.result.document.md_content
-                                            : null,
-                                    },
-                                };
-                            },
-                        },
-                    ],
-                },
             },
             [fileTableConfig.annotationsTable]: {
                 // dropIfExists: true,
@@ -158,6 +162,10 @@ const parseTableConfig = async ({ con, conMgr, app, dbs, type, newTableConfig, d
             ...(fileTableConfigMerged || {}),
             ...tableConfig,
         },
+        tableHooks: (fileTableHooksMerged || tableHooks) && {
+            ...(fileTableHooksMerged || {}),
+            ...tableHooks,
+        },
     };
 };
 exports.parseTableConfig = parseTableConfig;

package/dist/server/src/ConnectionManager/parseTableConfig.js.map

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

package/dist/server/src/ConnectionManager/startConnection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startConnection.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/startConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAEhF,OAAO,EAAkB,KAAK,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAQ1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAMnE,eAAO,MAAM,eAAe,GAC1B,MAAM,iBAAiB,EACvB,cAAc,MAAM,EACpB,KAAK,aAAa,CAAC,iBAAiB,CAAC,EACrC,MAAM,EAAE,EACR,SAAS,YAAY,EACrB,yBAAuB,KACtB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,CAgS3E,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,KAAK,aAAa,CAAC,iBAAiB,CAAC,EACrC,MAAM,IAAI,GAAG,SAAS,EACtB,aAAa,MAAM,EACnB,eAAe,MAAM,KACpB,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAqBjD,CAAC"}
+{"version":3,"file":"startConnection.d.ts","sourceRoot":"","sources":["../../../../src/ConnectionManager/startConnection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAEhF,OAAO,EAAkB,KAAK,EAAE,EAAE,MAAM,iCAAiC,CAAC;AAQ1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAMnE,eAAO,MAAM,eAAe,GAC1B,MAAM,iBAAiB,EACvB,cAAc,MAAM,EACpB,KAAK,aAAa,CAAC,iBAAiB,CAAC,EACrC,MAAM,EAAE,EACR,SAAS,YAAY,EACrB,yBAAuB,KACtB,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAAG,SAAS,CAkS3E,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,KAAK,aAAa,CAAC,iBAAiB,CAAC,EACrC,MAAM,IAAI,GAAG,SAAS,EACtB,aAAa,MAAM,EACnB,eAAe,MAAM,KACpB,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,SAAS,CAqBjD,CAAC"}

package/dist/server/src/ConnectionManager/startConnection.js

@@ -117,7 +117,7 @@ const startConnection = async function (connectionId, dbs, _dbs, socket, restart
                 const watchSchema = connection.db_watch_schema ? "*"
                     : !utils_2.IS_PROD && databaseConfig.config_sync ? "hotReloadMode"
                         : false;
-                const { connection: _connectionConfig, databaseConfig: _databaseConfig, onInitSQL: _onInitSQL, onMount: _onMount, workspaces: _workspaces, ...schemaProstglesOptions } = schemaConfig ?? {};
+                const { id: _id, createDatabase: _createDatabase, connection: _connectionConfig, databaseConfig: _databaseConfig, onInitSQL: _onInitSQL, onMount: _onMount, workspaces: _workspaces, ...schemaProstglesOptions } = schemaConfig ?? {};
                 const onMount = connection.on_mount_ts_disabled ? undefined : _onMount;
                 const { disable_realtime } = connection;
                 let onMountCleanup;