prostgles-server 4.2.591 → 4.2.593

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.d.ts

@@ -0,0 +1,15 @@
+import type { FixtureSchema } from "./getServerFunctionReturnTypes.fixture";
+export declare const externalFunctions: {
+    readonly externalScalar: {
+        input?: {
+            value: "string";
+        } | undefined;
+        description?: string;
+        run: (args: import("prostgles-types").JSONB.GetObjectType<{
+            value: "string";
+        }>, context: import("..").RestrictedFunctionContext<FixtureSchema, import("..").SessionUser>) => import("prostgles-types").MaybePromise<string>;
+    } & {
+        unrestrictedDbAccess?: undefined;
+    } & import("..").ServerFunctionContextMarker<FixtureSchema, import("..").SessionUser>;
+};
+//# sourceMappingURL=getServerFunctionReturnTypes.external.fixture.d.ts.map

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getServerFunctionReturnTypes.external.fixture.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAI5E,eAAO,MAAM,iBAAiB;;;;;;;;;;;;CAU5B,CAAC"}

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.externalFunctions = void 0;
+const __1 = require("..");
+const defineFixtureFunctions = (0, __1.createFunctionsDefiner)();
+exports.externalFunctions = defineFixtureFunctions({
+    externalScalar: (0, __1.defineFunction)({
+        input: { value: "string" },
+        run: ({ value }, { dbo }) => {
+            void dbo.orders.find();
+            // @ts-expect-error The schema must reach functions defined in another file.
+            void dbo.missingTable;
+            return value;
+        },
+    }),
+});
+//# sourceMappingURL=getServerFunctionReturnTypes.external.fixture.js.map

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getServerFunctionReturnTypes.external.fixture.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.ts"],"names":[],"mappings":";;;AAAA,0BAA4D;AAG5D,MAAM,sBAAsB,GAAG,IAAA,0BAAsB,GAAiB,CAAC;AAE1D,QAAA,iBAAiB,GAAG,sBAAsB,CAAC;IACtD,cAAc,EAAE,IAAA,kBAAc,EAAC;QAC7B,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;QAC1B,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC1B,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACvB,4EAA4E;YAC5E,KAAK,GAAG,CAAC,YAAY,CAAC;YACtB,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;CACH,CAAC,CAAC"}

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.d.ts

@@ -1,2 +1,82 @@
+type RecursiveResult = {
+    value: string;
+    next?: RecursiveResult;
+};
+type SampleSchema = {
+    name: string;
+    path: string;
+} & ({
+    type: "sql";
+    file: string;
+} | {
+    type: "dir";
+    workspaceConfig?: {
+        workspaces: {
+            options?: {
+                hideCounts?: boolean;
+                tableListEndInfo?: "count" | "size" | "none";
+            };
+        }[];
+    };
+});
+export type FixtureSchema = {
+    orders: {
+        columns: {
+            id: string;
+        };
+    };
+};
+export declare const stateServerFunctions: {
+    public: {
+        readonly userFilter: {
+            readonly type: "public";
+        };
+        readonly functions: {
+            readonly recursiveResult: {
+                input?: Record<string, import("prostgles-types").JSONB.FieldType> | undefined;
+                description?: string;
+                run: (args: import("prostgles-types").JSONB.GetObjectType<Record<string, import("prostgles-types").JSONB.FieldType>>, context: import("..").RestrictedFunctionContext<FixtureSchema, import("..").SessionUser>) => import("prostgles-types").MaybePromise<RecursiveResult>;
+            } & {
+                unrestrictedDbAccess?: undefined;
+            } & import("..").ServerFunctionContextMarker<FixtureSchema, import("..").SessionUser>;
+            readonly sampleSchemas: {
+                input?: Record<string, import("prostgles-types").JSONB.FieldType> | undefined;
+                description?: string;
+                run: (args: import("prostgles-types").JSONB.GetObjectType<Record<string, import("prostgles-types").JSONB.FieldType>>, context: import("..").RestrictedFunctionContext<FixtureSchema, import("..").SessionUser>) => import("prostgles-types").MaybePromise<SampleSchema[]>;
+            } & {
+                unrestrictedDbAccess?: undefined;
+            } & import("..").ServerFunctionContextMarker<FixtureSchema, import("..").SessionUser>;
+            readonly scalarResult: {
+                input?: {
+                    value: "number";
+                } | undefined;
+                description?: string;
+                run: (args: import("prostgles-types").JSONB.GetObjectType<{
+                    value: "number";
+                }>, context: import("..").RestrictedFunctionContext<FixtureSchema, import("..").SessionUser>) => import("prostgles-types").MaybePromise<number>;
+            } & {
+                unrestrictedDbAccess?: undefined;
+            } & import("..").ServerFunctionContextMarker<FixtureSchema, import("..").SessionUser>;
+        };
+    };
+    external: {
+        readonly userFilter: {
+            readonly type: "public";
+        };
+        readonly functions: {
+            readonly externalScalar: {
+                input?: {
+                    value: "string";
+                } | undefined;
+                description?: string;
+                run: (args: import("prostgles-types").JSONB.GetObjectType<{
+                    value: "string";
+                }>, context: import("..").RestrictedFunctionContext<FixtureSchema, import("..").SessionUser>) => import("prostgles-types").MaybePromise<string>;
+            } & {
+                unrestrictedDbAccess?: undefined;
+            } & import("..").ServerFunctionContextMarker<FixtureSchema, import("..").SessionUser>;
+        };
+    };
+};
 export {};
 //# sourceMappingURL=getServerFunctionReturnTypes.fixture.d.ts.map

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getServerFunctionReturnTypes.fixture.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts"],"names":[],"mappings":""}
+{"version":3,"file":"getServerFunctionReturnTypes.fixture.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts"],"names":[],"mappings":"AAGA,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,CACA;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC7B;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,eAAe,CAAC,EAAE;QAChB,UAAU,EAAE;YACV,OAAO,CAAC,EAAE;gBACR,UAAU,CAAC,EAAE,OAAO,CAAC;gBACrB,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;aAC9C,CAAC;SACH,EAAE,CAAC;KACL,CAAC;CACH,CACJ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE;QACN,OAAO,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;KACzB,CAAC;CACH,CAAC;AAIF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhC,CAAC"}

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.js

