prostgles-server 4.2.419 → 4.2.421

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

@@ -1 +1 @@
-{"version":3,"file":"getServerFunctionReturnTypes.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,4BAA4B,GAAI,cAAc,MAAM,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CA4TrF,CAAC"}
+{"version":3,"file":"getServerFunctionReturnTypes.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,4BAA4B,GAAI,cAAc,MAAM,KAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAwHrF,CAAC"}

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js

@@ -13,264 +13,80 @@ const getServerFunctionReturnTypes = (instancePath) => {
     const { fileNames, options } = ts.parseJsonConfigFileContent(config, ts.sys, (0, path_1.dirname)(configPath));
     const program = ts.createProgram(fileNames, options);
     const checker = program.getTypeChecker();
-    const sf = program.getSourceFile(instancePath);
+    const sourceFile = program.getSourceFile(instancePath);
     const result = new Map();
-    if (!sf) {
+    if (!sourceFile) {
         throw new Error(`Source file not found: ${instancePath}`);
     }
     const globalBuiltins = (0, getGlobalBuiltinTypes_1.getGlobalBuiltinTypes)(instancePath, checker, program);
-    const getActualSymbol = (symbol) => {
-        if (!symbol)
-            return undefined;
-        if (symbol.flags & ts.SymbolFlags.Alias) {
-            const aliased = checker.getAliasedSymbol(symbol);
-            return aliased;
-        }
-        return symbol;
-    };
-    const getDeclarationFromSymbol = (symbol) => {
-        const actualSymbol = getActualSymbol(symbol);
-        if (!actualSymbol)
-            return undefined;
-        return actualSymbol.valueDeclaration ?? actualSymbol.declarations?.[0];
-    };
-    /**
-     * Unwrap AsExpression, ParenthesizedExpression, etc. to get the actual expression
-     */
-    const unwrapExpression = (expr) => {
-        let current = expr;
-        let iterations = 0;
-        while (iterations < 10) {
-            iterations++;
-            if (ts.isAsExpression(current)) {
-                current = current.expression;
-            }
-            else if (ts.isParenthesizedExpression(current)) {
-                current = current.expression;
-            }
-            else if (ts.isSatisfiesExpression(current)) {
-                current = current.expression;
-            }
-            else if (ts.isTypeAssertionExpression(current)) {
-                current = current.expression;
-            }
-            else {
-                break;
-            }
-        }
-        return current;
-    };
-    /**
-     * Extract return type from a defineFunction call
-     */
-    const extractFromDefineCall = (callExpr, propertyName) => {
-        const arg = callExpr.arguments[0];
-        if (!arg) {
-            return;
-        }
-        if (!ts.isObjectLiteralExpression(arg)) {
-            return;
-        }
-        const runProp = arg.properties.find((x) => (ts.isPropertyAssignment(x) || ts.isMethodDeclaration(x)) && x.name.getText() === "run");
-        if (!runProp) {
-            return;
-        }
-        const runExpr = ts.isPropertyAssignment(runProp) ? runProp.initializer : runProp; // method declarations are already function-like
-        if (!ts.isFunctionLike(runExpr)) {
-            return;
-        }
-        const sig = checker.getSignatureFromDeclaration(runExpr);
-        if (!sig) {
-            return;
-        }
-        const returnType = checker.getReturnTypeOfSignature(sig);
-        const resolvedReturnType = (0, resolveTypeToStructure_1.resolveTypeToStructure)(globalBuiltins, propertyName, checker, returnType);
-        result.set(propertyName, resolvedReturnType);
-    };
-    /**
-     * Check if a call expression is a define function call
-     */
-    const isDefineFunctionCall = (node) => {
-        if (!ts.isCallExpression(node))
-            return false;
-        const callee = node.expression;
-        if (ts.isIdentifier(callee)) {
-            const name = callee.getText();
-            const isDefine = name.toLowerCase().includes("define") && name.toLowerCase().includes("function");
-            return isDefine;
-        }
-        return false;
-    };
-    const extractFromAwaitExpression = (spreadExpr, depth) => {
-        const awaitedExpr = spreadExpr.expression;
-        if (ts.isCallExpression(awaitedExpr)) {
-            // Resolve the function being called and extract from its return
-            const calleeExpr = awaitedExpr.expression;
-            if (ts.isIdentifier(calleeExpr)) {
-                const symbol = checker.getSymbolAtLocation(calleeExpr);
-                const decl = getDeclarationFromSymbol(symbol);
-                if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-                    const body = resolveFunctionBody(decl.initializer);
-                    if (body) {
-                        extractFromFunctionBody(body, depth + 2);
-                    }
-                }
-                if (decl && ts.isFunctionDeclaration(decl) && decl.body) {
-                    extractFromFunctionBody(decl.body, depth + 2);
-                }
-            }
-        }
-    };
-    /**
-     * Extract methods from an object literal that contains method definitions
-     */
-    const extractMethodsFromObjectLiteral = (obj, depth = 0) => {
-        for (const prop of obj.properties) {
-            if (ts.isPropertyAssignment(prop)) {
-                const propName = prop.name.getText();
-                if (isDefineFunctionCall(prop.initializer) || ts.isCallExpression(prop.initializer)) {
-                    extractFromDefineCall(prop.initializer, propName);
-                }
-            }
-            if (ts.isSpreadAssignment(prop)) {
-                const spreadExpr = prop.expression;
-                if (ts.isIdentifier(spreadExpr)) {
-                    const symbol = checker.getSymbolAtLocation(spreadExpr);
-                    const decl = getDeclarationFromSymbol(symbol);
-                    if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-                        if (ts.isObjectLiteralExpression(decl.initializer)) {
-                            extractMethodsFromObjectLiteral(decl.initializer, depth + 2);
-                        }
-                        else {
-                            const init = unwrapExpression(decl.initializer);
-                            if (ts.isAwaitExpression(init)) {
-                                extractFromAwaitExpression(init, depth);
-                            }
-                        }
-                    }
-                }
-                if (ts.isObjectLiteralExpression(spreadExpr)) {
-                    extractMethodsFromObjectLiteral(spreadExpr, depth + 2);
-                }
-                // Handle await expressions: ...await someAsyncFunction()
-                if (ts.isAwaitExpression(spreadExpr)) {
-                    extractFromAwaitExpression(spreadExpr, depth);
+    if (sourceFile.isDeclarationFile) {
+        throw new Error(`Source file is a declaration file: ${instancePath}`);
+    }
+    ts.forEachChild(sourceFile, function visit(node) {
+        if (ts.isCallExpression(node) &&
+            ts.isIdentifier(node.expression) &&
+            node.expression.text === "prostgles") {
+            const arg = node.arguments[0];
+            if (!arg || !ts.isObjectLiteralExpression(arg))
+                return;
+            const fnProp = arg.properties.find((p) => ts.isPropertyAssignment(p) && ts.isIdentifier(p.name) && p.name.text === "functions");
+            if (!fnProp)
+                return;
+            const functionsExpr = fnProp.initializer;
+            const recordType = resolveToRecordType(functionsExpr);
+            if (!recordType)
+                return;
+            for (const prop of checker.getPropertiesOfType(recordType)) {
+                const propType = checker.getTypeOfSymbolAtLocation(prop, prop.valueDeclaration ?? prop.declarations[0]);
+                const runReturnType = getRunReturnType(propType);
+                /** Peel away any wrapping helper functions */
+                let finalRunReturnType = runReturnType;
+                while (finalRunReturnType &&
+                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                    finalRunReturnType.symbol?.valueDeclaration &&
+                    ts.isFunctionLike(finalRunReturnType.symbol.valueDeclaration)) {
+                    finalRunReturnType = unwrapMaybePromise(checker.getReturnTypeOfSignature(finalRunReturnType.getCallSignatures()[0]));
                 }
-            }
-            if (ts.isShorthandPropertyAssignment(prop)) {
-                const propName = prop.name.getText();
-                const symbol = checker.getShorthandAssignmentValueSymbol(prop);
-                const decl = symbol?.valueDeclaration;
-                if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-                    if (isDefineFunctionCall(decl.initializer)) {
-                        extractFromDefineCall(decl.initializer, propName);
-                    }
+                if (finalRunReturnType) {
+                    const resolvedReturnType = (0, resolveTypeToStructure_1.resolveTypeToStructure)(globalBuiltins, prop.getName(), checker, finalRunReturnType);
+                    result.set(prop.getName(), resolvedReturnType);
                 }
             }
         }
-    };
-    /**
-     * Find return statements in a function body
-     */
-    const findReturnStatements = (node) => {
-        const returns = [];
-        const visit = (n) => {
-            if (ts.isReturnStatement(n)) {
-                returns.push(n);
-            }
-            if (!ts.isFunctionLike(n) || n === node) {
-                ts.forEachChild(n, visit);
-            }
-        };
         ts.forEachChild(node, visit);
-        return returns;
-    };
-    /**
-     * Extract from function body
-     */
-    const extractFromFunctionBody = (body, depth = 0) => {
-        // Handle concise body: () => ({ ... })
-        if (!ts.isBlock(body)) {
-            const unwrapped = unwrapExpression(body);
-            if (ts.isObjectLiteralExpression(unwrapped)) {
-                extractMethodsFromObjectLiteral(unwrapped, depth + 1);
-            }
-            return;
-        }
-        const returnStatements = findReturnStatements(body);
-        for (let i = 0; i < returnStatements.length; i++) {
-            const ret = returnStatements[i];
-            if (!ret?.expression) {
-                continue;
-            }
-            // Unwrap any type assertions
-            const unwrapped = unwrapExpression(ret.expression);
-            // Direct object literal return
-            if (ts.isObjectLiteralExpression(unwrapped)) {
-                extractMethodsFromObjectLiteral(unwrapped, depth + 2);
-            }
-            // Return of a variable: return result
-            if (ts.isIdentifier(unwrapped)) {
-                const symbol = checker.getSymbolAtLocation(unwrapped);
-                const decl = getDeclarationFromSymbol(symbol);
-                if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-                    if (ts.isObjectLiteralExpression(decl.initializer)) {
-                        extractMethodsFromObjectLiteral(decl.initializer, depth + 2);
-                    }
-                }
-            }
-        }
-    };
-    const resolveFunctionBody = (expr) => {
-        // Arrow function (including async)
-        if (ts.isArrowFunction(expr)) {
-            return expr.body;
-        }
-        // Function expression
-        if (ts.isFunctionExpression(expr)) {
-            return expr.body;
-        }
-        // Identifier referencing a function
-        if (ts.isIdentifier(expr)) {
-            const symbol = checker.getSymbolAtLocation(expr);
-            const decl = getDeclarationFromSymbol(symbol);
-            if (decl) {
-                if (ts.isVariableDeclaration(decl) && decl.initializer) {
-                    return resolveFunctionBody(decl.initializer);
-                }
-                if (ts.isFunctionDeclaration(decl) && decl.body) {
-                    return decl.body;
-                }
-            }
-        }
-        return undefined;
-    };
-    const visit = (n) => {
-        // Look for: functions: someExpression
-        if (ts.isPropertyAssignment(n) && n.name.getText() === "functions") {
-            const body = resolveFunctionBody(n.initializer);
-            if (body) {
-                extractFromFunctionBody(body);
-            }
-            else {
-                console.warn("Could not resolve functions property initializer:", n.initializer.getText());
-            }
-        }
-        // Look for: { functions } (shorthand)
-        if (ts.isShorthandPropertyAssignment(n) && n.name.getText() === "functions") {
-            const symbol = checker.getShorthandAssignmentValueSymbol(n);
-            const decl = symbol?.valueDeclaration;
-            if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-                const body = resolveFunctionBody(decl.initializer);
-                if (body) {
-                    extractFromFunctionBody(body);
-                }
-            }
-        }
-        ts.forEachChild(n, visit);
-    };
-    visit(sf);
+    });
     return result;
+    /** Resolve any expression to the final `Record<string, ServerFunctionDefinition>` */
+    function resolveToRecordType(expr) {
+        let t = checker.getTypeAtLocation(expr);
+        // If it's a function type (ServerFunctionDefinitions)
+        const [sig] = t.getCallSignatures();
+        if (sig) {
+            t = unwrapMaybePromise(checker.getReturnTypeOfSignature(sig));
+        }
+        // Strip undefined/null
+        t = checker.getNonNullableType(t);
+        return checker.getApparentType(t);
+    }
+    /** Extract `run` return type from ServerFunctionDefinition */
+    function getRunReturnType(fnDefType) {
+        const runSymbol = checker.getPropertyOfType(fnDefType, "run");
+        if (!runSymbol)
+            return;
+        let runType = checker.getTypeOfSymbolAtLocation(runSymbol, runSymbol.valueDeclaration ?? runSymbol.declarations[0]);
+        // run is usually `undefined | ((...) => MaybePromise<T>)`
+        runType = checker.getNonNullableType(runType);
+        /** Follow any wrapping function calls */
+        const [sig] = runType.getCallSignatures();
+        if (!sig)
+            return;
+        return unwrapMaybePromise(checker.getReturnTypeOfSignature(sig));
+    }
+    /** Unwrap `MaybePromise<T>` and `Promise<T>` */
+    function unwrapMaybePromise(type) {
+        const awaited = checker.getAwaitedType(type);
+        return awaited ?? type;
+    }
 };
 exports.getServerFunctionReturnTypes = getServerFunctionReturnTypes;
 //# sourceMappingURL=getServerFunctionReturnTypes.js.map

