prostgles-server 4.2.406 → 4.2.407
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.js +1 -1
- package/dist/DBSchemaBuilder/getFunctionsTypescriptSchema.js.map +1 -1
- package/dist/DBSchemaBuilder/resolveTypeToStructure.d.ts.map +1 -1
- package/dist/DBSchemaBuilder/resolveTypeToStructure.js +10 -42
- package/dist/DBSchemaBuilder/resolveTypeToStructure.js.map +1 -1
- package/lib/DBSchemaBuilder/getFunctionsTypescriptSchema.ts +1 -1
- package/lib/DBSchemaBuilder/resolveTypeToStructure.ts +11 -77
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ const getFunctionsTypescriptSchema = ({ tsGeneratedTypesFunctionsPath }, tablesO
|
|
|
11
11
|
const removeSemicolon = (v) => v.trim().endsWith(";") ? v.trim().slice(0, -1) : v.trim();
|
|
12
12
|
const returnType = removeSemicolon(functionReturnTypes?.get(name) ?? "unknown");
|
|
13
13
|
const returnTypePromise = !returnType.startsWith("Promise<") ? `Promise<${returnType}>` : returnType;
|
|
14
|
-
return ` ${JSON.stringify(name)}: (${removeSemicolon(argumentTypes)}) => ${returnTypePromise}
|
|
14
|
+
return ` ${JSON.stringify(name)}: (${removeSemicolon(argumentTypes)}) => ${returnTypePromise};`;
|
|
15
15
|
});
|
|
16
16
|
if (methodDefinitions.length) {
|
|
17
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,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,
|
|
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,GAAG,CAAC;IACnG,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"}
|
|
@@ -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,MA2JF,CAAC"}
|
|
@@ -57,60 +57,28 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
|
|
|
57
57
|
// Handle Promise<T> - unwrap to Promise<ResolvedT>
|
|
58
58
|
const symbol = type.getSymbol();
|
|
59
59
|
const typeName = symbol?.getName();
|
|
60
|
-
if (typeName && globalBuiltIns.has(typeName)) {
|
|
61
|
-
// Check for type arguments (e.g., ReadableStream<Uint8Array>)
|
|
62
|
-
const typeArgs = checker.getTypeArguments(type);
|
|
63
|
-
if (typeArgs.length > 0) {
|
|
64
|
-
const resolvedArgs = typeArgs.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, parentTypes));
|
|
65
|
-
return `${typeName}<${resolvedArgs.join(", ")}>`;
|
|
66
|
-
}
|
|
67
|
-
return typeName;
|
|
68
|
-
}
|
|
69
|
-
if (typeName === "Promise") {
|
|
70
|
-
const [typeArg] = checker.getTypeArguments(type);
|
|
71
|
-
if (typeArg) {
|
|
72
|
-
const innerType = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, typeArg, nextParentTypes);
|
|
73
|
-
return `Promise<${innerType}>`;
|
|
74
|
-
}
|
|
75
|
-
return "Promise<unknown>";
|
|
76
|
-
}
|
|
77
|
-
// Handle Array<T> or T[]
|
|
78
|
-
if (checker.isArrayType(type)) {
|
|
79
|
-
const [typeArg] = checker.getTypeArguments(type);
|
|
80
|
-
if (typeArg) {
|
|
81
|
-
const elementType = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, typeArg, nextParentTypes);
|
|
82
|
-
return `${elementType}[]`;
|
|
83
|
-
}
|
|
84
|
-
return "unknown[]";
|
|
85
|
-
}
|
|
86
60
|
// Handle tuple types
|
|
87
61
|
if (checker.isTupleType(type)) {
|
|
88
62
|
const typeArgs = checker.getTypeArguments(type);
|
|
89
63
|
const elements = typeArgs.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, nextParentTypes));
|
|
90
64
|
return `[${elements.join(", ")}]`;
|
|
91
65
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
const typeArgs = checker.getTypeArguments(type);
|
|
95
|
-
if (typeArgs.length === 2) {
|
|
96
|
-
const keyType = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, typeArgs[0], nextParentTypes);
|
|
97
|
-
const valueType = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, typeArgs[1], nextParentTypes);
|
|
98
|
-
return `Map<${keyType}, ${valueType}>`;
|
|
99
|
-
}
|
|
100
|
-
return "Map<unknown, unknown>";
|
|
101
|
-
}
|
|
102
|
-
// Handle Set<T>
|
|
103
|
-
if (typeName === "Set") {
|
|
66
|
+
if (typeName && globalBuiltIns.has(typeName)) {
|
|
67
|
+
// Check for type arguments (e.g., ReadableStream<Uint8Array>)
|
|
104
68
|
const typeArgs = checker.getTypeArguments(type);
|
|
105
69
|
if (typeArgs.length > 0) {
|
|
106
|
-
const
|
|
107
|
-
|
|
70
|
+
const resolvedArgs = typeArgs.map((t) => (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, t, parentTypes));
|
|
71
|
+
if (typeName === "Array") {
|
|
72
|
+
return `${resolvedArgs[0]}[]`;
|
|
73
|
+
}
|
|
74
|
+
return `${typeName}<${resolvedArgs.join(", ")}>`;
|
|
108
75
|
}
|
|
109
|
-
return
|
|
76
|
+
return typeName;
|
|
110
77
|
}
|
|
111
78
|
// Handle function types
|
|
112
79
|
const callSignatures = type.getCallSignatures();
|
|
113
80
|
if (callSignatures.length > 0) {
|
|
81
|
+
throw new Error("Function types are not supported in return types");
|
|
114
82
|
const sig = callSignatures[0];
|
|
115
83
|
const params = sig.getParameters().map((param) => {
|
|
116
84
|
const paramType = checker.getTypeOfSymbolAtLocation(param, param.valueDeclaration);
|
|
@@ -119,7 +87,7 @@ const resolveTypeToStructure = (globalBuiltIns, functionName, checker, type, par
|
|
|
119
87
|
return `${param.getName()}${isOptional ? "?" : ""}: ${paramTypeStr}`;
|
|
120
88
|
});
|
|
121
89
|
const returnType = (0, exports.resolveTypeToStructure)(globalBuiltIns, functionName, checker, checker.getReturnTypeOfSignature(sig), nextParentTypes);
|
|
122
|
-
return `(${params.join(", ")}) => ${returnType}`;
|
|
90
|
+
return `((${params.join(", ")}) => ${returnType})`;
|
|
123
91
|
}
|
|
124
92
|
// Handle object types - expand to structural form
|
|
125
93
|
const properties = type.getProperties();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveTypeToStructure.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/resolveTypeToStructure.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resolveTypeToStructure.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/resolveTypeToStructure.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export const getFunctionsTypescriptSchema = (
|
|
|
29
29
|
const returnType = removeSemicolon(functionReturnTypes?.get(name) ?? "unknown");
|
|
30
30
|
const returnTypePromise =
|
|
31
31
|
!returnType.startsWith("Promise<") ? `Promise<${returnType}>` : returnType;
|
|
32
|
-
return ` ${JSON.stringify(name)}: (${removeSemicolon(argumentTypes)}) => ${returnTypePromise}
|
|
32
|
+
return ` ${JSON.stringify(name)}: (${removeSemicolon(argumentTypes)}) => ${returnTypePromise};`;
|
|
33
33
|
},
|
|
34
34
|
);
|
|
35
35
|
if (methodDefinitions.length) {
|
|
@@ -63,49 +63,6 @@ export const resolveTypeToStructure = (
|
|
|
63
63
|
const symbol = type.getSymbol();
|
|
64
64
|
const typeName = symbol?.getName();
|
|
65
65
|
|
|
66
|
-
if (typeName && globalBuiltIns.has(typeName)) {
|
|
67
|
-
// Check for type arguments (e.g., ReadableStream<Uint8Array>)
|
|
68
|
-
const typeArgs = checker.getTypeArguments(type as ts.TypeReference);
|
|
69
|
-
if (typeArgs.length > 0) {
|
|
70
|
-
const resolvedArgs = typeArgs.map((t) =>
|
|
71
|
-
resolveTypeToStructure(globalBuiltIns, functionName, checker, t, parentTypes),
|
|
72
|
-
);
|
|
73
|
-
return `${typeName}<${resolvedArgs.join(", ")}>`;
|
|
74
|
-
}
|
|
75
|
-
return typeName;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
if (typeName === "Promise") {
|
|
79
|
-
const [typeArg] = checker.getTypeArguments(type as ts.TypeReference);
|
|
80
|
-
if (typeArg) {
|
|
81
|
-
const innerType = resolveTypeToStructure(
|
|
82
|
-
globalBuiltIns,
|
|
83
|
-
functionName,
|
|
84
|
-
checker,
|
|
85
|
-
typeArg,
|
|
86
|
-
nextParentTypes,
|
|
87
|
-
);
|
|
88
|
-
return `Promise<${innerType}>`;
|
|
89
|
-
}
|
|
90
|
-
return "Promise<unknown>";
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
// Handle Array<T> or T[]
|
|
94
|
-
if (checker.isArrayType(type)) {
|
|
95
|
-
const [typeArg] = checker.getTypeArguments(type as ts.TypeReference);
|
|
96
|
-
if (typeArg) {
|
|
97
|
-
const elementType = resolveTypeToStructure(
|
|
98
|
-
globalBuiltIns,
|
|
99
|
-
functionName,
|
|
100
|
-
checker,
|
|
101
|
-
typeArg,
|
|
102
|
-
nextParentTypes,
|
|
103
|
-
);
|
|
104
|
-
return `${elementType}[]`;
|
|
105
|
-
}
|
|
106
|
-
return "unknown[]";
|
|
107
|
-
}
|
|
108
|
-
|
|
109
66
|
// Handle tuple types
|
|
110
67
|
if (checker.isTupleType(type)) {
|
|
111
68
|
const typeArgs = checker.getTypeArguments(type as ts.TypeReference);
|
|
@@ -115,48 +72,25 @@ export const resolveTypeToStructure = (
|
|
|
115
72
|
return `[${elements.join(", ")}]`;
|
|
116
73
|
}
|
|
117
74
|
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
const typeArgs = checker.getTypeArguments(type as ts.TypeReference);
|
|
121
|
-
if (typeArgs.length === 2) {
|
|
122
|
-
const keyType = resolveTypeToStructure(
|
|
123
|
-
globalBuiltIns,
|
|
124
|
-
functionName,
|
|
125
|
-
checker,
|
|
126
|
-
typeArgs[0]!,
|
|
127
|
-
nextParentTypes,
|
|
128
|
-
);
|
|
129
|
-
const valueType = resolveTypeToStructure(
|
|
130
|
-
globalBuiltIns,
|
|
131
|
-
functionName,
|
|
132
|
-
checker,
|
|
133
|
-
typeArgs[1]!,
|
|
134
|
-
nextParentTypes,
|
|
135
|
-
);
|
|
136
|
-
return `Map<${keyType}, ${valueType}>`;
|
|
137
|
-
}
|
|
138
|
-
return "Map<unknown, unknown>";
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
// Handle Set<T>
|
|
142
|
-
if (typeName === "Set") {
|
|
75
|
+
if (typeName && globalBuiltIns.has(typeName)) {
|
|
76
|
+
// Check for type arguments (e.g., ReadableStream<Uint8Array>)
|
|
143
77
|
const typeArgs = checker.getTypeArguments(type as ts.TypeReference);
|
|
144
78
|
if (typeArgs.length > 0) {
|
|
145
|
-
const
|
|
146
|
-
globalBuiltIns,
|
|
147
|
-
functionName,
|
|
148
|
-
checker,
|
|
149
|
-
typeArgs[0]!,
|
|
150
|
-
nextParentTypes,
|
|
79
|
+
const resolvedArgs = typeArgs.map((t) =>
|
|
80
|
+
resolveTypeToStructure(globalBuiltIns, functionName, checker, t, parentTypes),
|
|
151
81
|
);
|
|
152
|
-
|
|
82
|
+
if (typeName === "Array") {
|
|
83
|
+
return `${resolvedArgs[0]}[]`;
|
|
84
|
+
}
|
|
85
|
+
return `${typeName}<${resolvedArgs.join(", ")}>`;
|
|
153
86
|
}
|
|
154
|
-
return
|
|
87
|
+
return typeName;
|
|
155
88
|
}
|
|
156
89
|
|
|
157
90
|
// Handle function types
|
|
158
91
|
const callSignatures = type.getCallSignatures();
|
|
159
92
|
if (callSignatures.length > 0) {
|
|
93
|
+
throw new Error("Function types are not supported in return types");
|
|
160
94
|
const sig = callSignatures[0]!;
|
|
161
95
|
const params = sig.getParameters().map((param) => {
|
|
162
96
|
const paramType = checker.getTypeOfSymbolAtLocation(param, param.valueDeclaration!);
|
|
@@ -177,7 +111,7 @@ export const resolveTypeToStructure = (
|
|
|
177
111
|
checker.getReturnTypeOfSignature(sig),
|
|
178
112
|
nextParentTypes,
|
|
179
113
|
);
|
|
180
|
-
return `(${params.join(", ")}) => ${returnType}`;
|
|
114
|
+
return `((${params.join(", ")}) => ${returnType})`;
|
|
181
115
|
}
|
|
182
116
|
|
|
183
117
|
// Handle object types - expand to structural form
|