prostgles-server 4.2.403 → 4.2.405
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/DBSchemaBuilder/getFunctionsTypescriptSchema.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getFunctionsTypescriptSchema.js +3 -2
- package/dist/DBSchemaBuilder/getFunctionsTypescriptSchema.js.map +1 -1
- package/dist/DBSchemaBuilder/getGlobalBuiltinTypes.d.ts +3 -0
- package/dist/DBSchemaBuilder/getGlobalBuiltinTypes.d.ts.map +1 -0
- package/dist/DBSchemaBuilder/getGlobalBuiltinTypes.js +41 -0
- package/dist/DBSchemaBuilder/getGlobalBuiltinTypes.js.map +1 -0
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.d.ts +1 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js +5 -16
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js.map +1 -1
- package/dist/DBSchemaBuilder/resolveTypeToStructure.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/resolveTypeToStructure.js +1 -2
- package/dist/DBSchemaBuilder/resolveTypeToStructure.js.map +1 -1
- package/lib/DBSchemaBuilder/getFunctionsTypescriptSchema.ts +4 -2
- package/lib/DBSchemaBuilder/getGlobalBuiltinTypes.ts +57 -0
- package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts +11 -23
- package/lib/DBSchemaBuilder/resolveTypeToStructure.ts +0 -2
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFunctionsTypescriptSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getFunctionsTypescriptSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,eAAO,MAAM,4BAA4B,GACvC,mCAAmC,IAAI,CAAC,oBAAoB,EAAE,+BAA+B,CAAC,EAC9F,eAAe,WAAW,EAAE,EAC5B,mBAAmB,MAAM,CACvB,MAAM,EACN;IACE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CACF,
|
|
1
|
+
{"version":3,"file":"getFunctionsTypescriptSchema.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getFunctionsTypescriptSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAG9D,eAAO,MAAM,4BAA4B,GACvC,mCAAmC,IAAI,CAAC,oBAAoB,EAAE,+BAA+B,CAAC,EAC9F,eAAe,WAAW,EAAE,EAC5B,mBAAmB,MAAM,CACvB,MAAM,EACN;IACE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CACF,uBAuBF,CAAC"}
|
|
@@ -9,8 +9,9 @@ const getFunctionsTypescriptSchema = ({ tsGeneratedTypesFunctionsPath }, tablesO
|
|
|
9
9
|
const input = functionDefinition.input;
|
|
10
10
|
const argumentTypes = !input ? "" : `args: ${(0, prostgles_types_1.getJSONBTSTypes)(tablesOrViews, { type: input })}`;
|
|
11
11
|
const removeSemicolon = (v) => v.trim().endsWith(";") ? v.trim().slice(0, -1) : v.trim();
|
|
12
|
-
const returnType = functionReturnTypes?.get(name) ?? "unknown";
|
|
13
|
-
|
|
12
|
+
const returnType = removeSemicolon(functionReturnTypes?.get(name) ?? "unknown");
|
|
13
|
+
const returnTypePromise = !returnType.startsWith("Promise<") ? `Promise<${returnType}>` : returnType;
|
|
14
|
+
return ` ${JSON.stringify(name)}: (${removeSemicolon(argumentTypes)}) => ${returnTypePromise}`;
|
|
14
15
|
});
|
|
15
16
|
if (methodDefinitions.length) {
|
|
16
17
|
return ["\n", `export type GeneratedFunctionSchema = { `, ...methodDefinitions, `}`].join("\n");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFunctionsTypescriptSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getFunctionsTypescriptSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAgF;AAGhF,iFAA8E;AAEvE,MAAM,4BAA4B,GAAG,CAC1C,EAAE,6BAA6B,EAA+D,EAC9F,aAA4B,EAC5B,iBAMC,EACD,EAAE;IACF,MAAM,mBAAmB,GACvB,CAAC,6BAA6B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,IAAA,2DAA4B,EAAC,6BAA6B,CAAC,CAC5D,CAAC;IACJ,MAAM,iBAAiB,GAAG,IAAA,kCAAgB,EAAC,iBAAiB,CAAC,CAAC,GAAG,CAC/D,CAAC,CAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC;QACvC,MAAM,aAAa,GACjB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAA,iCAAe,EAAC,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAE3E,MAAM,eAAe,GAAG,CAAC,CAAS,EAAE,EAAE,CACpC,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,UAAU,GAAG,mBAAmB,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getFunctionsTypescriptSchema.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getFunctionsTypescriptSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAgF;AAGhF,iFAA8E;AAEvE,MAAM,4BAA4B,GAAG,CAC1C,EAAE,6BAA6B,EAA+D,EAC9F,aAA4B,EAC5B,iBAMC,EACD,EAAE;IACF,MAAM,mBAAmB,GACvB,CAAC,6BAA6B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3C,IAAA,2DAA4B,EAAC,6BAA6B,CAAC,CAC5D,CAAC;IACJ,MAAM,iBAAiB,GAAG,IAAA,kCAAgB,EAAC,iBAAiB,CAAC,CAAC,GAAG,CAC/D,CAAC,CAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,kBAAkB,CAAC,KAAK,CAAC;QACvC,MAAM,aAAa,GACjB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAA,iCAAe,EAAC,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QAE3E,MAAM,eAAe,GAAG,CAAC,CAAS,EAAE,EAAE,CACpC,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,UAAU,GAAG,eAAe,CAAC,mBAAmB,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC;QAChF,MAAM,iBAAiB,GACrB,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,UAAU,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;QAC7E,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,aAAa,CAAC,QAAQ,iBAAiB,EAAE,CAAC;IAClG,CAAC,CACF,CAAC;IACF,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,EAAE,0CAA0C,EAAE,GAAG,iBAAiB,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClG,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,4BAA4B,gCAgCvC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getGlobalBuiltinTypes.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getGlobalBuiltinTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAOjC,eAAO,MAAM,qBAAqB,GAChC,cAAc,MAAM,EACpB,SAAS,EAAE,CAAC,WAAW,EACvB,SAAS,EAAE,CAAC,OAAO,KAClB,GAAG,CAAC,MAAM,CA6CZ,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getGlobalBuiltinTypes = void 0;
|
|
4
|
+
const ts = require("typescript");
|
|
5
|
+
let globalBuiltinsCache = undefined;
|
|
6
|
+
const getGlobalBuiltinTypes = (instancePath, checker, program) => {
|
|
7
|
+
if (!globalBuiltinsCache || globalBuiltinsCache.instancePath !== instancePath) {
|
|
8
|
+
// get all global type symbols
|
|
9
|
+
const globals = checker
|
|
10
|
+
.getSymbolsInScope(program.getSourceFiles()[0], ts.SymbolFlags.Type)
|
|
11
|
+
.filter((sym) => sym.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib))
|
|
12
|
+
.map((sym) => sym.getName());
|
|
13
|
+
// Also grab value symbols that have a type meaning (like Buffer)
|
|
14
|
+
const valuesThatAreAlsoTypes = checker
|
|
15
|
+
.getSymbolsInScope(program.getSourceFiles()[0], ts.SymbolFlags.Value)
|
|
16
|
+
.filter((sym) => {
|
|
17
|
+
const type = checker.getDeclaredTypeOfSymbol(sym);
|
|
18
|
+
return (sym.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib) &&
|
|
19
|
+
type.flags !== ts.TypeFlags.Any);
|
|
20
|
+
})
|
|
21
|
+
.filter((sym) => {
|
|
22
|
+
// Check if there's a matching type declaration
|
|
23
|
+
const typeSymbol = checker.resolveName(sym.getName(), undefined, ts.SymbolFlags.Type, false);
|
|
24
|
+
return (typeSymbol && typeSymbol.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib));
|
|
25
|
+
})
|
|
26
|
+
.map((sym) => sym.getName());
|
|
27
|
+
globalBuiltinsCache = {
|
|
28
|
+
instancePath,
|
|
29
|
+
names: new Set([...globals, ...valuesThatAreAlsoTypes]),
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
const globalBuiltins = globalBuiltinsCache.names;
|
|
33
|
+
if (globalBuiltins.size === 0 ||
|
|
34
|
+
!globalBuiltins.has("String") ||
|
|
35
|
+
!globalBuiltins.has("ArrayBuffer")) {
|
|
36
|
+
throw new Error("Global built-in types not ok");
|
|
37
|
+
}
|
|
38
|
+
return globalBuiltins;
|
|
39
|
+
};
|
|
40
|
+
exports.getGlobalBuiltinTypes = getGlobalBuiltinTypes;
|
|
41
|
+
//# sourceMappingURL=getGlobalBuiltinTypes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getGlobalBuiltinTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getGlobalBuiltinTypes.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,IAAI,mBAAmB,GAKP,SAAS,CAAC;AACnB,MAAM,qBAAqB,GAAG,CACnC,YAAoB,EACpB,OAAuB,EACvB,OAAmB,EACN,EAAE;IACf,IAAI,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,YAAY,KAAK,YAAY,EAAE,CAAC;QAC9E,8BAA8B;QAC9B,MAAM,OAAO,GAAG,OAAO;aACpB,iBAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;aACpE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,eAAe,CAAC,CAAC;aACjF,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/B,iEAAiE;QACjE,MAAM,sBAAsB,GAAG,OAAO;aACnC,iBAAiB,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC;aACrE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,MAAM,IAAI,GAAG,OAAO,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC;YAClD,OAAO,CACL,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,eAAe,CAAC;gBAChE,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,SAAS,CAAC,GAAG,CAChC,CAAC;QACJ,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,+CAA+C;YAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CACpC,GAAG,CAAC,OAAO,EAAE,EACb,SAAS,EACT,EAAE,CAAC,WAAW,CAAC,IAAI,EACnB,KAAK,CACN,CAAC;YACF,OAAO,CACL,UAAU,IAAI,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,eAAe,CAAC,CACtF,CAAC;QACJ,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/B,mBAAmB,GAAG;YACpB,YAAY;YACZ,KAAK,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,sBAAsB,CAAC,CAAC;SACxD,CAAC;IACJ,CAAC;IACD,MAAM,cAAc,GAAG,mBAAmB,CAAC,KAAK,CAAC;IACjD,IACE,cAAc,CAAC,IAAI,KAAK,CAAC;QACzB,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC7B,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAClC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAjDW,QAAA,qBAAqB,yBAiDhC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const getServerFunctionReturnTypes: (instancePath: string) => Map<
|
|
1
|
+
export declare const getServerFunctionReturnTypes: (instancePath: string) => Map<string, string>;
|
|
2
2
|
//# sourceMappingURL=getServerFunctionReturnTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServerFunctionReturnTypes.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":"
|
|
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,CAuTrF,CAAC"}
|
|
@@ -4,7 +4,7 @@ exports.getServerFunctionReturnTypes = void 0;
|
|
|
4
4
|
const ts = require("typescript");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const resolveTypeToStructure_1 = require("./resolveTypeToStructure");
|
|
7
|
-
|
|
7
|
+
const getGlobalBuiltinTypes_1 = require("./getGlobalBuiltinTypes");
|
|
8
8
|
const getServerFunctionReturnTypes = (instancePath) => {
|
|
9
9
|
const configPath = ts.findConfigFile((0, path_1.dirname)(instancePath), (f) => ts.sys.fileExists(f));
|
|
10
10
|
if (!configPath)
|
|
@@ -18,18 +18,7 @@ const getServerFunctionReturnTypes = (instancePath) => {
|
|
|
18
18
|
if (!sf) {
|
|
19
19
|
throw new Error(`Source file not found: ${instancePath}`);
|
|
20
20
|
}
|
|
21
|
-
|
|
22
|
-
// get all global type symbols
|
|
23
|
-
const globals = checker
|
|
24
|
-
.getSymbolsInScope(program.getSourceFiles()[0], ts.SymbolFlags.Type)
|
|
25
|
-
.filter((sym) => sym.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib))
|
|
26
|
-
.map((sym) => sym.getName());
|
|
27
|
-
globalBuiltinsCache = {
|
|
28
|
-
instancePath,
|
|
29
|
-
names: new Set(globals),
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
const globalBuiltins = globalBuiltinsCache.names;
|
|
21
|
+
const globalBuiltins = (0, getGlobalBuiltinTypes_1.getGlobalBuiltinTypes)(instancePath, checker, program);
|
|
33
22
|
const getActualSymbol = (symbol) => {
|
|
34
23
|
if (!symbol)
|
|
35
24
|
return undefined;
|
|
@@ -94,9 +83,9 @@ const getServerFunctionReturnTypes = (instancePath) => {
|
|
|
94
83
|
if (!sig) {
|
|
95
84
|
return;
|
|
96
85
|
}
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
result.set(propertyName,
|
|
86
|
+
const returnType = checker.getReturnTypeOfSignature(sig);
|
|
87
|
+
const resolvedReturnType = (0, resolveTypeToStructure_1.resolveTypeToStructure)(globalBuiltins, propertyName, checker, returnType);
|
|
88
|
+
result.set(propertyName, resolvedReturnType);
|
|
100
89
|
};
|
|
101
90
|
/**
|
|
102
91
|
* Check if a call expression is a define function call
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServerFunctionReturnTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,+BAA+B;AAC/B,qEAAkE;
|
|
1
|
+
{"version":3,"file":"getServerFunctionReturnTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +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,
|
|
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,MA6NF,CAAC"}
|
|
@@ -9,11 +9,10 @@ const ts = require("typescript");
|
|
|
9
9
|
const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, parentTypes = [], maxDepth = 10) => {
|
|
10
10
|
const depth = parentTypes.length;
|
|
11
11
|
if (depth > maxDepth) {
|
|
12
|
-
console.warn(`Max type resolution depth (${maxDepth}) reached for function ${JSON.stringify(functionName)} ReturnType
|
|
12
|
+
console.warn(`Max type resolution depth (${maxDepth}) reached for function ${JSON.stringify(functionName)} ReturnType`);
|
|
13
13
|
return "unknown";
|
|
14
14
|
}
|
|
15
15
|
const nextParentTypes = [...parentTypes, type];
|
|
16
|
-
// Handle primitive types
|
|
17
16
|
if (type.flags & ts.TypeFlags.String)
|
|
18
17
|
return "string";
|
|
19
18
|
if (type.flags & ts.TypeFlags.Number)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTypeToStructure.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/resolveTypeToStructure.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC;;;GAGG;AACI,MAAM,sBAAsB,GAAG,CACpC,cAA2B,EAC3B,YAAoB,EACpB,OAAuB,EACvB,IAAa,EACb,cAAyB,EAAE,EAC3B,QAAQ,GAAG,EAAE,EACL,EAAE;IACV,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;IACjC,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CACV,8BAA8B,QAAQ,0BAA0B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"resolveTypeToStructure.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/resolveTypeToStructure.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC;;;GAGG;AACI,MAAM,sBAAsB,GAAG,CACpC,cAA2B,EAC3B,YAAoB,EACpB,OAAuB,EACvB,IAAa,EACb,cAAyB,EAAE,EAC3B,QAAQ,GAAG,EAAE,EACL,EAAE;IACV,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC;IACjC,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CACV,8BAA8B,QAAQ,0BAA0B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAC1G,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,eAAe,GAAG,CAAC,GAAG,WAAW,EAAE,IAAI,CAAC,CAAC;IAE/C,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IACtD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IACtD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IACxD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAClD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS;QAAE,OAAO,WAAW,CAAC;IAC5D,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IAClD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK;QAAE,OAAO,OAAO,CAAC;IACpD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IACxD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IAChD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM;QAAE,OAAO,QAAQ,CAAC;IAEtD,uBAAuB;IACvB,IAAI,IAAI,CAAC,eAAe,EAAE;QAAE,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;IACrD,IAAI,IAAI,CAAC,eAAe,EAAE;QAAE,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IACnD,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;QAC7C,4DAA4D;QAC5D,OAAO,IAAI,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;IAC1D,CAAC;IAED,qBAAqB;IACrB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjC,IAAA,8BAAsB,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,CAAC,CAC9E,CAAC;QACF,cAAc;QACd,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED,4BAA4B;IAC5B,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACjC,IAAA,8BAAsB,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,CAAC,CAC9E,CAAC;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED,mDAAmD;IACnD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAChC,MAAM,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC;IAEnC,IAAI,QAAQ,IAAI,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC7C,8DAA8D;QAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAwB,CAAC,CAAC;QACpE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtC,IAAA,8BAAsB,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,CAAC,CAC9E,CAAC;YACF,OAAO,GAAG,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnD,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAwB,CAAC,CAAC;QACrE,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,SAAS,GAAG,IAAA,8BAAsB,EACtC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,OAAO,EACP,eAAe,CAChB,CAAC;YACF,OAAO,WAAW,SAAS,GAAG,CAAC;QACjC,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,yBAAyB;IACzB,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAwB,CAAC,CAAC;QACrE,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,WAAW,GAAG,IAAA,8BAAsB,EACxC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,OAAO,EACP,eAAe,CAChB,CAAC;YACF,OAAO,GAAG,WAAW,IAAI,CAAC;QAC5B,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,qBAAqB;IACrB,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAwB,CAAC,CAAC;QACpE,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClC,IAAA,8BAAsB,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,EAAE,eAAe,CAAC,CAClF,CAAC;QACF,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACpC,CAAC;IAED,mBAAmB;IACnB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAwB,CAAC,CAAC;QACpE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,IAAA,8BAAsB,EACpC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,QAAQ,CAAC,CAAC,CAAE,EACZ,eAAe,CAChB,CAAC;YACF,MAAM,SAAS,GAAG,IAAA,8BAAsB,EACtC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,QAAQ,CAAC,CAAC,CAAE,EACZ,eAAe,CAChB,CAAC;YACF,OAAO,OAAO,OAAO,KAAK,SAAS,GAAG,CAAC;QACzC,CAAC;QACD,OAAO,uBAAuB,CAAC;IACjC,CAAC;IAED,gBAAgB;IAChB,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC,IAAwB,CAAC,CAAC;QACpE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,WAAW,GAAG,IAAA,8BAAsB,EACxC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,QAAQ,CAAC,CAAC,CAAE,EACZ,eAAe,CAChB,CAAC;YACF,OAAO,OAAO,WAAW,GAAG,CAAC;QAC/B,CAAC;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,wBAAwB;IACxB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAChD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,cAAc,CAAC,CAAC,CAAE,CAAC;QAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,yBAAyB,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAiB,CAAC,CAAC;YACpF,MAAM,YAAY,GAAG,IAAA,8BAAsB,EACzC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,SAAS,EACT,eAAe,CAChB,CAAC;YACF,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;YACzD,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,EAAE,CAAC;QACvE,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAA,8BAAsB,EACvC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,EACrC,eAAe,CAChB,CAAC;QACF,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,UAAU,EAAE,CAAC;IACnD,CAAC;IAED,kDAAkD;IAClD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IACxC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;YACjE,IAAI,CAAC,QAAQ;gBAAE,SAAS;YAExB,MAAM,QAAQ,GAAG,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,IAAA,8BAAsB,EACxC,cAAc,EACd,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,WAAW,CACZ,CAAC;YACF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;YACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YAEhC,0CAA0C;YAC1C,MAAM,WAAW,GAAG,CAAC,4BAA4B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjE,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;YAE5D,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,6BAA6B;QAC7B,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAElD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CACV,kBAAkB,IAAA,8BAAsB,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,CACpH,CAAC;QACJ,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CACV,kBAAkB,IAAA,8BAAsB,EAAC,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,EAAE,eAAe,CAAC,EAAE,CACpH,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,uDAAuD;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACrC,CAAC;IAED,qDAAqD;IACrD,OAAO,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;AApOW,QAAA,sBAAsB,0BAoOjC"}
|
|
@@ -26,8 +26,10 @@ export const getFunctionsTypescriptSchema = (
|
|
|
26
26
|
|
|
27
27
|
const removeSemicolon = (v: string) =>
|
|
28
28
|
v.trim().endsWith(";") ? v.trim().slice(0, -1) : v.trim();
|
|
29
|
-
const returnType = functionReturnTypes?.get(name) ?? "unknown";
|
|
30
|
-
|
|
29
|
+
const returnType = removeSemicolon(functionReturnTypes?.get(name) ?? "unknown");
|
|
30
|
+
const returnTypePromise =
|
|
31
|
+
!returnType.startsWith("Promise<") ? `Promise<${returnType}>` : returnType;
|
|
32
|
+
return ` ${JSON.stringify(name)}: (${removeSemicolon(argumentTypes)}) => ${returnTypePromise}`;
|
|
31
33
|
},
|
|
32
34
|
);
|
|
33
35
|
if (methodDefinitions.length) {
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import * as ts from "typescript";
|
|
2
|
+
let globalBuiltinsCache:
|
|
3
|
+
| {
|
|
4
|
+
instancePath: string;
|
|
5
|
+
names: Set<string>;
|
|
6
|
+
}
|
|
7
|
+
| undefined = undefined;
|
|
8
|
+
export const getGlobalBuiltinTypes = (
|
|
9
|
+
instancePath: string,
|
|
10
|
+
checker: ts.TypeChecker,
|
|
11
|
+
program: ts.Program,
|
|
12
|
+
): Set<string> => {
|
|
13
|
+
if (!globalBuiltinsCache || globalBuiltinsCache.instancePath !== instancePath) {
|
|
14
|
+
// get all global type symbols
|
|
15
|
+
const globals = checker
|
|
16
|
+
.getSymbolsInScope(program.getSourceFiles()[0]!, ts.SymbolFlags.Type)
|
|
17
|
+
.filter((sym) => sym.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib))
|
|
18
|
+
.map((sym) => sym.getName());
|
|
19
|
+
// Also grab value symbols that have a type meaning (like Buffer)
|
|
20
|
+
const valuesThatAreAlsoTypes = checker
|
|
21
|
+
.getSymbolsInScope(program.getSourceFiles()[0]!, ts.SymbolFlags.Value)
|
|
22
|
+
.filter((sym) => {
|
|
23
|
+
const type = checker.getDeclaredTypeOfSymbol(sym);
|
|
24
|
+
return (
|
|
25
|
+
sym.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib) &&
|
|
26
|
+
type.flags !== ts.TypeFlags.Any
|
|
27
|
+
);
|
|
28
|
+
})
|
|
29
|
+
.filter((sym) => {
|
|
30
|
+
// Check if there's a matching type declaration
|
|
31
|
+
const typeSymbol = checker.resolveName(
|
|
32
|
+
sym.getName(),
|
|
33
|
+
undefined,
|
|
34
|
+
ts.SymbolFlags.Type,
|
|
35
|
+
false,
|
|
36
|
+
);
|
|
37
|
+
return (
|
|
38
|
+
typeSymbol && typeSymbol.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib)
|
|
39
|
+
);
|
|
40
|
+
})
|
|
41
|
+
.map((sym) => sym.getName());
|
|
42
|
+
|
|
43
|
+
globalBuiltinsCache = {
|
|
44
|
+
instancePath,
|
|
45
|
+
names: new Set([...globals, ...valuesThatAreAlsoTypes]),
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
const globalBuiltins = globalBuiltinsCache.names;
|
|
49
|
+
if (
|
|
50
|
+
globalBuiltins.size === 0 ||
|
|
51
|
+
!globalBuiltins.has("String") ||
|
|
52
|
+
!globalBuiltins.has("ArrayBuffer")
|
|
53
|
+
) {
|
|
54
|
+
throw new Error("Global built-in types not ok");
|
|
55
|
+
}
|
|
56
|
+
return globalBuiltins;
|
|
57
|
+
};
|
|
@@ -1,15 +1,9 @@
|
|
|
1
1
|
import * as ts from "typescript";
|
|
2
2
|
import { dirname } from "path";
|
|
3
3
|
import { resolveTypeToStructure } from "./resolveTypeToStructure";
|
|
4
|
+
import { getGlobalBuiltinTypes } from "./getGlobalBuiltinTypes";
|
|
4
5
|
|
|
5
|
-
|
|
6
|
-
| {
|
|
7
|
-
instancePath: string;
|
|
8
|
-
names: Set<string>;
|
|
9
|
-
}
|
|
10
|
-
| undefined = undefined;
|
|
11
|
-
|
|
12
|
-
export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
6
|
+
export const getServerFunctionReturnTypes = (instancePath: string): Map<string, string> => {
|
|
13
7
|
const configPath = ts.findConfigFile(dirname(instancePath), (f) => ts.sys.fileExists(f));
|
|
14
8
|
if (!configPath) throw new Error("tsconfig.json not found");
|
|
15
9
|
|
|
@@ -25,18 +19,7 @@ export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
|
25
19
|
throw new Error(`Source file not found: ${instancePath}`);
|
|
26
20
|
}
|
|
27
21
|
|
|
28
|
-
|
|
29
|
-
// get all global type symbols
|
|
30
|
-
const globals = checker
|
|
31
|
-
.getSymbolsInScope(program.getSourceFiles()[0]!, ts.SymbolFlags.Type)
|
|
32
|
-
.filter((sym) => sym.declarations?.some((d) => d.getSourceFile().hasNoDefaultLib))
|
|
33
|
-
.map((sym) => sym.getName());
|
|
34
|
-
globalBuiltinsCache = {
|
|
35
|
-
instancePath,
|
|
36
|
-
names: new Set(globals),
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
const globalBuiltins = globalBuiltinsCache.names;
|
|
22
|
+
const globalBuiltins = getGlobalBuiltinTypes(instancePath, checker, program);
|
|
40
23
|
|
|
41
24
|
const getActualSymbol = (symbol: ts.Symbol | undefined) => {
|
|
42
25
|
if (!symbol) return undefined;
|
|
@@ -107,9 +90,14 @@ export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
|
107
90
|
return;
|
|
108
91
|
}
|
|
109
92
|
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
|
|
93
|
+
const returnType = checker.getReturnTypeOfSignature(sig);
|
|
94
|
+
const resolvedReturnType = resolveTypeToStructure(
|
|
95
|
+
globalBuiltins,
|
|
96
|
+
propertyName,
|
|
97
|
+
checker,
|
|
98
|
+
returnType,
|
|
99
|
+
);
|
|
100
|
+
result.set(propertyName, resolvedReturnType);
|
|
113
101
|
};
|
|
114
102
|
|
|
115
103
|
/**
|
|
@@ -16,14 +16,12 @@ export const resolveTypeToStructure = (
|
|
|
16
16
|
if (depth > maxDepth) {
|
|
17
17
|
console.warn(
|
|
18
18
|
`Max type resolution depth (${maxDepth}) reached for function ${JSON.stringify(functionName)} ReturnType`,
|
|
19
|
-
parentTypes,
|
|
20
19
|
);
|
|
21
20
|
return "unknown";
|
|
22
21
|
}
|
|
23
22
|
|
|
24
23
|
const nextParentTypes = [...parentTypes, type];
|
|
25
24
|
|
|
26
|
-
// Handle primitive types
|
|
27
25
|
if (type.flags & ts.TypeFlags.String) return "string";
|
|
28
26
|
if (type.flags & ts.TypeFlags.Number) return "number";
|
|
29
27
|
if (type.flags & ts.TypeFlags.Boolean) return "boolean";
|