@kaapi/validator-arktype 0.0.32 → 0.0.34

package/lib/{chunk-ML2GHWVG.js → chunk-QLKH743P.js}

@@ -1,6 +1,50 @@
 // src/doc-helpers.ts
 import { OpenAPIJsonHelper, PostmanJsonHelper } from "@novice1/api-doc-json-helper";
 import { type, Type } from "arktype";
+function reformatAnyOf(schema) {
+  if ("anyOf" in schema) {
+    const propertiesToCheck = [];
+    if (!schema.description) {
+      propertiesToCheck.push("description");
+    }
+    if (!schema.examples) {
+      propertiesToCheck.push("examples");
+    }
+    if (!schema.format) {
+      propertiesToCheck.push("format");
+    }
+    const objects = schema.anyOf;
+    for (const prop of propertiesToCheck) {
+      const firstElement = objects[0];
+      if (firstElement && typeof firstElement === "object") {
+        const firstValue = firstElement[prop];
+        const arraysEqual = (a, b) => {
+          if (!Array.isArray(a) || !Array.isArray(b)) return false;
+          if (a.length !== b.length) return false;
+          const sortedA = [...a].sort();
+          const sortedB = [...b].sort();
+          return sortedA.every((val, i) => val === sortedB[i]);
+        };
+        const allSame = objects.every((obj) => {
+          const val = obj[prop];
+          if (Array.isArray(firstValue) && Array.isArray(val)) {
+            return arraysEqual(firstValue, val);
+          }
+          return val === firstValue;
+        });
+        if (allSame) {
+          if (prop === "description" && typeof firstValue === "string") {
+            schema.description = firstValue;
+          } else if (prop === "examples" && Array.isArray(firstValue)) {
+            schema.examples = firstValue;
+          } else if (prop === "format" && typeof firstValue === "string") {
+            schema.format = firstValue;
+          }
+        }
+      }
+    }
+  }
+}
 function transformValue(value) {
   let r = value;
   if (value && typeof value === "function" && "toJsonSchema" in value && typeof value.toJsonSchema === "function") {
@@ -30,6 +74,21 @@ function transformValue(value) {
             }
           }
         }
+        if ("properties" in r2) {
+          const r22 = value.toJSON();
+          if ("in" in r22 && r22.in && typeof r22.in === "object" && "optional" in r22.in) {
+            if (Array.isArray(r22.in.optional)) {
+              for (const prop of r22.in.optional) {
+                if (typeof prop === "object" && prop && "key" in prop && typeof prop.key === "string" && typeof r2.properties[prop.key].default === "undefined" && "default" in prop && typeof prop.default !== "undefined") {
+                  r2.properties[prop.key].default = prop.default;
+                }
+              }
+            }
+          }
+          for (const prop in r2.properties) {
+            reformatAnyOf(r2.properties[prop]);
+          }
+        }
         return r2;
       }
     });
