@skmtc/core 0.0.598 → 0.0.600

package/script/oas/_merge-all-of/merge-union.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeCrossProduct = exports.mergeUnion = void 0;
+const decompose_union_js_1 = require("./decompose-union.js");
+const merge_js_1 = require("./merge.js");
+const cross_product_js_1 = require("./cross-product.js");
+const refFns_js_1 = require("../../helpers/refFns.js");
+const mergeUnion = ({ schema, getRef, groupType }) => {
+    const { beforeExcluded, decomposed, afterExcluded } = (0, decompose_union_js_1.decomposeUnion)({ schema, groupType });
+    // if (decomposed.length === 1) {
+    //   console.log('DECOMPOSED', JSON.stringify(decomposed[0], null, 2))
+    //   const result = {
+    //     ...beforeExcluded,
+    //     ...decomposed[0],
+    //     ...afterExcluded
+    //   }
+    //   console.log('MERGED UNION - SHORT', JSON.stringify(result, null, 2))
+    //   return result
+    // }
+    const dereffed = decomposed.map(decomposed => {
+        return '$ref' in decomposed ? getRef(decomposed) : decomposed;
+    });
+    const result = dereffed.reduce((acc, decomposed) => {
+        const merged = (0, exports.mergeCrossProduct)({ first: acc, second: decomposed, getRef, groupType });
+        return merged;
+    }, {});
+    const output = {
+        ...beforeExcluded,
+        ...result,
+        ...afterExcluded
+    };
+    return output;
+};
+exports.mergeUnion = mergeUnion;
+const mergeCrossProduct = ({ first, second, getRef, groupType }) => {
+    const firstGroup = Array.isArray(first[groupType]) ? first[groupType] : [first];
+    const secondGroup = Array.isArray(second[groupType]) ? second[groupType] : [second];
+    const mergedGroup = (0, cross_product_js_1.crossProduct)(firstGroup, secondGroup)
+        .map(([firstItem, secondItem]) => {
+        try {
+            const result = (0, merge_js_1.mergeSchemasOrRefs)(firstItem, secondItem, getRef);
+            return result;
+        }
+        catch (_error) {
+            return undefined;
+        }
+    })
+        .filter(item => item !== undefined);
+    return {
+        [groupType]: mergedGroup.flatMap(item => {
+            if (!(0, refFns_js_1.isRef)(item) && Array.isArray(item[groupType])) {
+                return item[groupType];
+            }
+            return [item];
+        })
+    };
+};
+exports.mergeCrossProduct = mergeCrossProduct;

package/script/oas/_merge-all-of/merge.d.ts

@@ -0,0 +1,3 @@
+import type { SchemaOrReference, GetRefFn } from './types.js';
+export declare const mergeSchemasOrRefs: (first: SchemaOrReference, second: SchemaOrReference, getRef: GetRefFn) => SchemaOrReference;
+//# sourceMappingURL=merge.d.ts.map

package/script/oas/_merge-all-of/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/oas/_merge-all-of/merge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAiC,QAAQ,EAAE,MAAM,YAAY,CAAA;AAiB5F,eAAO,MAAM,kBAAkB,UACtB,iBAAiB,UAChB,iBAAiB,UACjB,QAAQ,KACf,iBAgCF,CAAA"}

package/script/oas/_merge-all-of/merge.js