@@ -33,27 +33,40 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.stateServerFunctions = void 0;
 const __1 = __importStar(require(".."));
+const getServerFunctionReturnTypes_external_fixture_1 = require("./getServerFunctionReturnTypes.external.fixture");
+const defineFixtureFunctionGroup = (0, __1.createFunctionGroupDefiner)();
+exports.stateServerFunctions = {
+    public: defineFixtureFunctionGroup({
+        userFilter: { type: "public" },
+        functions: {
+            recursiveResult: (0, __1.defineFunction)({
+                run: () => ({ value: "ok" }),
+            }),
+            sampleSchemas: (0, __1.defineFunction)({
+                run: () => [],
+            }),
+            scalarResult: (0, __1.defineFunction)({
+                input: { value: "number" },
+                run: ({ value }, { dbo }) => {
+                    value;
+                    void dbo.orders.find();
+                    // @ts-expect-error The schema must reach a function defined in another object.
+                    void dbo.missingTable;
+                    return value;
+                },
+            }),
+        },
+    }),
+    external: defineFixtureFunctionGroup({
+        userFilter: { type: "public" },
+        functions: getServerFunctionReturnTypes_external_fixture_1.externalFunctions,
+    }),
+};
 void (0, __1.default)({
     dbConnection: "",
     onReady: () => { },
-    functions: {
-        public: {
-            userFilter: { type: "public" },
-            functions: {
-                recursiveResult: (0, __1.defineFunction)({
-                    run: () => ({ value: "ok" }),
-                }),
-                scalarResult: (0, __1.defineFunction)({
-                    run: (_args, { dbo }) => {
-                        void dbo.orders.find();
-                        // @ts-expect-error The surrounding prostgles schema must reach defineFunction.
-                        void dbo.missingTable;
-                        return 42;
-                    },
-                }),
-            },
-        },
-    },
+    functions: exports.stateServerFunctions,
 });
 //# sourceMappingURL=getServerFunctionReturnTypes.fixture.js.map

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"getServerFunctionReturnTypes.fixture.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA+C;AAa/C,KAAK,IAAA,WAAS,EAAgB;IAC5B,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;IACjB,SAAS,EAAE;QACT,MAAM,EAAE;YACN,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,SAAS,EAAE;gBACT,eAAe,EAAE,IAAA,kBAAc,EAAC;oBAC9B,GAAG,EAAE,GAAoB,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;iBAC9C,CAAC;gBACF,YAAY,EAAE,IAAA,kBAAc,EAAC;oBAC3B,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;wBACtB,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;wBACvB,+EAA+E;wBAC/E,KAAK,GAAG,CAAC,YAAY,CAAC;wBACtB,OAAO,EAAE,CAAC;oBACZ,CAAC;iBACF,CAAC;aACH;SACF;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"getServerFunctionReturnTypes.fixture.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2E;AAC3E,mHAAoF;AA+BpF,MAAM,0BAA0B,GAAG,IAAA,8BAA0B,GAAiB,CAAC;AAElE,QAAA,oBAAoB,GAAG;IAClC,MAAM,EAAE,0BAA0B,CAAC;QACjC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,SAAS,EAAE;YACT,eAAe,EAAE,IAAA,kBAAc,EAAC;gBAC9B,GAAG,EAAE,GAAoB,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aAC9C,CAAC;YACF,aAAa,EAAE,IAAA,kBAAc,EAAC;gBAC5B,GAAG,EAAE,GAAmB,EAAE,CAAC,EAAE;aAC9B,CAAC;YACF,YAAY,EAAE,IAAA,kBAAc,EAAC;gBAC3B,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;gBAC1B,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;oBAC1B,KAAsB,CAAC;oBACvB,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACvB,+EAA+E;oBAC/E,KAAK,GAAG,CAAC,YAAY,CAAC;oBACtB,OAAO,KAAK,CAAC;gBACf,CAAC;aACF,CAAC;SACH;KACF,CAAC;IACF,QAAQ,EAAE,0BAA0B,CAAC;QACnC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,SAAS,EAAE,iEAAiB;KAC7B,CAAC;CACH,CAAC;AAEF,KAAK,IAAA,WAAS,EAAgB;IAC5B,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;IACjB,SAAS,EAAE,4BAAoB;CAChC,CAAC,CAAC"}

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.spec.js