package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"getServerFunctionReturnTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,+BAA+B;AAC/B,qEAAkE;AAClE,mEAAgE;AAEzD,MAAM,4BAA4B,GAAG,CAAC,YAAoB,EAAuB,EAAE;IACxF,MAAM,UAAU,GAAG,EAAE,CAAC,cAAc,CAAC,IAAA,cAAO,EAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACzF,IAAI,CAAC,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAE5D,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,0BAA0B,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC;IAElG,MAAM,OAAO,GAAG,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IACzC,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;IAEzB,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6CAAqB,EAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAE7E,MAAM,eAAe,GAAG,CAAC,MAA6B,EAAE,EAAE;QACxD,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,IAAI,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACjD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,wBAAwB,GAAG,CAAC,MAA6B,EAAE,EAAE;QACjE,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,YAAY;YAAE,OAAO,SAAS,CAAC;QACpC,OAAO,YAAY,CAAC,gBAAgB,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,gBAAgB,GAAG,CAAC,IAAmB,EAAE,EAAE;QAC/C,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,OAAO,UAAU,GAAG,EAAE,EAAE,CAAC;YACvB,UAAU,EAAE,CAAC;YACb,IAAI,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/B,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;YAC/B,CAAC;iBAAM,IAAI,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;YAC/B,CAAC;iBAAM,IAAI,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7C,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;YAC/B,CAAC;iBAAM,IAAI,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjD,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,MAAM;YACR,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,qBAAqB,GAAG,CAAC,QAA2B,EAAE,YAAoB,EAAE,EAAE;QAClF,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO;QACT,CAAC;QAED,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CACjC,CAAC,CAAC,EAAqD,EAAE,CACvD,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,KAAK,CAC1F,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,gDAAgD;QAElI,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAG,OAAO,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,kBAAkB,GAAG,IAAA,+CAAsB,EAC/C,cAAc,EACd,YAAY,EACZ,OAAO,EACP,UAAU,CACX,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,oBAAoB,GAAG,CAAC,IAAa,EAA6B,EAAE;QACxE,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;QAC/B,IAAI,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9B,MAAM,QAAQ,GACZ,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAEnF,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,MAAM,0BAA0B,GAAG,CAAC,UAA8B,EAAE,KAAa,EAAE,EAAE;QACnF,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC;QAE1C,IAAI,EAAE,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;YACrC,gEAAgE;YAChE,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;YAC1C,IAAI,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;gBACvD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;gBAE9C,IAAI,IAAI,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC/D,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACnD,IAAI,IAAI,EAAE,CAAC;wBACT,uBAAuB,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;oBAC3C,CAAC;gBACH,CAAC;gBACD,IAAI,IAAI,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACxD,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,+BAA+B,GAAG,CAAC,GAA+B,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;QACrF,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YAClC,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAErC,IAAI,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;oBACpF,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;gBACpD,CAAC;YACH,CAAC;YAED,IAAI,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBAEnC,IAAI,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;oBAChC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;oBACvD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;oBAE9C,IAAI,IAAI,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;wBAC/D,IAAI,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;4BACnD,+BAA+B,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;wBAC/D,CAAC;6BAAM,CAAC;4BACN,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;4BAChD,IAAI,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;gCAC/B,0BAA0B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;4BAC1C,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,IAAI,EAAE,CAAC,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7C,+BAA+B,CAAC,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;gBACzD,CAAC;gBAED,yDAAyD;gBACzD,IAAI,EAAE,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;oBACrC,0BAA0B,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;YAED,IAAI,EAAE,CAAC,6BAA6B,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAErC,MAAM,MAAM,GAAG,OAAO,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;gBAC/D,MAAM,IAAI,GAAG,MAAM,EAAE,gBAAgB,CAAC;gBACtC,IAAI,IAAI,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC/D,IAAI,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;wBAC3C,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;oBACpD,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,oBAAoB,GAAG,CAAC,IAAa,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAyB,EAAE,CAAC;QAEzC,MAAM,KAAK,GAAG,CAAC,CAAU,EAAE,EAAE;YAC3B,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBACxC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC;QAEF,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF;;OAEG;IACH,MAAM,uBAAuB,GAAG,CAAC,IAAsC,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;QACpF,uCAAuC;QACvC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,EAAE,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5C,+BAA+B,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACxD,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEpD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAM,GAAG,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAEhC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,CAAC;gBACrB,SAAS;YACX,CAAC;YAED,6BAA6B;YAC7B,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEnD,+BAA+B;YAC/B,IAAI,EAAE,CAAC,yBAAyB,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5C,+BAA+B,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACxD,CAAC;YAED,sCAAsC;YACtC,IAAI,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBACtD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;gBAC9C,IAAI,IAAI,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC/D,IAAI,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;wBACnD,+BAA+B,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;oBAC/D,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG,CAAC,IAAmB,EAAE,EAAE;QAClD,mCAAmC;QACnC,IAAI,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;QAED,sBAAsB;QACtB,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,CAAC;QAED,oCAAoC;QACpC,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;YAEjD,MAAM,IAAI,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;YAE9C,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACvD,OAAO,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/C,CAAC;gBAED,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChD,OAAO,IAAI,CAAC,IAAI,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,CAAU,EAAE,EAAE;QAC3B,sCAAsC;QACtC,IAAI,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,WAAW,EAAE,CAAC;YACnE,MAAM,IAAI,GAAG,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAChD,IAAI,IAAI,EAAE,CAAC;gBACT,uBAAuB,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,CAAC,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC;QAED,sCAAsC;QACtC,IAAI,EAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,WAAW,EAAE,CAAC;YAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC,CAAC,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,EAAE,gBAAgB,CAAC;YAEtC,IAAI,IAAI,IAAI,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC/D,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACnD,IAAI,IAAI,EAAE,CAAC;oBACT,uBAAuB,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;QAED,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,KAAK,CAAC,EAAE,CAAC,CAAC;IAEV,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA5TW,QAAA,4BAA4B,gCA4TvC"}
+{"version":3,"file":"getServerFunctionReturnTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":"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"}