@@ -0,0 +1,152 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeSchemasOrRefs = void 0;
+const refFns_js_1 = require("../../helpers/refFns.js");
+const lodash_es_1 = require("lodash-es");
+const check_type_conflicts_js_1 = require("./check-type-conflicts.js");
+const check_read_only_write_only_conflicts_js_1 = require("./check-read-only-write-only-conflicts.js");
+const check_format_conflicts_js_1 = require("./check-format-conflicts.js");
+const check_enum_conflicts_js_1 = require("./check-enum-conflicts.js");
+const check_number_constraints_conflicts_js_1 = require("./check-number-constraints-conflicts.js");
+const check_array_item_type_conflicts_js_1 = require("./check-array-item-type-conflicts.js");
+const merge_object_constraints_js_1 = require("./merge-object-constraints.js");
+const merge_array_constraints_js_1 = require("./merge-array-constraints.js");
+const merge_string_constraints_js_1 = require("./merge-string-constraints.js");
+const merge_number_constraints_js_1 = require("./merge-number-constraints.js");
+const merge_integer_constraints_js_1 = require("./merge-integer-constraints.js");
+const merge_boolean_constraints_js_1 = require("./merge-boolean-constraints.js");
+const generic_merge_js_1 = require("./generic-merge.js");
+const check_at_least_one_type_match_js_1 = require("./check-at-least-one-type-match.js");
+const merge_intersection_js_1 = require("./merge-intersection.js");
+const merge_union_js_1 = require("./merge-union.js");
+const mergeSchemasOrRefs = (first, second, getRef) => {
+    if (containsRef(first, second)) {
+        return mergeWithRef(first, second, getRef);
+    }
+    if ((0, refFns_js_1.isRef)(first)) {
+        throw new Error('Ref in first');
+    }
+    if ((0, refFns_js_1.isRef)(second)) {
+        throw new Error('Ref in second');
+    }
+    if (containsAllOf(first) || containsAllOf(second)) {
+        const mergedFirst = containsAllOf(first) ? (0, merge_intersection_js_1.mergeIntersection)({ schema: first, getRef }) : first;
+        const mergedSecond = containsAllOf(second)
+            ? (0, merge_intersection_js_1.mergeIntersection)({ schema: second, getRef })
+            : second;
+        return (0, exports.mergeSchemasOrRefs)(mergedFirst, mergedSecond, getRef);
+    }
+    if (containsOneOf(first, second)) {
+        return (0, merge_union_js_1.mergeCrossProduct)({ first, second, getRef, groupType: 'oneOf' });
+    }
+    if (containsAnyOf(first, second)) {
+        return (0, merge_union_js_1.mergeCrossProduct)({ first, second, getRef, groupType: 'anyOf' });
+    }
+    return mergeSchemas(first, second, getRef);
+};
+exports.mergeSchemasOrRefs = mergeSchemasOrRefs;
+const containsAllOf = (schema) => {
+    if (schema.allOf) {
+        if (schema.allOf?.length) {
+            return true;
+        }
+        throw new Error('Empty allOf');
+    }
+    return false;
+};
+const containsAnyOf = (first, second) => {
+    if (first.anyOf) {
+        if (first.anyOf?.length) {
+            return true;
+        }
+        throw new Error('Empty anyOf');
+    }
+    if (second.anyOf) {
+        if (second.anyOf?.length) {
+            return true;
+        }
+        throw new Error('Empty anyOf');
+    }
+    return false;
+};
+const containsOneOf = (first, second) => {
+    if (first.oneOf) {
+        if (first.oneOf?.length) {
+            return true;
+        }
+        throw new Error('Empty oneOf');
+    }
+    if (second.oneOf) {
+        if (second.oneOf?.length) {
+            return true;
+        }
+        throw new Error('Empty oneOf');
+    }
+    return false;
+};
+const containsRef = (first, second) => {
+    return (0, refFns_js_1.isRef)(first) || (0, refFns_js_1.isRef)(second);
+};
+const mergeSchemas = (first, second, getRef) => {
+    try {
+        (0, check_type_conflicts_js_1.checkTypeConflicts)(first, second);
+    }
+    catch (e) {
+        throw e;
+    }
+    (0, check_read_only_write_only_conflicts_js_1.checkReadOnlyWriteOnlyConflicts)(first, second);
+    (0, check_format_conflicts_js_1.checkFormatConflicts)(first, second);
+    (0, check_enum_conflicts_js_1.checkEnumConflicts)(first, second);
+    (0, check_number_constraints_conflicts_js_1.checkNumberConstraintsConflicts)(first, second);
+    (0, check_array_item_type_conflicts_js_1.checkArrayItemTypeConflicts)(first, second);
+    if (first.not || second.not) {
+        throw new Error('Merging schemas with "not" keyword is not supported');
+    }
+    return typedMerge(first, second, getRef);
+};
+const typedMerge = (first, second, getRef) => {
+    if (!first.type && !second.type) {
+        return (0, generic_merge_js_1.genericMerge)(first, second, getRef);
+    }
+    if ((0, check_at_least_one_type_match_js_1.checkAtLeastOneTypeMatch)(first, second, 'object')) {
+        return (0, merge_object_constraints_js_1.mergeObjectConstraints)(first, second, getRef);
+    }
+    if ((0, check_at_least_one_type_match_js_1.checkAtLeastOneTypeMatch)(first, second, 'array')) {
+        return (0, merge_array_constraints_js_1.mergeArrayConstraints)(first, second, getRef);
+    }
+    if ((0, check_at_least_one_type_match_js_1.checkAtLeastOneTypeMatch)(first, second, 'string')) {
+        return (0, merge_string_constraints_js_1.mergeStringConstraints)(first, second, getRef);
+    }
+    if ((0, check_at_least_one_type_match_js_1.checkAtLeastOneTypeMatch)(first, second, 'number')) {
+        return (0, merge_number_constraints_js_1.mergeNumberConstraints)(first, second, getRef);
+    }
+    if ((0, check_at_least_one_type_match_js_1.checkAtLeastOneTypeMatch)(first, second, 'integer')) {
+        return (0, merge_integer_constraints_js_1.mergeIntegerConstraints)(first, second, getRef);
+    }
+    if ((0, check_at_least_one_type_match_js_1.checkAtLeastOneTypeMatch)(first, second, 'boolean')) {
+        return (0, merge_boolean_constraints_js_1.mergeBooleanConstraints)(first, second, getRef);
+    }
+    throw new Error(`Cannot merge schemas with type "${first.type}" with type "${second.type}"`);
+};
+const mergeWithRef = (first, second, getRef) => {
+    if ((0, refFns_js_1.isRef)(first) && (0, refFns_js_1.isRef)(second)) {
+        if (first.$ref === second.$ref) {
+            return {
+                ...first,
+                ...second
+            };
+        }
+        else {
+            return mergeSchemas(getRef(first), getRef(second), getRef);
+        }
+    }
+    if ((0, refFns_js_1.isRef)(first) && !(0, refFns_js_1.isRef)(second)) {
+        const merged = (0, lodash_es_1.isEmpty)(second) ? first : mergeSchemas(getRef(first), second, getRef);
+        return merged;
+    }
+    if (!(0, refFns_js_1.isRef)(first) && (0, refFns_js_1.isRef)(second)) {
+        const merged = (0, lodash_es_1.isEmpty)(first) ? second : mergeSchemas(first, getRef(second), getRef);
+        return merged;
+    }
+    throw new Error('Invalid input');
+};