@@ -12,7 +12,9 @@ void (0, node_test_1.describe)("getServerFunctionReturnTypes", async () => {
         const fixturePath = (0, node_path_1.resolve)(__dirname, "../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts");
         const result = (0, getServerFunctionReturnTypes_1.getServerFunctionReturnTypes)(fixturePath);
         node_assert_1.default.equal(result.get("scalarResult"), "number");
+        node_assert_1.default.equal(result.get("externalScalar"), "string");
         node_assert_1.default.equal(result.get("recursiveResult"), "{ value: string; next?: unknown }");
+        node_assert_1.default.equal(result.get("sampleSchemas"), 'Array<(({ name: string; path: string } & { type: "sql"; file: string }) | ({ name: string; path: string } & { type: "dir"; workspaceConfig?: (undefined | { workspaces: Array<{ options?: (undefined | { hideCounts?: (undefined | false | true); tableListEndInfo?: (undefined | "count" | "size" | "none") }) }> }) }))>');
     });
 });
 //# sourceMappingURL=getServerFunctionReturnTypes.spec.js.map

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"getServerFunctionReturnTypes.spec.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.spec.ts"],"names":[],"mappings":";;;;;AAAA,8DAAiC;AACjC,yCAAoC;AACpC,yCAA2C;AAC3C,iFAA8E;AAG9E,KAAK,IAAA,oBAAQ,EAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,IAAA,gBAAI,EAAC,sDAAsD,EAAE,GAAG,EAAE;QACtE,MAAM,WAAW,GAAG,IAAA,mBAAO,EACzB,SAAS,EACT,mEAAmE,CACpE,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,2DAA4B,EAAC,WAAW,CAAC,CAAC;QAEzD,qBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnD,qBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,mCAAmC,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"getServerFunctionReturnTypes.spec.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.spec.ts"],"names":[],"mappings":";;;;;AAAA,8DAAiC;AACjC,yCAAoC;AACpC,yCAA2C;AAC3C,iFAA8E;AAG9E,KAAK,IAAA,oBAAQ,EAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;IACvD,MAAM,IAAA,gBAAI,EAAC,sDAAsD,EAAE,GAAG,EAAE;QACtE,MAAM,WAAW,GAAG,IAAA,mBAAO,EACzB,SAAS,EACT,mEAAmE,CACpE,CAAC;QACF,MAAM,MAAM,GAAG,IAAA,2DAA4B,EAAC,WAAW,CAAC,CAAC;QAEzD,qBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC;QACnD,qBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrD,qBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,mCAAmC,CAAC,CAAC;QACjF,qBAAM,CAAC,KAAK,CACV,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAC3B,4TAA4T,CAC7T,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/DBSchemaBuilder/resolveTypeToStructure.d.ts

@@ -3,5 +3,5 @@ import * as ts from "typescript";
  * Recursively resolve a type to its structural representation
  * using only built-in/primitive types
  */
-export declare const resolveTypeToStructure: (globalBuiltIns: Set<string>, functionName: string, checker: ts.TypeChecker, type: ts.Type, parentTypes?: ts.Type[], maxDepth?: number) => string;
+export declare const resolveTypeToStructure: (globalBuiltIns: Set<string>, functionName: string, checker: ts.TypeChecker, type: ts.Type, parentTypes?: ts.Type[], maxDepth?: number, depth?: number) => string;
 //# sourceMappingURL=resolveTypeToStructure.d.ts.map

package/dist/DBSchemaBuilder/resolveTypeToStructure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveTypeToStructure.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/resolveTypeToStructure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,gBAAgB,GAAG,CAAC,MAAM,CAAC,EAC3B,cAAc,MAAM,EACpB,SAAS,EAAE,CAAC,WAAW,EACvB,MAAM,EAAE,CAAC,IAAI,EACb,cAAa,EAAE,CAAC,IAAI,EAAO,EAC3B,iBAAa,KACZ,MA6LF,CAAC"}
+{"version":3,"file":"resolveTypeToStructure.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/resolveTypeToStructure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,gBAAgB,GAAG,CAAC,MAAM,CAAC,EAC3B,cAAc,MAAM,EACpB,SAAS,EAAE,CAAC,WAAW,EACvB,MAAM,EAAE,CAAC,IAAI,EACb,cAAa,EAAE,CAAC,IAAI,EAAO,EAC3B,iBAAa,EACb,cAAS,KACR,MA6KF,CAAC"}