package/dist/PublishParser/defineServerFunction.d.ts

@@ -22,13 +22,43 @@ export type ServerFunctionDefinitions<S = void, SUser extends SessionUser = Sess
  * params will be undefined on first run to generate the definitions
  */
 params: undefined | PublishParams<S, SUser>) => MaybePromise<Record<string, ServerFunctionDefinition>>;
-export declare const createServerFunctionWithContext: <C>(
+export declare const createServerFunctionWithContext: <Context>(
 /**
  * undefined if not allowed
  */
-context: C | undefined) => <TInput extends Record<string, JSONB.FieldType> | undefined = undefined>(args: {
-    input?: TInput;
+context: Context | undefined) => <Input extends Record<string, JSONB.FieldType> | undefined, Run extends (args: JSONBObjectTypeIfDefined<Input>, context: Context) => MaybePromise<any>>(args: {
+    input?: Input;
     description?: string;
-    run: (args: JSONBObjectTypeIfDefined<TInput>, context: C) => MaybePromise<unknown>;
-}) => ServerFunctionDefinition;
+    run: Run;
+}) => {
+    run: ((validatedArgs: any) => Run) | undefined;
+    input?: Input;
+    description?: string;
+};
+type InputOf<T> = T extends {
+    input?: infer I;
+} ? I : undefined;
+type SafeInput<I> = I extends Record<string, JSONB.FieldType> ? I : undefined;
+type ServerFunctionArgsFrom<Context, Def> = {
+    input?: InputOf<Def>;
+    description?: string;
+    run: (args: JSONBObjectTypeIfDefined<SafeInput<InputOf<Def>>>, context: Context) => MaybePromise<any>;
+};
+type ServerFunctionBlock<Context, Defs> = {
+    [K in keyof Defs]: ServerFunctionArgsFrom<Context, Defs[K]>;
+};
+type WrappedDef<Context, Def> = Def extends ({
+    input?: infer I;
+    description?: infer D;
+    run: (a: any, c: Context) => infer R;
+}) ? {
+    input?: SafeInput<I>;
+    description?: D extends string ? D : string | undefined;
+    run: undefined | ((a: any) => R);
+} : never;
+type WrappedBlock<Context, Defs> = {
+    [K in keyof Defs]: WrappedDef<Context, Defs[K]>;
+};
+export declare const createServerFunctionBlockWithContext: <Context>(context: Context | undefined) => <const Defs extends Record<string, any>>(defs: Defs & ServerFunctionBlock<Context, Defs>) => WrappedBlock<Context, Defs>;
+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":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,MAAM,wBAAwB,GAAG;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;IACpD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;CACzF,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,SAAS,EACtE,MAAM;IACN,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,GAAG,EAAE,SAAS,GAAG,CAAC,CAAC,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;CACtF,KAAwB,wBAAwB,CAAC;AAElD,MAAM,MAAM,yBAAyB,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,GAAG,WAAW,IAAI;AACzF;;GAEG;AACH,MAAM,EAAE,SAAS,GAAG,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,KACxC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC,CAAC;AAE5D,eAAO,MAAM,+BAA+B,GAAI,CAAC;AAC/C;;GAEG;AACH,SAAS,CAAC,GAAG,SAAS,MAEd,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,SAAS,EAAE,MAAM;IACpF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,CAAC,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC;CACpF,KAUO,wBACT,CAAC"}
+{"version":3,"file":"defineServerFunction.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":"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"}