package/script/oas/_merge-all-of/types.d.ts

@@ -0,0 +1,15 @@
+import type { OpenAPIV3 } from 'openapi-types';
+import * as v from 'valibot';
+export type GetRefFn = (ref: OpenAPIV3.ReferenceObject) => OpenAPIV3.SchemaObject;
+export type OneOfObject = {
+    oneOf?: (OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject)[];
+} & OpenAPIV3.SchemaObject;
+export type AnyOfObject = {
+    anyOf?: (OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject)[];
+} & OpenAPIV3.SchemaObject;
+export type SchemaObject = OpenAPIV3.SchemaObject;
+export type ReferenceObject = OpenAPIV3.ReferenceObject;
+export type SchemaOrReference = SchemaObject | ReferenceObject;
+export type ArraySchemaObject = OpenAPIV3.ArraySchemaObject;
+export declare const IntegerSchema: v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.IntegerAction<number, "The number must be an integer.">]>;
+//# sourceMappingURL=types.d.ts.map

package/script/oas/_merge-all-of/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/oas/_merge-all-of/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,eAAe,KAAK,SAAS,CAAC,YAAY,CAAA;AAEjF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,EAAE,CAAA;CAC/D,GAAG,SAAS,CAAC,YAAY,CAAA;AAE1B,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,EAAE,CAAA;CAC/D,GAAG,SAAS,CAAC,YAAY,CAAA;AAE1B,MAAM,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAA;AACjD,MAAM,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,CAAA;AACvD,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,eAAe,CAAA;AAE9D,MAAM,MAAM,iBAAiB,GAAG,SAAS,CAAC,iBAAiB,CAAA;AAE3D,eAAO,MAAM,aAAa,mHAAkE,CAAA"}