package/dist/DBSchemaBuilder/resolveTypeToStructure.js

@@ -39,14 +39,15 @@ const ts = __importStar(require("typescript"));
  * Recursively resolve a type to its structural representation
  * using only built-in/primitive types
  */
-const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, parentTypes = [], maxDepth = 10) => {
-    const depth = parentTypes.length;
+const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, parentTypes = [], maxDepth = 10, depth = 0) => {
     const getParentNames = () => parentTypes.map((t) => checker.typeToString(t));
     if (depth > maxDepth) {
         console.warn(`Max type resolution depth (${maxDepth}) reached for function ${JSON.stringify(functionName)} ReturnType`, getParentNames().join(" -> "));
         return "unknown";
     }
     const nextParentTypes = [...parentTypes, type];
+    /** Unions, intersections, and containers track cycles without consuming structural depth. */
+    const resolveChild = (childType, isNestedStructure = false) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, childType, nextParentTypes, maxDepth, depth + (isNestedStructure ? 1 : 0));
     if (type.flags & ts.TypeFlags.String)
         return "string";
     if (type.flags & ts.TypeFlags.Number)
@@ -81,7 +82,7 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
         return "unknown";
     // Handle union types
     if (type.isUnion()) {
-        const parts = type.types.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, nextParentTypes));
+        const parts = type.types.map((t) => resolveChild(t));
         // Deduplicate
         const unique = [...new Set(parts)];
         if (unique.includes("unknown"))
@@ -92,7 +93,7 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
     }
     // Handle intersection types
     if (type.isIntersection()) {
-        const parts = type.types.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, nextParentTypes));
+        const parts = type.types.map((t) => resolveChild(t));
         return `(${parts.join(" & ")})`;
     }
     // Handle Promise<T> - unwrap to Promise<ResolvedT>
@@ -113,14 +114,14 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
     // Handle tuple types
     if (checker.isTupleType(type)) {
         const typeArgs = checker.getTypeArguments(type);
-        const elements = typeArgs.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, nextParentTypes));
+        const elements = typeArgs.map((t) => resolveChild(t));
         return `[${elements.join(", ")}]`;
     }
     if (typeName && globalBuiltIns.has(typeName)) {
         // Check for type arguments (e.g., ReadableStream<Uint8Array>)
         const typeArgs = checker.getTypeArguments(type);
         if (typeArgs.length > 0) {
-            const resolvedArgs = typeArgs.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, nextParentTypes));
+            const resolvedArgs = typeArgs.map((t) => resolveChild(t));
             return `${typeName}<${resolvedArgs.join(", ")}>`;
         }
         return typeName;
@@ -132,11 +133,11 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
         const sig = callSignatures[0];
         const params = sig.getParameters().map((param) => {
             const paramType = checker.getTypeOfSymbolAtLocation(param, param.valueDeclaration);
-            const paramTypeStr = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, paramType, nextParentTypes);
+            const paramTypeStr = resolveChild(paramType, true);
             const isOptional = param.flags & ts.SymbolFlags.Optional;
             return `${param.getName()}${isOptional ? "?" : ""}: ${paramTypeStr}`;
         });
-        const returnType = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, checker.getReturnTypeOfSignature(sig), nextParentTypes);
+        const returnType = resolveChild(checker.getReturnTypeOfSignature(sig), true);
         return `((${params.join(", ")}) => ${returnType})`;
     }
     // Handle object types - expand to structural form
@@ -157,7 +158,7 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
                 // get the type directly from the symbol
                 propType = checker.getTypeOfSymbol(prop);
             }
-            const propTypeStr = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, propType, nextParentTypes);
+            const propTypeStr = resolveChild(propType, true);
             const isOptional = prop.flags & ts.SymbolFlags.Optional;
             const propName = prop.getName();
             // Handle property names that need quoting
@@ -169,10 +170,10 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
         const stringIndexType = type.getStringIndexType();
         const numberIndexType = type.getNumberIndexType();
         if (stringIndexType) {
-            members.push(`[key: string]: ${(0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, stringIndexType, nextParentTypes)}`);
+            members.push(`[key: string]: ${resolveChild(stringIndexType, true)}`);
         }
         if (numberIndexType) {
-            members.push(`[key: number]: ${(0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, numberIndexType, nextParentTypes)}`);
+            members.push(`[key: number]: ${resolveChild(numberIndexType, true)}`);
         }
         if (members.length === 0) {
             // Empty object or object with no enumerable properties

package/dist/DBSchemaBuilder/resolveTypeToStructure.js.map

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

package/dist/PublishParser/defineServerFunction.d.ts

@@ -21,7 +21,7 @@ export type ServerFunctionDefinition = {
     run: (...args: any[]) => MaybePromise<unknown>;
 };
 declare const serverFunctionContext: unique symbol;
-type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
+export type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
     [serverFunctionContext]?: [S, SUser];
 };
 type DefineFunctionArgs<TInput extends Record<string, JSONB.FieldType> | undefined, Context, Return> = {
@@ -41,9 +41,21 @@ type UsersTableRow<S> = S extends DBSchema ? S extends {
     };
 } ? UserRow : AnyObject : AnyObject;
 type ValidDbSchema<S> = S extends DBSchema ? S : void;