package/dist/PublishParser/defineServerFunction.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerFunctionWithContext = exports.defineServerFunction = void 0;
+exports.createServerFunctionBlockWithContext = exports.createServerFunctionWithContext = exports.defineServerFunction = void 0;
 const defineServerFunction = (args) => args;
 exports.defineServerFunction = defineServerFunction;
 const createServerFunctionWithContext = (
@@ -17,4 +17,18 @@ context) => {
     });
 };
 exports.createServerFunctionWithContext = createServerFunctionWithContext;
+const createServerFunctionBlockWithContext = (context) => {
+    return (defs) => {
+        const wrapped = {};
+        for (const key in defs) {
+            const def = defs[key];
+            wrapped[key] = {
+                ...def,
+                run: context === undefined ? undefined : (args) => def.run(args, context),
+            };
+        }
+        return wrapped;
+    };
+};
+exports.createServerFunctionBlockWithContext = createServerFunctionBlockWithContext;
 //# 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":";;;AAaO,MAAM,oBAAoB,GAAG,CAElC,IAOD,EAAE,EAAE,CAAC,IAA2C,CAAC;AATrC,QAAA,oBAAoB,wBASiB;AAS3C,MAAM,+BAA+B,GAAG;AAC7C;;GAEG;AACH,OAAsB,EACtB,EAAE;IACF,OAAO,CAAyE,IAI/E,EAAE,EAAE,CACH,CAAC;QACC,GAAG,IAAI;QACP,GAAG,EACD,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAClC,CAAC,aAAkB,EAAE,EAAE;YACrB,iEAAiE;YACjE,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC,CACF;KACJ,CAA6B,CAAC;AACnC,CAAC,CAAC;AArBW,QAAA,+BAA+B,mCAqB1C"}
