prostgles-server 4.2.595 → 4.2.597
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/JSONBSchemaValidation/validateJSONBSchemaSQL.d.ts +1 -1
- package/dist/JSONBSchemaValidation/validateJSONBSchemaSQL.d.ts.map +1 -1
- package/dist/JSONBSchemaValidation/validateJSONBSchemaSQL.js +29 -1
- package/dist/JSONBSchemaValidation/validateJSONBSchemaSQL.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +1 -1
- package/dist/runClientRequest.js.map +1 -1
- package/dist/runClientRequest.spec.d.ts +2 -0
- package/dist/runClientRequest.spec.d.ts.map +1 -0
- package/dist/runClientRequest.spec.js +39 -0
- package/dist/runClientRequest.spec.js.map +1 -0
- package/lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts +30 -2
- package/lib/runClientRequest.spec.ts +55 -0
- package/lib/runClientRequest.ts +4 -1
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare const VALIDATE_SCHEMA_FUNCNAME = "prostgles.validate_jsonb_schema";
|
|
2
|
-
export declare const JSONB_DATA_TYPES: readonly [...("string" | "number" | "boolean" | "integer" | "time" | "timestamp" | "Date" | "any" | "unknown" | "Uint8Array" | "Blob" | "FileLike" | "string[]" | "number[]" | "boolean[]" | "integer[]" | "time[]" | "timestamp[]" | "Date[]" | "any[]" | "unknown[]" | "Uint8Array[]" | "Blob[]" | "FileLike[]")[], "
|
|
2
|
+
export declare const JSONB_DATA_TYPES: readonly [...("string" | "number" | "boolean" | "integer" | "time" | "timestamp" | "Date" | "any" | "unknown" | "Uint8Array" | "Blob" | "FileLike" | "string[]" | "number[]" | "boolean[]" | "integer[]" | "time[]" | "timestamp[]" | "Date[]" | "any[]" | "unknown[]" | "Uint8Array[]" | "Blob[]" | "FileLike[]")[], "RowLookup", "RowLookup[]", "ValueLookup", "ValueLookup[]", "TableLookup", "TableLookup[]", "ColumnLookup", "ColumnLookup[]"];
|
|
3
3
|
export declare const CREATE_VALIDATE_SCHEMA_FUNCTION_SQL: string;
|
|
4
4
|
//# sourceMappingURL=validateJSONBSchemaSQL.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateJSONBSchemaSQL.d.ts","sourceRoot":"","sources":["../../lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,wBAAwB,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"validateJSONBSchemaSQL.d.ts","sourceRoot":"","sources":["../../lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,wBAAwB,oCAAoC,CAAC;AAW1E,eAAO,MAAM,gBAAgB,qbAAkD,CAAC;AAEhF,eAAO,MAAM,mCAAmC,QAsc/C,CAAC"}
|
|
@@ -11,7 +11,17 @@ ELSE
|
|
|
11
11
|
END IF;
|
|
12
12
|
`;
|
|
13
13
|
exports.VALIDATE_SCHEMA_FUNCNAME = "prostgles.validate_jsonb_schema";
|
|
14
|
-
|
|
14
|
+
const JSONB_LOOKUP_TYPES = [
|
|
15
|
+
"RowLookup",
|
|
16
|
+
"RowLookup[]",
|
|
17
|
+
"ValueLookup",
|
|
18
|
+
"ValueLookup[]",
|
|
19
|
+
"TableLookup",
|
|
20
|
+
"TableLookup[]",
|
|
21
|
+
"ColumnLookup",
|
|
22
|
+
"ColumnLookup[]",
|
|
23
|
+
];
|
|
24
|
+
exports.JSONB_DATA_TYPES = [...prostgles_types_1.DATA_TYPES, ...JSONB_LOOKUP_TYPES];
|
|
15
25
|
exports.CREATE_VALIDATE_SCHEMA_FUNCTION_SQL = `
|
|
16
26
|
/*
|
|
17
27
|
* ${PubSubManagerUtils_1.EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID}
|
|
@@ -195,6 +205,24 @@ BEGIN
|
|
|
195
205
|
/** Primitive */
|
|
196
206
|
ELSE
|
|
197
207
|
|
|
208
|
+
IF typeStr = 'TableLookup' THEN
|
|
209
|
+
typeStr = 'string';
|
|
210
|
+
ELSIF typeStr = 'ValueLookup' THEN
|
|
211
|
+
typeStr = 'any';
|
|
212
|
+
ELSIF typeStr = 'RowLookup' THEN
|
|
213
|
+
IF jsonb_typeof(data) != 'object' THEN
|
|
214
|
+
${raiseException(`'Data type not matching. Expected: object, Actual: %, %', jsonb_typeof(data), path`)}
|
|
215
|
+
END IF;
|
|
216
|
+
RETURN TRUE;
|
|
217
|
+
ELSIF typeStr = 'ColumnLookup' THEN
|
|
218
|
+
RETURN ${exports.VALIDATE_SCHEMA_FUNCNAME}(
|
|
219
|
+
'{ "type": { "table": "string", "column": "string" } }',
|
|
220
|
+
data,
|
|
221
|
+
context,
|
|
222
|
+
checked_path
|
|
223
|
+
);
|
|
224
|
+
END IF;
|
|
225
|
+
|
|
198
226
|
IF (
|
|
199
227
|
typeStr = 'number' AND jsonb_typeof(data) != typeStr OR
|
|
200
228
|
(typeStr = 'integer' AND (jsonb_typeof(data) != 'number' OR ceil(data::NUMERIC) != floor(data::NUMERIC))) OR
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateJSONBSchemaSQL.js","sourceRoot":"","sources":["../../lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"validateJSONBSchemaSQL.js","sourceRoot":"","sources":["../../lib/JSONBSchemaValidation/validateJSONBSchemaSQL.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AACzD,4EAAyF;AAEzF,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC;;;;oBAIpB,GAAG;;CAEtB,CAAC;AAEW,QAAA,wBAAwB,GAAG,iCAAiC,CAAC;AAC1E,MAAM,kBAAkB,GAAG;IACzB,WAAW;IACX,aAAa;IACb,aAAa;IACb,eAAe;IACf,aAAa;IACb,eAAe;IACf,cAAc;IACd,gBAAgB;CACyB,CAAC;AAC/B,QAAA,gBAAgB,GAAG,CAAC,GAAG,4BAAU,EAAE,GAAG,kBAAkB,CAAU,CAAC;AAEnE,QAAA,mCAAmC,GAAG;;IAE/C,uDAAkC;;6BAET,gCAAwB;;;;;;;;;;;;;6BAaxB,wBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAoDjD,cAAc,CAAC,yBAAyB,CAAC;;;;;;;;;;;;;MAazC,cAAc,CAAC,2GAA2G,CAAC;;;;;;;QAOzH,cAAc,CAAC,4BAA4B,CAAC;;;;;;;;;;;QAW5C,cAAc,CAAC,8EAA8E,CAAC;;;;QAI9F,cAAc,CAAC,8DAA8D,CAAC;;;;;;;;;;;aAWzE,gCAAwB;;;;;;;;;;aAUxB,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;UAwB3B,cAAc,CAAC,yEAAyE,CAAC;;;;;;;;;YASvF,cAAc,CAAC,mDAAmD,CAAC;;;;;;;mBAO5D,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;cAwB7B,cAAc,CAAC,oFAAoF,CAAC;;;;mBAI/F,gCAAwB;;;;;;;;;;;;;;;YAe/B,cAAc,CAAC,wFAAwF,CAAC;;;;;;;;cAQtG,cAAc,CAAC,iHAAiH,CAAC;;;;;;;;cAQjI,cAAc,CAAC,oIAAoI,CAAC;;;YAGtJ,cAAc,CAAC,oEAAoE,CAAC;;;;;;;;;;UAUtF,cAAc,CAAC,oCAAoC,CAAC;;;;;;;;;;UAUpD,cAAc,CAAC,2HAA2H,CAAC;;;;;;;;;;;cAWvI,cAAc,CAAC,oFAAoF,CAAC;;;oBAG9F,gCAAwB;;;;;;;;;;;;;;QAcpC,cAAc,CAAC,sEAAsE,CAAC;;;;;;;;;QAStF,cAAc,CAAC,iGAAiG,CAAC;;;;;;;;;;;aAW5G,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuC/B,cAAc,CAAC,gEAAgE,CAAC;;;;;;QAM9E,cAAc,CAAC,uGAAuG,CAAC;;;;QAIvH,cAAc,CAAC,uCAAuC,CAAC;;;;QAIvD,cAAc,CAAC;;;aAGV,CAAC;;;;;;;;;;;;eAYC,gCAAwB;;;;;;;;;;;;;;;;;;QAkB/B,cAAc,CAAC,4BAA4B,CAAC;;;;;;;eAOrC,gCAAwB;;;;;;;;;;;;;;;;;;;;;;;QAuB/B,cAAc,CAAC,kIAAkI,CAAC;;;;QAIlJ,cAAc,CAAC,6BAA6B,CAAC;;;;;;;6EAOwB,gCAAwB;;;;;;;oEAOjC,gCAAwB;;;;;;;;;MAStF,cAAc,CAAC,yCAAyC,CAAC;;;;;;;sBAOzC,gCAAwB,QAAQ,uDAAkC;;;;;;;;;CASvF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAOL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA8B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,EACf,kBAAkB,IAAI,EACtB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,8BAgInC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,MAAM,SAAS,EACf,WAAW,iBAAiB;;;;;;;;EAa7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,iBAqB7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,eAAO,MAAM,eAAe,GAC1B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,qBA0C7B,CAAC"}
|
package/dist/runClientRequest.js
CHANGED
|
@@ -161,7 +161,7 @@ const runClientMethod = async function (unvalidatedArgs, clientReq) {
|
|
|
161
161
|
if (!inputSchema && input !== undefined) {
|
|
162
162
|
throw "Function " + JSON.stringify(name) + " does not accept any arguments";
|
|
163
163
|
}
|
|
164
|
-
const expectedArgsError = !inputSchema ? undefined : (0, prostgles_types_1.
|
|
164
|
+
const expectedArgsError = !inputSchema ? undefined : (await (0, prostgles_types_1.getJSONBSchemaValidationErrorAsync)({ type: inputSchema }, input, this.dboBuilder.dboMap));
|
|
165
165
|
if (expectedArgsError?.error !== undefined) {
|
|
166
166
|
const { error } = expectedArgsError;
|
|
167
167
|
const message = error.startsWith(" ") ? "input" + error : error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runClientRequest.spec.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_assert_1 = require("node:assert");
|
|
4
|
+
const node_test_1 = require("node:test");
|
|
5
|
+
const runClientRequest_1 = require("./runClientRequest");
|
|
6
|
+
void (0, node_test_1.describe)("runClientMethod", async () => {
|
|
7
|
+
const getProstgles = (run) => ({
|
|
8
|
+
dboBuilder: {
|
|
9
|
+
dboMap: new Map([["items", {}]]),
|
|
10
|
+
},
|
|
11
|
+
publishParser: {
|
|
12
|
+
getAllowedFunctions: () => Promise.resolve(new Map([
|
|
13
|
+
[
|
|
14
|
+
"testLookup",
|
|
15
|
+
{
|
|
16
|
+
input: { table: { type: "TableLookup" } },
|
|
17
|
+
run,
|
|
18
|
+
},
|
|
19
|
+
],
|
|
20
|
+
])),
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
await (0, node_test_1.test)("accepts valid lookup values", async () => {
|
|
24
|
+
const result = await runClientRequest_1.runClientMethod.call(getProstgles(() => "ok"), { name: "testLookup", input: { table: "items" } }, {});
|
|
25
|
+
node_assert_1.strict.equal(result, "ok");
|
|
26
|
+
});
|
|
27
|
+
await (0, node_test_1.test)("rejects invalid lookup values before running the function", async () => {
|
|
28
|
+
let didRun = false;
|
|
29
|
+
const error = await runClientRequest_1.runClientMethod
|
|
30
|
+
.call(getProstgles(() => {
|
|
31
|
+
didRun = true;
|
|
32
|
+
return "ok";
|
|
33
|
+
}), { name: "testLookup", input: { table: "missing" } }, {})
|
|
34
|
+
.catch((error) => error);
|
|
35
|
+
node_assert_1.strict.equal(error, 'table references an unknown table "missing"');
|
|
36
|
+
node_assert_1.strict.equal(didRun, false);
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
//# sourceMappingURL=runClientRequest.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runClientRequest.spec.js","sourceRoot":"","sources":["../lib/runClientRequest.spec.ts"],"names":[],"mappings":";;AAAA,6CAA+C;AAC/C,yCAA2C;AAG3C,yDAAqD;AAErD,KAAK,IAAA,oBAAQ,EAAC,iBAAiB,EAAE,KAAK,IAAI,EAAE;IAC1C,MAAM,YAAY,GAAG,CAAC,GAAiB,EAAE,EAAE,CACzC,CAAC;QACC,UAAU,EAAE;YACV,MAAM,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;SACjC;QACD,aAAa,EAAE;YACb,mBAAmB,EAAE,GAAG,EAAE,CACxB,OAAO,CAAC,OAAO,CACb,IAAI,GAAG,CAAC;gBACN;oBACE,YAAY;oBACZ;wBACE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE;wBACzC,GAAG;qBACJ;iBACF;aACF,CAAC,CACH;SACJ;KACF,CAAyB,CAAC;IAE7B,MAAM,IAAA,gBAAI,EAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,MAAM,GAAG,MAAM,kCAAe,CAAC,IAAI,CACvC,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EACxB,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EACjD,EAAuB,CACxB,CAAC;QAEF,oBAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,MAAM,IAAA,gBAAI,EAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACjF,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,KAAK,GAAG,MAAM,kCAAe;aAChC,IAAI,CACH,YAAY,CAAC,GAAG,EAAE;YAChB,MAAM,GAAG,IAAI,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,EACF,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EACnD,EAAuB,CACxB;aACA,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAEpC,oBAAM,CAAC,KAAK,CAAC,KAAK,EAAE,6CAA6C,CAAC,CAAC;QACnE,oBAAM,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DATA_TYPES } from "prostgles-types";
|
|
1
|
+
import { DATA_TYPES, type JSONB } from "prostgles-types";
|
|
2
2
|
import { EXCLUDE_QUERY_FROM_SCHEMA_WATCH_ID } from "../PubSubManager/PubSubManagerUtils";
|
|
3
3
|
|
|
4
4
|
const raiseException = (err: string) => `
|
|
@@ -10,7 +10,17 @@ END IF;
|
|
|
10
10
|
`;
|
|
11
11
|
|
|
12
12
|
export const VALIDATE_SCHEMA_FUNCNAME = "prostgles.validate_jsonb_schema";
|
|
13
|
-
|
|
13
|
+
const JSONB_LOOKUP_TYPES = [
|
|
14
|
+
"RowLookup",
|
|
15
|
+
"RowLookup[]",
|
|
16
|
+
"ValueLookup",
|
|
17
|
+
"ValueLookup[]",
|
|
18
|
+
"TableLookup",
|
|
19
|
+
"TableLookup[]",
|
|
20
|
+
"ColumnLookup",
|
|
21
|
+
"ColumnLookup[]",
|
|
22
|
+
] as const satisfies JSONB.Lookup["type"][];
|
|
23
|
+
export const JSONB_DATA_TYPES = [...DATA_TYPES, ...JSONB_LOOKUP_TYPES] as const;
|
|
14
24
|
|
|
15
25
|
export const CREATE_VALIDATE_SCHEMA_FUNCTION_SQL = `
|
|
16
26
|
/*
|
|
@@ -195,6 +205,24 @@ BEGIN
|
|
|
195
205
|
/** Primitive */
|
|
196
206
|
ELSE
|
|
197
207
|
|
|
208
|
+
IF typeStr = 'TableLookup' THEN
|
|
209
|
+
typeStr = 'string';
|
|
210
|
+
ELSIF typeStr = 'ValueLookup' THEN
|
|
211
|
+
typeStr = 'any';
|
|
212
|
+
ELSIF typeStr = 'RowLookup' THEN
|
|
213
|
+
IF jsonb_typeof(data) != 'object' THEN
|
|
214
|
+
${raiseException(`'Data type not matching. Expected: object, Actual: %, %', jsonb_typeof(data), path`)}
|
|
215
|
+
END IF;
|
|
216
|
+
RETURN TRUE;
|
|
217
|
+
ELSIF typeStr = 'ColumnLookup' THEN
|
|
218
|
+
RETURN ${VALIDATE_SCHEMA_FUNCNAME}(
|
|
219
|
+
'{ "type": { "table": "string", "column": "string" } }',
|
|
220
|
+
data,
|
|
221
|
+
context,
|
|
222
|
+
checked_path
|
|
223
|
+
);
|
|
224
|
+
END IF;
|
|
225
|
+
|
|
198
226
|
IF (
|
|
199
227
|
typeStr = 'number' AND jsonb_typeof(data) != typeStr OR
|
|
200
228
|
(typeStr = 'integer' AND (jsonb_typeof(data) != 'number' OR ceil(data::NUMERIC) != floor(data::NUMERIC))) OR
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { strict as assert } from "node:assert";
|
|
2
|
+
import { describe, test } from "node:test";
|
|
3
|
+
import type { AuthClientRequest } from "./Auth/AuthTypes";
|
|
4
|
+
import type { Prostgles } from "./Prostgles";
|
|
5
|
+
import { runClientMethod } from "./runClientRequest";
|
|
6
|
+
|
|
7
|
+
void describe("runClientMethod", async () => {
|
|
8
|
+
const getProstgles = (run: () => string) =>
|
|
9
|
+
({
|
|
10
|
+
dboBuilder: {
|
|
11
|
+
dboMap: new Map([["items", {}]]),
|
|
12
|
+
},
|
|
13
|
+
publishParser: {
|
|
14
|
+
getAllowedFunctions: () =>
|
|
15
|
+
Promise.resolve(
|
|
16
|
+
new Map([
|
|
17
|
+
[
|
|
18
|
+
"testLookup",
|
|
19
|
+
{
|
|
20
|
+
input: { table: { type: "TableLookup" } },
|
|
21
|
+
run,
|
|
22
|
+
},
|
|
23
|
+
],
|
|
24
|
+
]),
|
|
25
|
+
),
|
|
26
|
+
},
|
|
27
|
+
}) as unknown as Prostgles;
|
|
28
|
+
|
|
29
|
+
await test("accepts valid lookup values", async () => {
|
|
30
|
+
const result = await runClientMethod.call(
|
|
31
|
+
getProstgles(() => "ok"),
|
|
32
|
+
{ name: "testLookup", input: { table: "items" } },
|
|
33
|
+
{} as AuthClientRequest,
|
|
34
|
+
);
|
|
35
|
+
|
|
36
|
+
assert.equal(result, "ok");
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
await test("rejects invalid lookup values before running the function", async () => {
|
|
40
|
+
let didRun = false;
|
|
41
|
+
const error = await runClientMethod
|
|
42
|
+
.call(
|
|
43
|
+
getProstgles(() => {
|
|
44
|
+
didRun = true;
|
|
45
|
+
return "ok";
|
|
46
|
+
}),
|
|
47
|
+
{ name: "testLookup", input: { table: "missing" } },
|
|
48
|
+
{} as AuthClientRequest,
|
|
49
|
+
)
|
|
50
|
+
.catch((error: unknown) => error);
|
|
51
|
+
|
|
52
|
+
assert.equal(error, 'table references an unknown table "missing"');
|
|
53
|
+
assert.equal(didRun, false);
|
|
54
|
+
});
|
|
55
|
+
});
|
package/lib/runClientRequest.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
ABORTABLE_METHODS,
|
|
4
4
|
getJSONBObjectSchemaValidationError,
|
|
5
5
|
getJSONBSchemaValidationError,
|
|
6
|
+
getJSONBSchemaValidationErrorAsync,
|
|
6
7
|
getKeys,
|
|
7
8
|
pickKeys,
|
|
8
9
|
type AnyObject,
|
|
@@ -272,7 +273,9 @@ export const runClientMethod = async function (
|
|
|
272
273
|
}
|
|
273
274
|
|
|
274
275
|
const expectedArgsError =
|
|
275
|
-
!inputSchema ? undefined :
|
|
276
|
+
!inputSchema ? undefined : (
|
|
277
|
+
await getJSONBSchemaValidationErrorAsync({ type: inputSchema }, input, this.dboBuilder.dboMap)
|
|
278
|
+
);
|
|
276
279
|
|
|
277
280
|
if (expectedArgsError?.error !== undefined) {
|
|
278
281
|
const { error } = expectedArgsError;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.597",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"pg": "^8.23.0",
|
|
58
58
|
"pg-cursor": "^2.22.0",
|
|
59
59
|
"pg-promise": "^12.7.0",
|
|
60
|
-
"prostgles-types": "^4.0.
|
|
60
|
+
"prostgles-types": "^4.0.278"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@eslint/js": "^9.22.0",
|