@kaapi/validator-valibot 0.0.24 → 0.0.26
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/lib/validator.js +27 -16
- package/lib/validator.js.map +1 -1
- package/package.json +3 -3
package/lib/validator.js
CHANGED
|
@@ -23,32 +23,43 @@ const normalizeBooleans = (obj) => {
|
|
|
23
23
|
}
|
|
24
24
|
return obj;
|
|
25
25
|
};
|
|
26
|
+
function mergeOptions(options, schema) {
|
|
27
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
28
|
+
// validator
|
|
29
|
+
if (!options.plugins) {
|
|
30
|
+
options.plugins = {};
|
|
31
|
+
}
|
|
32
|
+
options.plugins.valibot = schema;
|
|
33
|
+
// docs
|
|
34
|
+
options.plugins.kaapi = options.plugins.kaapi || {};
|
|
35
|
+
if (options.plugins.kaapi.docs != false && // docs not disabled
|
|
36
|
+
!((_a = options.plugins.kaapi.docs) === null || _a === void 0 ? void 0 : _a.disabled) // docs not disabled
|
|
37
|
+
) {
|
|
38
|
+
if (!((_d = (_c = (_b = options.plugins) === null || _b === void 0 ? void 0 : _b.kaapi) === null || _c === void 0 ? void 0 : _c.docs) === null || _d === void 0 ? void 0 : _d.helperSchemaProperty)) // docs have not helperSchemaProperty
|
|
39
|
+
options.plugins.kaapi.docs = Object.assign(Object.assign({}, options.plugins.kaapi.docs), { helperSchemaProperty: 'valibot' });
|
|
40
|
+
if (!((_g = (_f = (_e = options.plugins) === null || _e === void 0 ? void 0 : _e.kaapi) === null || _f === void 0 ? void 0 : _f.docs) === null || _g === void 0 ? void 0 : _g.openAPIHelperClass)) // docs have not openAPIHelperClass
|
|
41
|
+
options.plugins.kaapi.docs = Object.assign(Object.assign({}, options.plugins.kaapi.docs), { openAPIHelperClass: doc_helpers_1.OpenAPIValibotHelper });
|
|
42
|
+
}
|
|
43
|
+
return options;
|
|
44
|
+
}
|
|
26
45
|
exports.validatorValibot = {
|
|
27
46
|
integrate(t) {
|
|
28
47
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
29
48
|
const validator = (schema) => {
|
|
30
49
|
return {
|
|
31
50
|
route(serverRoute, handler) {
|
|
32
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
33
51
|
if (!serverRoute.options) {
|
|
34
52
|
serverRoute.options = {};
|
|
35
53
|
}
|
|
36
54
|
if (typeof serverRoute.options === 'object') {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
serverRoute.options
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
!((_a = serverRoute.options.plugins.kaapi.docs) === null || _a === void 0 ? void 0 : _a.disabled) // docs not disabled
|
|
46
|
-
) {
|
|
47
|
-
if (!((_d = (_c = (_b = serverRoute.options.plugins) === null || _b === void 0 ? void 0 : _b.kaapi) === null || _c === void 0 ? void 0 : _c.docs) === null || _d === void 0 ? void 0 : _d.helperSchemaProperty)) // docs have not helperSchemaProperty
|
|
48
|
-
serverRoute.options.plugins.kaapi.docs = Object.assign(Object.assign({}, serverRoute.options.plugins.kaapi.docs), { helperSchemaProperty: 'valibot' });
|
|
49
|
-
if (!((_g = (_f = (_e = serverRoute.options.plugins) === null || _e === void 0 ? void 0 : _e.kaapi) === null || _f === void 0 ? void 0 : _f.docs) === null || _g === void 0 ? void 0 : _g.openAPIHelperClass)) // docs have not openAPIHelperClass
|
|
50
|
-
serverRoute.options.plugins.kaapi.docs = Object.assign(Object.assign({}, serverRoute.options.plugins.kaapi.docs), { openAPIHelperClass: doc_helpers_1.OpenAPIValibotHelper });
|
|
51
|
-
}
|
|
55
|
+
mergeOptions(serverRoute.options, schema);
|
|
56
|
+
}
|
|
57
|
+
else if (typeof serverRoute.options === 'function') {
|
|
58
|
+
const fn = serverRoute.options.bind(serverRoute);
|
|
59
|
+
serverRoute.options = (server) => {
|
|
60
|
+
const options = fn(server);
|
|
61
|
+
return mergeOptions(options, schema);
|
|
62
|
+
};
|
|
52
63
|
}
|
|
53
64
|
t.route(serverRoute, handler);
|
|
54
65
|
return t.server;
|
package/lib/validator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":";;;;AAAA,8DAA8B;AAC9B,qCAAqF;AAGrF,+CAA2E;AAC3E,2EAAkC;AAElC,MAAM,EAAE,KAAK,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC;AACnF,QAAA,cAAc,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAU,CAAC;AAC1F,MAAM,iBAAiB,GAAG,CAAC,GAA4B,EAAE,EAAE;IACvD,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,IAAI,GAAG,KAAK,MAAM;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;iBAC/B,IAAI,GAAG,KAAK,OAAO;gBAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC/C,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjF,CAAC;IACL,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kaapi/validator-valibot",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.26",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Valibot-powered request validation and documentation plugin for Kaapi.",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"license": "MIT",
|
|
27
27
|
"dependencies": {
|
|
28
28
|
"@hapi/boom": "^10.0.1",
|
|
29
|
-
"@novice1/api-doc-generator": "^1.
|
|
29
|
+
"@novice1/api-doc-generator": "^1.2.0",
|
|
30
30
|
"@valibot/to-json-schema": "^1.3.0",
|
|
31
31
|
"tslib": "^2.8.1",
|
|
32
|
-
"@kaapi/kaapi": "^0.0.
|
|
32
|
+
"@kaapi/kaapi": "^0.0.26"
|
|
33
33
|
},
|
|
34
34
|
"peerDependencies": {
|
|
35
35
|
"valibot": "^1.1.0"
|