+{"version":3,"file":"defineServerFunction.js","sourceRoot":"","sources":["../../lib/PublishParser/defineServerFunction.ts"],"names":[],"mappings":";;;AAaO,MAAM,oBAAoB,GAAG,CAElC,IAOD,EAAE,EAAE,CAAC,IAA2C,CAAC;AATrC,QAAA,oBAAoB,wBASiB;AAS3C,MAAM,+BAA+B,GAAG;AAC7C;;GAEG;AACH,OAA4B,EAC5B,EAAE;IACF,OAAO,CAGL,IAID,EAAE,EAAE,CACH,CAAC;QACC,GAAG,IAAI;QACP,GAAG,EACD,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAClC,CAAC,aAAkB,EAAE,EAAE;YACrB,iEAAiE;YACjE,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAQ,CAAC;QACjD,CAAC,CACF;KACJ,CAAoC,CAAC;AAC1C,CAAC,CAAC;AAxBW,QAAA,+BAA+B,mCAwB1C;AAuCK,MAAM,oCAAoC,GAAG,CAAU,OAA4B,EAAE,EAAE;IAC5F,OAAO,CACL,IAA+C,EAClB,EAAE;QAC/B,MAAM,OAAO,GAAG,EAAiC,CAAC;QAElD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,GAAG;gBACb,GAAG,GAAG;gBACN,GAAG,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC;aAC/E,CAAC;QACJ,CAAC;QAED,OAAO,OAA0D,CAAC;IACpE,CAAC,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,oCAAoC,wCAgB/C"}

package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts

@@ -12,311 +12,115 @@ export const getServerFunctionReturnTypes = (instancePath: string): Map<string,
 
   const program = ts.createProgram(fileNames, options);
   const checker = program.getTypeChecker();
-  const sf = program.getSourceFile(instancePath);
-  const result = new Map();
+  const sourceFile = program.getSourceFile(instancePath);
+  const result = new Map<string, string>();
 