-export type ServerFunctionDefinitions<S = void, SUser extends SessionUser = SessionUser> = Record<string, {
+export type ServerFunctionGroupFunctions<S = void, SUser extends SessionUser = SessionUser> = Record<string, ServerFunctionDefinition & ServerFunctionContextMarker<S, SUser>>;
+export type ServerFunctionGroup<S = void, SUser extends SessionUser = SessionUser> = {
     userFilter: FullFilter<UsersTableRow<S>, ValidDbSchema<S>>;
-    functions: Record<string, ServerFunctionDefinition & ServerFunctionContextMarker<S, SUser>>;
-}>;
+    functions: ServerFunctionGroupFunctions<S, SUser>;
+};
+export type ServerFunctionDefinitions<S = void, SUser extends SessionUser = SessionUser> = Record<string, ServerFunctionGroup<S, SUser>>;
+/**
+ * Creates a schema-aware identity helper for defining a server function group
+ * while preserving its inferred function names and return types.
+ */
+export declare const createFunctionGroupDefiner: <S = void, SUser extends SessionUser = SessionUser>() => <const T extends ServerFunctionGroup<S, SUser>>(group: T) => T;
+/**
+ * Creates a schema-aware identity helper for function maps that are composed
+ * into a server function group elsewhere.
+ */
+export declare const createFunctionsDefiner: <S = void, SUser extends SessionUser = SessionUser>() => <const T extends ServerFunctionGroupFunctions<S, SUser>>(functions: T) => T;
 export {};
 //# sourceMappingURL=defineServerFunction.d.ts.map

package/dist/PublishParser/defineServerFunction.d.ts.map

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

package/dist/PublishParser/defineServerFunction.js

@@ -1,7 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFunctionsDefiner = exports.createFunctionGroupDefiner = void 0;
 exports.defineFunction = defineFunction;
 function defineFunction(args) {
     return args;
 }
+/**
+ * Creates a schema-aware identity helper for defining a server function group
+ * while preserving its inferred function names and return types.
+ */
+const createFunctionGroupDefiner = () => {
+    return (group) => group;
+};
+exports.createFunctionGroupDefiner = createFunctionGroupDefiner;
+/**
+ * Creates a schema-aware identity helper for function maps that are composed
+ * into a server function group elsewhere.
+ */
+const createFunctionsDefiner = () => {
+    return (functions) => functions;
+};
+exports.createFunctionsDefiner = createFunctionsDefiner;
 //# sourceMappingURL=defineServerFunction.js.map

package/dist/PublishParser/defineServerFunction.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineServerFunction.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":";;AAqFA,wCAEC;AAFD,SAAgB,cAAc,CAAC,IAAa;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"defineServerFunction.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":";;;AAqFA,wCAEC;AAFD,SAAgB,cAAc,CAAC,IAAa;IAC1C,OAAO,IAAI,CAAC;AACd,CAAC;AA0BD;;;GAGG;AACI,MAAM,0BAA0B,GAAG,GAAsD,EAAE;IAChG,OAAO,CAAgD,KAAQ,EAAK,EAAE,CAAC,KAAK,CAAC;AAC/E,CAAC,CAAC;AAFW,QAAA,0BAA0B,8BAErC;AAEF;;;GAGG;AACI,MAAM,sBAAsB,GAAG,GAAsD,EAAE;IAC5F,OAAO,CAAyD,SAAY,EAAK,EAAE,CAAC,SAAS,CAAC;AAChG,CAAC,CAAC;AAFW,QAAA,sBAAsB,0BAEjC"}

package/dist/PublishParser/defineServerFunction.spec.js

@@ -22,6 +22,25 @@ void (0, node_test_1.describe)("defineFunction type test", async () => {
         });
         //@ts-expect-error run is required
         (0, defineServerFunction_1.defineFunction)({ description: "invalid" });
+        const defineTestFunctions = (0, defineServerFunction_1.createFunctionsDefiner)();
+        const functions = defineTestFunctions({
+            getItem: (0, defineServerFunction_1.defineFunction)({
+                run: (_args, { dbo }) => {
+                    void dbo.items.find();
+                    // @ts-expect-error The schema is retained without a satisfies assertion.
+                    void dbo.missingTable;
+                    return { id: 1 };
+                },
+            }),
+        });
+        const defineTestFunctionGroup = (0, defineServerFunction_1.createFunctionGroupDefiner)();
+        const group = defineTestFunctionGroup({
+            userFilter: { type: "public" },
+            functions,
+        });
+        group.functions.getItem;
+        // @ts-expect-error A group must have a user filter.
+        defineTestFunctionGroup({ functions });
     });
 });
 //# sourceMappingURL=defineServerFunction.spec.js.map

