prostgles-server 4.2.590 → 4.2.592

package/lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts

@@ -45,6 +45,9 @@ void describe("DBSchemaBuilder type tests", async () => {
           db.dwadaw?.find;
           return {};
         },
+        findUser: (userFilter) => {
+          return { id: "123", name: "John Doe", type: "dwa" };
+        },
       };
 
       type S = {

package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts

@@ -1,4 +1,4 @@
-import prostgles, { defineFunction } from "..";
+import prostgles, { defineFunction, type ServerFunctionDefinitions } from "..";
 
 type RecursiveResult = {
   value: string;
@@ -11,25 +11,29 @@ type FixtureSchema = {
   };
 };
 
+export const stateServerFunctions = {
+  public: {
+    userFilter: { type: "public" },
+    functions: {
+      recursiveResult: defineFunction({
+        run: (): RecursiveResult => ({ value: "ok" }),
+      }),
+      scalarResult: defineFunction({
+        input: { value: "number" },
+        run: ({ value }, { dbo }) => {
+          value satisfies number;
+          void dbo.orders.find();
+          // @ts-expect-error The schema must reach a function defined in another object.
+          void dbo.missingTable;
+          return value;
+        },
+      }),
+    },
+  },
+} as const satisfies ServerFunctionDefinitions<FixtureSchema>;
+
 void prostgles<FixtureSchema>({
   dbConnection: "",
   onReady: () => {},
-  functions: {
-    public: {
-      userFilter: { type: "public" },
-      functions: {
-        recursiveResult: defineFunction({
-          run: (): RecursiveResult => ({ value: "ok" }),
-        }),
-        scalarResult: defineFunction({
-          run: (_args, { dbo }) => {
-            void dbo.orders.find();
-            // @ts-expect-error The surrounding prostgles schema must reach defineFunction.
-            void dbo.missingTable;
-            return 42;
-          },
-        }),
-      },
-    },
-  },
+  functions: stateServerFunctions,
 });

package/lib/PublishParser/PublishParser.ts

@@ -71,9 +71,13 @@ export class PublishParser {
     if (!functionGroups || !publishParams.user) {
       return;
     }
+    const { findUser } = this.prostgles.opts.auth ?? {};
+    if (!findUser) {
+      throw new Error(
+        "findUser function is missing in auth config. It is required for functions to work.",
+      );
+    }
     const user = publishParams.user;
-    const users = publishParams.dbo.users;
-    if (!users?.findOne) return;
     const userId = user.id;
     if (!userId || typeof userId !== "string") {
       throw "User ID is missing or invalid";
@@ -81,9 +85,12 @@ export class PublishParser {
     const allowedFunctionsMap = new Map<string, ServerFunctionDefinition>();
 
     for (const group of Object.values(functionGroups)) {
-      const matchingUser = await users.findOne({
-        $and: [group.userFilter, { id: userId }],
-      });
+      const matchingUser = await findUser(
+        {
+          $and: [group.userFilter, { id: userId }],
+        },
+        publishParams.dbo,
+      );
       if (!matchingUser) continue;
 
       for (const [name, method] of Object.entries(group.functions)) {

package/lib/PublishParser/defineServerFunction.ts

@@ -48,7 +48,10 @@ export type ServerFunctionDefinition = {
 };
 
 declare const serverFunctionContext: unique symbol;
-type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
+export type ServerFunctionContextMarker<
+  S,
+  SUser extends SessionUser,
+> = {
   [serverFunctionContext]?: [S, SUser];
 };
 

package/package.json

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

package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;AAQA,kEAcC;AAED,wEA8CC;AAtED,gDAA+F;AAG/F,oCAAoD;AACpD,2EAAwE;AACxE,yDAAsD;AACtD,iDAA8C;AAE9C,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;IAE9D,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,OAAO,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YACnD,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;IAE9D,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAQ;QAClB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KAC7C,CAAC;IACX,MAAM,UAAU,GAAG,GAAG,CAAC;IAEvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,qDAAyB,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EAAC,GAAG,CAAC,WAAW,EAAE,wCAA0B,CAAC,CAAC;IACtF,IAAI,eAAe,IAAI,CAAC,IAAA,2BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,CAAC;QAClF,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC"}