prostgles-server 4.2.403 → 4.2.404
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/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.map +1 -1
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js +2 -13
- package/dist/DBSchemaBuilder/getServerFunctionReturnTypes.js.map +1 -1
- package/lib/DBSchemaBuilder/getGlobalBuiltinTypes.ts +57 -0
- package/lib/DBSchemaBuilder/getServerFunctionReturnTypes.ts +2 -19
- package/package.json +1 -1
|
@@ -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 +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,kBAkThE,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;
|
|
@@ -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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"}
|
|
@@ -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,13 +1,7 @@
|
|
|
1
1
|
import * as ts from "typescript";
|
|
2
2
|
import { dirname } from "path";
|
|
3
3
|
import { resolveTypeToStructure } from "./resolveTypeToStructure";
|
|
4
|
-
|
|
5
|
-
let globalBuiltinsCache:
|
|
6
|
-
| {
|
|
7
|
-
instancePath: string;
|
|
8
|
-
names: Set<string>;
|
|
9
|
-
}
|
|
10
|
-
| undefined = undefined;
|
|
4
|
+
import { getGlobalBuiltinTypes } from "./getGlobalBuiltinTypes";
|
|
11
5
|
|
|
12
6
|
export const getServerFunctionReturnTypes = (instancePath: string) => {
|
|
13
7
|
const configPath = ts.findConfigFile(dirname(instancePath), (f) => ts.sys.fileExists(f));
|
|
@@ -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;
|