package/dist/PublishParser/defineServerFunction.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineServerFunction.spec.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.spec.ts"],"names":[],"mappings":";;AAAA,yCAA2C;AAC3C,iEAAwD;AAExD,KAAK,IAAA,oBAAQ,EAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IACnD,MAAM,IAAA,gBAAI,EAAC,WAAW,EAAE,GAAG,EAAE;QAC3B,IAAA,qCAAc,EAAC;YACb,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE;YACnC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBACrB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAEhB,2DAA2D;gBAC3D,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE3B,kBAAkB;gBAClB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,IAAA,qCAAc,EAAC;YACb,oBAAoB,EAAE,IAAI;YAC1B,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;SACpD,CAAC,CAAC;QAEH,kCAAkC;QAClC,IAAA,qCAAc,EAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"defineServerFunction.spec.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.spec.ts"],"names":[],"mappings":";;AAAA,yCAA2C;AAC3C,iEAIgC;AAQhC,KAAK,IAAA,oBAAQ,EAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;IACnD,MAAM,IAAA,gBAAI,EAAC,WAAW,EAAE,GAAG,EAAE;QAC3B,IAAA,qCAAc,EAAC;YACb,KAAK,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE;YACnC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBACrB,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAEhB,2DAA2D;gBAC3D,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAE3B,kBAAkB;gBAClB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,IAAA,qCAAc,EAAC;YACb,oBAAoB,EAAE,IAAI;YAC1B,GAAG,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;SACpD,CAAC,CAAC;QAEH,kCAAkC;QAClC,IAAA,qCAAc,EAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QAE3C,MAAM,mBAAmB,GAAG,IAAA,6CAAsB,GAAc,CAAC;QACjE,MAAM,SAAS,GAAG,mBAAmB,CAAC;YACpC,OAAO,EAAE,IAAA,qCAAc,EAAC;gBACtB,GAAG,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;oBACtB,KAAK,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBACtB,yEAAyE;oBACzE,KAAK,GAAG,CAAC,YAAY,CAAC;oBACtB,OAAO,EAAE,EAAE,EAAE,CAAU,EAAE,CAAC;gBAC5B,CAAC;aACF,CAAC;SACH,CAAC,CAAC;QAEH,MAAM,uBAAuB,GAAG,IAAA,iDAA0B,GAAc,CAAC;QACzE,MAAM,KAAK,GAAG,uBAAuB,CAAC;YACpC,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC9B,SAAS;SACV,CAAC,CAAC;QAEH,KAAK,CAAC,SAAS,CAAC,OAA+C,CAAC;QAEhE,oDAAoD;QACpD,uBAAuB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.external.fixture.ts

@@ -0,0 +1,16 @@
+import { defineFunction, createFunctionsDefiner } from "..";
+import type { FixtureSchema } from "./getServerFunctionReturnTypes.fixture";
+
+const defineFixtureFunctions = createFunctionsDefiner<FixtureSchema>();
+
+export const externalFunctions = defineFixtureFunctions({
+  externalScalar: defineFunction({
+    input: { value: "string" },
+    run: ({ value }, { dbo }) => {
+      void dbo.orders.find();
+      // @ts-expect-error The schema must reach functions defined in another file.
+      void dbo.missingTable;
+      return value;
+    },
+  }),
+});

package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.fixture.ts

@@ -1,35 +1,67 @@
-import prostgles, { defineFunction } from "..";
+import prostgles, { defineFunction, createFunctionGroupDefiner } from "..";
+import { externalFunctions } from "./getServerFunctionReturnTypes.external.fixture";
 
 type RecursiveResult = {
   value: string;
   next?: RecursiveResult;
 };
 
-type FixtureSchema = {
+type SampleSchema = {
+  name: string;
+  path: string;
+} & (
+  | { type: "sql"; file: string }
+  | {
+      type: "dir";
+      workspaceConfig?: {
+        workspaces: {
+          options?: {
+            hideCounts?: boolean;
+            tableListEndInfo?: "count" | "size" | "none";
+          };
+        }[];
+      };
+    }
+);
+
+export type FixtureSchema = {
   orders: {
     columns: { id: string };
   };
 };
 
+const defineFixtureFunctionGroup = createFunctionGroupDefiner<FixtureSchema>();
+
+export const stateServerFunctions = {
+  public: defineFixtureFunctionGroup({
+    userFilter: { type: "public" },
+    functions: {
+      recursiveResult: defineFunction({
+        run: (): RecursiveResult => ({ value: "ok" }),
+      }),
+      sampleSchemas: defineFunction({
+        run: (): SampleSchema[] => [],
+      }),
+      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;
+        },
+      }),
+    },
+  }),
+  external: defineFixtureFunctionGroup({
+    userFilter: { type: "public" },
+    functions: externalFunctions,
+  }),
+};
+
 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/DBSchemaBuilder/getServerFunctionReturnTypes.spec.ts

