@kaapi/validator-arktype 0.0.39 β 0.0.40
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/README.md +29 -0
- package/lib/{chunk-LGK4EOPV.js β chunk-ZMRC2IOO.js} +31 -15
- package/lib/chunk-ZMRC2IOO.js.map +1 -0
- package/lib/index.d.ts +2 -2
- package/lib/index.js +5 -3
- package/lib/metafile-esm.json +1 -1
- package/lib/types.d.ts +4 -1
- package/lib/validator.d.ts +4 -1
- package/lib/validator.js +5 -3
- package/package.json +2 -2
- package/lib/chunk-LGK4EOPV.js.map +0 -1
package/README.md
CHANGED
|
@@ -88,6 +88,35 @@ app.base().ark(routeSchema).route({
|
|
|
88
88
|
|
|
89
89
|
---
|
|
90
90
|
|
|
91
|
+
### π§± Build Routes Separately with `withSchema`
|
|
92
|
+
|
|
93
|
+
You can use `withSchema` to create validated routes without directly chaining from `app.base()`.
|
|
94
|
+
This cleanly separates **route construction** from **app registration**.
|
|
95
|
+
|
|
96
|
+
```ts
|
|
97
|
+
import { withSchema } from '@kaapi/validator-arktype'
|
|
98
|
+
import { type } from 'arktype';
|
|
99
|
+
|
|
100
|
+
const schema = {
|
|
101
|
+
payload: type({
|
|
102
|
+
name: 'string'
|
|
103
|
+
})
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
const route = withSchema(schema).route({
|
|
107
|
+
method: 'POST',
|
|
108
|
+
path: '/items',
|
|
109
|
+
handler: req => ({ id: Date.now(), name: req.payload.name })
|
|
110
|
+
})
|
|
111
|
+
|
|
112
|
+
// later, during app setup
|
|
113
|
+
app.route(route)
|
|
114
|
+
```
|
|
115
|
+
|
|
116
|
+
This is the most flexible and convenient way to use `@kaapi/validator-arktype` when building modular APIs.
|
|
117
|
+
|
|
118
|
+
---
|
|
119
|
+
|
|
91
120
|
## βοΈ Advanced Configuration
|
|
92
121
|
|
|
93
122
|
### π¨ `failAction`
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
var package_default = {
|
|
8
8
|
name: "@kaapi/validator-arktype",
|
|
9
9
|
type: "module",
|
|
10
|
-
version: "0.0.
|
|
10
|
+
version: "0.0.40",
|
|
11
11
|
private: false,
|
|
12
12
|
description: "ArkType-powered request validation and documentation plugin for Kaapi.",
|
|
13
13
|
main: "lib/index.js",
|
|
@@ -97,24 +97,39 @@ function mergeOptions(options, schema) {
|
|
|
97
97
|
}
|
|
98
98
|
return options;
|
|
99
99
|
}
|
|
100
|
+
var withSchema = function withSchema2(schema) {
|
|
101
|
+
return {
|
|
102
|
+
route(serverRoute, handler) {
|
|
103
|
+
const { ...route } = serverRoute;
|
|
104
|
+
if (!route.options) {
|
|
105
|
+
route.options = {};
|
|
106
|
+
}
|
|
107
|
+
if (typeof route.options === "object") {
|
|
108
|
+
mergeOptions(route.options, schema);
|
|
109
|
+
} else if (typeof route.options === "function") {
|
|
110
|
+
const fn = route.options.bind(route);
|
|
111
|
+
route.options = (server) => {
|
|
112
|
+
const options = fn(server);
|
|
113
|
+
return mergeOptions(options, schema);
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
if (handler) {
|
|
117
|
+
route.handler = handler;
|
|
118
|
+
}
|
|
119
|
+
return route;
|
|
120
|
+
}
|
|
121
|
+
};
|
|
122
|
+
};
|
|
100
123
|
var validatorArk = {
|
|
101
124
|
async integrate(t) {
|
|
102
125
|
const validator = (schema) => {
|
|
126
|
+
const builder = withSchema(schema);
|
|
103
127
|
return {
|
|
104
128
|
route(serverRoute, handler) {
|
|
105
|
-
|
|
106
|
-
serverRoute
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
mergeOptions(serverRoute.options, schema);
|
|
110
|
-
} else if (typeof serverRoute.options === "function") {
|
|
111
|
-
const fn = serverRoute.options.bind(serverRoute);
|
|
112
|
-
serverRoute.options = (server) => {
|
|
113
|
-
const options = fn(server);
|
|
114
|
-
return mergeOptions(options, schema);
|
|
115
|
-
};
|
|
116
|
-
}
|
|
117
|
-
t.route(serverRoute, handler);
|
|
129
|
+
t.route(builder.route(
|
|
130
|
+
serverRoute,
|
|
131
|
+
handler
|
|
132
|
+
));
|
|
118
133
|
return t.server;
|
|
119
134
|
}
|
|
120
135
|
};
|
|
@@ -187,6 +202,7 @@ var validatorArk = {
|
|
|
187
202
|
|
|
188
203
|
export {
|
|
189
204
|
supportedProps,
|
|
205
|
+
withSchema,
|
|
190
206
|
validatorArk
|
|
191
207
|
};
|
|
192
|
-
//# sourceMappingURL=chunk-
|
|
208
|
+
//# sourceMappingURL=chunk-ZMRC2IOO.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../package.json","../src/validator.ts"],"sourcesContent":["{\n \"name\": \"@kaapi/validator-arktype\",\n \"type\": \"module\",\n \"version\": \"0.0.40\",\n \"private\": false,\n \"description\": \"ArkType-powered request validation and documentation plugin for Kaapi.\",\n \"main\": \"lib/index.js\",\n \"exports\": {\n \".\": {\n \"types\": \"./lib/index.d.ts\",\n \"default\": \"./lib/index.js\"\n }\n },\n \"scripts\": {\n \"build\": \"tsup src !src/**/*.d.ts --format esm --outDir lib --clean --metafile --dts --sourcemap && node ./scripts/buildDT.mjs\",\n \"check\": \"tsc --noEmit\",\n \"check:deps\": \"depcruise src --validate\",\n \"ci\": \"npm run verify\",\n \"coverage\": \"c8 node --loader ts-node/esm --experimental-specifier-resolution=node --no-warnings ../../node_modules/mocha/bin/mocha test/**/*.spec.ts\",\n \"format\": \"prettier --write ./\",\n \"format:check\": \"prettier --check ./\",\n \"lint\": \"eslint .\",\n \"test\": \"node --loader ts-node/esm --experimental-specifier-resolution=node --no-warnings ../../node_modules/mocha/bin/mocha test/**/*.spec.ts\",\n \"type-coverage\": \"type-coverage --at-least 90 --detail\",\n \"verify\": \"npm run lint && npm run format:check && npm run check && npm run check:deps && npm run type-coverage && npm run test:kaukau && npm run coverage\"\n },\n \"keywords\": [\n \"kaapi\",\n \"hapi\",\n \"arktype\",\n \"typescript\",\n \"validation\"\n ],\n \"author\": \"demingongo\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git+https://github.com/demingongo/kaapi.git\",\n \"directory\": \"packages/validator-arktype\"\n },\n \"license\": \"MIT\",\n \"dependencies\": {\n \"@hapi/boom\": \"^10.0.1\",\n \"@kaapi/kaapi\": \"workspace:^\",\n \"@novice1/api-doc-json-helper\": \"^1.0.8\",\n \"arktype\": \"^2.1.29\",\n \"tslib\": \"^2.8.1\"\n },\n \"devDependencies\": {\n \"@types/mocha\": \"^10.0.10\"\n },\n \"peerDependencies\": {\n \"arktype\": \"^2.1.25\"\n }\n}\n","import pkg from '../package.json' with { type: 'json' };\nimport { OpenAPIArkHelper, PostmanArkHelper } from './doc-helpers.js';\nimport type {\n ArklessReqRef,\n ArklessReqRefDefaults,\n ValidatorArk,\n ValidatorArkReqRef,\n ValidatorArkRouteBuilder,\n ValidatorArkSchema,\n} from './types.js';\nimport Boom from '@hapi/boom';\nimport type {\n KaapiServerRoute,\n HandlerDecorations,\n Lifecycle,\n KaapiPlugin,\n Request,\n ResponseToolkit,\n RouteOptions,\n} from '@kaapi/kaapi';\nimport { type, type Type } from 'arktype';\n\nconst { parse = { payload: true, query: true, params: true, headers: true, state: true } } = {};\nexport const supportedProps = ['payload', 'query', 'params', 'headers', 'state'] as const;\nconst normalizeBooleans = (obj: Record<string, unknown>) => {\n for (const key in obj) {\n const val = obj[key];\n if (typeof val === 'string') {\n if (val === 'true') obj[key] = true;\n else if (val === 'false') obj[key] = false;\n } else if (Array.isArray(val)) {\n obj[key] = val.map((v) => (v === 'true' ? true : v === 'false' ? false : v));\n }\n }\n return obj;\n};\n\nfunction mergeOptions<V extends ValidatorArkSchema, R extends ArklessReqRef>(\n options: RouteOptions<ValidatorArkReqRef<V> & R>,\n schema: V\n) {\n // validator\n if (!options.plugins) {\n options.plugins = {};\n }\n options.plugins.ark = schema;\n\n // docs\n options.plugins.kaapi = options.plugins.kaapi || {};\n if (\n options.plugins.kaapi.docs != false && // docs not disabled\n !options.plugins.kaapi.docs?.disabled // docs not disabled\n ) {\n if (!options.plugins?.kaapi?.docs?.helperSchemaProperty)\n // docs have not helperSchemaProperty\n options.plugins.kaapi.docs = {\n ...options.plugins.kaapi.docs,\n helperSchemaProperty: 'ark',\n };\n if (!options.plugins?.kaapi?.docs?.openAPIHelperClass)\n // docs have not openAPIHelperClass\n options.plugins.kaapi.docs = {\n ...options.plugins.kaapi.docs,\n openAPIHelperClass: OpenAPIArkHelper,\n };\n }\n return options\n}\n\nexport const withSchema = function withSchema<V extends ValidatorArkSchema>(schema: V): ValidatorArkRouteBuilder<V> {\n return {\n route<R extends ArklessReqRef = ArklessReqRefDefaults>(\n serverRoute: KaapiServerRoute<ValidatorArkReqRef<V> & R>,\n handler?: HandlerDecorations | Lifecycle.Method<ValidatorArkReqRef<V> & R, Lifecycle.ReturnValue<ValidatorArkReqRef<V> & R>>\n ) {\n const { ...route } = serverRoute\n if (!route.options) {\n route.options = {}\n }\n if (typeof route.options === 'object') {\n mergeOptions(route.options, schema)\n } else if (typeof route.options === 'function') {\n const fn = route.options.bind(route);\n route.options = (server) => {\n const options = fn(server)\n return mergeOptions(options, schema)\n }\n }\n if (handler) {\n route.handler = handler\n }\n return route\n }\n }\n}\n\nexport const validatorArk: KaapiPlugin = {\n async integrate(t) {\n const validator: ValidatorArk = <V extends ValidatorArkSchema>(schema: V) => {\n const builder = withSchema(schema)\n return {\n route<R extends ArklessReqRef = ArklessReqRefDefaults>(\n serverRoute: KaapiServerRoute<ValidatorArkReqRef<V> & R>,\n handler?:\n | HandlerDecorations\n | Lifecycle.Method<ValidatorArkReqRef<V> & R, Lifecycle.ReturnValue<ValidatorArkReqRef<V> & R>>\n ) {\n t.route(builder.route(\n serverRoute,\n handler\n ));\n return t.server;\n },\n };\n };\n\n await t.server.register({\n name: 'kaapi-validator-arktype',\n version: pkg.version,\n register: async function (server) {\n server.ext('onPreHandler', async (request: Request, h: ResponseToolkit) => {\n const routeValidation = request?.route?.settings?.plugins?.ark as ValidatorArkSchema | undefined;\n try {\n // Initialize empty objects to hold the parsed data and corresponding ArkType schemas\n const data: Record<string, unknown> = {};\n const dataSchema: Record<string, Type> = {};\n\n // Loop through all supported properties for this route\n for (const prop of supportedProps) {\n // Check if validation exists for this property and there is a parser defined\n if (routeValidation?.[prop] && parse[prop]) {\n // Add the ArkType schema for this property to the dataSchema\n dataSchema[prop] = routeValidation[prop];\n // Prepare the value for parsing:\n // - For query params, normalize boolean strings to actual booleans\n // - Otherwise, take the raw value from the request object\n data[prop] = prop === 'query' ? normalizeBooleans(request[prop]) : request[prop];\n }\n }\n\n // Determine if there are any properties to validate\n let hasProps = false;\n for (const key in dataSchema) {\n // Safely check own properties to avoid inherited keys\n if (Object.prototype.hasOwnProperty.call(dataSchema, key)) {\n hasProps = true;\n break;\n }\n }\n\n // If we have any props to validate, parse them using ArkType\n if (hasProps) {\n // Create an ArkType object from the collected schema and parse\n const parsedProps = type(dataSchema)(data);\n if (parsedProps instanceof type.errors) {\n // throw ArkErrors\n throw parsedProps;\n }\n // Merge the parsed and validated properties back into the request object\n Object.assign(request, parsedProps);\n }\n\n // Continue the Hapi request lifecycle\n return h.continue;\n } catch (err) {\n // Initialize a set to track which paths (properties) failed validation\n const issuePaths = new Set<string>();\n let message: string;\n\n // Check if the error is instance of ValiError\n if (err instanceof type.errors && err.issues.length) {\n const firstIssue = err.issues[0];\n message = firstIssue.message;\n } else if (err instanceof Error) {\n // If itβs a regular Error, use its message\n message = err.message;\n } else {\n // Unknown error type\n message = 'Unknown error';\n }\n\n // Create a Boom badRequest response with the error message\n const response = Boom.badRequest(message);\n\n // Attach the raw validation error object for debugging/logging\n response.data = {\n validationError: err,\n };\n\n // Handle custom failAction if itβs a function\n if (typeof routeValidation?.failAction === 'function') {\n return routeValidation.failAction(request, h, response);\n }\n\n // If failAction is 'log', log the validation error with the request\n if (routeValidation?.failAction === 'log') {\n request.log(['validation', 'error', 'arktype', ...issuePaths], response);\n // Note: unlike Hapi's failAction 'log', 'log' here still returns a Boom response\n }\n\n // Return the error response to halt request processing\n return response;\n }\n });\n server.decorate('server', 'ark', validator);\n },\n });\n\n if (t.openapi) {\n t.openapi.addHelperClass(OpenAPIArkHelper);\n }\n if (t.postman) {\n t.postman.addHelperClass(PostmanArkHelper);\n }\n },\n};\n"],"mappings":"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","names":["withSchema"]}
|
package/lib/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import './declarations.d.ts'
|
|
2
|
-
export { ArkSchema, ArklessReqRef, ArklessReqRefDefaults, Infer, ValidatorArk, ValidatorArkReqRef, ValidatorArkSchema, output } from './types.js';
|
|
2
|
+
export { ArkSchema, ArklessReqRef, ArklessReqRefDefaults, Infer, ValidatorArk, ValidatorArkReqRef, ValidatorArkRouteBuilder, ValidatorArkSchema, output } from './types.js';
|
|
3
3
|
export { OpenAPIArkHelper, PostmanArkHelper } from './doc-helpers.js';
|
|
4
|
-
export { supportedProps, validatorArk } from './validator.js';
|
|
4
|
+
export { supportedProps, validatorArk, withSchema } from './validator.js';
|
|
5
5
|
import '@kaapi/kaapi';
|
|
6
6
|
import 'arktype';
|
|
7
7
|
import '@novice1/api-doc-json-helper';
|
package/lib/index.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import "./chunk-55J6XMHW.js";
|
|
2
2
|
import {
|
|
3
3
|
supportedProps,
|
|
4
|
-
validatorArk
|
|
5
|
-
|
|
4
|
+
validatorArk,
|
|
5
|
+
withSchema
|
|
6
|
+
} from "./chunk-ZMRC2IOO.js";
|
|
6
7
|
import {
|
|
7
8
|
OpenAPIArkHelper,
|
|
8
9
|
PostmanArkHelper
|
|
@@ -11,6 +12,7 @@ export {
|
|
|
11
12
|
OpenAPIArkHelper,
|
|
12
13
|
PostmanArkHelper,
|
|
13
14
|
supportedProps,
|
|
14
|
-
validatorArk
|
|
15
|
+
validatorArk,
|
|
16
|
+
withSchema
|
|
15
17
|
};
|
|
16
18
|
//# sourceMappingURL=index.js.map
|
package/lib/metafile-esm.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"src/doc-helpers.ts":{"bytes":13491,"imports":[{"path":"@novice1/api-doc-json-helper","kind":"import-statement","external":true},{"path":"arktype","kind":"import-statement","external":true}],"format":"esm"},"src/types.ts":{"bytes":
|
|
1
|
+
{"inputs":{"src/doc-helpers.ts":{"bytes":13491,"imports":[{"path":"@novice1/api-doc-json-helper","kind":"import-statement","external":true},{"path":"arktype","kind":"import-statement","external":true}],"format":"esm"},"src/types.ts":{"bytes":2221,"imports":[],"format":"esm"},"package.json":{"bytes":1797,"imports":[],"format":"esm","with":{"type":"json"}},"src/validator.ts":{"bytes":9273,"imports":[{"path":"package.json","kind":"import-statement","original":"../package.json","with":{"type":"json"}},{"path":"src/doc-helpers.ts","kind":"import-statement","original":"./doc-helpers.js"},{"path":"@hapi/boom","kind":"import-statement","external":true},{"path":"arktype","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":94,"imports":[{"path":"src/types.ts","kind":"import-statement","original":"./types.js"},{"path":"src/doc-helpers.ts","kind":"import-statement","original":"./doc-helpers.js"},{"path":"src/validator.ts","kind":"import-statement","original":"./validator.js"}],"format":"esm"}},"outputs":{"lib/doc-helpers.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":93},"lib/doc-helpers.js":{"imports":[{"path":"lib/chunk-QLKH743P.js","kind":"import-statement"}],"exports":["OpenAPIArkHelper","PostmanArkHelper"],"entryPoint":"src/doc-helpers.ts","inputs":{},"bytes":129},"lib/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":93},"lib/index.js":{"imports":[{"path":"lib/chunk-55J6XMHW.js","kind":"import-statement"},{"path":"lib/chunk-ZMRC2IOO.js","kind":"import-statement"},{"path":"lib/chunk-QLKH743P.js","kind":"import-statement"}],"exports":["OpenAPIArkHelper","PostmanArkHelper","supportedProps","validatorArk","withSchema"],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":0}},"bytes":293},"lib/types.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":93},"lib/types.js":{"imports":[{"path":"lib/chunk-55J6XMHW.js","kind":"import-statement"}],"exports":[],"entryPoint":"src/types.ts","inputs":{},"bytes":30},"lib/chunk-55J6XMHW.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":93},"lib/chunk-55J6XMHW.js":{"imports":[],"exports":[],"inputs":{"src/types.ts":{"bytesInOutput":0}},"bytes":0},"lib/validator.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":93},"lib/validator.js":{"imports":[{"path":"lib/chunk-ZMRC2IOO.js","kind":"import-statement"},{"path":"lib/chunk-QLKH743P.js","kind":"import-statement"}],"exports":["supportedProps","validatorArk","withSchema"],"entryPoint":"src/validator.ts","inputs":{},"bytes":175},"lib/chunk-ZMRC2IOO.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":15471},"lib/chunk-ZMRC2IOO.js":{"imports":[{"path":"lib/chunk-QLKH743P.js","kind":"import-statement"},{"path":"@hapi/boom","kind":"import-statement","external":true},{"path":"arktype","kind":"import-statement","external":true}],"exports":["supportedProps","validatorArk","withSchema"],"inputs":{"package.json":{"bytesInOutput":1758},"src/validator.ts":{"bytesInOutput":4576}},"bytes":6510},"lib/chunk-QLKH743P.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":20569},"lib/chunk-QLKH743P.js":{"imports":[{"path":"@novice1/api-doc-json-helper","kind":"import-statement","external":true},{"path":"arktype","kind":"import-statement","external":true}],"exports":["OpenAPIArkHelper","PostmanArkHelper"],"inputs":{"src/doc-helpers.ts":{"bytesInOutput":9196}},"bytes":9270}}}
|
package/lib/types.d.ts
CHANGED
|
@@ -23,5 +23,8 @@ interface ValidatorArkReqRef<RS extends ValidatorArkSchema = ValidatorArkSchema>
|
|
|
23
23
|
type ValidatorArk = <V extends ValidatorArkSchema>(schema: V) => {
|
|
24
24
|
route<R extends ArklessReqRef = ArklessReqRefDefaults>(serverRoute: KaapiServerRoute<ValidatorArkReqRef<V> & R>, handler?: HandlerDecorations | Lifecycle.Method<ValidatorArkReqRef<V> & R, Lifecycle.ReturnValue<ValidatorArkReqRef<V> & R>>): Server;
|
|
25
25
|
};
|
|
26
|
+
interface ValidatorArkRouteBuilder<V extends ValidatorArkSchema> {
|
|
27
|
+
route<R extends ArklessReqRef = ArklessReqRefDefaults>(serverRoute: KaapiServerRoute<ValidatorArkReqRef<V> & R>, handler?: HandlerDecorations | Lifecycle.Method<ValidatorArkReqRef<V> & R, Lifecycle.ReturnValue<ValidatorArkReqRef<V> & R>>): KaapiServerRoute<ValidatorArkReqRef<V> & R>;
|
|
28
|
+
}
|
|
26
29
|
|
|
27
|
-
export type { ArkSchema, ArklessReqRef, ArklessReqRefDefaults, Infer, ValidatorArk, ValidatorArkReqRef, ValidatorArkSchema, output };
|
|
30
|
+
export type { ArkSchema, ArklessReqRef, ArklessReqRefDefaults, Infer, ValidatorArk, ValidatorArkReqRef, ValidatorArkRouteBuilder, ValidatorArkSchema, output };
|
package/lib/validator.d.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
|
+
import { ValidatorArkSchema, ValidatorArkRouteBuilder } from './types.js';
|
|
1
2
|
import { KaapiPlugin } from '@kaapi/kaapi';
|
|
3
|
+
import 'arktype';
|
|
2
4
|
|
|
3
5
|
declare const supportedProps: readonly ["payload", "query", "params", "headers", "state"];
|
|
6
|
+
declare const withSchema: <V extends ValidatorArkSchema>(schema: V) => ValidatorArkRouteBuilder<V>;
|
|
4
7
|
declare const validatorArk: KaapiPlugin;
|
|
5
8
|
|
|
6
|
-
export { supportedProps, validatorArk };
|
|
9
|
+
export { supportedProps, validatorArk, withSchema };
|
package/lib/validator.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
2
|
supportedProps,
|
|
3
|
-
validatorArk
|
|
4
|
-
|
|
3
|
+
validatorArk,
|
|
4
|
+
withSchema
|
|
5
|
+
} from "./chunk-ZMRC2IOO.js";
|
|
5
6
|
import "./chunk-QLKH743P.js";
|
|
6
7
|
export {
|
|
7
8
|
supportedProps,
|
|
8
|
-
validatorArk
|
|
9
|
+
validatorArk,
|
|
10
|
+
withSchema
|
|
9
11
|
};
|
|
10
12
|
//# sourceMappingURL=validator.js.map
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kaapi/validator-arktype",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.40",
|
|
5
5
|
"private": false,
|
|
6
6
|
"description": "ArkType-powered request validation and documentation plugin for Kaapi.",
|
|
7
7
|
"main": "lib/index.js",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@novice1/api-doc-json-helper": "^1.0.8",
|
|
31
31
|
"arktype": "^2.1.29",
|
|
32
32
|
"tslib": "^2.8.1",
|
|
33
|
-
"@kaapi/kaapi": "^0.0.
|
|
33
|
+
"@kaapi/kaapi": "^0.0.40"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/mocha": "^10.0.10"
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../package.json","../src/validator.ts"],"sourcesContent":["{\n \"name\": \"@kaapi/validator-arktype\",\n \"type\": \"module\",\n \"version\": \"0.0.39\",\n \"private\": false,\n \"description\": \"ArkType-powered request validation and documentation plugin for Kaapi.\",\n \"main\": \"lib/index.js\",\n \"exports\": {\n \".\": {\n \"types\": \"./lib/index.d.ts\",\n \"default\": \"./lib/index.js\"\n }\n },\n \"scripts\": {\n \"build\": \"tsup src !src/**/*.d.ts --format esm --outDir lib --clean --metafile --dts --sourcemap && node ./scripts/buildDT.mjs\",\n \"check\": \"tsc --noEmit\",\n \"check:deps\": \"depcruise src --validate\",\n \"ci\": \"npm run verify\",\n \"coverage\": \"c8 node --loader ts-node/esm --experimental-specifier-resolution=node --no-warnings ../../node_modules/mocha/bin/mocha test/**/*.spec.ts\",\n \"format\": \"prettier --write ./\",\n \"format:check\": \"prettier --check ./\",\n \"lint\": \"eslint .\",\n \"test\": \"node --loader ts-node/esm --experimental-specifier-resolution=node --no-warnings ../../node_modules/mocha/bin/mocha test/**/*.spec.ts\",\n \"type-coverage\": \"type-coverage --at-least 90 --detail\",\n \"verify\": \"npm run lint && npm run format:check && npm run check && npm run check:deps && npm run type-coverage && npm run test:kaukau && npm run coverage\"\n },\n \"keywords\": [\n \"kaapi\",\n \"hapi\",\n \"arktype\",\n \"typescript\",\n \"validation\"\n ],\n \"author\": \"demingongo\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git+https://github.com/demingongo/kaapi.git\",\n \"directory\": \"packages/validator-arktype\"\n },\n \"license\": \"MIT\",\n \"dependencies\": {\n \"@hapi/boom\": \"^10.0.1\",\n \"@kaapi/kaapi\": \"workspace:^\",\n \"@novice1/api-doc-json-helper\": \"^1.0.8\",\n \"arktype\": \"^2.1.29\",\n \"tslib\": \"^2.8.1\"\n },\n \"devDependencies\": {\n \"@types/mocha\": \"^10.0.10\"\n },\n \"peerDependencies\": {\n \"arktype\": \"^2.1.25\"\n }\n}\n","import pkg from '../package.json' with { type: 'json' };\nimport { OpenAPIArkHelper, PostmanArkHelper } from './doc-helpers.js';\nimport type {\n ArklessReqRef,\n ArklessReqRefDefaults,\n ValidatorArk,\n ValidatorArkReqRef,\n ValidatorArkSchema,\n} from './types.js';\nimport Boom from '@hapi/boom';\nimport type {\n KaapiServerRoute,\n HandlerDecorations,\n Lifecycle,\n KaapiPlugin,\n Request,\n ResponseToolkit,\n RouteOptions,\n} from '@kaapi/kaapi';\nimport { type, type Type } from 'arktype';\n\nconst { parse = { payload: true, query: true, params: true, headers: true, state: true } } = {};\nexport const supportedProps = ['payload', 'query', 'params', 'headers', 'state'] as const;\nconst normalizeBooleans = (obj: Record<string, unknown>) => {\n for (const key in obj) {\n const val = obj[key];\n if (typeof val === 'string') {\n if (val === 'true') obj[key] = true;\n else if (val === 'false') obj[key] = false;\n } else if (Array.isArray(val)) {\n obj[key] = val.map((v) => (v === 'true' ? true : v === 'false' ? false : v));\n }\n }\n return obj;\n};\n\nfunction mergeOptions<V extends ValidatorArkSchema, R extends ArklessReqRef>(\n options: RouteOptions<ValidatorArkReqRef<V> & R>,\n schema: V\n) {\n // validator\n if (!options.plugins) {\n options.plugins = {};\n }\n options.plugins.ark = schema;\n\n // docs\n options.plugins.kaapi = options.plugins.kaapi || {};\n if (\n options.plugins.kaapi.docs != false && // docs not disabled\n !options.plugins.kaapi.docs?.disabled // docs not disabled\n ) {\n if (!options.plugins?.kaapi?.docs?.helperSchemaProperty)\n // docs have not helperSchemaProperty\n options.plugins.kaapi.docs = {\n ...options.plugins.kaapi.docs,\n helperSchemaProperty: 'ark',\n };\n if (!options.plugins?.kaapi?.docs?.openAPIHelperClass)\n // docs have not openAPIHelperClass\n options.plugins.kaapi.docs = {\n ...options.plugins.kaapi.docs,\n openAPIHelperClass: OpenAPIArkHelper,\n };\n }\n return options\n}\n\nexport const validatorArk: KaapiPlugin = {\n async integrate(t) {\n const validator: ValidatorArk = <V extends ValidatorArkSchema>(schema: V) => {\n return {\n route<R extends ArklessReqRef = ArklessReqRefDefaults>(\n serverRoute: KaapiServerRoute<ValidatorArkReqRef<V> & R>,\n handler?:\n | HandlerDecorations\n | Lifecycle.Method<ValidatorArkReqRef<V> & R, Lifecycle.ReturnValue<ValidatorArkReqRef<V> & R>>\n ) {\n if (!serverRoute.options) {\n serverRoute.options = {};\n }\n if (typeof serverRoute.options === 'object') {\n mergeOptions(serverRoute.options, schema)\n } else if (typeof serverRoute.options === 'function') {\n const fn = serverRoute.options.bind(serverRoute);\n serverRoute.options = (server) => {\n const options = fn(server)\n return mergeOptions(options, schema)\n }\n }\n t.route(serverRoute, handler);\n return t.server;\n },\n };\n };\n\n await t.server.register({\n name: 'kaapi-validator-arktype',\n version: pkg.version,\n register: async function (server) {\n server.ext('onPreHandler', async (request: Request, h: ResponseToolkit) => {\n const routeValidation = request?.route?.settings?.plugins?.ark as ValidatorArkSchema | undefined;\n try {\n // Initialize empty objects to hold the parsed data and corresponding ArkType schemas\n const data: Record<string, unknown> = {};\n const dataSchema: Record<string, Type> = {};\n\n // Loop through all supported properties for this route\n for (const prop of supportedProps) {\n // Check if validation exists for this property and there is a parser defined\n if (routeValidation?.[prop] && parse[prop]) {\n // Add the ArkType schema for this property to the dataSchema\n dataSchema[prop] = routeValidation[prop];\n // Prepare the value for parsing:\n // - For query params, normalize boolean strings to actual booleans\n // - Otherwise, take the raw value from the request object\n data[prop] = prop === 'query' ? normalizeBooleans(request[prop]) : request[prop];\n }\n }\n\n // Determine if there are any properties to validate\n let hasProps = false;\n for (const key in dataSchema) {\n // Safely check own properties to avoid inherited keys\n if (Object.prototype.hasOwnProperty.call(dataSchema, key)) {\n hasProps = true;\n break;\n }\n }\n\n // If we have any props to validate, parse them using ArkType\n if (hasProps) {\n // Create an ArkType object from the collected schema and parse\n const parsedProps = type(dataSchema)(data);\n if (parsedProps instanceof type.errors) {\n // throw ArkErrors\n throw parsedProps;\n }\n // Merge the parsed and validated properties back into the request object\n Object.assign(request, parsedProps);\n }\n\n // Continue the Hapi request lifecycle\n return h.continue;\n } catch (err) {\n // Initialize a set to track which paths (properties) failed validation\n const issuePaths = new Set<string>();\n let message: string;\n\n // Check if the error is instance of ValiError\n if (err instanceof type.errors && err.issues.length) {\n const firstIssue = err.issues[0];\n message = firstIssue.message;\n } else if (err instanceof Error) {\n // If itβs a regular Error, use its message\n message = err.message;\n } else {\n // Unknown error type\n message = 'Unknown error';\n }\n\n // Create a Boom badRequest response with the error message\n const response = Boom.badRequest(message);\n\n // Attach the raw validation error object for debugging/logging\n response.data = {\n validationError: err,\n };\n\n // Handle custom failAction if itβs a function\n if (typeof routeValidation?.failAction === 'function') {\n return routeValidation.failAction(request, h, response);\n }\n\n // If failAction is 'log', log the validation error with the request\n if (routeValidation?.failAction === 'log') {\n request.log(['validation', 'error', 'arktype', ...issuePaths], response);\n // Note: unlike Hapi's failAction 'log', 'log' here still returns a Boom response\n }\n\n // Return the error response to halt request processing\n return response;\n }\n });\n server.decorate('server', 'ark', validator);\n },\n });\n\n if (t.openapi) {\n t.openapi.addHelperClass(OpenAPIArkHelper);\n }\n if (t.postman) {\n t.postman.addHelperClass(PostmanArkHelper);\n }\n },\n};\n"],"mappings":";;;;;;AAAA;AAAA,EACE,MAAQ;AAAA,EACR,MAAQ;AAAA,EACR,SAAW;AAAA,EACX,SAAW;AAAA,EACX,aAAe;AAAA,EACf,MAAQ;AAAA,EACR,SAAW;AAAA,IACT,KAAK;AAAA,MACH,OAAS;AAAA,MACT,SAAW;AAAA,IACb;AAAA,EACF;AAAA,EACA,SAAW;AAAA,IACT,OAAS;AAAA,IACT,OAAS;AAAA,IACT,cAAc;AAAA,IACd,IAAM;AAAA,IACN,UAAY;AAAA,IACZ,QAAU;AAAA,IACV,gBAAgB;AAAA,IAChB,MAAQ;AAAA,IACR,MAAQ;AAAA,IACR,iBAAiB;AAAA,IACjB,QAAU;AAAA,EACZ;AAAA,EACA,UAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,QAAU;AAAA,EACV,YAAc;AAAA,IACZ,MAAQ;AAAA,IACR,KAAO;AAAA,IACP,WAAa;AAAA,EACf;AAAA,EACA,SAAW;AAAA,EACX,cAAgB;AAAA,IACd,cAAc;AAAA,IACd,gBAAgB;AAAA,IAChB,gCAAgC;AAAA,IAChC,SAAW;AAAA,IACX,OAAS;AAAA,EACX;AAAA,EACA,iBAAmB;AAAA,IACjB,gBAAgB;AAAA,EAClB;AAAA,EACA,kBAAoB;AAAA,IAClB,SAAW;AAAA,EACb;AACF;;;AC5CA,OAAO,UAAU;AAUjB,SAAS,YAAuB;AAEhC,IAAM,EAAE,QAAQ,EAAE,SAAS,MAAM,OAAO,MAAM,QAAQ,MAAM,SAAS,MAAM,OAAO,KAAK,EAAE,IAAI,CAAC;AACvF,IAAM,iBAAiB,CAAC,WAAW,SAAS,UAAU,WAAW,OAAO;AAC/E,IAAM,oBAAoB,CAAC,QAAiC;AACxD,aAAW,OAAO,KAAK;AACnB,UAAM,MAAM,IAAI,GAAG;AACnB,QAAI,OAAO,QAAQ,UAAU;AACzB,UAAI,QAAQ,OAAQ,KAAI,GAAG,IAAI;AAAA,eACtB,QAAQ,QAAS,KAAI,GAAG,IAAI;AAAA,IACzC,WAAW,MAAM,QAAQ,GAAG,GAAG;AAC3B,UAAI,GAAG,IAAI,IAAI,IAAI,CAAC,MAAO,MAAM,SAAS,OAAO,MAAM,UAAU,QAAQ,CAAE;AAAA,IAC/E;AAAA,EACJ;AACA,SAAO;AACX;AAEA,SAAS,aACL,SACA,QACF;AAEE,MAAI,CAAC,QAAQ,SAAS;AAClB,YAAQ,UAAU,CAAC;AAAA,EACvB;AACA,UAAQ,QAAQ,MAAM;AAGtB,UAAQ,QAAQ,QAAQ,QAAQ,QAAQ,SAAS,CAAC;AAClD,MACI,QAAQ,QAAQ,MAAM,QAAQ;AAAA,EAC9B,CAAC,QAAQ,QAAQ,MAAM,MAAM,UAC/B;AACE,QAAI,CAAC,QAAQ,SAAS,OAAO,MAAM;AAE/B,cAAQ,QAAQ,MAAM,OAAO;AAAA,QACzB,GAAG,QAAQ,QAAQ,MAAM;AAAA,QACzB,sBAAsB;AAAA,MAC1B;AACJ,QAAI,CAAC,QAAQ,SAAS,OAAO,MAAM;AAE/B,cAAQ,QAAQ,MAAM,OAAO;AAAA,QACzB,GAAG,QAAQ,QAAQ,MAAM;AAAA,QACzB,oBAAoB;AAAA,MACxB;AAAA,EACR;AACA,SAAO;AACX;AAEO,IAAM,eAA4B;AAAA,EACrC,MAAM,UAAU,GAAG;AACf,UAAM,YAA0B,CAA+B,WAAc;AACzE,aAAO;AAAA,QACH,MACI,aACA,SAGF;AACE,cAAI,CAAC,YAAY,SAAS;AACtB,wBAAY,UAAU,CAAC;AAAA,UAC3B;AACA,cAAI,OAAO,YAAY,YAAY,UAAU;AACzC,yBAAa,YAAY,SAAS,MAAM;AAAA,UAC5C,WAAW,OAAO,YAAY,YAAY,YAAY;AAClD,kBAAM,KAAK,YAAY,QAAQ,KAAK,WAAW;AAC/C,wBAAY,UAAU,CAAC,WAAW;AAC9B,oBAAM,UAAU,GAAG,MAAM;AACzB,qBAAO,aAAa,SAAS,MAAM;AAAA,YACvC;AAAA,UACJ;AACA,YAAE,MAAM,aAAa,OAAO;AAC5B,iBAAO,EAAE;AAAA,QACb;AAAA,MACJ;AAAA,IACJ;AAEA,UAAM,EAAE,OAAO,SAAS;AAAA,MACpB,MAAM;AAAA,MACN,SAAS,gBAAI;AAAA,MACb,UAAU,eAAgB,QAAQ;AAC9B,eAAO,IAAI,gBAAgB,OAAO,SAAkB,MAAuB;AACvE,gBAAM,kBAAkB,SAAS,OAAO,UAAU,SAAS;AAC3D,cAAI;AAEA,kBAAM,OAAgC,CAAC;AACvC,kBAAM,aAAmC,CAAC;AAG1C,uBAAW,QAAQ,gBAAgB;AAE/B,kBAAI,kBAAkB,IAAI,KAAK,MAAM,IAAI,GAAG;AAExC,2BAAW,IAAI,IAAI,gBAAgB,IAAI;AAIvC,qBAAK,IAAI,IAAI,SAAS,UAAU,kBAAkB,QAAQ,IAAI,CAAC,IAAI,QAAQ,IAAI;AAAA,cACnF;AAAA,YACJ;AAGA,gBAAI,WAAW;AACf,uBAAW,OAAO,YAAY;AAE1B,kBAAI,OAAO,UAAU,eAAe,KAAK,YAAY,GAAG,GAAG;AACvD,2BAAW;AACX;AAAA,cACJ;AAAA,YACJ;AAGA,gBAAI,UAAU;AAEV,oBAAM,cAAc,KAAK,UAAU,EAAE,IAAI;AACzC,kBAAI,uBAAuB,KAAK,QAAQ;AAEpC,sBAAM;AAAA,cACV;AAEA,qBAAO,OAAO,SAAS,WAAW;AAAA,YACtC;AAGA,mBAAO,EAAE;AAAA,UACb,SAAS,KAAK;AAEV,kBAAM,aAAa,oBAAI,IAAY;AACnC,gBAAI;AAGJ,gBAAI,eAAe,KAAK,UAAU,IAAI,OAAO,QAAQ;AACjD,oBAAM,aAAa,IAAI,OAAO,CAAC;AAC/B,wBAAU,WAAW;AAAA,YACzB,WAAW,eAAe,OAAO;AAE7B,wBAAU,IAAI;AAAA,YAClB,OAAO;AAEH,wBAAU;AAAA,YACd;AAGA,kBAAM,WAAW,KAAK,WAAW,OAAO;AAGxC,qBAAS,OAAO;AAAA,cACZ,iBAAiB;AAAA,YACrB;AAGA,gBAAI,OAAO,iBAAiB,eAAe,YAAY;AACnD,qBAAO,gBAAgB,WAAW,SAAS,GAAG,QAAQ;AAAA,YAC1D;AAGA,gBAAI,iBAAiB,eAAe,OAAO;AACvC,sBAAQ,IAAI,CAAC,cAAc,SAAS,WAAW,GAAG,UAAU,GAAG,QAAQ;AAAA,YAE3E;AAGA,mBAAO;AAAA,UACX;AAAA,QACJ,CAAC;AACD,eAAO,SAAS,UAAU,OAAO,SAAS;AAAA,MAC9C;AAAA,IACJ,CAAC;AAED,QAAI,EAAE,SAAS;AACX,QAAE,QAAQ,eAAe,gBAAgB;AAAA,IAC7C;AACA,QAAI,EAAE,SAAS;AACX,QAAE,QAAQ,eAAe,gBAAgB;AAAA,IAC7C;AAAA,EACJ;AACJ;","names":[]}
|