@@ -89,7 +148,7 @@ var OpenAPIArkHelper = class _OpenAPIArkHelper extends OpenAPIJsonHelper {
     let r = super.isRequired();
     if (!r && this._originalSchema) {
       const schema = this._schema;
-      if ("required" in schema && Array.isArray(schema.required) && "properties" in schema && typeof schema.properties === "object" && schema.properties && schema.required.length === Object.keys(schema.properties).length) {
+      if ("required" in schema && Array.isArray(schema.required) && "properties" in schema && typeof schema.properties === "object" && schema.properties && schema.required.length <= Object.keys(schema.properties).length) {
         r = true;
       }
     }
@@ -135,10 +194,23 @@ var OpenAPIArkHelper = class _OpenAPIArkHelper extends OpenAPIJsonHelper {
 var PostmanArkHelper = class _PostmanArkHelper extends PostmanJsonHelper {
   constructor(params, isRequired) {
     super({ ...params, value: transformValue(params.value) }, isRequired);
+    if (params.value instanceof Type) {
+      this._originalSchema = params.value;
+    }
   }
   isValid() {
     return !!(this._schema && typeof this._schema === "object" && !("~standard" in this._schema) && ("type" in this._schema && typeof this._schema.type === "string" || "oneOf" in this._schema && Array.isArray(this._schema.oneOf) || "anyOf" in this._schema && Array.isArray(this._schema.anyOf) || "enum" in this._schema && Array.isArray(this._schema.enum)));
   }
+  isRequired() {
+    let r = super.isRequired();
+    if (!r && this._originalSchema) {
+      const schema = this._schema;
+      if ("required" in schema && Array.isArray(schema.required) && "properties" in schema && typeof schema.properties === "object" && schema.properties && schema.required.length <= Object.keys(schema.properties).length) {
+        r = true;
+      }
+    }
+    return r;
+  }
   getFirstItem() {
     const schema = this._schema;
     if ("items" in schema && typeof schema.items === "object") {
@@ -174,4 +246,4 @@ export {
   OpenAPIArkHelper,
   PostmanArkHelper
 };
-//# sourceMappingURL=chunk-ML2GHWVG.js.map
+//# sourceMappingURL=chunk-QLKH743P.js.map

package/lib/chunk-QLKH743P.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/doc-helpers.ts"],"sourcesContent":["import type { KaapiOpenAPIHelperInterface } from '@kaapi/kaapi';\nimport { OpenAPIJsonHelper, PostmanJsonHelper } from '@novice1/api-doc-json-helper';\nimport { type, Type, type JsonSchema } from 'arktype';\n\n/**\n * reformat anyOf to externalize common values for: \n * - examples\n * - format\n * - description\n */\nfunction reformatAnyOf(schema: JsonSchema) {\n    if ('anyOf' in schema) {\n        const propertiesToCheck: ('description' | 'examples' | 'format')[] = [];\n        if (!schema.description) {\n            propertiesToCheck.push('description')\n        }\n        if (!schema.examples) {\n            propertiesToCheck.push('examples')\n        }\n        if (!schema.format) {\n            propertiesToCheck.push('format')\n        }\n        const objects = schema.anyOf;\n        for (const prop of propertiesToCheck) {\n            // Get the value from the first object\n            const firstElement = objects[0]\n            if (firstElement && typeof firstElement === 'object') {\n                const firstValue = firstElement[prop];\n\n                // Helper to compare arrays ignoring order\n                const arraysEqual = (a: unknown, b: unknown) => {\n                    if (!Array.isArray(a) || !Array.isArray(b)) return false;\n                    if (a.length !== b.length) return false;\n                    const sortedA = [...a].sort();\n                    const sortedB = [...b].sort();\n                    return sortedA.every((val, i) => val === sortedB[i]);\n                };\n\n                // Check all objects\n                const allSame = objects.every(obj => {\n                    const val = obj[prop];\n                    if (Array.isArray(firstValue) && Array.isArray(val)) {\n                        return arraysEqual(firstValue, val);\n                    }\n                    return val === firstValue;\n                });\n\n                if (allSame) {\n                    if (prop === 'description' && typeof firstValue === 'string') {\n                        schema.description = firstValue;\n                    } else if (prop === 'examples' && Array.isArray(firstValue)) {\n                        schema.examples = firstValue;\n                    } else if (prop === 'format' && typeof firstValue === 'string') {\n                        schema.format = firstValue;\n                    }\n                }\n            }\n        }\n    }\n}\n\nfunction transformValue(value?: Type | object | unknown) {\n    let r: unknown = value;\n    if (value && typeof value === 'function' && 'toJsonSchema' in value && typeof value.toJsonSchema === 'function') {\n        r = (value as Type).toJsonSchema({\n            fallback: (v) => {\n                let r: JsonSchema & { _instanceof?: string } = {};\n                let _instanceof = '';\n                if (v && 'proto' in v && v.proto && typeof v.proto === 'function' && 'name' in v.proto) {\n                    r.type = 'object';\n                    r._instanceof = `${v.proto.name}`;\n                    _instanceof = `${v.proto.name}`;\n                }\n                if (v.base) {\n                    r = { ...r, ...v.base };\n                    if ('out' in v && v.out) {\n                        if ('anyOf' in r && 'type' in v.out) {\n                            const description = r.anyOf[0]?.description;\n                            r = { ...v.out };\n                            if (description) {\n                                r.description = description;\n                            }\n                            if (_instanceof) {\n                                r._instanceof = _instanceof;\n                            }\n                        } else {\n                            r = { ...r, ...v.out };\n                        }\n                    }\n                }\n\n                if ('properties' in r) {\n                    // because default values are not always in the schema (arktype bug)\n                    const r2 = (value as Type).toJSON()\n                    if ('in' in r2 &&\n                        r2.in &&\n                        typeof r2.in === 'object' &&\n                        'optional' in r2.in) {\n                        if (Array.isArray(r2.in.optional)) {\n                            for (const prop of r2.in.optional) {\n                                if (typeof prop === 'object' &&\n                                    prop &&\n                                    'key' in prop &&\n                                    typeof prop.key === 'string' &&\n                                    typeof r.properties[prop.key].default === 'undefined' &&\n                                    'default' in prop &&\n                                    typeof prop.default !== 'undefined'\n                                ) {\n                                    r.properties[prop.key].default = prop.default\n                                }\n                            }\n                        }\n                    }\n\n                    // reformat anyOf schemas\n                    for (const prop in r.properties) {\n                        reformatAnyOf(r.properties[prop])\n                    }\n                }\n                return r;\n            },\n        });\n    }\n\n    return r;\n}\n\nexport class OpenAPIArkHelper extends OpenAPIJsonHelper implements KaapiOpenAPIHelperInterface {\n    protected _originalSchema?: Type\n    constructor(\n        params: {\n            value?: Type | object | unknown;\n            isRoot?: boolean;\n        },\n        isRequired?: boolean\n    ) {\n        super({ ...params, value: transformValue(params.value) }, isRequired);\n        if (params.value instanceof Type) {\n            this._originalSchema = params.value\n        }\n    }\n    isValid(): boolean {\n        return !!(\n            this._schema &&\n            typeof this._schema === 'object' &&\n            !('~standard' in this._schema) &&\n            (('type' in this._schema && typeof this._schema.type === 'string') ||\n                ('oneOf' in this._schema && Array.isArray(this._schema.oneOf)) ||\n                ('anyOf' in this._schema && Array.isArray(this._schema.anyOf)) ||\n                ('enum' in this._schema && Array.isArray(this._schema.enum)))\n        );\n    }\n    getFirstItem(): OpenAPIArkHelper | undefined {\n        const schema = this._schema;\n\n        if ('items' in schema && typeof schema.items === 'object') {\n            return new OpenAPIArkHelper({ value: schema.items });\n        }\n\n        return;\n    }\n    getChildren(): Record<string, OpenAPIArkHelper> {\n        const r: Record<string, OpenAPIArkHelper> = {};\n        const schema = this._schema;\n        if ('properties' in schema && typeof schema.properties === 'object' && schema.properties) {\n            const properties: Record<string, unknown> = schema.properties as Record<string, unknown>;\n            for (const p in properties) {\n                const isRequired: boolean =\n                    'required' in schema && Array.isArray(schema.required) && schema.required.includes(p);\n                r[p] = new OpenAPIArkHelper({ value: properties[p] }, isRequired);\n            }\n        }\n        return r;\n    }\n    getAlternatives(): OpenAPIArkHelper[] {\n        const r: OpenAPIArkHelper[] = [];\n        const schema = this._schema;\n        if ('oneOf' in schema && Array.isArray(schema.oneOf)) {\n            for (const p of schema.oneOf) {\n                r.push(new OpenAPIArkHelper({ value: p }));\n            }\n        }\n        return r;\n    }\n    isFile(): boolean | undefined {\n        if (!this.isValid()) return false;\n        let r: boolean = false;\n        const schema = this._schema;\n        if ('properties' in schema && typeof schema.properties === 'object' && schema.properties) {\n            const properties: Record<string, unknown> = schema.properties as Record<string, unknown>;\n            r = !!(\n                '_data' in properties &&\n                properties._data &&\n                typeof properties._data === 'object' &&\n                '_instanceof' in properties._data &&\n                properties._data._instanceof === 'Buffer'\n            );\n        }\n        return r;\n    }\n    isRequired(): boolean {\n        let r = super.isRequired()\n        if (!r && this._originalSchema) {\n            const schema = this._schema;\n            // if there is at least one required property\n            if ('required' in schema &&\n                Array.isArray(schema.required) &&\n                'properties' in schema &&\n                typeof schema.properties === 'object' &&\n                schema.properties &&\n                schema.required.length <= Object.keys(schema.properties).length\n            ) {\n                r = true\n            }\n        }\n        return r;\n    }\n    getFilesChildren(): Record<string, unknown> {\n        const r: Record<string, unknown> = {};\n        const schema = this._schema;\n        if ('properties' in schema && typeof schema.properties === 'object' && schema.properties) {\n            const properties: Record<string, unknown> = schema.properties as Record<string, unknown>;\n            if (this._originalSchema) {\n                const betterR: Record<string, Type> = {}\n                for (const p in properties) {\n                    const isRequired: boolean =\n                        'required' in schema && Array.isArray(schema.required) && schema.required.includes(p);\n                    const ch = new OpenAPIArkHelper({ value: properties[p] }, isRequired);\n                    if (ch.isFile()) {\n                        const propOriginalSchema = (this._originalSchema as Type<Record<string, unknown>>)?.props?.find(v => v.key === p)\n                        if (propOriginalSchema) {\n                            let key = p;\n                            if (!isRequired) {\n                                key = `${p}?` // set it as optional\n                            }\n                            betterR[key] = propOriginalSchema.value\n                        }\n                    }\n                }\n                if (Object.keys(betterR).length) {\n                    return type<unknown, Type<typeof betterR>>(betterR) as unknown as Record<string, unknown>\n                }\n            } else {\n                for (const p in properties) {\n                    const isRequired: boolean =\n                        'required' in schema && Array.isArray(schema.required) && schema.required.includes(p);\n                    const ch = new OpenAPIArkHelper({ value: properties[p] }, isRequired);\n                    if (ch.isFile()) {\n                        r[p] = properties[p];\n                    }\n                }\n            }\n        }\n        return r;\n    }\n}\n\nexport class PostmanArkHelper extends PostmanJsonHelper {\n    protected _originalSchema?: Type\n    constructor(\n        params: {\n            value?: Type | object | unknown;\n            isRoot?: boolean;\n        },\n        isRequired?: boolean\n    ) {\n        super({ ...params, value: transformValue(params.value) }, isRequired);\n        if (params.value instanceof Type) {\n            this._originalSchema = params.value\n        }\n    }\n    isValid(): boolean {\n        return !!(\n            this._schema &&\n            typeof this._schema === 'object' &&\n            !('~standard' in this._schema) &&\n            (('type' in this._schema && typeof this._schema.type === 'string') ||\n                ('oneOf' in this._schema && Array.isArray(this._schema.oneOf)) ||\n                ('anyOf' in this._schema && Array.isArray(this._schema.anyOf)) ||\n                ('enum' in this._schema && Array.isArray(this._schema.enum)))\n        );\n    }\n    isRequired(): boolean {\n        let r = super.isRequired()\n        if (!r && this._originalSchema) {\n            const schema = this._schema;\n            // if there is at least one required property\n            if ('required' in schema &&\n                Array.isArray(schema.required) &&\n                'properties' in schema &&\n                typeof schema.properties === 'object' &&\n                schema.properties &&\n                schema.required.length <= Object.keys(schema.properties).length\n            ) {\n                r = true\n            }\n        }\n        return r;\n    }\n    getFirstItem(): PostmanArkHelper | undefined {\n        const schema = this._schema;\n\n        if ('items' in schema && typeof schema.items === 'object') {\n            return new PostmanArkHelper({ value: schema.items });\n        }\n\n        return;\n    }\n    getChildren(): Record<string, PostmanArkHelper> {\n        const r: Record<string, PostmanArkHelper> = {};\n        const schema = this._schema;\n        if ('properties' in schema && typeof schema.properties === 'object' && schema.properties) {\n            const properties: Record<string, unknown> = schema.properties as Record<string, unknown>;\n            for (const p in properties) {\n                const isRequired: boolean =\n                    'required' in schema && Array.isArray(schema.required) && schema.required.includes(p);\n                r[p] = new PostmanArkHelper({ value: properties[p] }, isRequired);\n            }\n        }\n        return r;\n    }\n    getAlternatives(): PostmanArkHelper[] {\n        const r: PostmanArkHelper[] = [];\n        const schema = this._schema;\n        if ('oneOf' in schema && Array.isArray(schema.oneOf)) {\n            for (const p of schema.oneOf) {\n                r.push(new PostmanArkHelper({ value: p }));\n            }\n        }\n        return r;\n    }\n}\n"],"mappings":"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","names":["r","r2"]}

package/lib/{chunk-4FGTS4GA.js → chunk-U7WK3Q5P.js}

@@ -1,13 +1,13 @@
 import {
   OpenAPIArkHelper,
   PostmanArkHelper
-} from "./chunk-ML2GHWVG.js";
+} from "./chunk-QLKH743P.js";
 
 // package.json
 var package_default = {
   name: "@kaapi/validator-arktype",
   type: "module",
-  version: "0.0.32",
+  version: "0.0.34",
   private: false,
   description: "ArkType-powered request validation and documentation plugin for Kaapi.",
   main: "lib/index.js",
@@ -47,7 +47,7 @@ var package_default = {
   dependencies: {
     "@hapi/boom": "^10.0.1",
     "@kaapi/kaapi": "workspace:^",
-    "@novice1/api-doc-json-helper": "^1.0.6",
+    "@novice1/api-doc-json-helper": "^1.0.8",
     arktype: "^2.1.25",
     tslib: "^2.8.1"
   },
@@ -189,4 +189,4 @@ export {
   supportedProps,
   validatorArk
 };
-//# sourceMappingURL=chunk-4FGTS4GA.js.map
+//# sourceMappingURL=chunk-U7WK3Q5P.js.map

package/lib/chunk-U7WK3Q5P.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../package.json","../src/validator.ts"],"sourcesContent":["{\n  \"name\": \"@kaapi/validator-arktype\",\n  \"type\": \"module\",\n  \"version\": \"0.0.34\",\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.25\",\n    \"tslib\": \"^2.8.1\"\n  },\n  \"devDependencies\": {\n    \"@types/mocha\": \"^10.0.10\"\n  },\n  \"peerDependencies\": {\n    \"arktype\": \"^2.1.25\"\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":"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","names":[]}

package/lib/doc-helpers.d.ts

@@ -17,11 +17,13 @@ declare class OpenAPIArkHelper extends OpenAPIJsonHelper implements KaapiOpenAPI
     getFilesChildren(): Record<string, unknown>;
 }
 declare class PostmanArkHelper extends PostmanJsonHelper {
+    protected _originalSchema?: Type;
     constructor(params: {
         value?: Type | object | unknown;
         isRoot?: boolean;
     }, isRequired?: boolean);
     isValid(): boolean;
+    isRequired(): boolean;
     getFirstItem(): PostmanArkHelper | undefined;
     getChildren(): Record<string, PostmanArkHelper>;
     getAlternatives(): PostmanArkHelper[];

package/lib/doc-helpers.js

@@ -1,7 +1,7 @@
 import {
   OpenAPIArkHelper,
   PostmanArkHelper
-} from "./chunk-ML2GHWVG.js";
+} from "./chunk-QLKH743P.js";
 export {
   OpenAPIArkHelper,
   PostmanArkHelper

package/lib/index.js

@@ -2,11 +2,11 @@ import "./chunk-55J6XMHW.js";
 import {
   supportedProps,
   validatorArk
-} from "./chunk-4FGTS4GA.js";
+} from "./chunk-U7WK3Q5P.js";
 import {
   OpenAPIArkHelper,
   PostmanArkHelper
-} from "./chunk-ML2GHWVG.js";
+} from "./chunk-QLKH743P.js";
 export {
   OpenAPIArkHelper,
   PostmanArkHelper,

package/lib/metafile-esm.json

@@ -1 +1 @@
-{"inputs":{"src/doc-helpers.ts":{"bytes":9157,"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":1833,"imports":[],"format":"esm"},"package.json":{"bytes":1797,"imports":[],"format":"esm","with":{"type":"json"}},"src/validator.ts":{"bytes":8672,"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-ML2GHWVG.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-4FGTS4GA.js","kind":"import-statement"},{"path":"lib/chunk-ML2GHWVG.js","kind":"import-statement"}],"exports":["OpenAPIArkHelper","PostmanArkHelper","supportedProps","validatorArk"],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":0}},"bytes":265},"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-4FGTS4GA.js","kind":"import-statement"},{"path":"lib/chunk-ML2GHWVG.js","kind":"import-statement"}],"exports":["supportedProps","validatorArk"],"entryPoint":"src/validator.ts","inputs":{},"bytes":147},"lib/chunk-4FGTS4GA.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":14610},"lib/chunk-4FGTS4GA.js":{"imports":[{"path":"lib/chunk-ML2GHWVG.js","kind":"import-statement"},{"path":"@hapi/boom","kind":"import-statement","external":true},{"path":"arktype","kind":"import-statement","external":true}],"exports":["supportedProps","validatorArk"],"inputs":{"package.json":{"bytesInOutput":1758},"src/validator.ts":{"bytesInOutput":4350}},"bytes":6270},"lib/chunk-ML2GHWVG.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":14190},"lib/chunk-ML2GHWVG.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":6443}},"bytes":6517}}}
+{"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":1833,"imports":[],"format":"esm"},"package.json":{"bytes":1796,"imports":[],"format":"esm","with":{"type":"json"}},"src/validator.ts":{"bytes":8672,"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-U7WK3Q5P.js","kind":"import-statement"},{"path":"lib/chunk-QLKH743P.js","kind":"import-statement"}],"exports":["OpenAPIArkHelper","PostmanArkHelper","supportedProps","validatorArk"],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":0}},"bytes":265},"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-U7WK3Q5P.js","kind":"import-statement"},{"path":"lib/chunk-QLKH743P.js","kind":"import-statement"}],"exports":["supportedProps","validatorArk"],"entryPoint":"src/validator.ts","inputs":{},"bytes":147},"lib/chunk-U7WK3Q5P.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":14608},"lib/chunk-U7WK3Q5P.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"],"inputs":{"package.json":{"bytesInOutput":1758},"src/validator.ts":{"bytesInOutput":4350}},"bytes":6270},"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/validator.js

@@ -1,8 +1,8 @@
 import {
   supportedProps,
   validatorArk
-} from "./chunk-4FGTS4GA.js";
-import "./chunk-ML2GHWVG.js";
+} from "./chunk-U7WK3Q5P.js";
+import "./chunk-QLKH743P.js";
 export {
   supportedProps,
   validatorArk

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaapi/validator-arktype",
   "type": "module",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "private": false,
   "description": "ArkType-powered request validation and documentation plugin for Kaapi.",
   "main": "lib/index.js",
@@ -27,10 +27,10 @@
   "license": "MIT",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
-    "@novice1/api-doc-json-helper": "^1.0.6",
+    "@novice1/api-doc-json-helper": "^1.0.8",
     "arktype": "^2.1.25",
     "tslib": "^2.8.1",
-    "@kaapi/kaapi": "^0.0.32"
+    "@kaapi/kaapi": "^0.0.34"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.10"

package/coverage/lcov-report/base.css

@@ -1,224 +0,0 @@
-body, html {
-  margin:0; padding: 0;
-  height: 100%;
-}
-body {
-    font-family: Helvetica Neue, Helvetica, Arial;
-    font-size: 14px;
-    color:#333;
-}
-.small { font-size: 12px; }
-*, *:after, *:before {
-  -webkit-box-sizing:border-box;
-     -moz-box-sizing:border-box;
-          box-sizing:border-box;
-  }
-h1 { font-size: 20px; margin: 0;}
-h2 { font-size: 14px; }
-pre {
-    font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    margin: 0;
-    padding: 0;
-    -moz-tab-size: 2;
-    -o-tab-size:  2;
-    tab-size: 2;
-}
-a { color:#0074D9; text-decoration:none; }
-a:hover { text-decoration:underline; }
-.strong { font-weight: bold; }
-.space-top1 { padding: 10px 0 0 0; }
-.pad2y { padding: 20px 0; }
-.pad1y { padding: 10px 0; }
-.pad2x { padding: 0 20px; }
-.pad2 { padding: 20px; }
-.pad1 { padding: 10px; }
-.space-left2 { padding-left:55px; }
-.space-right2 { padding-right:20px; }
-.center { text-align:center; }
-.clearfix { display:block; }
-.clearfix:after {
-  content:'';
-  display:block;
-  height:0;
-  clear:both;
-  visibility:hidden;
-  }
-.fl { float: left; }
-@media only screen and (max-width:640px) {
-  .col3 { width:100%; max-width:100%; }
-  .hide-mobile { display:none!important; }
-}
-
-.quiet {
-  color: #7f7f7f;
-  color: rgba(0,0,0,0.5);
-}
-.quiet a { opacity: 0.7; }
-
-.fraction {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-  font-size: 10px;
-  color: #555;
-  background: #E8E8E8;
-  padding: 4px 5px;
-  border-radius: 3px;
-  vertical-align: middle;
-}
-
-div.path a:link, div.path a:visited { color: #333; }
-table.coverage {
-  border-collapse: collapse;
-  margin: 10px 0 0 0;
-  padding: 0;
-}
-
-table.coverage td {
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-}
-table.coverage td.line-count {
-    text-align: right;
-    padding: 0 5px 0 20px;
-}
-table.coverage td.line-coverage {
-    text-align: right;
-    padding-right: 10px;
-    min-width:20px;
-}
-
-table.coverage td span.cline-any {
-    display: inline-block;
-    padding: 0 5px;
-    width: 100%;
-}
-.missing-if-branch {
-    display: inline-block;
-    margin-right: 5px;
-    border-radius: 3px;
-    position: relative;
-    padding: 0 4px;
-    background: #333;
-    color: yellow;
-}
-
-.skip-if-branch {
-    display: none;
-    margin-right: 10px;
-    position: relative;
-    padding: 0 4px;
-    background: #ccc;
-    color: white;
-}
-.missing-if-branch .typ, .skip-if-branch .typ {
-    color: inherit !important;
-}
-.coverage-summary {
-  border-collapse: collapse;
-  width: 100%;
-}
-.coverage-summary tr { border-bottom: 1px solid #bbb; }
-.keyline-all { border: 1px solid #ddd; }
-.coverage-summary td, .coverage-summary th { padding: 10px; }
-.coverage-summary tbody { border: 1px solid #bbb; }
-.coverage-summary td { border-right: 1px solid #bbb; }
-.coverage-summary td:last-child { border-right: none; }
-.coverage-summary th {
-  text-align: left;
-  font-weight: normal;
-  white-space: nowrap;
-}
-.coverage-summary th.file { border-right: none !important; }
-.coverage-summary th.pct { }
-.coverage-summary th.pic,
-.coverage-summary th.abs,
-.coverage-summary td.pct,
-.coverage-summary td.abs { text-align: right; }
-.coverage-summary td.file { white-space: nowrap;  }
-.coverage-summary td.pic { min-width: 120px !important;  }
-.coverage-summary tfoot td { }
-
-.coverage-summary .sorter {
-    height: 10px;
-    width: 7px;
-    display: inline-block;
-    margin-left: 0.5em;
-    background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
-}
-.coverage-summary .sorted .sorter {
-    background-position: 0 -20px;
-}
-.coverage-summary .sorted-desc .sorter {
-    background-position: 0 -10px;
-}
-.status-line {  height: 10px; }
-/* yellow */
-.cbranch-no { background: yellow !important; color: #111; }
-/* dark red */
-.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
-.low .chart { border:1px solid #C21F39 }
-.highlighted,
-.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{
-  background: #C21F39 !important;
-}
-/* medium red */
-.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
-/* light red */
-.low, .cline-no { background:#FCE1E5 }
-/* light green */
-.high, .cline-yes { background:rgb(230,245,208) }
-/* medium green */
-.cstat-yes { background:rgb(161,215,106) }
-/* dark green */
-.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
-.high .chart { border:1px solid rgb(77,146,33) }
-/* dark yellow (gold) */
-.status-line.medium, .medium .cover-fill { background: #f9cd0b; }
-.medium .chart { border:1px solid #f9cd0b; }
-/* light yellow */
-.medium { background: #fff4c2; }
-
-.cstat-skip { background: #ddd; color: #111; }
-.fstat-skip { background: #ddd; color: #111 !important; }
-.cbranch-skip { background: #ddd !important; color: #111; }
-
-span.cline-neutral { background: #eaeaea; }
-
-.coverage-summary td.empty {
-    opacity: .5;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    line-height: 1;
-    color: #888;
-}
-
-.cover-fill, .cover-empty {
-  display:inline-block;
-  height: 12px;
-}
-.chart {
-  line-height: 0;
-}
-.cover-empty {
-    background: white;
-}
-.cover-full {
-    border-right: none !important;
-}
-pre.prettyprint {
-    border: none !important;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-.com { color: #999 !important; }
-.ignore-none { color: #999; font-weight: normal; }
-
-.wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -48px;
-}
-.footer, .push {
-  height: 48px;
-}

package/coverage/lcov-report/block-navigation.js

@@ -1,87 +0,0 @@
-/* eslint-disable */
-var jumpToCode = (function init() {
-    // Classes of code we would like to highlight in the file view
-    var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no'];
-
-    // Elements to highlight in the file listing view
-    var fileListingElements = ['td.pct.low'];
-
-    // We don't want to select elements that are direct descendants of another match
-    var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > `
-
-    // Selector that finds elements on the page to which we can jump
-    var selector =
-        fileListingElements.join(', ') +
-        ', ' +
-        notSelector +
-        missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b`
-
-    // The NodeList of matching elements
-    var missingCoverageElements = document.querySelectorAll(selector);
-
-    var currentIndex;
-
-    function toggleClass(index) {
-        missingCoverageElements
-            .item(currentIndex)
-            .classList.remove('highlighted');
-        missingCoverageElements.item(index).classList.add('highlighted');
-    }
-
-    function makeCurrent(index) {
-        toggleClass(index);
-        currentIndex = index;
-        missingCoverageElements.item(index).scrollIntoView({
-            behavior: 'smooth',
-            block: 'center',
-            inline: 'center'
-        });
-    }
-
-    function goToPrevious() {
-        var nextIndex = 0;
-        if (typeof currentIndex !== 'number' || currentIndex === 0) {
-            nextIndex = missingCoverageElements.length - 1;
-        } else if (missingCoverageElements.length > 1) {
-            nextIndex = currentIndex - 1;
-        }
-
-        makeCurrent(nextIndex);
-    }
-
-    function goToNext() {
-        var nextIndex = 0;
-
-        if (
-            typeof currentIndex === 'number' &&
-            currentIndex < missingCoverageElements.length - 1
-        ) {
-            nextIndex = currentIndex + 1;
-        }
-
-        makeCurrent(nextIndex);
-    }
-
-    return function jump(event) {
-        if (
-            document.getElementById('fileSearch') === document.activeElement &&
-            document.activeElement != null
-        ) {
-            // if we're currently focused on the search input, we don't want to navigate
-            return;
-        }
-
-        switch (event.which) {
-            case 78: // n
-            case 74: // j
-                goToNext();
-                break;
-            case 66: // b
-            case 75: // k
-            case 80: // p
-                goToPrevious();
-                break;
-        }
-    };
-})();
-window.addEventListener('keydown', jumpToCode);