prostgles-server 4.2.396 → 4.2.398
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/getServerFunctionReturnTypes.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js +28 -6
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js.map +1 -1
- package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts +33 -6
- package/package.json +1 -1
|
@@ -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":"AAGA,eAAO,MAAM,4BAA4B,GAAI,cAAc,MAAM,wBA+HhE,CAAC"}
|
|
@@ -1,13 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getServerFunctionReturnTypes = void 0;
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
4
5
|
const ts = require("typescript");
|
|
5
6
|
const getServerFunctionReturnTypes = (instancePath) => {
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
const configPath = ts.findConfigFile((0, node_path_1.dirname)(instancePath), (f) => ts.sys.fileExists(f));
|
|
8
|
+
if (!configPath)
|
|
9
|
+
throw new Error("tsconfig.json not found");
|
|
10
|
+
// const program = ts.createProgram([instancePath], {
|
|
11
|
+
// strict: true,
|
|
12
|
+
// target: ts.ScriptTarget.ESNext,
|
|
13
|
+
// module: ts.ModuleKind.ESNext,
|
|
14
|
+
// });
|
|
15
|
+
const { config } = ts.readConfigFile(configPath, (f) => ts.sys.readFile(f));
|
|
16
|
+
const { fileNames, options } = ts.parseJsonConfigFileContent(config, ts.sys, (0, node_path_1.dirname)(configPath));
|
|
17
|
+
const program = ts.createProgram(fileNames, options);
|
|
11
18
|
const checker = program.getTypeChecker();
|
|
12
19
|
const sf = program.getSourceFile(instancePath);
|
|
13
20
|
const result = new Map();
|
|
@@ -41,6 +48,21 @@ const getServerFunctionReturnTypes = (instancePath) => {
|
|
|
41
48
|
result.set(p.name.getText(), checker.typeToString(rt));
|
|
42
49
|
}
|
|
43
50
|
};
|
|
51
|
+
const getActualSymbol = (symbol) => {
|
|
52
|
+
if (!symbol)
|
|
53
|
+
return undefined;
|
|
54
|
+
// Follow alias to get the actual symbol (for imports)
|
|
55
|
+
if (symbol.flags & ts.SymbolFlags.Alias) {
|
|
56
|
+
return checker.getAliasedSymbol(symbol);
|
|
57
|
+
}
|
|
58
|
+
return symbol;
|
|
59
|
+
};
|
|
60
|
+
const getDeclarationFromSymbol = (symbol) => {
|
|
61
|
+
const actualSymbol = getActualSymbol(symbol);
|
|
62
|
+
if (!actualSymbol)
|
|
63
|
+
return undefined;
|
|
64
|
+
return actualSymbol.valueDeclaration ?? actualSymbol.declarations?.[0];
|
|
65
|
+
};
|
|
44
66
|
const resolveFunctionBody = (expr) => {
|
|
45
67
|
// Case 1: Inline arrow function
|
|
46
68
|
if (ts.isArrowFunction(expr) && ts.isBlock(expr.body)) {
|
|
@@ -53,7 +75,7 @@ const getServerFunctionReturnTypes = (instancePath) => {
|
|
|
53
75
|
// Case 3: Identifier referencing a function
|
|
54
76
|
if (ts.isIdentifier(expr)) {
|
|
55
77
|
const symbol = checker.getSymbolAtLocation(expr);
|
|
56
|
-
const decl = symbol
|
|
78
|
+
const decl = getDeclarationFromSymbol(symbol);
|
|
57
79
|
if (decl) {
|
|
58
80
|
// Variable declaration: const getServerFunctions = () => { ... }
|
|
59
81
|
if (ts.isVariableDeclaration(decl) && decl.initializer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getServerFunctionReturnTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAE1B,MAAM,4BAA4B,GAAG,CAAC,YAAoB,EAAE,EAAE;IACnE,MAAM,
|
|
1
|
+
{"version":3,"file":"getServerFunctionReturnTypes.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,20 @@
|
|
|
1
|
+
import { dirname } from "node:path";
|
|
1
2
|
import * as ts from "typescript";
|
|
2
3
|
|
|
3
4
|
export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
const configPath = ts.findConfigFile(dirname(instancePath), (f) => ts.sys.fileExists(f));
|
|
6
|
+
if (!configPath) throw new Error("tsconfig.json not found");
|
|
7
|
+
|
|
8
|
+
// const program = ts.createProgram([instancePath], {
|
|
9
|
+
// strict: true,
|
|
10
|
+
// target: ts.ScriptTarget.ESNext,
|
|
11
|
+
// module: ts.ModuleKind.ESNext,
|
|
12
|
+
// });
|
|
13
|
+
|
|
14
|
+
const { config } = ts.readConfigFile(configPath, (f) => ts.sys.readFile(f));
|
|
15
|
+
const { fileNames, options } = ts.parseJsonConfigFileContent(config, ts.sys, dirname(configPath));
|
|
16
|
+
|
|
17
|
+
const program = ts.createProgram(fileNames, options);
|
|
9
18
|
|
|
10
19
|
const checker = program.getTypeChecker();
|
|
11
20
|
const sf = program.getSourceFile(instancePath);
|
|
@@ -43,6 +52,24 @@ export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
|
43
52
|
result.set(p.name.getText(), checker.typeToString(rt));
|
|
44
53
|
}
|
|
45
54
|
};
|
|
55
|
+
|
|
56
|
+
const getActualSymbol = (symbol: ts.Symbol | undefined): ts.Symbol | undefined => {
|
|
57
|
+
if (!symbol) return undefined;
|
|
58
|
+
|
|
59
|
+
// Follow alias to get the actual symbol (for imports)
|
|
60
|
+
if (symbol.flags & ts.SymbolFlags.Alias) {
|
|
61
|
+
return checker.getAliasedSymbol(symbol);
|
|
62
|
+
}
|
|
63
|
+
return symbol;
|
|
64
|
+
};
|
|
65
|
+
|
|
66
|
+
const getDeclarationFromSymbol = (symbol: ts.Symbol | undefined): ts.Declaration | undefined => {
|
|
67
|
+
const actualSymbol = getActualSymbol(symbol);
|
|
68
|
+
if (!actualSymbol) return undefined;
|
|
69
|
+
|
|
70
|
+
return actualSymbol.valueDeclaration ?? actualSymbol.declarations?.[0];
|
|
71
|
+
};
|
|
72
|
+
|
|
46
73
|
const resolveFunctionBody = (expr: ts.Expression): ts.Block | undefined => {
|
|
47
74
|
// Case 1: Inline arrow function
|
|
48
75
|
if (ts.isArrowFunction(expr) && ts.isBlock(expr.body)) {
|
|
@@ -57,7 +84,7 @@ export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
|
57
84
|
// Case 3: Identifier referencing a function
|
|
58
85
|
if (ts.isIdentifier(expr)) {
|
|
59
86
|
const symbol = checker.getSymbolAtLocation(expr);
|
|
60
|
-
const decl = symbol
|
|
87
|
+
const decl = getDeclarationFromSymbol(symbol);
|
|
61
88
|
|
|
62
89
|
if (decl) {
|
|
63
90
|
// Variable declaration: const getServerFunctions = () => { ... }
|