-  if (!sf) {
+  if (!sourceFile) {
     throw new Error(`Source file not found: ${instancePath}`);
   }
 
   const globalBuiltins = getGlobalBuiltinTypes(instancePath, checker, program);
 
-  const getActualSymbol = (symbol: ts.Symbol | undefined) => {
-    if (!symbol) return undefined;
-    if (symbol.flags & ts.SymbolFlags.Alias) {
-      const aliased = checker.getAliasedSymbol(symbol);
-      return aliased;
-    }
-    return symbol;
-  };
-
-  const getDeclarationFromSymbol = (symbol: ts.Symbol | undefined) => {
-    const actualSymbol = getActualSymbol(symbol);
-    if (!actualSymbol) return undefined;
-    return actualSymbol.valueDeclaration ?? actualSymbol.declarations?.[0];
-  };
-
-  /**
-   * Unwrap AsExpression, ParenthesizedExpression, etc. to get the actual expression
-   */
-  const unwrapExpression = (expr: ts.Expression) => {
-    let current = expr;
-    let iterations = 0;
-    while (iterations < 10) {
-      iterations++;
-      if (ts.isAsExpression(current)) {
-        current = current.expression;
-      } else if (ts.isParenthesizedExpression(current)) {
-        current = current.expression;
-      } else if (ts.isSatisfiesExpression(current)) {
-        current = current.expression;
-      } else if (ts.isTypeAssertionExpression(current)) {
-        current = current.expression;
-      } else {
-        break;
-      }
-    }
-    return current;
-  };
-
-  /**
-   * Extract return type from a defineFunction call
-   */
-  const extractFromDefineCall = (callExpr: ts.CallExpression, propertyName: string) => {
-    const arg = callExpr.arguments[0];
-    if (!arg) {
-      return;
-    }
-
-    if (!ts.isObjectLiteralExpression(arg)) {
-      return;
-    }
-
-    const runProp = arg.properties.find(
-      (x): x is ts.PropertyAssignment | ts.MethodDeclaration =>
-        (ts.isPropertyAssignment(x) || ts.isMethodDeclaration(x)) && x.name.getText() === "run",
-    );
-    if (!runProp) {
-      return;
-    }
-
-    const runExpr = ts.isPropertyAssignment(runProp) ? runProp.initializer : runProp; // method declarations are already function-like
-
-    if (!ts.isFunctionLike(runExpr)) {
-      return;
-    }
-
-    const sig = checker.getSignatureFromDeclaration(runExpr);
-    if (!sig) {
-      return;
-    }
-
-    const returnType = checker.getReturnTypeOfSignature(sig);
-    const resolvedReturnType = resolveTypeToStructure(
-      globalBuiltins,
-      propertyName,
-      checker,
-      returnType,
-    );
-    result.set(propertyName, resolvedReturnType);
-  };
-
-  /**
-   * Check if a call expression is a define function call
-   */
-  const isDefineFunctionCall = (node: ts.Node): node is ts.CallExpression => {
-    if (!ts.isCallExpression(node)) return false;
-    const callee = node.expression;
-    if (ts.isIdentifier(callee)) {
-      const name = callee.getText();
-      const isDefine =
-        name.toLowerCase().includes("define") && name.toLowerCase().includes("function");
-
-      return isDefine;
-    }
-    return false;
-  };
-
-  const extractFromAwaitExpression = (spreadExpr: ts.AwaitExpression, depth: number) => {
-    const awaitedExpr = spreadExpr.expression;
-
-    if (ts.isCallExpression(awaitedExpr)) {
-      // Resolve the function being called and extract from its return
-      const calleeExpr = awaitedExpr.expression;
-      if (ts.isIdentifier(calleeExpr)) {
-        const symbol = checker.getSymbolAtLocation(calleeExpr);
-        const decl = getDeclarationFromSymbol(symbol);
-
-        if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-          const body = resolveFunctionBody(decl.initializer);
-          if (body) {
-            extractFromFunctionBody(body, depth + 2);
-          }
-        }
-        if (decl && ts.isFunctionDeclaration(decl) && decl.body) {
-          extractFromFunctionBody(decl.body, depth + 2);
-        }
-      }
-    }
-  };
-
-  /**
-   * Extract methods from an object literal that contains method definitions
-   */
-  const extractMethodsFromObjectLiteral = (obj: ts.ObjectLiteralExpression, depth = 0) => {
-    for (const prop of obj.properties) {
-      if (ts.isPropertyAssignment(prop)) {
-        const propName = prop.name.getText();
-
-        if (isDefineFunctionCall(prop.initializer) || ts.isCallExpression(prop.initializer)) {
-          extractFromDefineCall(prop.initializer, propName);
-        }
-      }
-
-      if (ts.isSpreadAssignment(prop)) {
-        const spreadExpr = prop.expression;
-
-        if (ts.isIdentifier(spreadExpr)) {
-          const symbol = checker.getSymbolAtLocation(spreadExpr);
-          const decl = getDeclarationFromSymbol(symbol);
-
-          if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-            if (ts.isObjectLiteralExpression(decl.initializer)) {
-              extractMethodsFromObjectLiteral(decl.initializer, depth + 2);
-            } else {
-              const init = unwrapExpression(decl.initializer);
-              if (ts.isAwaitExpression(init)) {
-                extractFromAwaitExpression(init, depth);
-              }
-            }
-          }
-        }
-
-        if (ts.isObjectLiteralExpression(spreadExpr)) {
-          extractMethodsFromObjectLiteral(spreadExpr, depth + 2);
-        }
+  if (sourceFile.isDeclarationFile) {
+    throw new Error(`Source file is a declaration file: ${instancePath}`);
+  }
 
-        // Handle await expressions: ...await someAsyncFunction()
-        if (ts.isAwaitExpression(spreadExpr)) {
-          extractFromAwaitExpression(spreadExpr, depth);
+  ts.forEachChild(sourceFile, function visit(node) {
+    if (
+      ts.isCallExpression(node) &&
+      ts.isIdentifier(node.expression) &&
+      node.expression.text === "prostgles"
+    ) {
+      const arg = node.arguments[0];
+      if (!arg || !ts.isObjectLiteralExpression(arg)) return;
+
+      const fnProp = arg.properties.find(
+        (p): p is ts.PropertyAssignment =>
+          ts.isPropertyAssignment(p) && ts.isIdentifier(p.name) && p.name.text === "functions",
+      );
+      if (!fnProp) return;
+
+      const functionsExpr = fnProp.initializer;
+      const recordType = resolveToRecordType(functionsExpr);
+
+      if (!recordType) return;
+
+      for (const prop of checker.getPropertiesOfType(recordType)) {
+        const propType = checker.getTypeOfSymbolAtLocation(
+          prop,
+          prop.valueDeclaration ?? prop.declarations![0]!,
+        );
+        const runReturnType = getRunReturnType(propType);
+
+        /** Peel away any wrapping helper functions */
+        let finalRunReturnType = runReturnType;
+        while (
+          finalRunReturnType &&
+          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          finalRunReturnType.symbol?.valueDeclaration &&
+          ts.isFunctionLike(finalRunReturnType.symbol.valueDeclaration)
+        ) {
+          finalRunReturnType = unwrapMaybePromise(
+            checker.getReturnTypeOfSignature(finalRunReturnType.getCallSignatures()[0]!),
+          );
         }
-      }
-
-      if (ts.isShorthandPropertyAssignment(prop)) {
-        const propName = prop.name.getText();
 
-        const symbol = checker.getShorthandAssignmentValueSymbol(prop);
-        const decl = symbol?.valueDeclaration;
-        if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-          if (isDefineFunctionCall(decl.initializer)) {
-            extractFromDefineCall(decl.initializer, propName);
-          }
+        if (finalRunReturnType) {
+          const resolvedReturnType = resolveTypeToStructure(
+            globalBuiltins,
+            prop.getName(),
+            checker,
+            finalRunReturnType,
+          );
+          result.set(prop.getName(), resolvedReturnType);
         }
       }
     }
-  };
-
-  /**
-   * Find return statements in a function body
-   */
-  const findReturnStatements = (node: ts.Node) => {
-    const returns: ts.ReturnStatement[] = [];
-
-    const visit = (n: ts.Node) => {
-      if (ts.isReturnStatement(n)) {
-        returns.push(n);
-      }
-      if (!ts.isFunctionLike(n) || n === node) {
-        ts.forEachChild(n, visit);
-      }
-    };
 
     ts.forEachChild(node, visit);
-    return returns;
-  };
-
-  /**
-   * Extract from function body
-   */
-  const extractFromFunctionBody = (body: ts.FunctionBody | ts.ConciseBody, depth = 0) => {
-    // Handle concise body: () => ({ ... })
-    if (!ts.isBlock(body)) {
-      const unwrapped = unwrapExpression(body);
-      if (ts.isObjectLiteralExpression(unwrapped)) {
-        extractMethodsFromObjectLiteral(unwrapped, depth + 1);
-      }
-      return;
-    }
+  });
 
-    const returnStatements = findReturnStatements(body);
-
-    for (let i = 0; i < returnStatements.length; i++) {
-      const ret = returnStatements[i];
-
-      if (!ret?.expression) {
-        continue;
-      }
-
-      // Unwrap any type assertions
-      const unwrapped = unwrapExpression(ret.expression);
-
-      // Direct object literal return
-      if (ts.isObjectLiteralExpression(unwrapped)) {
-        extractMethodsFromObjectLiteral(unwrapped, depth + 2);
-      }
-
-      // Return of a variable: return result
-      if (ts.isIdentifier(unwrapped)) {
-        const symbol = checker.getSymbolAtLocation(unwrapped);
-        const decl = getDeclarationFromSymbol(symbol);
-        if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-          if (ts.isObjectLiteralExpression(decl.initializer)) {
-            extractMethodsFromObjectLiteral(decl.initializer, depth + 2);
-          }
-        }
-      }
-    }
-  };
+  return result;
 
-  const resolveFunctionBody = (expr: ts.Expression) => {
-    // Arrow function (including async)
-    if (ts.isArrowFunction(expr)) {
-      return expr.body;
-    }
+  /** Resolve any expression to the final `Record<string, ServerFunctionDefinition>` */
+  function resolveToRecordType(expr: ts.Expression): ts.Type | undefined {
+    let t = checker.getTypeAtLocation(expr);
 
-    // Function expression
-    if (ts.isFunctionExpression(expr)) {
-      return expr.body;
+    // If it's a function type (ServerFunctionDefinitions)
+    const [sig] = t.getCallSignatures();
+    if (sig) {
+      t = unwrapMaybePromise(checker.getReturnTypeOfSignature(sig));
     }
 
-    // Identifier referencing a function
-    if (ts.isIdentifier(expr)) {
-      const symbol = checker.getSymbolAtLocation(expr);
-
-      const decl = getDeclarationFromSymbol(symbol);
-
-      if (decl) {
-        if (ts.isVariableDeclaration(decl) && decl.initializer) {
-          return resolveFunctionBody(decl.initializer);
-        }
-
-        if (ts.isFunctionDeclaration(decl) && decl.body) {
-          return decl.body;
-        }
-      }
-    }
+    // Strip undefined/null
+    t = checker.getNonNullableType(t);
+    return checker.getApparentType(t);
+  }
 
-    return undefined;
-  };
+  /** Extract `run` return type from ServerFunctionDefinition */
+  function getRunReturnType(fnDefType: ts.Type) {
+    const runSymbol = checker.getPropertyOfType(fnDefType, "run");
+    if (!runSymbol) return;
 
-  const visit = (n: ts.Node) => {
-    // Look for: functions: someExpression
-    if (ts.isPropertyAssignment(n) && n.name.getText() === "functions") {
-      const body = resolveFunctionBody(n.initializer);
-      if (body) {
-        extractFromFunctionBody(body);
-      } else {
-        console.warn("Could not resolve functions property initializer:", n.initializer.getText());
-      }
-    }
+    let runType = checker.getTypeOfSymbolAtLocation(
+      runSymbol,
+      runSymbol.valueDeclaration ?? runSymbol.declarations![0]!,
+    );
 
-    // Look for: { functions } (shorthand)
-    if (ts.isShorthandPropertyAssignment(n) && n.name.getText() === "functions") {
-      const symbol = checker.getShorthandAssignmentValueSymbol(n);
-      const decl = symbol?.valueDeclaration;
+    // run is usually `undefined | ((...) => MaybePromise<T>)`
+    runType = checker.getNonNullableType(runType);
 
-      if (decl && ts.isVariableDeclaration(decl) && decl.initializer) {
-        const body = resolveFunctionBody(decl.initializer);
-        if (body) {
-          extractFromFunctionBody(body);
-        }
-      }
-    }
+    /** Follow any wrapping function calls */
 
-    ts.forEachChild(n, visit);
-  };
+    const [sig] = runType.getCallSignatures();
+    if (!sig) return;
 
-  visit(sf);
+    return unwrapMaybePromise(checker.getReturnTypeOfSignature(sig));
+  }
 
-  return result;
+  /** Unwrap `MaybePromise<T>` and `Promise<T>` */
+  function unwrapMaybePromise(type: ts.Type) {
+    const awaited = checker.getAwaitedType(type);
+    return awaited ?? type;
+  }
 };

package/lib/PublishParser/defineServerFunction.ts

@@ -29,16 +29,19 @@ export type ServerFunctionDefinitions<S = void, SUser extends SessionUser = Sess
   params: undefined | PublishParams<S, SUser>,
 ) => MaybePromise<Record<string, ServerFunctionDefinition>>;
 