@@ -13,6 +13,11 @@ void describe("getServerFunctionReturnTypes", async () => {
     const result = getServerFunctionReturnTypes(fixturePath);
 
     assert.equal(result.get("scalarResult"), "number");
+    assert.equal(result.get("externalScalar"), "string");
     assert.equal(result.get("recursiveResult"), "{ value: string; next?: unknown }");
+    assert.equal(
+      result.get("sampleSchemas"),
+      'Array<(({ name: string; path: string } & { type: "sql"; file: string }) | ({ name: string; path: string } & { type: "dir"; workspaceConfig?: (undefined | { workspaces: Array<{ options?: (undefined | { hideCounts?: (undefined | false | true); tableListEndInfo?: (undefined | "count" | "size" | "none") }) }> }) }))>',
+    );
   });
 });

package/lib/DBSchemaBuilder/resolveTypeToStructure.ts

@@ -11,8 +11,8 @@ export const resolveTypeToStructure = (
   type: ts.Type,
   parentTypes: ts.Type[] = [],
   maxDepth = 10,
+  depth = 0,
 ): string => {
-  const depth = parentTypes.length;
   const getParentNames = () => parentTypes.map((t) => checker.typeToString(t));
   if (depth > maxDepth) {
     console.warn(
@@ -23,6 +23,17 @@ export const resolveTypeToStructure = (
   }
 
   const nextParentTypes = [...parentTypes, type];
+  /** Unions, intersections, and containers track cycles without consuming structural depth. */
+  const resolveChild = (childType: ts.Type, isNestedStructure = false) =>
+    resolveTypeToStructure(
+      globalBuiltIns,
+      functionName,
+      checker,
+      childType,
+      nextParentTypes,
+      maxDepth,
+      depth + (isNestedStructure ? 1 : 0),
+    );
 
   if (type.flags & ts.TypeFlags.String) return "string";
   if (type.flags & ts.TypeFlags.Number) return "number";
@@ -48,9 +59,7 @@ export const resolveTypeToStructure = (
 
   // Handle union types
   if (type.isUnion()) {
-    const parts = type.types.map((t) =>
-      resolveTypeToStructure(globalBuiltIns, functionName, checker, t, nextParentTypes),
-    );
+    const parts = type.types.map((t) => resolveChild(t));
     // Deduplicate
     const unique = [...new Set(parts)];
     if (unique.includes("unknown")) return "unknown";
@@ -60,9 +69,7 @@ export const resolveTypeToStructure = (
 
   // Handle intersection types
   if (type.isIntersection()) {
-    const parts = type.types.map((t) =>
-      resolveTypeToStructure(globalBuiltIns, functionName, checker, t, nextParentTypes),
-    );
+    const parts = type.types.map((t) => resolveChild(t));
     return `(${parts.join(" & ")})`;
   }
 
@@ -91,9 +98,7 @@ export const resolveTypeToStructure = (
   // Handle tuple types
   if (checker.isTupleType(type)) {
     const typeArgs = checker.getTypeArguments(type as ts.TypeReference);
-    const elements = typeArgs.map((t) =>
-      resolveTypeToStructure(globalBuiltIns, functionName, checker, t, nextParentTypes),
-    );
+    const elements = typeArgs.map((t) => resolveChild(t));
     return `[${elements.join(", ")}]`;
   }
 
@@ -101,9 +106,7 @@ export const resolveTypeToStructure = (
     // Check for type arguments (e.g., ReadableStream<Uint8Array>)
     const typeArgs = checker.getTypeArguments(type as ts.TypeReference);
     if (typeArgs.length > 0) {
-      const resolvedArgs = typeArgs.map((t) =>
-        resolveTypeToStructure(globalBuiltIns, functionName, checker, t, nextParentTypes),
-      );
+      const resolvedArgs = typeArgs.map((t) => resolveChild(t));
       return `${typeName}<${resolvedArgs.join(", ")}>`;
     }
     return typeName;
@@ -119,23 +122,11 @@ export const resolveTypeToStructure = (
     const sig = callSignatures[0]!;
     const params = sig.getParameters().map((param) => {
       const paramType = checker.getTypeOfSymbolAtLocation(param, param.valueDeclaration!);
-      const paramTypeStr = resolveTypeToStructure(
-        globalBuiltIns,
-        functionName,
-        checker,
-        paramType,
-        nextParentTypes,
-      );
+      const paramTypeStr = resolveChild(paramType, true);
       const isOptional = param.flags & ts.SymbolFlags.Optional;
       return `${param.getName()}${isOptional ? "?" : ""}: ${paramTypeStr}`;
     });
-    const returnType = resolveTypeToStructure(
-      globalBuiltIns,
-      functionName,
-      checker,
-      checker.getReturnTypeOfSignature(sig),
-      nextParentTypes,
-    );
+    const returnType = resolveChild(checker.getReturnTypeOfSignature(sig), true);
     return `((${params.join(", ")}) => ${returnType})`;
   }
 
@@ -158,13 +149,7 @@ export const resolveTypeToStructure = (
         propType = checker.getTypeOfSymbol(prop);
       }
 
-      const propTypeStr = resolveTypeToStructure(
-        globalBuiltIns,
-        functionName,
-        checker,
-        propType,
-        nextParentTypes,
-      );
+      const propTypeStr = resolveChild(propType, true);
       const isOptional = prop.flags & ts.SymbolFlags.Optional;
       const propName = prop.getName();
 
@@ -181,12 +166,12 @@ export const resolveTypeToStructure = (
 
     if (stringIndexType) {
       members.push(
-        `[key: string]: ${resolveTypeToStructure(globalBuiltIns, functionName, checker, stringIndexType, nextParentTypes)}`,
+        `[key: string]: ${resolveChild(stringIndexType, true)}`,
       );
     }
     if (numberIndexType) {
       members.push(
-        `[key: number]: ${resolveTypeToStructure(globalBuiltIns, functionName, checker, numberIndexType, nextParentTypes)}`,
+        `[key: number]: ${resolveChild(numberIndexType, true)}`,
       );
     }
 

package/lib/PublishParser/defineServerFunction.spec.ts

@@ -1,5 +1,15 @@
 import { describe, test } from "node:test";
-import { defineFunction } from "./defineServerFunction";
+import {
+  defineFunction,
+  createFunctionGroupDefiner,
+  createFunctionsDefiner,
+} from "./defineServerFunction";
+
+type TestSchema = {
+  items: {
+    columns: { id: number };
+  };
+};
 
 void describe("defineFunction type test", async () => {
   await test("Type test", () => {
@@ -25,5 +35,28 @@ void describe("defineFunction type test", async () => {
 
     //@ts-expect-error run is required
     defineFunction({ description: "invalid" });
+
+    const defineTestFunctions = createFunctionsDefiner<TestSchema>();
+    const functions = defineTestFunctions({
+      getItem: defineFunction({
+        run: (_args, { dbo }) => {
+          void dbo.items.find();
+          // @ts-expect-error The schema is retained without a satisfies assertion.
+          void dbo.missingTable;
+          return { id: 1 as const };
+        },
+      }),
+    });
+
+    const defineTestFunctionGroup = createFunctionGroupDefiner<TestSchema>();
+    const group = defineTestFunctionGroup({
+      userFilter: { type: "public" },
+      functions,
+    });
+
+    group.functions.getItem satisfies (typeof functions)["getItem"];
+
+    // @ts-expect-error A group must have a user filter.
+    defineTestFunctionGroup({ functions });
   });
 });

package/lib/PublishParser/defineServerFunction.ts

@@ -48,7 +48,7 @@ export type ServerFunctionDefinition = {
 };
 
 declare const serverFunctionContext: unique symbol;
-type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
+export type ServerFunctionContextMarker<S, SUser extends SessionUser> = {
   [serverFunctionContext]?: [S, SUser];
 };
 
@@ -96,16 +96,33 @@ type UsersTableRow<S> =
 
 type ValidDbSchema<S> = S extends DBSchema ? S : void;
 
-export type ServerFunctionDefinitions<
+export type ServerFunctionGroupFunctions<
   S = void,
   SUser extends SessionUser = SessionUser,
-> = Record<
+> = Record<string, ServerFunctionDefinition & ServerFunctionContextMarker<S, SUser>>;
+
+export type ServerFunctionGroup<S = void, SUser extends SessionUser = SessionUser> = {
+  userFilter: FullFilter<UsersTableRow<S>, ValidDbSchema<S>>;
+  functions: ServerFunctionGroupFunctions<S, SUser>;
+};
+
+export type ServerFunctionDefinitions<S = void, SUser extends SessionUser = SessionUser> = Record<
   string,
-  {
-    userFilter: FullFilter<UsersTableRow<S>, ValidDbSchema<S>>;
-    functions: Record<
-      string,
-      ServerFunctionDefinition & ServerFunctionContextMarker<S, SUser>
-    >;
-  }
+  ServerFunctionGroup<S, SUser>
 >;
+
+/**
+ * Creates a schema-aware identity helper for defining a server function group
+ * while preserving its inferred function names and return types.
+ */
+export const createFunctionGroupDefiner = <S = void, SUser extends SessionUser = SessionUser>() => {
+  return <const T extends ServerFunctionGroup<S, SUser>>(group: T): T => group;
+};
+
+/**
+ * Creates a schema-aware identity helper for function maps that are composed
+ * into a server function group elsewhere.
+ */
+export const createFunctionsDefiner = <S = void, SUser extends SessionUser = SessionUser>() => {
+  return <const T extends ServerFunctionGroupFunctions<S, SUser>>(functions: T): T => functions;
+};

package/package.json

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