package/script/oas/_merge-all-of/types.js

@@ -0,0 +1,28 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IntegerSchema = void 0;
+const v = __importStar(require("valibot"));
+exports.IntegerSchema = v.pipe(v.number(), v.integer('The number must be an integer.'));

package/script/oas/array/Array.d.ts

@@ -2,19 +2,23 @@ import "../../_dnt.polyfills.js";
 import type { OasSchema, ToJsonSchemaOptions } from '../schema/Schema.js';
 import type { OasRef } from '../ref/Ref.js';
 import type { OpenAPIV3 } from 'openapi-types';
-export type ArrayFields = {
+export type ArrayFields<Nullable extends boolean | undefined> = {
     items: OasSchema | OasRef<'schema'>;
     title?: string;
     description?: string;
-    nullable?: boolean;
+    nullable: Nullable;
     uniqueItems?: boolean;
     extensionFields?: Record<string, unknown>;
-    example?: Array<any>;
+    example?: Nullable extends true ? unknown[] | null | undefined : unknown[] | undefined;
+    maxItems?: number;
+    minItems?: number;
+    enums?: Nullable extends true ? (unknown | null)[] | undefined : unknown[] | undefined;
+    defaultValue?: Nullable extends true ? unknown[] | null | undefined : unknown[] | undefined;
 };
 /**
  * Object representing an array in the OpenAPI Specification.
  */
-export declare class OasArray {
+export declare class OasArray<Nullable extends boolean | undefined = boolean | undefined> {
     /**
      * Object is part the 'schema' set which is used
      * to define data types in an OpenAPI document.
@@ -39,7 +43,7 @@ export declare class OasArray {
     /**
      * Indicates whether value can be null.
      */
-    nullable: boolean | undefined;
+    nullable: Nullable;
     /**
      * Indicates whether the array items must be unique.
      */
@@ -49,11 +53,27 @@ export declare class OasArray {
     /**
      * An example of the array.
      */
-    example: Array<unknown> | undefined;
-    constructor(fields: ArrayFields);
+    example: Nullable extends true ? unknown[] | null | undefined : unknown[] | undefined;
+    /**
+     * The maximum number of items in the array.
+     */
+    maxItems: number | undefined;
+    /**
+     * The minimum number of items in the array.
+     */
+    minItems: number | undefined;
+    /**
+     * The enum values for the array.
+     */
+    enums: Nullable extends true ? (unknown | null)[] | undefined : unknown[] | undefined;
+    /**
+     * The default value for the array.
+     */
+    defaultValue: Nullable extends true ? unknown[] | null | undefined : unknown[] | undefined;
+    constructor(fields: ArrayFields<Nullable>);
     isRef(): this is OasRef<'schema'>;
-    resolve(): OasArray;
-    resolveOnce(): OasArray;
+    resolve(): OasArray<Nullable>;
+    resolveOnce(): OasArray<Nullable>;
     toJsonSchema(options: ToJsonSchemaOptions): OpenAPIV3.ArraySchemaObject;
 }
 //# sourceMappingURL=Array.d.ts.map

package/script/oas/array/Array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Array.d.ts","sourceRoot":"","sources":["../../../src/oas/array/Array.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IACnC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAEzC,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;CACrB,CAAA;AAED;;GAEG;AACH,qBAAa,QAAQ;IACnB;;;OAGG;IACH,OAAO,WAAoB;IAC3B;;OAEG;IACH,IAAI,UAAmB;IACvB;;OAEG;IACH,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IACnC;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B;;OAEG;IACH,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B;;OAEG;IACH,WAAW,EAAE,OAAO,GAAG,SAAS,CAAA;IAEhC,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAEpD;;OAEG;IACH,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;gBAEvB,MAAM,EAAE,WAAW;IAU/B,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;IAIjC,OAAO,IAAI,QAAQ;IAInB,WAAW,IAAI,QAAQ;IAIvB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC,iBAAiB;CAUxE"}
+{"version":3,"file":"Array.d.ts","sourceRoot":"","sources":["../../../src/oas/array/Array.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,MAAM,WAAW,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,IAAI;IAC9D,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IACnC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;IAClB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACzC,OAAO,CAAC,EAAE,QAAQ,SAAS,IAAI,GAAG,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;IACtF,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;IACtF,YAAY,CAAC,EAAE,QAAQ,SAAS,IAAI,GAAG,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;CAC5F,CAAA;AAED;;GAEG;AACH,qBAAa,QAAQ,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS;IAC9E;;;OAGG;IACH,OAAO,WAAoB;IAC3B;;OAEG;IACH,IAAI,UAAmB;IACvB;;OAEG;IACH,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IACnC;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAA;IAClB;;OAEG;IACH,WAAW,EAAE,OAAO,GAAG,SAAS,CAAA;IAEhC,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAEpD;;OAEG;IACH,OAAO,EAAE,QAAQ,SAAS,IAAI,GAAG,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;IACrF;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B;;OAEG;IACH,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAE5B;;OAEG;IACH,KAAK,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;IAErF;;OAEG;IACH,YAAY,EAAE,QAAQ,SAAS,IAAI,GAAG,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;gBAE9E,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC;IAczC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;IAIjC,OAAO,IAAI,QAAQ,CAAC,QAAQ,CAAC;IAI7B,WAAW,IAAI,QAAQ,CAAC,QAAQ,CAAC;IAIjC,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,CAAC,iBAAiB;CAexE"}

package/script/oas/array/Array.js

@@ -87,6 +87,42 @@ class OasArray {
             writable: true,
             value: void 0
         });
+        /**
+         * The maximum number of items in the array.
+         */
+        Object.defineProperty(this, "maxItems", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**
+         * The minimum number of items in the array.
+         */
+        Object.defineProperty(this, "minItems", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**
+         * The enum values for the array.
+         */
+        Object.defineProperty(this, "enums", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /**
+         * The default value for the array.
+         */
+        Object.defineProperty(this, "defaultValue", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.items = fields.items;
         this.title = fields.title;
         this.description = fields.description;
@@ -94,6 +130,10 @@ class OasArray {
         this.uniqueItems = fields.uniqueItems;
         this.extensionFields = fields.extensionFields;
         this.example = fields.example;
+        this.maxItems = fields.maxItems;
+        this.minItems = fields.minItems;
+        this.enums = fields.enums;
+        this.defaultValue = fields.defaultValue;
     }
     isRef() {
         return false;
@@ -109,9 +149,14 @@ class OasArray {
             type: 'array',
             items: this.items.toJsonSchema(options),
             title: this.title,
+            enum: this.enums,
             description: this.description,
             nullable: this.nullable,
-            example: this.example
+            example: this.example,
+            maxItems: this.maxItems,
+            minItems: this.minItems,
+            uniqueItems: this.uniqueItems,
+            default: this.defaultValue
         };
     }
 }

package/script/oas/array/array-types.d.ts

@@ -1,13 +1,26 @@
-import { z } from '@hono/zod-openapi';
+import * as v from 'valibot';
 import { type OasSchemaData } from '../schema/schema-types.js';
 import { type OasSchemaRefData } from '../ref/ref-types.js';
-export declare const oasArrayData: z.ZodType<OasArrayData>;
+export declare const oasArrayData: v.ObjectSchema<{
+    readonly type: v.LiteralSchema<"array", undefined>;
+    readonly items: v.LazySchema<v.UnionSchema<[v.LazySchema<v.GenericSchema<OasSchemaData>>, v.GenericSchema<OasSchemaRefData>], undefined>>;
+    readonly title: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+    readonly description: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+    readonly default: v.OptionalSchema<v.ArraySchema<v.UnknownSchema, undefined>, undefined>;
+    readonly maxItems: v.OptionalSchema<v.NumberSchema<undefined>, undefined>;
+    readonly minItems: v.OptionalSchema<v.NumberSchema<undefined>, undefined>;
+    readonly uniqueItems: v.OptionalSchema<v.BooleanSchema<undefined>, undefined>;
+    readonly enums: v.OptionalSchema<v.ArraySchema<v.UnknownSchema, undefined>, undefined>;
+}, undefined>;
 export type OasArrayData = {
-    oasType: 'schema';
     type: 'array';
     items: OasSchemaData | OasSchemaRefData;
     title?: string;
     description?: string;
     default?: unknown[];
+    maxItems?: number;
+    minItems?: number;
+    uniqueItems?: boolean;
+    enums?: unknown[];
 };
 //# sourceMappingURL=array-types.d.ts.map

package/script/oas/array/array-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-types.d.ts","sourceRoot":"","sources":["../../../src/oas/array/array-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAA;AACrC,OAAO,EAAE,KAAK,aAAa,EAAiB,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAAE,KAAK,gBAAgB,EAAoB,MAAM,qBAAqB,CAAA;AAE7E,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAc/C,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,QAAQ,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,aAAa,GAAG,gBAAgB,CAAA;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAA;CACpB,CAAA"}
+{"version":3,"file":"array-types.d.ts","sourceRoot":"","sources":["../../../src/oas/array/array-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,KAAK,aAAa,EAAiB,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAAE,KAAK,gBAAgB,EAAoB,MAAM,qBAAqB,CAAA;AAE7E,eAAO,MAAM,YAAY;;;;;;;;;;aAUvB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,aAAa,GAAG,gBAAgB,CAAA;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAA;CAClB,CAAA"}

package/script/oas/array/array-types.js

@@ -1,20 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.oasArrayData = void 0;
-const zod_openapi_1 = require("@hono/zod-openapi");
+const v = __importStar(require("valibot"));
 const schema_types_js_1 = require("../schema/schema-types.js");
 const ref_types_js_1 = require("../ref/ref-types.js");
-exports.oasArrayData = zod_openapi_1.z.object({
-    oasType: zod_openapi_1.z.literal('schema'),
-    // Add soon
-    type: zod_openapi_1.z.literal('array'),
-    // additionalItems: z.lazy(() => z.union([z.boolean(), jsonSchema4]).optional()),
-    items: zod_openapi_1.z.lazy(() => zod_openapi_1.z.union([schema_types_js_1.oasSchemaData, ref_types_js_1.oasSchemaRefData])),
-    title: zod_openapi_1.z.string().optional(),
-    description: zod_openapi_1.z.string().optional(),
-    default: zod_openapi_1.z.array(zod_openapi_1.z.unknown()).optional()
-    // Add soon
-    // maxItems: z.number().optional(),
-    // minItems: z.number().optional(),
-    // uniqueItems: z.boolean().optional()
+exports.oasArrayData = v.object({
+    type: v.literal('array'),
+    items: v.lazy(() => v.union([v.lazy(() => schema_types_js_1.oasSchemaData), ref_types_js_1.oasSchemaRefData])),
+    title: v.optional(v.string()),
+    description: v.optional(v.string()),
+    default: v.optional(v.array(v.unknown())),
+    maxItems: v.optional(v.number()),
+    minItems: v.optional(v.number()),
+    uniqueItems: v.optional(v.boolean()),
+    enums: v.optional(v.array(v.unknown()))
 });

package/script/oas/array/toArray.d.ts

@@ -6,5 +6,14 @@ type ToArrayArgs = {
     context: ParseContext;
 };
 export declare const toArray: ({ value, context }: ToArrayArgs) => OasArray;
+type ToParsedArrayArgs<Nullable extends boolean | undefined> = {
+    value: Omit<OpenAPIV3.ArraySchemaObject, 'nullable' | 'example' | 'enums' | 'default'>;
+    context: ParseContext;
+    nullable: Nullable;
+    example: Nullable extends true ? unknown[] | null | undefined : unknown[] | undefined;
+    enums: Nullable extends true ? (unknown[] | null)[] | undefined : unknown[] | undefined;
+    defaultValue: Nullable extends true ? unknown[] | null | undefined : unknown[] | undefined;
+};
+export declare const toParsedArray: <Nullable extends boolean | undefined>({ context, nullable, example, enums, defaultValue, value }: ToParsedArrayArgs<Nullable>) => OasArray<Nullable>;
 export {};
 //# sourceMappingURL=toArray.d.ts.map

package/script/oas/array/toArray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toArray.d.ts","sourceRoot":"","sources":["../../../src/oas/array/toArray.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAGjE,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,SAAS,CAAC,iBAAiB,CAAA;IAClC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,OAAO,uBAAwB,WAAW,KAAG,QAuBzD,CAAA"}
+{"version":3,"file":"toArray.d.ts","sourceRoot":"","sources":["../../../src/oas/array/toArray.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAQjE,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,SAAS,CAAC,iBAAiB,CAAA;IAClC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,OAAO,uBAAwB,WAAW,KAAG,QAmCzD,CAAA;AAED,KAAK,iBAAiB,CAAC,QAAQ,SAAS,OAAO,GAAG,SAAS,IAAI;IAC7D,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC,CAAA;IACtF,OAAO,EAAE,YAAY,CAAA;IACrB,QAAQ,EAAE,QAAQ,CAAA;IAClB,OAAO,EAAE,QAAQ,SAAS,IAAI,GAAG,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;IACrF,KAAK,EAAE,QAAQ,SAAS,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;IACvF,YAAY,EAAE,QAAQ,SAAS,IAAI,GAAG,OAAO,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,EAAE,GAAG,SAAS,CAAA;CAC3F,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,SAAS,OAAO,GAAG,SAAS,8DAO/D,iBAAiB,CAAC,QAAQ,CAAC,KAAG,QAAQ,CAAC,QAAQ,CAyCjD,CAAA"}

package/script/oas/array/toArray.js

@@ -1,20 +1,98 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toArray = void 0;
+exports.toParsedArray = exports.toArray = void 0;
 const Array_js_1 = require("./Array.js");
 const toSchemasV3_js_1 = require("../schema/toSchemasV3.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
+const parseNullable_js_1 = require("../_helpers/parseNullable.js");
+const parseExample_js_1 = require("../_helpers/parseExample.js");
+const parseEnum_js_1 = require("../_helpers/parseEnum.js");
+const v = __importStar(require("valibot"));
+const array_types_js_1 = require("./array-types.js");
+const parseDefault_js_1 = require("../_helpers/parseDefault.js");
 const toArray = ({ value, context }) => {
-    const { type: _type, items, title, description, nullable, uniqueItems, example, ...skipped } = value;
-    const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({ skipped, context });
+    const { nullable, value: valueWithoutNullable } = (0, parseNullable_js_1.parseNullable)({
+        value,
+        context
+    });
+    const { example, value: valueWithoutExample } = (0, parseExample_js_1.parseExample)({
+        value: valueWithoutNullable,
+        nullable,
+        valibotSchema: v.array(v.any()),
+        context
+    });
+    const { enum: enums, value: valueWithoutEnums } = (0, parseEnum_js_1.parseEnum)({
+        value: valueWithoutExample,
+        nullable,
+        valibotSchema: v.array(v.any()),
+        context
+    });
+    const { default: defaultValue, value: valueWithoutDefault } = (0, parseDefault_js_1.parseDefault)({
+        value: valueWithoutEnums,
+        nullable,
+        valibotSchema: v.array(v.any()),
+        context
+    });
+    return (0, exports.toParsedArray)({
+        context,
+        nullable,
+        example,
+        enums,
+        defaultValue,
+        value: valueWithoutDefault
+    });
+};
+exports.toArray = toArray;
+const toParsedArray = ({ context, nullable, example, enums, defaultValue, value }) => {
+    // We only want parse non-items fields here since items is handled below
+    const { items, ...rest } = value;
+    const oasArrayDataSchemaWithItems = v.omit(array_types_js_1.oasArrayData, ['items']);
+    const { type: _type, title, description, uniqueItems, maxItems, minItems, ...skipped } = v.parse(oasArrayDataSchemaWithItems, rest);
+    const extensionFields = (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({
+        skipped,
+        parent: value,
+        context,
+        parentType: 'schema:array'
+    });
+    // if (!items) {
+    //   console.log(JSON.stringify(value, null, 2))
+    //   throw new Error('No items')
+    // }
     return new Array_js_1.OasArray({
         title,
         description,
         nullable,
-        uniqueItems,
+        defaultValue,
         items: context.trace('items', () => (0, toSchemasV3_js_1.toSchemaV3)({ schema: items, context })),
         extensionFields,
-        example
+        example,
+        uniqueItems,
+        maxItems,
+        minItems,
+        enums
     });
 };
-exports.toArray = toArray;
+exports.toParsedArray = toParsedArray;