-export const createServerFunctionWithContext = <C>(
+export const createServerFunctionWithContext = <Context>(
   /**
    * undefined if not allowed
    */
-  context: C | undefined,
+  context: Context | undefined,
 ) => {
-  return <TInput extends Record<string, JSONB.FieldType> | undefined = undefined>(args: {
-    input?: TInput;
+  return <
+    Input extends Record<string, JSONB.FieldType> | undefined,
+    Run extends (args: JSONBObjectTypeIfDefined<Input>, context: Context) => MaybePromise<any>,
+  >(args: {
+    input?: Input;
     description?: string;
-    run: (args: JSONBObjectTypeIfDefined<TInput>, context: C) => MaybePromise<unknown>;
+    run: Run;
   }) =>
     ({
       ...args,
@@ -46,8 +49,63 @@ export const createServerFunctionWithContext = <C>(
         context === undefined ? undefined : (
           (validatedArgs: any) => {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            return args.run(validatedArgs, context);
+            return args.run(validatedArgs, context) as Run;
           }
         ),
-    }) as ServerFunctionDefinition;
+    }) satisfies ServerFunctionDefinition;
+};
+
+type InputOf<T> = T extends { input?: infer I } ? I : undefined;
+
+// if inference fails or is invalid → fall back to undefined
+type SafeInput<I> = I extends Record<string, JSONB.FieldType> ? I : undefined;
+
+type ServerFunctionArgsFrom<Context, Def> = {
+  input?: InputOf<Def>;
+  description?: string;
+  run: (
+    args: JSONBObjectTypeIfDefined<SafeInput<InputOf<Def>>>,
+    context: Context,
+  ) => MaybePromise<any>;
+};
+
+type ServerFunctionBlock<Context, Defs> = {
+  [K in keyof Defs]: ServerFunctionArgsFrom<Context, Defs[K]>;
+};
+
+type WrappedDef<Context, Def> =
+  Def extends (
+    {
+      input?: infer I;
+      description?: infer D;
+      run: (a: any, c: Context) => infer R;
+    }
+  ) ?
+    {
+      input?: SafeInput<I>;
+      description?: D extends string ? D : string | undefined;
+      run: undefined | ((a: any) => R); // keep return type, widen args
+    }
+  : never;
+
+type WrappedBlock<Context, Defs> = {
+  [K in keyof Defs]: WrappedDef<Context, Defs[K]>;
+};
+
+export const createServerFunctionBlockWithContext = <Context>(context: Context | undefined) => {
+  return <const Defs extends Record<string, any>>(
+    defs: Defs & ServerFunctionBlock<Context, Defs>,
+  ): WrappedBlock<Context, Defs> => {
+    const wrapped = {} as WrappedBlock<Context, Defs>;
+
+    for (const key in defs) {
+      const def = defs[key];
+      wrapped[key] = {
+        ...def,
+        run: context === undefined ? undefined : (args: any) => def.run(args, context),
+      };
+    }
+
+    return wrapped satisfies Record<string, ServerFunctionDefinition>;
+  };
 };

package/package.json

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