diff --git a/.vscode/settings.json b/.vscode/settings.json index aba13d82bd..7c1d0130b9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,5 +9,6 @@ }, "[mdx]": { "editor.wordWrap": "on" - } + }, + "typescript.tsdk": "node_modules\\typescript\\lib" } \ No newline at end of file diff --git a/benchmark/package.json b/benchmark/package.json index 88bd42d4e8..2cb6386efe 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -60,9 +60,9 @@ "suppress-warnings": "^1.0.2", "tgrid": "^0.10.0", "ts-node": "^10.9.1", - "ts-patch": "^3.2.0", + "ts-patch": "^3.3.0", "tstl": "^3.0.0", - "typescript": "~5.6.3", + "typescript": "~5.7.2", "uuid": "^8.3.2", "zod": "^3.19.1" }, diff --git a/package.json b/package.json index 80572734b2..b48b56932a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "typia", - "version": "7.0.1", + "version": "7.0.2", "description": "Superfast runtime validators with only one line", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -41,7 +41,7 @@ }, "homepage": "https://typia.io", "dependencies": { - "@samchon/openapi": "^2.0.0", + "@samchon/openapi": "^2.0.1", "commander": "^10.0.0", "comment-json": "^4.2.3", "inquirer": "^8.2.5", @@ -49,8 +49,8 @@ "randexp": "^0.5.3" }, "peerDependencies": { - "typescript": ">=4.8.0 <5.7.0", - "@samchon/openapi": ">=2.0.0 <3.0.0" + "typescript": ">=4.8.0 <5.8.0", + "@samchon/openapi": ">=2.0.1 <3.0.0" }, "devDependencies": { "@rollup/plugin-commonjs": "^26.0.1", @@ -68,7 +68,7 @@ "rollup": "^4.18.0", "suppress-warnings": "^1.0.2", "ts-node": "^10.9.2", - "typescript": "~5.6.3" + "typescript": "~5.7.2" }, "stackblitz": { "startCommand": "npm install && npm run test" diff --git a/packages/typescript-json/README.md b/packages/typescript-json/README.md index 291ed6b315..7a6e17fd13 100644 --- a/packages/typescript-json/README.md +++ b/packages/typescript-json/README.md @@ -5,11 +5,12 @@ ![Typia Logo](https://typia.io/logo.png) [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/samchon/typia/blob/master/LICENSE) -[![npm version](https://img.shields.io/npm/v/typia.svg)](https://www.npmjs.com/package/typia) -[![Downloads](https://img.shields.io/npm/dm/typia.svg)](https://www.npmjs.com/package/typia) +[![NPM Version](https://img.shields.io/npm/v/typia.svg)](https://www.npmjs.com/package/typia) +[![NPM Downloads](https://img.shields.io/npm/dm/typia.svg)](https://www.npmjs.com/package/typia) [![Build Status](https://github.com/samchon/typia/workflows/build/badge.svg)](https://github.com/samchon/typia/actions?query=workflow%3Abuild) [![Guide Documents](https://img.shields.io/badge/guide-documents-forestgreen)](https://typia.io/docs/) [![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20Typia%20Guru-006BFF)](https://gurubase.io/g/typia) +[![Discord Badge](https://img.shields.io/badge/discord-samchon-d91965?style=flat&labelColor=5866f2&logo=discord&logoColor=white&link=https://discord.gg/E94XhzrUCZ)](https://discord.gg/E94XhzrUCZ) ```typescript // RUNTIME VALIDATORS diff --git a/packages/typescript-json/package.json b/packages/typescript-json/package.json index 5941c70cfc..98f5443a61 100644 --- a/packages/typescript-json/package.json +++ b/packages/typescript-json/package.json @@ -1,6 +1,6 @@ { "name": "typescript-json", - "version": "7.0.0-dev.20241202-3", + "version": "7.0.2-dev.20241205", "description": "Superfast runtime validators with only one line", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -37,11 +37,11 @@ }, "homepage": "https://typia.io", "dependencies": { - "typia": "7.0.0-dev.20241202-3" + "typia": "7.0.2-dev.20241205" }, "peerDependencies": { - "typescript": ">=4.8.0 <5.7.0", - "@samchon/openapi": ">=2.0.0 <3.0.0" + "typescript": ">=4.8.0 <5.8.0", + "@samchon/openapi": ">=2.0.1 <3.0.0" }, "stackblitz": { "startCommand": "npm install && npm run test" diff --git a/src/executable/TypiaPatchWizard.ts b/src/executable/TypiaPatchWizard.ts index ac31631c0a..75ff6b650a 100644 --- a/src/executable/TypiaPatchWizard.ts +++ b/src/executable/TypiaPatchWizard.ts @@ -19,20 +19,23 @@ export namespace TypiaPatchWizard { }; export const patch = async (): Promise => { - const location: string = require.resolve("typescript/lib/tsc.js"); - const content: string = await fs.promises.readFile(location, "utf8"); - if (content.indexOf(FROM_WITH_COMMENT) !== -1) - await fs.promises.writeFile( - location, - content.replace(FROM_WITH_COMMENT, TO_WITH_COMMENT), - "utf8", - ); - else if (content.indexOf(FROM_ONLY) !== -1) - await fs.promises.writeFile( - location, - content.replace(FROM_ONLY, TO_ONLY), - "utf8", - ); + for (const file of ["tsc.js", "_tsc.js"]) + try { + const location: string = require.resolve(`typescript/lib/${file}`); + const content: string = await fs.promises.readFile(location, "utf8"); + if (content.indexOf(FROM_WITH_COMMENT) !== -1) + await fs.promises.writeFile( + location, + content.replace(FROM_WITH_COMMENT, TO_WITH_COMMENT), + "utf8", + ); + else if (content.indexOf(FROM_ONLY) !== -1) + await fs.promises.writeFile( + location, + content.replace(FROM_ONLY, TO_ONLY), + "utf8", + ); + } catch {} }; } diff --git a/src/factories/internal/metadata/iterate_metadata_native.ts b/src/factories/internal/metadata/iterate_metadata_native.ts index 43d516834a..1d3aa6b157 100644 --- a/src/factories/internal/metadata/iterate_metadata_native.ts +++ b/src/factories/internal/metadata/iterate_metadata_native.ts @@ -10,11 +10,12 @@ import { IMetadataIteratorProps } from "./IMetadataIteratorProps"; export const iterate_metadata_native = ( props: IMetadataIteratorProps, ): boolean => { - const name: string = TypeFactory.getFullName({ - checker: props.checker, - type: props.type, - symbol: props.type.getSymbol(), - }); + const name: string = + TypeFactory.getFullName({ + checker: props.checker, + type: props.type, + symbol: props.type.getSymbol(), + }).split("<")?.[0] ?? ""; const simple: IClassInfo | undefined = SIMPLES.get(name); if ( simple !== undefined && @@ -72,7 +73,7 @@ const validate = (props: { }); return ( returnType !== null && - props.checker.typeToString(returnType) === method.return + props.checker.typeToString(returnType).split("<")?.[0] === method.return ); }) && (props.info.properties ?? []).every((property) => { @@ -82,7 +83,7 @@ const validate = (props: { : undefined; return ( propType !== undefined && - props.checker.typeToString(propType) === property.type + props.checker.typeToString(propType).split("<")?.[0] === property.type ); }); @@ -187,9 +188,9 @@ const SIMPLES: Map = new Map([ className, { methods: [ - { name: "arrayBuffer", return: "Promise" }, + { name: "arrayBuffer", return: "Promise" }, { name: "slice", return: "Blob" }, - { name: "text", return: "Promise" }, + { name: "text", return: "Promise" }, ], properties: [ { name: "size", type: "number" }, diff --git a/src/programmers/json/JsonAssertParseProgrammer.ts b/src/programmers/json/JsonAssertParseProgrammer.ts index 62d741c2c6..94ebf48f3a 100644 --- a/src/programmers/json/JsonAssertParseProgrammer.ts +++ b/src/programmers/json/JsonAssertParseProgrammer.ts @@ -1,6 +1,7 @@ import ts from "typescript"; import { IdentifierFactory } from "../../factories/IdentifierFactory"; +import { JsonMetadataFactory } from "../../factories/JsonMetadataFactory"; import { StatementFactory } from "../../factories/StatementFactory"; import { TypeFactory } from "../../factories/TypeFactory"; @@ -19,6 +20,12 @@ export namespace JsonAssertParseProgrammer { name: string | undefined; init: ts.Expression | undefined; }): FeatureProgrammer.IDecomposed => { + JsonMetadataFactory.analyze({ + method: props.functor.method, + checker: props.context.checker, + transformer: props.context.transformer, + type: props.type, + }); const assert: FeatureProgrammer.IDecomposed = AssertProgrammer.decompose({ ...props, context: { diff --git a/test-error/package.json b/test-error/package.json index 224cabb7bf..b83e9da630 100644 --- a/test-error/package.json +++ b/test-error/package.json @@ -28,8 +28,8 @@ "homepage": "https://github.com/samchon/typia#readme", "devDependencies": { "rimraf": "^5.0.5", - "ts-patch": "^3.2.0", - "typescript": "~5.6.3" + "ts-patch": "^3.3.0", + "typescript": "~5.7.2" }, "dependencies": { "typia": "../" diff --git a/test-esm/package.json b/test-esm/package.json index 6ea3e1454c..852169a3ae 100644 --- a/test-esm/package.json +++ b/test-esm/package.json @@ -31,9 +31,9 @@ "homepage": "https://github.com/samchon/typia#readme", "devDependencies": { "@types/cli": "^0.11.25", - "@types/node": "^20.9.4", - "ts-patch": "^3.2.0", - "typescript": "~5.6.3" + "@types/node": "^22.10.1", + "ts-patch": "^3.3.0", + "typescript": "~5.7.2" }, "dependencies": { "typia": "../" diff --git a/test-esm/src/index.ts b/test-esm/src/index.ts index 8add853e25..052df64f7f 100644 --- a/test-esm/src/index.ts +++ b/test-esm/src/index.ts @@ -4,4 +4,17 @@ console.log( typia.is(true), typia.assert("something"), typia.json.stringify(3), + typia.protobuf.message<{ + value: number; + binary: Uint8Array; + }>(), + typia.llm.schema< + { + /** + * Primary Key. + */ + id: string; + }, + "gemini" + >(), ); diff --git a/test/package.json b/test/package.json index 199bb349a0..d961ec116c 100644 --- a/test/package.json +++ b/test/package.json @@ -42,8 +42,8 @@ "prettier": "^3.2.5", "rimraf": "^5.0.5", "ts-node": "^10.9.2", - "ts-patch": "^3.2.1", - "typescript": "~5.6.3" + "ts-patch": "^3.3.0", + "typescript": "~5.7.2" }, "dependencies": { "cli": "^1.0.1", diff --git a/test/schemas/llm.application/3.0/ArrayAny.json b/test/schemas/llm.application/3.0/ArrayAny.json index 0abd60640e..a820ceac07 100644 --- a/test/schemas/llm.application/3.0/ArrayAny.json +++ b/test/schemas/llm.application/3.0/ArrayAny.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayHierarchical.json b/test/schemas/llm.application/3.0/ArrayHierarchical.json index 3bbc2f99ce..adc722f27e 100644 --- a/test/schemas/llm.application/3.0/ArrayHierarchical.json +++ b/test/schemas/llm.application/3.0/ArrayHierarchical.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayHierarchicalPointer.json b/test/schemas/llm.application/3.0/ArrayHierarchicalPointer.json index 08c76db952..ef51159f5a 100644 --- a/test/schemas/llm.application/3.0/ArrayHierarchicalPointer.json +++ b/test/schemas/llm.application/3.0/ArrayHierarchicalPointer.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayMatrix.json b/test/schemas/llm.application/3.0/ArrayMatrix.json index e7a9c4568e..ae9941db0d 100644 --- a/test/schemas/llm.application/3.0/ArrayMatrix.json +++ b/test/schemas/llm.application/3.0/ArrayMatrix.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRecursive.json b/test/schemas/llm.application/3.0/ArrayRecursive.json index 0772871ade..23f3716eca 100644 --- a/test/schemas/llm.application/3.0/ArrayRecursive.json +++ b/test/schemas/llm.application/3.0/ArrayRecursive.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicit.json b/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicit.json index bee8df629e..528d49e74b 100644 --- a/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicit.json +++ b/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicit.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicitPointer.json b/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicitPointer.json index d39f7632ea..5f3f2fe37f 100644 --- a/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicitPointer.json +++ b/test/schemas/llm.application/3.0/ArrayRecursiveUnionExplicitPointer.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRecursiveUnionImplicit.json b/test/schemas/llm.application/3.0/ArrayRecursiveUnionImplicit.json index f22c2dda87..eaf542ccbd 100644 --- a/test/schemas/llm.application/3.0/ArrayRecursiveUnionImplicit.json +++ b/test/schemas/llm.application/3.0/ArrayRecursiveUnionImplicit.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRepeatedNullable.json b/test/schemas/llm.application/3.0/ArrayRepeatedNullable.json index 01eaf7f333..c129072fa2 100644 --- a/test/schemas/llm.application/3.0/ArrayRepeatedNullable.json +++ b/test/schemas/llm.application/3.0/ArrayRepeatedNullable.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRepeatedRequired.json b/test/schemas/llm.application/3.0/ArrayRepeatedRequired.json index 58ae97c23c..41b75a6def 100644 --- a/test/schemas/llm.application/3.0/ArrayRepeatedRequired.json +++ b/test/schemas/llm.application/3.0/ArrayRepeatedRequired.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayRepeatedUnion.json b/test/schemas/llm.application/3.0/ArrayRepeatedUnion.json index 053c845529..b80e564d65 100644 --- a/test/schemas/llm.application/3.0/ArrayRepeatedUnion.json +++ b/test/schemas/llm.application/3.0/ArrayRepeatedUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArraySimple.json b/test/schemas/llm.application/3.0/ArraySimple.json index f133e46706..4095411be0 100644 --- a/test/schemas/llm.application/3.0/ArraySimple.json +++ b/test/schemas/llm.application/3.0/ArraySimple.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ArrayUnion.json b/test/schemas/llm.application/3.0/ArrayUnion.json index 0b7bef995b..d61ddda8f5 100644 --- a/test/schemas/llm.application/3.0/ArrayUnion.json +++ b/test/schemas/llm.application/3.0/ArrayUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/AtomicUnion.json b/test/schemas/llm.application/3.0/AtomicUnion.json index 3c1c02cf44..8b6a2684c1 100644 --- a/test/schemas/llm.application/3.0/AtomicUnion.json +++ b/test/schemas/llm.application/3.0/AtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ClassGetter.json b/test/schemas/llm.application/3.0/ClassGetter.json index 1d74bbc155..409770a35c 100644 --- a/test/schemas/llm.application/3.0/ClassGetter.json +++ b/test/schemas/llm.application/3.0/ClassGetter.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ClassMethod.json b/test/schemas/llm.application/3.0/ClassMethod.json index dbc0d93812..254c36213d 100644 --- a/test/schemas/llm.application/3.0/ClassMethod.json +++ b/test/schemas/llm.application/3.0/ClassMethod.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ClassPropertyAssignment.json b/test/schemas/llm.application/3.0/ClassPropertyAssignment.json index 8df7469cf8..4647e7c439 100644 --- a/test/schemas/llm.application/3.0/ClassPropertyAssignment.json +++ b/test/schemas/llm.application/3.0/ClassPropertyAssignment.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/CommentTagArray.json b/test/schemas/llm.application/3.0/CommentTagArray.json index 0ad3a70379..1fba2623f5 100644 --- a/test/schemas/llm.application/3.0/CommentTagArray.json +++ b/test/schemas/llm.application/3.0/CommentTagArray.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/CommentTagArrayUnion.json b/test/schemas/llm.application/3.0/CommentTagArrayUnion.json index 614e4c77a1..de28fc92de 100644 --- a/test/schemas/llm.application/3.0/CommentTagArrayUnion.json +++ b/test/schemas/llm.application/3.0/CommentTagArrayUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/CommentTagAtomicUnion.json b/test/schemas/llm.application/3.0/CommentTagAtomicUnion.json index 32976d025b..f7fb31b21c 100644 --- a/test/schemas/llm.application/3.0/CommentTagAtomicUnion.json +++ b/test/schemas/llm.application/3.0/CommentTagAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -23,11 +23,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -69,11 +70,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -102,11 +104,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -143,11 +146,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -183,11 +187,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -217,11 +222,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -251,11 +257,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -292,11 +299,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.application/3.0/CommentTagDefault.json b/test/schemas/llm.application/3.0/CommentTagDefault.json index dfbe716401..55fd8fb061 100644 --- a/test/schemas/llm.application/3.0/CommentTagDefault.json +++ b/test/schemas/llm.application/3.0/CommentTagDefault.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -88,14 +88,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -210,14 +212,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -319,14 +323,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -436,14 +442,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -552,14 +560,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -662,14 +672,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -772,14 +784,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -889,14 +903,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" diff --git a/test/schemas/llm.application/3.0/CommentTagFormat.json b/test/schemas/llm.application/3.0/CommentTagFormat.json index fee215d8f6..938ce5bea4 100644 --- a/test/schemas/llm.application/3.0/CommentTagFormat.json +++ b/test/schemas/llm.application/3.0/CommentTagFormat.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,91 +16,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -147,91 +147,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -265,91 +265,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -391,91 +391,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -516,91 +516,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -635,91 +635,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -754,91 +754,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -880,91 +880,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.application/3.0/CommentTagLength.json b/test/schemas/llm.application/3.0/CommentTagLength.json index eb4ddabc87..001b6817a2 100644 --- a/test/schemas/llm.application/3.0/CommentTagLength.json +++ b/test/schemas/llm.application/3.0/CommentTagLength.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -21,23 +21,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -79,23 +82,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -124,23 +130,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -177,23 +186,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -229,23 +241,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -275,23 +290,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -321,23 +339,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -374,23 +395,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/CommentTagObjectUnion.json b/test/schemas/llm.application/3.0/CommentTagObjectUnion.json index dc16c07fec..ac9bc6dae9 100644 --- a/test/schemas/llm.application/3.0/CommentTagObjectUnion.json +++ b/test/schemas/llm.application/3.0/CommentTagObjectUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -20,7 +20,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -33,7 +33,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -66,7 +67,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -79,7 +80,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -99,7 +101,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -112,7 +114,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -140,7 +143,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -153,7 +156,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -180,7 +184,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -193,7 +197,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -214,7 +219,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -227,7 +232,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -248,7 +254,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -261,7 +267,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -289,7 +296,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -302,7 +309,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/CommentTagPattern.json b/test/schemas/llm.application/3.0/CommentTagPattern.json index 136429e24a..0c99ff9554 100644 --- a/test/schemas/llm.application/3.0/CommentTagPattern.json +++ b/test/schemas/llm.application/3.0/CommentTagPattern.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,19 +16,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -57,19 +57,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -85,19 +85,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -121,19 +121,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -156,19 +156,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -185,19 +185,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -214,19 +214,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -250,19 +250,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.application/3.0/CommentTagRange.json b/test/schemas/llm.application/3.0/CommentTagRange.json index f044c21f74..4d49d75dc5 100644 --- a/test/schemas/llm.application/3.0/CommentTagRange.json +++ b/test/schemas/llm.application/3.0/CommentTagRange.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -21,39 +21,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -99,39 +110,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -164,39 +186,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -237,39 +270,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -309,39 +353,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -375,39 +430,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -441,39 +507,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -514,39 +591,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/CommentTagType.json b/test/schemas/llm.application/3.0/CommentTagType.json index 6c59938ff6..ed28fbc47f 100644 --- a/test/schemas/llm.application/3.0/CommentTagType.json +++ b/test/schemas/llm.application/3.0/CommentTagType.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ConstantAtomicAbsorbed.json b/test/schemas/llm.application/3.0/ConstantAtomicAbsorbed.json index fa3bf1c0d2..0e678423f7 100644 --- a/test/schemas/llm.application/3.0/ConstantAtomicAbsorbed.json +++ b/test/schemas/llm.application/3.0/ConstantAtomicAbsorbed.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,11 +16,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -47,11 +47,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -65,11 +65,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -91,11 +91,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -116,11 +116,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -135,11 +135,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -154,11 +154,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -180,11 +180,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/ConstantAtomicTagged.json b/test/schemas/llm.application/3.0/ConstantAtomicTagged.json index 15fe9c27b3..57b9a941ee 100644 --- a/test/schemas/llm.application/3.0/ConstantAtomicTagged.json +++ b/test/schemas/llm.application/3.0/ConstantAtomicTagged.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,16 +16,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -60,16 +60,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -91,16 +91,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -130,16 +130,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -168,16 +168,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -200,16 +200,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -232,16 +232,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -271,16 +271,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", diff --git a/test/schemas/llm.application/3.0/ConstantAtomicUnion.json b/test/schemas/llm.application/3.0/ConstantAtomicUnion.json index 0a8f844f4f..e265bb8979 100644 --- a/test/schemas/llm.application/3.0/ConstantAtomicUnion.json +++ b/test/schemas/llm.application/3.0/ConstantAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ConstantConstEnumeration.json b/test/schemas/llm.application/3.0/ConstantConstEnumeration.json index b9fe845014..b90bf623f1 100644 --- a/test/schemas/llm.application/3.0/ConstantConstEnumeration.json +++ b/test/schemas/llm.application/3.0/ConstantConstEnumeration.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ConstantEnumeration.json b/test/schemas/llm.application/3.0/ConstantEnumeration.json index b9fe845014..b90bf623f1 100644 --- a/test/schemas/llm.application/3.0/ConstantEnumeration.json +++ b/test/schemas/llm.application/3.0/ConstantEnumeration.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicArray.json b/test/schemas/llm.application/3.0/DynamicArray.json index af9518858b..79675d5017 100644 --- a/test/schemas/llm.application/3.0/DynamicArray.json +++ b/test/schemas/llm.application/3.0/DynamicArray.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicComposite.json b/test/schemas/llm.application/3.0/DynamicComposite.json index c0e4c76ea9..5ba2549ffa 100644 --- a/test/schemas/llm.application/3.0/DynamicComposite.json +++ b/test/schemas/llm.application/3.0/DynamicComposite.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicConstant.json b/test/schemas/llm.application/3.0/DynamicConstant.json index 61fa7b7ade..e1a1c88a3b 100644 --- a/test/schemas/llm.application/3.0/DynamicConstant.json +++ b/test/schemas/llm.application/3.0/DynamicConstant.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicEnumeration.json b/test/schemas/llm.application/3.0/DynamicEnumeration.json index a584a51341..2c42ff5464 100644 --- a/test/schemas/llm.application/3.0/DynamicEnumeration.json +++ b/test/schemas/llm.application/3.0/DynamicEnumeration.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicNever.json b/test/schemas/llm.application/3.0/DynamicNever.json index 54d77aaf30..04c1d268ce 100644 --- a/test/schemas/llm.application/3.0/DynamicNever.json +++ b/test/schemas/llm.application/3.0/DynamicNever.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicSimple.json b/test/schemas/llm.application/3.0/DynamicSimple.json index 9e6faa6fcb..704be5b9b5 100644 --- a/test/schemas/llm.application/3.0/DynamicSimple.json +++ b/test/schemas/llm.application/3.0/DynamicSimple.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicTemplate.json b/test/schemas/llm.application/3.0/DynamicTemplate.json index bf47c2ec0a..26278438ba 100644 --- a/test/schemas/llm.application/3.0/DynamicTemplate.json +++ b/test/schemas/llm.application/3.0/DynamicTemplate.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicTree.json b/test/schemas/llm.application/3.0/DynamicTree.json index eecf2283c8..18dffa981b 100644 --- a/test/schemas/llm.application/3.0/DynamicTree.json +++ b/test/schemas/llm.application/3.0/DynamicTree.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicUndefined.json b/test/schemas/llm.application/3.0/DynamicUndefined.json index 54d77aaf30..04c1d268ce 100644 --- a/test/schemas/llm.application/3.0/DynamicUndefined.json +++ b/test/schemas/llm.application/3.0/DynamicUndefined.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/DynamicUnion.json b/test/schemas/llm.application/3.0/DynamicUnion.json index 050e4e5e86..f8971d3b19 100644 --- a/test/schemas/llm.application/3.0/DynamicUnion.json +++ b/test/schemas/llm.application/3.0/DynamicUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectAlias.json b/test/schemas/llm.application/3.0/ObjectAlias.json index 3d89503e9f..f8eabf4a1f 100644 --- a/test/schemas/llm.application/3.0/ObjectAlias.json +++ b/test/schemas/llm.application/3.0/ObjectAlias.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectDate.json b/test/schemas/llm.application/3.0/ObjectDate.json index db404cafca..ed5e11a00c 100644 --- a/test/schemas/llm.application/3.0/ObjectDate.json +++ b/test/schemas/llm.application/3.0/ObjectDate.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,28 +16,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -66,28 +66,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -103,28 +103,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -148,28 +148,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -192,28 +192,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -230,28 +230,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -268,28 +268,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -313,28 +313,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ diff --git a/test/schemas/llm.application/3.0/ObjectDescription.json b/test/schemas/llm.application/3.0/ObjectDescription.json index a9427c2206..4ac0bd9e9e 100644 --- a/test/schemas/llm.application/3.0/ObjectDescription.json +++ b/test/schemas/llm.application/3.0/ObjectDescription.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,8 +16,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -71,8 +72,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -113,8 +115,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -161,8 +164,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -210,8 +214,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -251,8 +256,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -292,8 +298,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -340,8 +347,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", diff --git a/test/schemas/llm.application/3.0/ObjectDynamic.json b/test/schemas/llm.application/3.0/ObjectDynamic.json index bf47c2ec0a..26278438ba 100644 --- a/test/schemas/llm.application/3.0/ObjectDynamic.json +++ b/test/schemas/llm.application/3.0/ObjectDynamic.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectGenericAlias.json b/test/schemas/llm.application/3.0/ObjectGenericAlias.json index a1db1b4b19..6297c2d0cf 100644 --- a/test/schemas/llm.application/3.0/ObjectGenericAlias.json +++ b/test/schemas/llm.application/3.0/ObjectGenericAlias.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectGenericArray.json b/test/schemas/llm.application/3.0/ObjectGenericArray.json index e5368564ec..cfe3a594a6 100644 --- a/test/schemas/llm.application/3.0/ObjectGenericArray.json +++ b/test/schemas/llm.application/3.0/ObjectGenericArray.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectGenericUnion.json b/test/schemas/llm.application/3.0/ObjectGenericUnion.json index 5c27587b45..4412ead680 100644 --- a/test/schemas/llm.application/3.0/ObjectGenericUnion.json +++ b/test/schemas/llm.application/3.0/ObjectGenericUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectInternal.json b/test/schemas/llm.application/3.0/ObjectInternal.json index b630025071..a8b6034015 100644 --- a/test/schemas/llm.application/3.0/ObjectInternal.json +++ b/test/schemas/llm.application/3.0/ObjectInternal.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectIntersection.json b/test/schemas/llm.application/3.0/ObjectIntersection.json index 063a36ac3e..1d0d2edbc8 100644 --- a/test/schemas/llm.application/3.0/ObjectIntersection.json +++ b/test/schemas/llm.application/3.0/ObjectIntersection.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectJsonTag.json b/test/schemas/llm.application/3.0/ObjectJsonTag.json index 2440f378f2..1869e9d609 100644 --- a/test/schemas/llm.application/3.0/ObjectJsonTag.json +++ b/test/schemas/llm.application/3.0/ObjectJsonTag.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectLiteralProperty.json b/test/schemas/llm.application/3.0/ObjectLiteralProperty.json index d331b8e3e1..a95d009e2a 100644 --- a/test/schemas/llm.application/3.0/ObjectLiteralProperty.json +++ b/test/schemas/llm.application/3.0/ObjectLiteralProperty.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectLiteralType.json b/test/schemas/llm.application/3.0/ObjectLiteralType.json index 3ed2da42d2..cc25e46ff0 100644 --- a/test/schemas/llm.application/3.0/ObjectLiteralType.json +++ b/test/schemas/llm.application/3.0/ObjectLiteralType.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectNullable.json b/test/schemas/llm.application/3.0/ObjectNullable.json index a0963c95ba..fb391b5659 100644 --- a/test/schemas/llm.application/3.0/ObjectNullable.json +++ b/test/schemas/llm.application/3.0/ObjectNullable.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectOptional.json b/test/schemas/llm.application/3.0/ObjectOptional.json index 08670737e8..a202c59270 100644 --- a/test/schemas/llm.application/3.0/ObjectOptional.json +++ b/test/schemas/llm.application/3.0/ObjectOptional.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectPartial.json b/test/schemas/llm.application/3.0/ObjectPartial.json index b028a7aa79..953181aeb6 100644 --- a/test/schemas/llm.application/3.0/ObjectPartial.json +++ b/test/schemas/llm.application/3.0/ObjectPartial.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectPartialAndRequired.json b/test/schemas/llm.application/3.0/ObjectPartialAndRequired.json index dd4434d470..06083bd3c5 100644 --- a/test/schemas/llm.application/3.0/ObjectPartialAndRequired.json +++ b/test/schemas/llm.application/3.0/ObjectPartialAndRequired.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectPrimitive.json b/test/schemas/llm.application/3.0/ObjectPrimitive.json index f1fb560ff0..ab2d870605 100644 --- a/test/schemas/llm.application/3.0/ObjectPrimitive.json +++ b/test/schemas/llm.application/3.0/ObjectPrimitive.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectRecursive.json b/test/schemas/llm.application/3.0/ObjectRecursive.json index 019d7bd368..326bf0031f 100644 --- a/test/schemas/llm.application/3.0/ObjectRecursive.json +++ b/test/schemas/llm.application/3.0/ObjectRecursive.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectRequired.json b/test/schemas/llm.application/3.0/ObjectRequired.json index 48776ad81d..84e80c6dc4 100644 --- a/test/schemas/llm.application/3.0/ObjectRequired.json +++ b/test/schemas/llm.application/3.0/ObjectRequired.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectSimple.json b/test/schemas/llm.application/3.0/ObjectSimple.json index 035060f1b0..54a6a2313b 100644 --- a/test/schemas/llm.application/3.0/ObjectSimple.json +++ b/test/schemas/llm.application/3.0/ObjectSimple.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUndefined.json b/test/schemas/llm.application/3.0/ObjectUndefined.json index b934a9b268..12643f30e7 100644 --- a/test/schemas/llm.application/3.0/ObjectUndefined.json +++ b/test/schemas/llm.application/3.0/ObjectUndefined.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionComposite.json b/test/schemas/llm.application/3.0/ObjectUnionComposite.json index 3b56bb6c40..1e65b81b30 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionComposite.json +++ b/test/schemas/llm.application/3.0/ObjectUnionComposite.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionCompositePointer.json b/test/schemas/llm.application/3.0/ObjectUnionCompositePointer.json index e764b47170..610cf7ade1 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionCompositePointer.json +++ b/test/schemas/llm.application/3.0/ObjectUnionCompositePointer.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionDouble.json b/test/schemas/llm.application/3.0/ObjectUnionDouble.json index caf0e21d00..9c0256eadb 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionDouble.json +++ b/test/schemas/llm.application/3.0/ObjectUnionDouble.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionExplicit.json b/test/schemas/llm.application/3.0/ObjectUnionExplicit.json index 0f78b90d4d..46821011f1 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionExplicit.json +++ b/test/schemas/llm.application/3.0/ObjectUnionExplicit.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionExplicitPointer.json b/test/schemas/llm.application/3.0/ObjectUnionExplicitPointer.json index 97f0946633..7417008b74 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionExplicitPointer.json +++ b/test/schemas/llm.application/3.0/ObjectUnionExplicitPointer.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionImplicit.json b/test/schemas/llm.application/3.0/ObjectUnionImplicit.json index eb1528253a..53969f0107 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionImplicit.json +++ b/test/schemas/llm.application/3.0/ObjectUnionImplicit.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ObjectUnionNonPredictable.json b/test/schemas/llm.application/3.0/ObjectUnionNonPredictable.json index 54d74b9ecb..d0b4a98276 100644 --- a/test/schemas/llm.application/3.0/ObjectUnionNonPredictable.json +++ b/test/schemas/llm.application/3.0/ObjectUnionNonPredictable.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/TemplateAtomic.json b/test/schemas/llm.application/3.0/TemplateAtomic.json index 24b8ac4ee9..c6e943cf5b 100644 --- a/test/schemas/llm.application/3.0/TemplateAtomic.json +++ b/test/schemas/llm.application/3.0/TemplateAtomic.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,23 +16,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -43,11 +43,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -80,23 +80,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -107,11 +107,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -131,23 +131,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -158,11 +158,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -190,23 +190,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -217,11 +217,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -248,23 +248,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -275,11 +275,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -300,23 +300,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -327,11 +327,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -352,23 +352,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -379,11 +379,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -411,23 +411,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -438,11 +438,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ diff --git a/test/schemas/llm.application/3.0/TemplateConstant.json b/test/schemas/llm.application/3.0/TemplateConstant.json index 4ffaeb4691..88f0233dfa 100644 --- a/test/schemas/llm.application/3.0/TemplateConstant.json +++ b/test/schemas/llm.application/3.0/TemplateConstant.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/TemplateUnion.json b/test/schemas/llm.application/3.0/TemplateUnion.json index 340ce8ac6f..b149d1cf85 100644 --- a/test/schemas/llm.application/3.0/TemplateUnion.json +++ b/test/schemas/llm.application/3.0/TemplateUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -21,29 +21,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -104,29 +104,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -174,29 +174,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -252,29 +252,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -329,29 +329,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -400,29 +400,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -471,29 +471,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -549,29 +549,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" diff --git a/test/schemas/llm.application/3.0/ToJsonAtomicUnion.json b/test/schemas/llm.application/3.0/ToJsonAtomicUnion.json index 3c1c02cf44..8b6a2684c1 100644 --- a/test/schemas/llm.application/3.0/ToJsonAtomicUnion.json +++ b/test/schemas/llm.application/3.0/ToJsonAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ToJsonDouble.json b/test/schemas/llm.application/3.0/ToJsonDouble.json index 17cda0ed5f..75e3a38cfe 100644 --- a/test/schemas/llm.application/3.0/ToJsonDouble.json +++ b/test/schemas/llm.application/3.0/ToJsonDouble.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ToJsonNull.json b/test/schemas/llm.application/3.0/ToJsonNull.json index 14813c6575..2decafe6b1 100644 --- a/test/schemas/llm.application/3.0/ToJsonNull.json +++ b/test/schemas/llm.application/3.0/ToJsonNull.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/ToJsonUnion.json b/test/schemas/llm.application/3.0/ToJsonUnion.json index 829c9d907e..e55a6d13a1 100644 --- a/test/schemas/llm.application/3.0/ToJsonUnion.json +++ b/test/schemas/llm.application/3.0/ToJsonUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.0/TypeTagArray.json b/test/schemas/llm.application/3.0/TypeTagArray.json index d2b95186d1..5b06e82134 100644 --- a/test/schemas/llm.application/3.0/TypeTagArray.json +++ b/test/schemas/llm.application/3.0/TypeTagArray.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -23,7 +23,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -32,7 +32,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -40,7 +40,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -49,7 +49,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -103,7 +104,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -112,7 +113,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -120,7 +121,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -129,7 +130,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -170,7 +172,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -179,7 +181,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -187,7 +189,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -196,7 +198,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -245,7 +248,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -254,7 +257,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -262,7 +265,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -271,7 +274,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -319,7 +323,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -328,7 +332,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -336,7 +340,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -345,7 +349,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -387,7 +392,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -396,7 +401,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -404,7 +409,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -413,7 +418,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -455,7 +461,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -464,7 +470,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -472,7 +478,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -481,7 +487,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -530,7 +537,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -539,7 +546,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -547,7 +554,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -556,7 +563,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 diff --git a/test/schemas/llm.application/3.0/TypeTagArrayUnion.json b/test/schemas/llm.application/3.0/TypeTagArrayUnion.json index 2bdf720eac..854067d599 100644 --- a/test/schemas/llm.application/3.0/TypeTagArrayUnion.json +++ b/test/schemas/llm.application/3.0/TypeTagArrayUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -20,7 +20,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -29,7 +29,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -39,11 +39,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -53,7 +53,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -90,7 +90,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -99,7 +99,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -109,11 +109,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -123,7 +123,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -147,7 +147,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -156,7 +156,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -166,11 +166,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -180,7 +180,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -212,7 +212,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -221,7 +221,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -231,11 +231,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -245,7 +245,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -276,7 +276,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -285,7 +285,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -295,11 +295,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -309,7 +309,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -334,7 +334,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -343,7 +343,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -353,11 +353,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -367,7 +367,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -392,7 +392,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -401,7 +401,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -411,11 +411,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -425,7 +425,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -457,7 +457,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -466,7 +466,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -476,11 +476,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -490,7 +490,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 diff --git a/test/schemas/llm.application/3.0/TypeTagAtomicUnion.json b/test/schemas/llm.application/3.0/TypeTagAtomicUnion.json index 32976d025b..f7fb31b21c 100644 --- a/test/schemas/llm.application/3.0/TypeTagAtomicUnion.json +++ b/test/schemas/llm.application/3.0/TypeTagAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -23,11 +23,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -69,11 +70,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -102,11 +104,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -143,11 +146,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -183,11 +187,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -217,11 +222,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -251,11 +257,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -292,11 +299,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.application/3.0/TypeTagCustom.json b/test/schemas/llm.application/3.0/TypeTagCustom.json index 6765c906f6..0b79ed946e 100644 --- a/test/schemas/llm.application/3.0/TypeTagCustom.json +++ b/test/schemas/llm.application/3.0/TypeTagCustom.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,7 +16,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -57,7 +57,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -85,7 +85,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -121,7 +121,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -156,7 +156,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -185,7 +185,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -214,7 +214,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -250,7 +250,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", diff --git a/test/schemas/llm.application/3.0/TypeTagDefault.json b/test/schemas/llm.application/3.0/TypeTagDefault.json index 18b0a361d3..f3ba057ce2 100644 --- a/test/schemas/llm.application/3.0/TypeTagDefault.json +++ b/test/schemas/llm.application/3.0/TypeTagDefault.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -19,25 +19,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -64,7 +64,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -78,7 +78,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -89,11 +89,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -135,25 +135,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -180,7 +180,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -194,7 +194,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -205,11 +205,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -238,25 +238,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -283,7 +283,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -297,7 +297,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -308,11 +308,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -349,25 +349,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -394,7 +394,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -408,7 +408,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -419,11 +419,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -459,25 +459,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -504,7 +504,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -518,7 +518,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -529,11 +529,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -563,25 +563,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -608,7 +608,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -622,7 +622,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -633,11 +633,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -667,25 +667,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -712,7 +712,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -726,7 +726,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -737,11 +737,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -778,25 +778,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -823,7 +823,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -837,7 +837,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -848,11 +848,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" diff --git a/test/schemas/llm.application/3.0/TypeTagFormat.json b/test/schemas/llm.application/3.0/TypeTagFormat.json index fee215d8f6..938ce5bea4 100644 --- a/test/schemas/llm.application/3.0/TypeTagFormat.json +++ b/test/schemas/llm.application/3.0/TypeTagFormat.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,91 +16,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -147,91 +147,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -265,91 +265,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -391,91 +391,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -516,91 +516,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -635,91 +635,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -754,91 +754,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -880,91 +880,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.application/3.0/TypeTagLength.json b/test/schemas/llm.application/3.0/TypeTagLength.json index eb4ddabc87..001b6817a2 100644 --- a/test/schemas/llm.application/3.0/TypeTagLength.json +++ b/test/schemas/llm.application/3.0/TypeTagLength.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -21,23 +21,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -79,23 +82,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -124,23 +130,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -177,23 +186,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -229,23 +241,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -275,23 +290,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -321,23 +339,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -374,23 +395,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/TypeTagMatrix.json b/test/schemas/llm.application/3.0/TypeTagMatrix.json index 7785928298..1377ee5152 100644 --- a/test/schemas/llm.application/3.0/TypeTagMatrix.json +++ b/test/schemas/llm.application/3.0/TypeTagMatrix.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -20,7 +20,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -56,7 +56,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -79,7 +79,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -110,7 +110,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -140,7 +140,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -164,7 +164,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -188,7 +188,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -219,7 +219,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 diff --git a/test/schemas/llm.application/3.0/TypeTagObjectUnion.json b/test/schemas/llm.application/3.0/TypeTagObjectUnion.json index dc16c07fec..ac9bc6dae9 100644 --- a/test/schemas/llm.application/3.0/TypeTagObjectUnion.json +++ b/test/schemas/llm.application/3.0/TypeTagObjectUnion.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -20,7 +20,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -33,7 +33,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -66,7 +67,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -79,7 +80,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -99,7 +101,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -112,7 +114,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -140,7 +143,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -153,7 +156,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -180,7 +184,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -193,7 +197,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -214,7 +219,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -227,7 +232,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -248,7 +254,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -261,7 +267,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -289,7 +296,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -302,7 +309,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/TypeTagPattern.json b/test/schemas/llm.application/3.0/TypeTagPattern.json index 671313baee..6dabf237c6 100644 --- a/test/schemas/llm.application/3.0/TypeTagPattern.json +++ b/test/schemas/llm.application/3.0/TypeTagPattern.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -16,19 +16,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -57,19 +57,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -85,19 +85,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -121,19 +121,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -156,19 +156,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -185,19 +185,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -214,19 +214,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -250,19 +250,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.application/3.0/TypeTagRange.json b/test/schemas/llm.application/3.0/TypeTagRange.json index f044c21f74..4d49d75dc5 100644 --- a/test/schemas/llm.application/3.0/TypeTagRange.json +++ b/test/schemas/llm.application/3.0/TypeTagRange.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, @@ -21,39 +21,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -99,39 +110,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -164,39 +186,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -237,39 +270,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -309,39 +353,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -375,39 +430,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -441,39 +507,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -514,39 +591,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.application/3.0/TypeTagType.json b/test/schemas/llm.application/3.0/TypeTagType.json index f462599bd1..69039ca5c3 100644 --- a/test/schemas/llm.application/3.0/TypeTagType.json +++ b/test/schemas/llm.application/3.0/TypeTagType.json @@ -1,7 +1,7 @@ { "model": "3.0", "options": { - "constraint": false, + "constraint": true, "recursive": 3, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayAny.json b/test/schemas/llm.application/3.1/ArrayAny.json index 042461a804..e8b2c16f49 100644 --- a/test/schemas/llm.application/3.1/ArrayAny.json +++ b/test/schemas/llm.application/3.1/ArrayAny.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayHierarchical.json b/test/schemas/llm.application/3.1/ArrayHierarchical.json index be2439ca16..6dc0201e89 100644 --- a/test/schemas/llm.application/3.1/ArrayHierarchical.json +++ b/test/schemas/llm.application/3.1/ArrayHierarchical.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayHierarchicalPointer.json b/test/schemas/llm.application/3.1/ArrayHierarchicalPointer.json index 316c9fdfac..0a2f9891ef 100644 --- a/test/schemas/llm.application/3.1/ArrayHierarchicalPointer.json +++ b/test/schemas/llm.application/3.1/ArrayHierarchicalPointer.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayMatrix.json b/test/schemas/llm.application/3.1/ArrayMatrix.json index 8fb21ec0f5..228b6ec988 100644 --- a/test/schemas/llm.application/3.1/ArrayMatrix.json +++ b/test/schemas/llm.application/3.1/ArrayMatrix.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRecursive.json b/test/schemas/llm.application/3.1/ArrayRecursive.json index ebdb001d6d..cf36543c0a 100644 --- a/test/schemas/llm.application/3.1/ArrayRecursive.json +++ b/test/schemas/llm.application/3.1/ArrayRecursive.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicit.json b/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicit.json index c36809c8bd..98f9c751ca 100644 --- a/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicit.json +++ b/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicit.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicitPointer.json b/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicitPointer.json index 9fb5df965a..2d158d2017 100644 --- a/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicitPointer.json +++ b/test/schemas/llm.application/3.1/ArrayRecursiveUnionExplicitPointer.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRecursiveUnionImplicit.json b/test/schemas/llm.application/3.1/ArrayRecursiveUnionImplicit.json index 88406d31a5..a5a342a0ed 100644 --- a/test/schemas/llm.application/3.1/ArrayRecursiveUnionImplicit.json +++ b/test/schemas/llm.application/3.1/ArrayRecursiveUnionImplicit.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRepeatedNullable.json b/test/schemas/llm.application/3.1/ArrayRepeatedNullable.json index daee4673a8..f4ff02fe87 100644 --- a/test/schemas/llm.application/3.1/ArrayRepeatedNullable.json +++ b/test/schemas/llm.application/3.1/ArrayRepeatedNullable.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRepeatedRequired.json b/test/schemas/llm.application/3.1/ArrayRepeatedRequired.json index 75482fb680..d0297cad7f 100644 --- a/test/schemas/llm.application/3.1/ArrayRepeatedRequired.json +++ b/test/schemas/llm.application/3.1/ArrayRepeatedRequired.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayRepeatedUnion.json b/test/schemas/llm.application/3.1/ArrayRepeatedUnion.json index f563d70e25..6588dce810 100644 --- a/test/schemas/llm.application/3.1/ArrayRepeatedUnion.json +++ b/test/schemas/llm.application/3.1/ArrayRepeatedUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArraySimple.json b/test/schemas/llm.application/3.1/ArraySimple.json index 3056f83357..a14e7a73e6 100644 --- a/test/schemas/llm.application/3.1/ArraySimple.json +++ b/test/schemas/llm.application/3.1/ArraySimple.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ArrayUnion.json b/test/schemas/llm.application/3.1/ArrayUnion.json index 855b8f647a..f768f833c7 100644 --- a/test/schemas/llm.application/3.1/ArrayUnion.json +++ b/test/schemas/llm.application/3.1/ArrayUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/AtomicUnion.json b/test/schemas/llm.application/3.1/AtomicUnion.json index e45e8116e6..4e09eee809 100644 --- a/test/schemas/llm.application/3.1/AtomicUnion.json +++ b/test/schemas/llm.application/3.1/AtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ClassGetter.json b/test/schemas/llm.application/3.1/ClassGetter.json index 5d8aee3ee0..7f20de307d 100644 --- a/test/schemas/llm.application/3.1/ClassGetter.json +++ b/test/schemas/llm.application/3.1/ClassGetter.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ClassMethod.json b/test/schemas/llm.application/3.1/ClassMethod.json index 8652fb94a5..e5ab33a8a4 100644 --- a/test/schemas/llm.application/3.1/ClassMethod.json +++ b/test/schemas/llm.application/3.1/ClassMethod.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ClassPropertyAssignment.json b/test/schemas/llm.application/3.1/ClassPropertyAssignment.json index c1218148c3..c64762651b 100644 --- a/test/schemas/llm.application/3.1/ClassPropertyAssignment.json +++ b/test/schemas/llm.application/3.1/ClassPropertyAssignment.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/CommentTagArray.json b/test/schemas/llm.application/3.1/CommentTagArray.json index 5af058e000..3773d80f70 100644 --- a/test/schemas/llm.application/3.1/CommentTagArray.json +++ b/test/schemas/llm.application/3.1/CommentTagArray.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,39 +20,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -92,39 +95,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -155,39 +161,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -223,39 +232,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -293,39 +305,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -358,39 +373,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -423,39 +441,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -497,39 +518,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagArrayUnion.json b/test/schemas/llm.application/3.1/CommentTagArrayUnion.json index 31f5770c23..febd4b236d 100644 --- a/test/schemas/llm.application/3.1/CommentTagArrayUnion.json +++ b/test/schemas/llm.application/3.1/CommentTagArrayUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -17,21 +17,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -42,14 +42,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -80,21 +82,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -105,14 +107,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -134,21 +138,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -159,14 +163,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -193,21 +199,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -218,14 +224,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -254,21 +262,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -279,14 +287,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -310,21 +320,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -335,14 +345,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -366,21 +378,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -391,14 +403,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -431,21 +445,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -456,14 +470,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagAtomicUnion.json b/test/schemas/llm.application/3.1/CommentTagAtomicUnion.json index 3a635dbbad..4bb4868642 100644 --- a/test/schemas/llm.application/3.1/CommentTagAtomicUnion.json +++ b/test/schemas/llm.application/3.1/CommentTagAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -23,11 +23,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -68,11 +69,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -104,11 +106,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -145,11 +148,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -188,11 +192,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -226,11 +231,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -264,11 +270,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -311,11 +318,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.application/3.1/CommentTagDefault.json b/test/schemas/llm.application/3.1/CommentTagDefault.json index e41855cdb3..51fed4031e 100644 --- a/test/schemas/llm.application/3.1/CommentTagDefault.json +++ b/test/schemas/llm.application/3.1/CommentTagDefault.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -96,8 +96,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -105,7 +107,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -228,8 +230,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -237,7 +241,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -351,8 +355,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -360,7 +366,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -479,8 +485,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -488,7 +496,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -609,8 +617,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -618,7 +628,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -734,8 +744,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -743,7 +755,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -859,8 +871,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -868,7 +882,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -993,8 +1007,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -1002,7 +1018,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" diff --git a/test/schemas/llm.application/3.1/CommentTagFormat.json b/test/schemas/llm.application/3.1/CommentTagFormat.json index e98008ec4d..58d85701f9 100644 --- a/test/schemas/llm.application/3.1/CommentTagFormat.json +++ b/test/schemas/llm.application/3.1/CommentTagFormat.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,92 +15,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -146,92 +146,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -268,92 +268,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -395,92 +395,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -524,92 +524,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -648,92 +648,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -772,92 +772,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -905,92 +905,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagLength.json b/test/schemas/llm.application/3.1/CommentTagLength.json index 6bcc38d08f..2edf4bfd15 100644 --- a/test/schemas/llm.application/3.1/CommentTagLength.json +++ b/test/schemas/llm.application/3.1/CommentTagLength.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,24 +20,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -77,24 +80,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -125,24 +131,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -178,24 +187,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -233,24 +245,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -283,24 +298,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -333,24 +351,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -392,24 +413,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagObjectUnion.json b/test/schemas/llm.application/3.1/CommentTagObjectUnion.json index ec625d5e24..21d4f3c2e0 100644 --- a/test/schemas/llm.application/3.1/CommentTagObjectUnion.json +++ b/test/schemas/llm.application/3.1/CommentTagObjectUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -19,8 +19,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -31,8 +31,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -64,8 +65,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -76,8 +77,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -100,8 +102,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -112,8 +114,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -141,8 +144,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -153,8 +156,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -184,8 +188,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -196,8 +200,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -222,8 +227,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -234,8 +239,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -260,8 +266,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -272,8 +278,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -307,8 +314,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -319,8 +326,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagPattern.json b/test/schemas/llm.application/3.1/CommentTagPattern.json index deb2611c46..7c5dc2d042 100644 --- a/test/schemas/llm.application/3.1/CommentTagPattern.json +++ b/test/schemas/llm.application/3.1/CommentTagPattern.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,20 +15,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -56,20 +56,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -88,20 +88,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -125,20 +125,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -164,20 +164,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -198,20 +198,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -232,20 +232,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -275,20 +275,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagRange.json b/test/schemas/llm.application/3.1/CommentTagRange.json index 7ad5bb1d51..93e03e4a38 100644 --- a/test/schemas/llm.application/3.1/CommentTagRange.json +++ b/test/schemas/llm.application/3.1/CommentTagRange.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,40 +20,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -97,40 +108,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -165,40 +187,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -238,40 +271,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -313,40 +357,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -383,40 +438,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -453,40 +519,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -532,40 +609,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/CommentTagType.json b/test/schemas/llm.application/3.1/CommentTagType.json index f45dfe6561..c4cb2820b9 100644 --- a/test/schemas/llm.application/3.1/CommentTagType.json +++ b/test/schemas/llm.application/3.1/CommentTagType.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ConstantAtomicAbsorbed.json b/test/schemas/llm.application/3.1/ConstantAtomicAbsorbed.json index c7b58f5a06..33af678a2a 100644 --- a/test/schemas/llm.application/3.1/ConstantAtomicAbsorbed.json +++ b/test/schemas/llm.application/3.1/ConstantAtomicAbsorbed.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,12 +15,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -46,12 +46,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -68,12 +68,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -95,12 +95,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -124,12 +124,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -148,12 +148,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -172,12 +172,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -205,12 +205,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/ConstantAtomicTagged.json b/test/schemas/llm.application/3.1/ConstantAtomicTagged.json index 1ffbd52aa6..c759316809 100644 --- a/test/schemas/llm.application/3.1/ConstantAtomicTagged.json +++ b/test/schemas/llm.application/3.1/ConstantAtomicTagged.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -21,7 +21,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -32,7 +32,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -66,7 +66,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -77,7 +77,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -102,7 +102,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -113,7 +113,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -143,7 +143,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -154,7 +154,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -186,7 +186,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -197,7 +197,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -224,7 +224,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -235,7 +235,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -262,7 +262,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -273,7 +273,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -309,7 +309,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -320,7 +320,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } diff --git a/test/schemas/llm.application/3.1/ConstantAtomicUnion.json b/test/schemas/llm.application/3.1/ConstantAtomicUnion.json index 65afaffae4..a329faddcf 100644 --- a/test/schemas/llm.application/3.1/ConstantAtomicUnion.json +++ b/test/schemas/llm.application/3.1/ConstantAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ConstantConstEnumeration.json b/test/schemas/llm.application/3.1/ConstantConstEnumeration.json index c19b55a6af..d98c73852a 100644 --- a/test/schemas/llm.application/3.1/ConstantConstEnumeration.json +++ b/test/schemas/llm.application/3.1/ConstantConstEnumeration.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ConstantEnumeration.json b/test/schemas/llm.application/3.1/ConstantEnumeration.json index c19b55a6af..d98c73852a 100644 --- a/test/schemas/llm.application/3.1/ConstantEnumeration.json +++ b/test/schemas/llm.application/3.1/ConstantEnumeration.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicArray.json b/test/schemas/llm.application/3.1/DynamicArray.json index 36e9a60618..afadaea9e3 100644 --- a/test/schemas/llm.application/3.1/DynamicArray.json +++ b/test/schemas/llm.application/3.1/DynamicArray.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicComposite.json b/test/schemas/llm.application/3.1/DynamicComposite.json index 30bc656774..040913944e 100644 --- a/test/schemas/llm.application/3.1/DynamicComposite.json +++ b/test/schemas/llm.application/3.1/DynamicComposite.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicConstant.json b/test/schemas/llm.application/3.1/DynamicConstant.json index bce4f00aa9..7f0e15ccf5 100644 --- a/test/schemas/llm.application/3.1/DynamicConstant.json +++ b/test/schemas/llm.application/3.1/DynamicConstant.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicEnumeration.json b/test/schemas/llm.application/3.1/DynamicEnumeration.json index 4f5ae74ef1..8cc7c3208f 100644 --- a/test/schemas/llm.application/3.1/DynamicEnumeration.json +++ b/test/schemas/llm.application/3.1/DynamicEnumeration.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicNever.json b/test/schemas/llm.application/3.1/DynamicNever.json index b48ebb4830..33d34abb8c 100644 --- a/test/schemas/llm.application/3.1/DynamicNever.json +++ b/test/schemas/llm.application/3.1/DynamicNever.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicSimple.json b/test/schemas/llm.application/3.1/DynamicSimple.json index fa9870a204..66a7b0fbcf 100644 --- a/test/schemas/llm.application/3.1/DynamicSimple.json +++ b/test/schemas/llm.application/3.1/DynamicSimple.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicTemplate.json b/test/schemas/llm.application/3.1/DynamicTemplate.json index a4b1250b7f..2eb0597d8e 100644 --- a/test/schemas/llm.application/3.1/DynamicTemplate.json +++ b/test/schemas/llm.application/3.1/DynamicTemplate.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicTree.json b/test/schemas/llm.application/3.1/DynamicTree.json index a19310dd32..3073658e3e 100644 --- a/test/schemas/llm.application/3.1/DynamicTree.json +++ b/test/schemas/llm.application/3.1/DynamicTree.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicUndefined.json b/test/schemas/llm.application/3.1/DynamicUndefined.json index b48ebb4830..33d34abb8c 100644 --- a/test/schemas/llm.application/3.1/DynamicUndefined.json +++ b/test/schemas/llm.application/3.1/DynamicUndefined.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/DynamicUnion.json b/test/schemas/llm.application/3.1/DynamicUnion.json index aeac5deb73..7263b18b0f 100644 --- a/test/schemas/llm.application/3.1/DynamicUnion.json +++ b/test/schemas/llm.application/3.1/DynamicUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectAlias.json b/test/schemas/llm.application/3.1/ObjectAlias.json index 740b86d649..576bba49a3 100644 --- a/test/schemas/llm.application/3.1/ObjectAlias.json +++ b/test/schemas/llm.application/3.1/ObjectAlias.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectDate.json b/test/schemas/llm.application/3.1/ObjectDate.json index 6c363078d9..f1bbbd9e33 100644 --- a/test/schemas/llm.application/3.1/ObjectDate.json +++ b/test/schemas/llm.application/3.1/ObjectDate.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -21,7 +21,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -32,7 +32,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -43,7 +43,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -54,7 +54,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -65,7 +65,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -102,7 +102,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -113,7 +113,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -124,7 +124,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -135,7 +135,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -146,7 +146,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -174,7 +174,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -185,7 +185,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -196,7 +196,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -207,7 +207,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -218,7 +218,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -251,7 +251,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -262,7 +262,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -273,7 +273,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -284,7 +284,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -295,7 +295,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -330,7 +330,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -341,7 +341,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -352,7 +352,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -363,7 +363,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -374,7 +374,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -404,7 +404,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -415,7 +415,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -426,7 +426,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -437,7 +437,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -448,7 +448,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -478,7 +478,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -489,7 +489,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -500,7 +500,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -511,7 +511,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -522,7 +522,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -561,7 +561,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -572,7 +572,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -583,7 +583,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -594,7 +594,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -605,7 +605,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } diff --git a/test/schemas/llm.application/3.1/ObjectDescription.json b/test/schemas/llm.application/3.1/ObjectDescription.json index d7a3ea1182..af445bb033 100644 --- a/test/schemas/llm.application/3.1/ObjectDescription.json +++ b/test/schemas/llm.application/3.1/ObjectDescription.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -18,8 +18,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -74,8 +75,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -119,8 +121,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -173,8 +176,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -225,8 +229,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -274,8 +279,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -323,8 +329,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -381,8 +388,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", diff --git a/test/schemas/llm.application/3.1/ObjectDynamic.json b/test/schemas/llm.application/3.1/ObjectDynamic.json index a4b1250b7f..2eb0597d8e 100644 --- a/test/schemas/llm.application/3.1/ObjectDynamic.json +++ b/test/schemas/llm.application/3.1/ObjectDynamic.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectGenericAlias.json b/test/schemas/llm.application/3.1/ObjectGenericAlias.json index 0c85731dbd..0582e11dda 100644 --- a/test/schemas/llm.application/3.1/ObjectGenericAlias.json +++ b/test/schemas/llm.application/3.1/ObjectGenericAlias.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectGenericArray.json b/test/schemas/llm.application/3.1/ObjectGenericArray.json index d8b8d490ae..d5205b9bfb 100644 --- a/test/schemas/llm.application/3.1/ObjectGenericArray.json +++ b/test/schemas/llm.application/3.1/ObjectGenericArray.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectGenericUnion.json b/test/schemas/llm.application/3.1/ObjectGenericUnion.json index 25c401df0d..98c1525620 100644 --- a/test/schemas/llm.application/3.1/ObjectGenericUnion.json +++ b/test/schemas/llm.application/3.1/ObjectGenericUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectInternal.json b/test/schemas/llm.application/3.1/ObjectInternal.json index 900e0c7c83..603d646d87 100644 --- a/test/schemas/llm.application/3.1/ObjectInternal.json +++ b/test/schemas/llm.application/3.1/ObjectInternal.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectIntersection.json b/test/schemas/llm.application/3.1/ObjectIntersection.json index b4923ae173..6b0ee40b86 100644 --- a/test/schemas/llm.application/3.1/ObjectIntersection.json +++ b/test/schemas/llm.application/3.1/ObjectIntersection.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectJsonTag.json b/test/schemas/llm.application/3.1/ObjectJsonTag.json index f63e124388..d00d16d032 100644 --- a/test/schemas/llm.application/3.1/ObjectJsonTag.json +++ b/test/schemas/llm.application/3.1/ObjectJsonTag.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectLiteralProperty.json b/test/schemas/llm.application/3.1/ObjectLiteralProperty.json index 105a0998b8..d51ca2ce2d 100644 --- a/test/schemas/llm.application/3.1/ObjectLiteralProperty.json +++ b/test/schemas/llm.application/3.1/ObjectLiteralProperty.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectLiteralType.json b/test/schemas/llm.application/3.1/ObjectLiteralType.json index 9d0db43cf3..5f221b29b3 100644 --- a/test/schemas/llm.application/3.1/ObjectLiteralType.json +++ b/test/schemas/llm.application/3.1/ObjectLiteralType.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectNullable.json b/test/schemas/llm.application/3.1/ObjectNullable.json index 007d40b321..bbc556b94c 100644 --- a/test/schemas/llm.application/3.1/ObjectNullable.json +++ b/test/schemas/llm.application/3.1/ObjectNullable.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectOptional.json b/test/schemas/llm.application/3.1/ObjectOptional.json index 0d8b1c5375..cbbca96c9d 100644 --- a/test/schemas/llm.application/3.1/ObjectOptional.json +++ b/test/schemas/llm.application/3.1/ObjectOptional.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectPartial.json b/test/schemas/llm.application/3.1/ObjectPartial.json index 87d090da7f..ab22360d23 100644 --- a/test/schemas/llm.application/3.1/ObjectPartial.json +++ b/test/schemas/llm.application/3.1/ObjectPartial.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectPartialAndRequired.json b/test/schemas/llm.application/3.1/ObjectPartialAndRequired.json index 72def0741b..d5e1b887fc 100644 --- a/test/schemas/llm.application/3.1/ObjectPartialAndRequired.json +++ b/test/schemas/llm.application/3.1/ObjectPartialAndRequired.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectPrimitive.json b/test/schemas/llm.application/3.1/ObjectPrimitive.json index b6c1e46bdb..c67ce68006 100644 --- a/test/schemas/llm.application/3.1/ObjectPrimitive.json +++ b/test/schemas/llm.application/3.1/ObjectPrimitive.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectRecursive.json b/test/schemas/llm.application/3.1/ObjectRecursive.json index a42286a2db..1f6d067be5 100644 --- a/test/schemas/llm.application/3.1/ObjectRecursive.json +++ b/test/schemas/llm.application/3.1/ObjectRecursive.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectRequired.json b/test/schemas/llm.application/3.1/ObjectRequired.json index 7f6a941944..c641cd8564 100644 --- a/test/schemas/llm.application/3.1/ObjectRequired.json +++ b/test/schemas/llm.application/3.1/ObjectRequired.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectSimple.json b/test/schemas/llm.application/3.1/ObjectSimple.json index 1b80caa68c..d2ccf75347 100644 --- a/test/schemas/llm.application/3.1/ObjectSimple.json +++ b/test/schemas/llm.application/3.1/ObjectSimple.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUndefined.json b/test/schemas/llm.application/3.1/ObjectUndefined.json index 3d19fb458c..540134ae16 100644 --- a/test/schemas/llm.application/3.1/ObjectUndefined.json +++ b/test/schemas/llm.application/3.1/ObjectUndefined.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionComposite.json b/test/schemas/llm.application/3.1/ObjectUnionComposite.json index 8e3c5db14b..23d1e16cab 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionComposite.json +++ b/test/schemas/llm.application/3.1/ObjectUnionComposite.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionCompositePointer.json b/test/schemas/llm.application/3.1/ObjectUnionCompositePointer.json index fc1fdfe25d..8b96f0f5e1 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionCompositePointer.json +++ b/test/schemas/llm.application/3.1/ObjectUnionCompositePointer.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionDouble.json b/test/schemas/llm.application/3.1/ObjectUnionDouble.json index f8d733da21..e90d0a7354 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionDouble.json +++ b/test/schemas/llm.application/3.1/ObjectUnionDouble.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionExplicit.json b/test/schemas/llm.application/3.1/ObjectUnionExplicit.json index 82b48d5a90..c611c2b5d2 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionExplicit.json +++ b/test/schemas/llm.application/3.1/ObjectUnionExplicit.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionExplicitPointer.json b/test/schemas/llm.application/3.1/ObjectUnionExplicitPointer.json index f3242ae35a..f3f25dfada 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionExplicitPointer.json +++ b/test/schemas/llm.application/3.1/ObjectUnionExplicitPointer.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionImplicit.json b/test/schemas/llm.application/3.1/ObjectUnionImplicit.json index 79d9df4ffd..04d423b5de 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionImplicit.json +++ b/test/schemas/llm.application/3.1/ObjectUnionImplicit.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ObjectUnionNonPredictable.json b/test/schemas/llm.application/3.1/ObjectUnionNonPredictable.json index 7bb120a04b..e7a47113f3 100644 --- a/test/schemas/llm.application/3.1/ObjectUnionNonPredictable.json +++ b/test/schemas/llm.application/3.1/ObjectUnionNonPredictable.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/TemplateAtomic.json b/test/schemas/llm.application/3.1/TemplateAtomic.json index e9bc5f3b57..b36f1baf8b 100644 --- a/test/schemas/llm.application/3.1/TemplateAtomic.json +++ b/test/schemas/llm.application/3.1/TemplateAtomic.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,24 +15,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -45,12 +45,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -82,24 +82,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -112,12 +112,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -140,24 +140,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -170,12 +170,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -203,24 +203,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -233,12 +233,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -268,24 +268,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -298,12 +298,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -328,24 +328,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -358,12 +358,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -388,24 +388,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -418,12 +418,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -457,24 +457,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -487,12 +487,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TemplateConstant.json b/test/schemas/llm.application/3.1/TemplateConstant.json index 28e9bc9760..e0306f75fa 100644 --- a/test/schemas/llm.application/3.1/TemplateConstant.json +++ b/test/schemas/llm.application/3.1/TemplateConstant.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/TemplateUnion.json b/test/schemas/llm.application/3.1/TemplateUnion.json index fbca3d1d90..6a1dcd4e96 100644 --- a/test/schemas/llm.application/3.1/TemplateUnion.json +++ b/test/schemas/llm.application/3.1/TemplateUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,18 +20,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -45,7 +45,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -109,18 +109,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -134,7 +134,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -189,18 +189,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -214,7 +214,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -274,18 +274,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -299,7 +299,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -361,18 +361,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -386,7 +386,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -443,18 +443,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -468,7 +468,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -525,18 +525,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -550,7 +550,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -616,18 +616,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -641,7 +641,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" diff --git a/test/schemas/llm.application/3.1/ToJsonAtomicUnion.json b/test/schemas/llm.application/3.1/ToJsonAtomicUnion.json index e45e8116e6..4e09eee809 100644 --- a/test/schemas/llm.application/3.1/ToJsonAtomicUnion.json +++ b/test/schemas/llm.application/3.1/ToJsonAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ToJsonDouble.json b/test/schemas/llm.application/3.1/ToJsonDouble.json index 1cf7662fff..622ee73f70 100644 --- a/test/schemas/llm.application/3.1/ToJsonDouble.json +++ b/test/schemas/llm.application/3.1/ToJsonDouble.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ToJsonNull.json b/test/schemas/llm.application/3.1/ToJsonNull.json index 302b602f07..1305a11b0e 100644 --- a/test/schemas/llm.application/3.1/ToJsonNull.json +++ b/test/schemas/llm.application/3.1/ToJsonNull.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/ToJsonUnion.json b/test/schemas/llm.application/3.1/ToJsonUnion.json index d9ddf0a80c..af0ee57ce6 100644 --- a/test/schemas/llm.application/3.1/ToJsonUnion.json +++ b/test/schemas/llm.application/3.1/ToJsonUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/3.1/TypeTagArray.json b/test/schemas/llm.application/3.1/TypeTagArray.json index 47fd0c0edf..f5fbe72ae5 100644 --- a/test/schemas/llm.application/3.1/TypeTagArray.json +++ b/test/schemas/llm.application/3.1/TypeTagArray.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,43 +20,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -96,43 +100,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -163,43 +171,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -235,43 +247,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -309,43 +325,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -378,43 +398,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -447,43 +471,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -525,43 +553,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagArrayUnion.json b/test/schemas/llm.application/3.1/TypeTagArrayUnion.json index c90f2bffe4..c5da6dcc6a 100644 --- a/test/schemas/llm.application/3.1/TypeTagArrayUnion.json +++ b/test/schemas/llm.application/3.1/TypeTagArrayUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -17,44 +17,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -85,44 +87,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -144,44 +148,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -208,44 +214,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -274,44 +282,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -335,44 +345,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -396,44 +408,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -466,44 +480,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagAtomicUnion.json b/test/schemas/llm.application/3.1/TypeTagAtomicUnion.json index 3a635dbbad..4bb4868642 100644 --- a/test/schemas/llm.application/3.1/TypeTagAtomicUnion.json +++ b/test/schemas/llm.application/3.1/TypeTagAtomicUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -23,11 +23,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -68,11 +69,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -104,11 +106,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -145,11 +148,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -188,11 +192,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -226,11 +231,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -264,11 +270,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -311,11 +318,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.application/3.1/TypeTagCustom.json b/test/schemas/llm.application/3.1/TypeTagCustom.json index 9aec713bba..bcb663263f 100644 --- a/test/schemas/llm.application/3.1/TypeTagCustom.json +++ b/test/schemas/llm.application/3.1/TypeTagCustom.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,8 +15,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -56,8 +56,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -88,8 +88,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -125,8 +125,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -164,8 +164,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -198,8 +198,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -232,8 +232,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -275,8 +275,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", diff --git a/test/schemas/llm.application/3.1/TypeTagDefault.json b/test/schemas/llm.application/3.1/TypeTagDefault.json index 7b0623b0ee..79a20809a6 100644 --- a/test/schemas/llm.application/3.1/TypeTagDefault.json +++ b/test/schemas/llm.application/3.1/TypeTagDefault.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -18,26 +18,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -64,7 +64,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -78,7 +78,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -89,11 +89,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -134,26 +134,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -180,7 +180,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -194,7 +194,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -205,11 +205,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -241,26 +241,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -287,7 +287,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -301,7 +301,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -312,11 +312,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -353,26 +353,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -399,7 +399,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -413,7 +413,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -424,11 +424,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -467,26 +467,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -513,7 +513,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -527,7 +527,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -538,11 +538,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -576,26 +576,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -622,7 +622,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -636,7 +636,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -647,11 +647,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -685,26 +685,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -731,7 +731,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -745,7 +745,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -756,11 +756,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -803,26 +803,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -849,7 +849,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -863,7 +863,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -874,11 +874,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" diff --git a/test/schemas/llm.application/3.1/TypeTagFormat.json b/test/schemas/llm.application/3.1/TypeTagFormat.json index e98008ec4d..58d85701f9 100644 --- a/test/schemas/llm.application/3.1/TypeTagFormat.json +++ b/test/schemas/llm.application/3.1/TypeTagFormat.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,92 +15,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -146,92 +146,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -268,92 +268,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -395,92 +395,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -524,92 +524,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -648,92 +648,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -772,92 +772,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -905,92 +905,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagLength.json b/test/schemas/llm.application/3.1/TypeTagLength.json index 6bcc38d08f..2edf4bfd15 100644 --- a/test/schemas/llm.application/3.1/TypeTagLength.json +++ b/test/schemas/llm.application/3.1/TypeTagLength.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,24 +20,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -77,24 +80,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -125,24 +131,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -178,24 +187,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -233,24 +245,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -283,24 +298,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -333,24 +351,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -392,24 +413,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagMatrix.json b/test/schemas/llm.application/3.1/TypeTagMatrix.json index 8a808c9434..9768753a39 100644 --- a/test/schemas/llm.application/3.1/TypeTagMatrix.json +++ b/test/schemas/llm.application/3.1/TypeTagMatrix.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,16 +15,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -49,16 +51,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -74,16 +78,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -104,16 +110,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -136,16 +144,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -163,16 +173,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -190,16 +202,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -226,16 +240,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagObjectUnion.json b/test/schemas/llm.application/3.1/TypeTagObjectUnion.json index ec625d5e24..21d4f3c2e0 100644 --- a/test/schemas/llm.application/3.1/TypeTagObjectUnion.json +++ b/test/schemas/llm.application/3.1/TypeTagObjectUnion.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -19,8 +19,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -31,8 +31,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -64,8 +65,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -76,8 +77,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -100,8 +102,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -112,8 +114,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -141,8 +144,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -153,8 +156,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -184,8 +188,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -196,8 +200,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -222,8 +227,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -234,8 +239,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -260,8 +266,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -272,8 +278,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -307,8 +314,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -319,8 +326,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagPattern.json b/test/schemas/llm.application/3.1/TypeTagPattern.json index 6392332816..9109beab38 100644 --- a/test/schemas/llm.application/3.1/TypeTagPattern.json +++ b/test/schemas/llm.application/3.1/TypeTagPattern.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -15,20 +15,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -56,20 +56,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -88,20 +88,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -125,20 +125,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -164,20 +164,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -198,20 +198,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -232,20 +232,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -275,20 +275,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagRange.json b/test/schemas/llm.application/3.1/TypeTagRange.json index 7ad5bb1d51..93e03e4a38 100644 --- a/test/schemas/llm.application/3.1/TypeTagRange.json +++ b/test/schemas/llm.application/3.1/TypeTagRange.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, @@ -20,40 +20,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -97,40 +108,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -165,40 +187,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -238,40 +271,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -313,40 +357,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -383,40 +438,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -453,40 +519,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -532,40 +609,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.application/3.1/TypeTagType.json b/test/schemas/llm.application/3.1/TypeTagType.json index 8444bda183..d9e93c7b0c 100644 --- a/test/schemas/llm.application/3.1/TypeTagType.json +++ b/test/schemas/llm.application/3.1/TypeTagType.json @@ -1,7 +1,7 @@ { "model": "3.1", "options": { - "constraint": false, + "constraint": true, "reference": false, "separate": null }, diff --git a/test/schemas/llm.application/gemini/ArrayRecursive.json b/test/schemas/llm.application/gemini/ArrayRecursive.json index 6793126680..465f773de2 100644 --- a/test/schemas/llm.application/gemini/ArrayRecursive.json +++ b/test/schemas/llm.application/gemini/ArrayRecursive.json @@ -31,7 +31,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -201,7 +201,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -359,7 +359,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -524,7 +524,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -689,7 +689,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -848,7 +848,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -1007,7 +1007,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -1172,7 +1172,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" diff --git a/test/schemas/llm.application/gemini/CommentTagArray.json b/test/schemas/llm.application/gemini/CommentTagArray.json index fb287b26aa..22d9ace62c 100644 --- a/test/schemas/llm.application/gemini/CommentTagArray.json +++ b/test/schemas/llm.application/gemini/CommentTagArray.json @@ -23,38 +23,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -96,38 +93,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -157,38 +151,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -225,38 +216,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -293,38 +281,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -355,38 +340,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -417,38 +399,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -485,38 +464,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ diff --git a/test/schemas/llm.application/gemini/TypeTagArray.json b/test/schemas/llm.application/gemini/TypeTagArray.json index 420b4d3535..c30b22d15a 100644 --- a/test/schemas/llm.application/gemini/TypeTagArray.json +++ b/test/schemas/llm.application/gemini/TypeTagArray.json @@ -24,8 +24,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -33,7 +32,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -41,8 +40,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -50,15 +48,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -101,8 +98,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -110,7 +106,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -118,8 +114,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -127,15 +122,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -166,8 +160,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -175,7 +168,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -183,8 +176,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -192,15 +184,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -238,8 +229,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -247,7 +237,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -255,8 +245,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -264,15 +253,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -310,8 +298,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -319,7 +306,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -327,8 +314,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -336,15 +322,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -376,8 +361,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -385,7 +369,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -393,8 +377,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -402,15 +385,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -442,8 +424,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -451,7 +432,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -459,8 +440,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -468,15 +448,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -514,8 +493,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -523,7 +501,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -531,8 +509,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -540,15 +517,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ diff --git a/test/schemas/llm.application/gemini/TypeTagMatrix.json b/test/schemas/llm.application/gemini/TypeTagMatrix.json index 7553fb7acc..89791a36f9 100644 --- a/test/schemas/llm.application/gemini/TypeTagMatrix.json +++ b/test/schemas/llm.application/gemini/TypeTagMatrix.json @@ -21,11 +21,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -55,11 +53,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -77,11 +73,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -106,11 +100,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -135,11 +127,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -158,11 +148,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -181,11 +169,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -210,11 +196,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/CommentTagAtomicUnion.json b/test/schemas/llm.parameters/3.0/CommentTagAtomicUnion.json index ed4d69681d..2d6f7dff4a 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagAtomicUnion.json +++ b/test/schemas/llm.parameters/3.0/CommentTagAtomicUnion.json @@ -13,11 +13,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -46,11 +47,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -80,11 +82,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -113,11 +116,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -149,11 +153,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.parameters/3.0/CommentTagDefault.json b/test/schemas/llm.parameters/3.0/CommentTagDefault.json index c8a1e21040..e27da9426b 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagDefault.json +++ b/test/schemas/llm.parameters/3.0/CommentTagDefault.json @@ -78,14 +78,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -187,14 +189,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -297,14 +301,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -406,14 +412,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -518,14 +526,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" diff --git a/test/schemas/llm.parameters/3.0/CommentTagFormat.json b/test/schemas/llm.parameters/3.0/CommentTagFormat.json index 255a496ad6..c5326c33f8 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagFormat.json +++ b/test/schemas/llm.parameters/3.0/CommentTagFormat.json @@ -6,91 +6,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -124,91 +124,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -243,91 +243,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -361,91 +361,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -482,91 +482,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/CommentTagLength.json b/test/schemas/llm.parameters/3.0/CommentTagLength.json index fd2c20b200..4b569bea24 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagLength.json +++ b/test/schemas/llm.parameters/3.0/CommentTagLength.json @@ -11,23 +11,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -56,23 +59,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -102,23 +108,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -147,23 +156,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -195,23 +207,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/CommentTagObjectUnion.json b/test/schemas/llm.parameters/3.0/CommentTagObjectUnion.json index 1f9ad1a7d1..d250bc5b19 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagObjectUnion.json +++ b/test/schemas/llm.parameters/3.0/CommentTagObjectUnion.json @@ -10,7 +10,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -23,7 +23,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -43,7 +44,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -56,7 +57,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -77,7 +79,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -90,7 +92,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -110,7 +113,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -123,7 +126,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -146,7 +150,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -159,7 +163,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/CommentTagPattern.json b/test/schemas/llm.parameters/3.0/CommentTagPattern.json index d8b5f0e99e..0c533a8008 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagPattern.json +++ b/test/schemas/llm.parameters/3.0/CommentTagPattern.json @@ -6,19 +6,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -34,19 +34,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -63,19 +63,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -91,19 +91,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -122,19 +122,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/CommentTagRange.json b/test/schemas/llm.parameters/3.0/CommentTagRange.json index 2c3b9e522e..568ae0c7bb 100644 --- a/test/schemas/llm.parameters/3.0/CommentTagRange.json +++ b/test/schemas/llm.parameters/3.0/CommentTagRange.json @@ -11,39 +11,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -76,39 +87,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -142,39 +164,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -207,39 +240,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -275,39 +319,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/ConstantAtomicAbsorbed.json b/test/schemas/llm.parameters/3.0/ConstantAtomicAbsorbed.json index 0e2db1a7d1..caea8f3d63 100644 --- a/test/schemas/llm.parameters/3.0/ConstantAtomicAbsorbed.json +++ b/test/schemas/llm.parameters/3.0/ConstantAtomicAbsorbed.json @@ -6,11 +6,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -24,11 +24,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -43,11 +43,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -61,11 +61,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ @@ -82,11 +82,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/ConstantAtomicTagged.json b/test/schemas/llm.parameters/3.0/ConstantAtomicTagged.json index b25b427811..467e8aeb4e 100644 --- a/test/schemas/llm.parameters/3.0/ConstantAtomicTagged.json +++ b/test/schemas/llm.parameters/3.0/ConstantAtomicTagged.json @@ -6,16 +6,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -37,16 +37,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -69,16 +69,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -100,16 +100,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", @@ -134,16 +134,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", diff --git a/test/schemas/llm.parameters/3.0/ObjectDate.json b/test/schemas/llm.parameters/3.0/ObjectDate.json index 9053940796..8d0ccbd802 100644 --- a/test/schemas/llm.parameters/3.0/ObjectDate.json +++ b/test/schemas/llm.parameters/3.0/ObjectDate.json @@ -6,28 +6,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -43,28 +43,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -81,28 +81,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -118,28 +118,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ @@ -158,28 +158,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/ObjectDescription.json b/test/schemas/llm.parameters/3.0/ObjectDescription.json index 6f2a9c8cf3..d95d75893c 100644 --- a/test/schemas/llm.parameters/3.0/ObjectDescription.json +++ b/test/schemas/llm.parameters/3.0/ObjectDescription.json @@ -6,8 +6,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -48,8 +49,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -89,8 +91,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -131,8 +134,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", @@ -174,8 +178,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", diff --git a/test/schemas/llm.parameters/3.0/TemplateAtomic.json b/test/schemas/llm.parameters/3.0/TemplateAtomic.json index e4dce98b47..5c97ca2473 100644 --- a/test/schemas/llm.parameters/3.0/TemplateAtomic.json +++ b/test/schemas/llm.parameters/3.0/TemplateAtomic.json @@ -6,23 +6,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -33,11 +33,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -57,23 +57,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -84,11 +84,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -109,23 +109,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -136,11 +136,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -160,23 +160,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -187,11 +187,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -214,23 +214,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -241,11 +241,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/TemplateUnion.json b/test/schemas/llm.parameters/3.0/TemplateUnion.json index 53eaff8cc8..fd24a660ac 100644 --- a/test/schemas/llm.parameters/3.0/TemplateUnion.json +++ b/test/schemas/llm.parameters/3.0/TemplateUnion.json @@ -11,29 +11,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -81,29 +81,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -152,29 +152,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -222,29 +222,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" @@ -295,29 +295,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" diff --git a/test/schemas/llm.parameters/3.0/TypeTagArray.json b/test/schemas/llm.parameters/3.0/TypeTagArray.json index 1b9be0fe41..1541378468 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagArray.json +++ b/test/schemas/llm.parameters/3.0/TypeTagArray.json @@ -13,7 +13,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -22,7 +22,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -30,7 +30,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -39,7 +39,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -80,7 +81,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -89,7 +90,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -97,7 +98,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -106,7 +107,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -148,7 +150,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -157,7 +159,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -165,7 +167,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -174,7 +176,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -215,7 +218,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -224,7 +227,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -232,7 +235,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -241,7 +244,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 @@ -285,7 +289,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -294,7 +298,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -302,7 +306,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -311,7 +315,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 diff --git a/test/schemas/llm.parameters/3.0/TypeTagArrayUnion.json b/test/schemas/llm.parameters/3.0/TypeTagArrayUnion.json index a4b9959ccd..0808940c54 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagArrayUnion.json +++ b/test/schemas/llm.parameters/3.0/TypeTagArrayUnion.json @@ -10,7 +10,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -19,7 +19,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -29,11 +29,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -43,7 +43,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -67,7 +67,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -76,7 +76,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -86,11 +86,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -100,7 +100,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -125,7 +125,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -134,7 +134,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -144,11 +144,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -158,7 +158,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -182,7 +182,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -191,7 +191,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -201,11 +201,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -215,7 +215,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -242,7 +242,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -251,7 +251,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -261,11 +261,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -275,7 +275,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 diff --git a/test/schemas/llm.parameters/3.0/TypeTagAtomicUnion.json b/test/schemas/llm.parameters/3.0/TypeTagAtomicUnion.json index ed4d69681d..2d6f7dff4a 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagAtomicUnion.json +++ b/test/schemas/llm.parameters/3.0/TypeTagAtomicUnion.json @@ -13,11 +13,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -46,11 +47,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -80,11 +82,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -113,11 +116,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -149,11 +153,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.parameters/3.0/TypeTagCustom.json b/test/schemas/llm.parameters/3.0/TypeTagCustom.json index 02613d3443..add3808924 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagCustom.json +++ b/test/schemas/llm.parameters/3.0/TypeTagCustom.json @@ -6,7 +6,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -34,7 +34,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -63,7 +63,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -91,7 +91,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", @@ -122,7 +122,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", diff --git a/test/schemas/llm.parameters/3.0/TypeTagDefault.json b/test/schemas/llm.parameters/3.0/TypeTagDefault.json index ba7d85aa79..37492e4b16 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagDefault.json +++ b/test/schemas/llm.parameters/3.0/TypeTagDefault.json @@ -9,25 +9,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -54,7 +54,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -68,7 +68,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -79,11 +79,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -112,25 +112,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -157,7 +157,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -171,7 +171,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -182,11 +182,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -216,25 +216,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -261,7 +261,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -275,7 +275,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -286,11 +286,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -319,25 +319,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -364,7 +364,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -378,7 +378,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -389,11 +389,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -425,25 +425,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -470,7 +470,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -484,7 +484,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -495,11 +495,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" diff --git a/test/schemas/llm.parameters/3.0/TypeTagFormat.json b/test/schemas/llm.parameters/3.0/TypeTagFormat.json index 255a496ad6..c5326c33f8 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagFormat.json +++ b/test/schemas/llm.parameters/3.0/TypeTagFormat.json @@ -6,91 +6,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -124,91 +124,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -243,91 +243,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -361,91 +361,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ @@ -482,91 +482,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/TypeTagLength.json b/test/schemas/llm.parameters/3.0/TypeTagLength.json index fd2c20b200..4b569bea24 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagLength.json +++ b/test/schemas/llm.parameters/3.0/TypeTagLength.json @@ -11,23 +11,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -56,23 +59,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -102,23 +108,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -147,23 +156,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -195,23 +207,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/TypeTagMatrix.json b/test/schemas/llm.parameters/3.0/TypeTagMatrix.json index f2b189b7ef..a1aae48a3b 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagMatrix.json +++ b/test/schemas/llm.parameters/3.0/TypeTagMatrix.json @@ -10,7 +10,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -33,7 +33,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -57,7 +57,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -80,7 +80,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 @@ -106,7 +106,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 diff --git a/test/schemas/llm.parameters/3.0/TypeTagObjectUnion.json b/test/schemas/llm.parameters/3.0/TypeTagObjectUnion.json index 1f9ad1a7d1..d250bc5b19 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagObjectUnion.json +++ b/test/schemas/llm.parameters/3.0/TypeTagObjectUnion.json @@ -10,7 +10,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -23,7 +23,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -43,7 +44,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -56,7 +57,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -77,7 +79,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -90,7 +92,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -110,7 +113,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -123,7 +126,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -146,7 +150,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -159,7 +163,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/TypeTagPattern.json b/test/schemas/llm.parameters/3.0/TypeTagPattern.json index f3cbddcb0d..2707eca3b2 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagPattern.json +++ b/test/schemas/llm.parameters/3.0/TypeTagPattern.json @@ -6,19 +6,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -34,19 +34,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -63,19 +63,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -91,19 +91,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -122,19 +122,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.0/TypeTagRange.json b/test/schemas/llm.parameters/3.0/TypeTagRange.json index 2c3b9e522e..568ae0c7bb 100644 --- a/test/schemas/llm.parameters/3.0/TypeTagRange.json +++ b/test/schemas/llm.parameters/3.0/TypeTagRange.json @@ -11,39 +11,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -76,39 +87,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -142,39 +164,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -207,39 +240,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -275,39 +319,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagArray.json b/test/schemas/llm.parameters/3.1/CommentTagArray.json index 0b914681e3..b4ed344ce5 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagArray.json +++ b/test/schemas/llm.parameters/3.1/CommentTagArray.json @@ -10,39 +10,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -73,39 +76,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -133,39 +139,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -196,39 +205,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -258,39 +270,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagArrayUnion.json b/test/schemas/llm.parameters/3.1/CommentTagArrayUnion.json index 8ea80463e4..b81d7c7661 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagArrayUnion.json +++ b/test/schemas/llm.parameters/3.1/CommentTagArrayUnion.json @@ -7,21 +7,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -32,14 +32,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -61,21 +63,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -86,14 +88,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -112,21 +116,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -137,14 +141,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -166,21 +172,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -191,14 +197,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -219,21 +227,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -244,14 +252,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagAtomicUnion.json b/test/schemas/llm.parameters/3.1/CommentTagAtomicUnion.json index d5b82550f4..815ffb6595 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagAtomicUnion.json +++ b/test/schemas/llm.parameters/3.1/CommentTagAtomicUnion.json @@ -13,11 +13,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -49,11 +50,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -82,11 +84,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -118,11 +121,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -153,11 +157,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.parameters/3.1/CommentTagDefault.json b/test/schemas/llm.parameters/3.1/CommentTagDefault.json index cb1d8b9598..831abbc3ad 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagDefault.json +++ b/test/schemas/llm.parameters/3.1/CommentTagDefault.json @@ -86,8 +86,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -95,7 +97,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -209,8 +211,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -218,7 +222,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -329,8 +333,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -338,7 +344,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -452,8 +458,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -461,7 +469,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" @@ -574,8 +582,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -583,7 +593,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" diff --git a/test/schemas/llm.parameters/3.1/CommentTagFormat.json b/test/schemas/llm.parameters/3.1/CommentTagFormat.json index 60adb55916..08a29afb7b 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagFormat.json +++ b/test/schemas/llm.parameters/3.1/CommentTagFormat.json @@ -5,92 +5,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -127,92 +127,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -246,92 +246,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -368,92 +368,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -489,92 +489,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagLength.json b/test/schemas/llm.parameters/3.1/CommentTagLength.json index 6fa7663764..aba9d7b88b 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagLength.json +++ b/test/schemas/llm.parameters/3.1/CommentTagLength.json @@ -10,24 +10,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -58,24 +61,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -103,24 +109,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -151,24 +160,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -198,24 +210,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagObjectUnion.json b/test/schemas/llm.parameters/3.1/CommentTagObjectUnion.json index 2d784c2f1b..b747bb8c47 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagObjectUnion.json +++ b/test/schemas/llm.parameters/3.1/CommentTagObjectUnion.json @@ -9,8 +9,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -21,8 +21,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -45,8 +46,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -57,8 +58,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -78,8 +80,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -90,8 +92,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -114,8 +117,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -126,8 +129,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -149,8 +153,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -161,8 +165,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagPattern.json b/test/schemas/llm.parameters/3.1/CommentTagPattern.json index 49856afee6..4b79c8cfb0 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagPattern.json +++ b/test/schemas/llm.parameters/3.1/CommentTagPattern.json @@ -5,20 +5,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -37,20 +37,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -66,20 +66,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -98,20 +98,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -129,20 +129,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/CommentTagRange.json b/test/schemas/llm.parameters/3.1/CommentTagRange.json index 555e09d002..6fa59a1bb2 100644 --- a/test/schemas/llm.parameters/3.1/CommentTagRange.json +++ b/test/schemas/llm.parameters/3.1/CommentTagRange.json @@ -10,40 +10,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -78,40 +89,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -143,40 +165,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -211,40 +244,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -278,40 +322,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/ConstantAtomicAbsorbed.json b/test/schemas/llm.parameters/3.1/ConstantAtomicAbsorbed.json index dba622a641..4578a192dd 100644 --- a/test/schemas/llm.parameters/3.1/ConstantAtomicAbsorbed.json +++ b/test/schemas/llm.parameters/3.1/ConstantAtomicAbsorbed.json @@ -5,12 +5,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -27,12 +27,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -46,12 +46,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -68,12 +68,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ @@ -89,12 +89,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/ConstantAtomicTagged.json b/test/schemas/llm.parameters/3.1/ConstantAtomicTagged.json index 6c1b3512ca..b947bae2d8 100644 --- a/test/schemas/llm.parameters/3.1/ConstantAtomicTagged.json +++ b/test/schemas/llm.parameters/3.1/ConstantAtomicTagged.json @@ -11,7 +11,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -22,7 +22,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -47,7 +47,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -58,7 +58,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -80,7 +80,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -91,7 +91,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -116,7 +116,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -127,7 +127,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } @@ -151,7 +151,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -162,7 +162,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } diff --git a/test/schemas/llm.parameters/3.1/ObjectDate.json b/test/schemas/llm.parameters/3.1/ObjectDate.json index 9b6e9e845e..20be22a50e 100644 --- a/test/schemas/llm.parameters/3.1/ObjectDate.json +++ b/test/schemas/llm.parameters/3.1/ObjectDate.json @@ -11,7 +11,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -22,7 +22,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -33,7 +33,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -44,7 +44,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -55,7 +55,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -83,7 +83,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -94,7 +94,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -105,7 +105,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -116,7 +116,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -127,7 +127,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -152,7 +152,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -163,7 +163,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -174,7 +174,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -185,7 +185,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -196,7 +196,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -224,7 +224,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -235,7 +235,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -246,7 +246,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -257,7 +257,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -268,7 +268,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } @@ -295,7 +295,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -306,7 +306,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -317,7 +317,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -328,7 +328,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -339,7 +339,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } diff --git a/test/schemas/llm.parameters/3.1/ObjectDescription.json b/test/schemas/llm.parameters/3.1/ObjectDescription.json index ec8052ced8..52da819973 100644 --- a/test/schemas/llm.parameters/3.1/ObjectDescription.json +++ b/test/schemas/llm.parameters/3.1/ObjectDescription.json @@ -8,8 +8,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -53,8 +54,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -99,8 +101,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -144,8 +147,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", @@ -192,8 +196,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", diff --git a/test/schemas/llm.parameters/3.1/TemplateAtomic.json b/test/schemas/llm.parameters/3.1/TemplateAtomic.json index bcbf0bff64..dd5fee90df 100644 --- a/test/schemas/llm.parameters/3.1/TemplateAtomic.json +++ b/test/schemas/llm.parameters/3.1/TemplateAtomic.json @@ -5,24 +5,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -35,12 +35,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -63,24 +63,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -93,12 +93,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -118,24 +118,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -148,12 +148,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -176,24 +176,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -206,12 +206,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ @@ -233,24 +233,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -263,12 +263,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TemplateUnion.json b/test/schemas/llm.parameters/3.1/TemplateUnion.json index aa497d5ef2..11e31b131e 100644 --- a/test/schemas/llm.parameters/3.1/TemplateUnion.json +++ b/test/schemas/llm.parameters/3.1/TemplateUnion.json @@ -10,18 +10,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -35,7 +35,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -90,18 +90,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -115,7 +115,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -167,18 +167,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -192,7 +192,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -247,18 +247,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -272,7 +272,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" @@ -326,18 +326,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -351,7 +351,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" diff --git a/test/schemas/llm.parameters/3.1/TypeTagArray.json b/test/schemas/llm.parameters/3.1/TypeTagArray.json index 60ca2ba318..6959d7d48f 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagArray.json +++ b/test/schemas/llm.parameters/3.1/TypeTagArray.json @@ -10,43 +10,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -77,43 +81,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -141,43 +149,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -208,43 +220,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ @@ -274,43 +290,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagArrayUnion.json b/test/schemas/llm.parameters/3.1/TypeTagArrayUnion.json index d5c2712226..6fabeae36a 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagArrayUnion.json +++ b/test/schemas/llm.parameters/3.1/TypeTagArrayUnion.json @@ -7,44 +7,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -66,44 +68,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -122,44 +126,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -181,44 +187,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ @@ -239,44 +247,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagAtomicUnion.json b/test/schemas/llm.parameters/3.1/TypeTagAtomicUnion.json index d5b82550f4..815ffb6595 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagAtomicUnion.json +++ b/test/schemas/llm.parameters/3.1/TypeTagAtomicUnion.json @@ -13,11 +13,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -49,11 +50,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -82,11 +84,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -118,11 +121,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } @@ -153,11 +157,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.parameters/3.1/TypeTagCustom.json b/test/schemas/llm.parameters/3.1/TypeTagCustom.json index f572c753b6..5e2584807b 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagCustom.json +++ b/test/schemas/llm.parameters/3.1/TypeTagCustom.json @@ -5,8 +5,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -37,8 +37,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -66,8 +66,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -98,8 +98,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", @@ -129,8 +129,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", diff --git a/test/schemas/llm.parameters/3.1/TypeTagDefault.json b/test/schemas/llm.parameters/3.1/TypeTagDefault.json index 0564804c30..c3aab96ab6 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagDefault.json +++ b/test/schemas/llm.parameters/3.1/TypeTagDefault.json @@ -8,26 +8,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -54,7 +54,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -68,7 +68,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -79,11 +79,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -115,26 +115,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -161,7 +161,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -175,7 +175,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -186,11 +186,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -219,26 +219,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -265,7 +265,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -279,7 +279,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -290,11 +290,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -326,26 +326,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -372,7 +372,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -386,7 +386,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -397,11 +397,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" @@ -432,26 +432,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -478,7 +478,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -492,7 +492,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -503,11 +503,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" diff --git a/test/schemas/llm.parameters/3.1/TypeTagFormat.json b/test/schemas/llm.parameters/3.1/TypeTagFormat.json index 60adb55916..08a29afb7b 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagFormat.json +++ b/test/schemas/llm.parameters/3.1/TypeTagFormat.json @@ -5,92 +5,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -127,92 +127,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -246,92 +246,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -368,92 +368,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ @@ -489,92 +489,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagLength.json b/test/schemas/llm.parameters/3.1/TypeTagLength.json index 6fa7663764..aba9d7b88b 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagLength.json +++ b/test/schemas/llm.parameters/3.1/TypeTagLength.json @@ -10,24 +10,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -58,24 +61,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -103,24 +109,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -151,24 +160,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ @@ -198,24 +210,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagMatrix.json b/test/schemas/llm.parameters/3.1/TypeTagMatrix.json index c409be6362..3f464ab252 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagMatrix.json +++ b/test/schemas/llm.parameters/3.1/TypeTagMatrix.json @@ -5,16 +5,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -30,16 +32,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -52,16 +56,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -77,16 +83,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ @@ -101,16 +109,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagObjectUnion.json b/test/schemas/llm.parameters/3.1/TypeTagObjectUnion.json index 2d784c2f1b..b747bb8c47 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagObjectUnion.json +++ b/test/schemas/llm.parameters/3.1/TypeTagObjectUnion.json @@ -9,8 +9,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -21,8 +21,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -45,8 +46,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -57,8 +58,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -78,8 +80,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -90,8 +92,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -114,8 +117,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -126,8 +129,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ @@ -149,8 +153,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -161,8 +165,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagPattern.json b/test/schemas/llm.parameters/3.1/TypeTagPattern.json index 7843966a39..08ecb36f35 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagPattern.json +++ b/test/schemas/llm.parameters/3.1/TypeTagPattern.json @@ -5,20 +5,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -37,20 +37,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -66,20 +66,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -98,20 +98,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ @@ -129,20 +129,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.parameters/3.1/TypeTagRange.json b/test/schemas/llm.parameters/3.1/TypeTagRange.json index 555e09d002..6fa59a1bb2 100644 --- a/test/schemas/llm.parameters/3.1/TypeTagRange.json +++ b/test/schemas/llm.parameters/3.1/TypeTagRange.json @@ -10,40 +10,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -78,40 +89,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -143,40 +165,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -211,40 +244,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ @@ -278,40 +322,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.parameters/gemini/ArrayRecursive.json b/test/schemas/llm.parameters/gemini/ArrayRecursive.json index 7b36f843a6..dc352d92ff 100644 --- a/test/schemas/llm.parameters/gemini/ArrayRecursive.json +++ b/test/schemas/llm.parameters/gemini/ArrayRecursive.json @@ -22,7 +22,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -180,7 +180,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -339,7 +339,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -497,7 +497,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" @@ -658,7 +658,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" diff --git a/test/schemas/llm.parameters/gemini/CommentTagArray.json b/test/schemas/llm.parameters/gemini/CommentTagArray.json index 1546f8cd36..2c184bd558 100644 --- a/test/schemas/llm.parameters/gemini/CommentTagArray.json +++ b/test/schemas/llm.parameters/gemini/CommentTagArray.json @@ -14,38 +14,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -75,38 +72,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -137,38 +131,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -198,38 +189,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -262,38 +250,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ diff --git a/test/schemas/llm.parameters/gemini/TypeTagArray.json b/test/schemas/llm.parameters/gemini/TypeTagArray.json index d0ba0f702d..875f46d469 100644 --- a/test/schemas/llm.parameters/gemini/TypeTagArray.json +++ b/test/schemas/llm.parameters/gemini/TypeTagArray.json @@ -15,8 +15,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -24,7 +23,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -32,8 +31,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -41,15 +39,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -80,8 +77,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -89,7 +85,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -97,8 +93,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -106,15 +101,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -146,8 +140,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -155,7 +148,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -163,8 +156,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -172,15 +164,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -211,8 +202,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -220,7 +210,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -228,8 +218,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -237,15 +226,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ @@ -279,8 +267,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -288,7 +275,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -296,8 +283,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -305,15 +291,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ diff --git a/test/schemas/llm.parameters/gemini/TypeTagMatrix.json b/test/schemas/llm.parameters/gemini/TypeTagMatrix.json index ce60f177a1..5095cbf09b 100644 --- a/test/schemas/llm.parameters/gemini/TypeTagMatrix.json +++ b/test/schemas/llm.parameters/gemini/TypeTagMatrix.json @@ -12,11 +12,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -34,11 +32,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -57,11 +53,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -79,11 +73,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ @@ -104,11 +96,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/CommentTagAtomicUnion.json b/test/schemas/llm.schema/3.0/CommentTagAtomicUnion.json index bcd2339f64..4d814e123d 100644 --- a/test/schemas/llm.schema/3.0/CommentTagAtomicUnion.json +++ b/test/schemas/llm.schema/3.0/CommentTagAtomicUnion.json @@ -10,11 +10,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.schema/3.0/CommentTagDefault.json b/test/schemas/llm.schema/3.0/CommentTagDefault.json index 276050aabb..222261f60d 100644 --- a/test/schemas/llm.schema/3.0/CommentTagDefault.json +++ b/test/schemas/llm.schema/3.0/CommentTagDefault.json @@ -75,14 +75,16 @@ }, "vulnerable_range": { "type": "number", + "minimum": 3, + "maximum": 5, "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5" + "description": "Default value on union typed property." }, "boolean_and_number_and_template": { "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" diff --git a/test/schemas/llm.schema/3.0/CommentTagFormat.json b/test/schemas/llm.schema/3.0/CommentTagFormat.json index 719a81cd8d..3822e1a6bd 100644 --- a/test/schemas/llm.schema/3.0/CommentTagFormat.json +++ b/test/schemas/llm.schema/3.0/CommentTagFormat.json @@ -3,91 +3,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/CommentTagLength.json b/test/schemas/llm.schema/3.0/CommentTagLength.json index 048f961d79..79018d4b80 100644 --- a/test/schemas/llm.schema/3.0/CommentTagLength.json +++ b/test/schemas/llm.schema/3.0/CommentTagLength.json @@ -8,23 +8,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/CommentTagObjectUnion.json b/test/schemas/llm.schema/3.0/CommentTagObjectUnion.json index 4fbc4a2af7..ec0ecdcc99 100644 --- a/test/schemas/llm.schema/3.0/CommentTagObjectUnion.json +++ b/test/schemas/llm.schema/3.0/CommentTagObjectUnion.json @@ -7,7 +7,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -20,7 +20,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/CommentTagPattern.json b/test/schemas/llm.schema/3.0/CommentTagPattern.json index fc58abea78..fb2e985935 100644 --- a/test/schemas/llm.schema/3.0/CommentTagPattern.json +++ b/test/schemas/llm.schema/3.0/CommentTagPattern.json @@ -3,19 +3,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/CommentTagRange.json b/test/schemas/llm.schema/3.0/CommentTagRange.json index 0731556940..f81fad64de 100644 --- a/test/schemas/llm.schema/3.0/CommentTagRange.json +++ b/test/schemas/llm.schema/3.0/CommentTagRange.json @@ -8,39 +8,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/ConstantAtomicAbsorbed.json b/test/schemas/llm.schema/3.0/ConstantAtomicAbsorbed.json index a2bcdd9035..f68ef2131d 100644 --- a/test/schemas/llm.schema/3.0/ConstantAtomicAbsorbed.json +++ b/test/schemas/llm.schema/3.0/ConstantAtomicAbsorbed.json @@ -3,11 +3,11 @@ "properties": { "id": { "type": "string", - "description": "@default something" + "default": "something" }, "age": { "type": "number", - "description": "@default 20" + "default": 20 } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/ConstantAtomicTagged.json b/test/schemas/llm.schema/3.0/ConstantAtomicTagged.json index 78126785f6..1f07983818 100644 --- a/test/schemas/llm.schema/3.0/ConstantAtomicTagged.json +++ b/test/schemas/llm.schema/3.0/ConstantAtomicTagged.json @@ -3,16 +3,16 @@ "properties": { "id": { "type": "string", + "format": "uuid", "enum": [ "latest" - ], - "description": "@format uuid" + ] }, "age": { "oneOf": [ { "type": "integer", - "description": "@maximum 100" + "maximum": 100 }, { "type": "number", diff --git a/test/schemas/llm.schema/3.0/ObjectDate.json b/test/schemas/llm.schema/3.0/ObjectDate.json index 061e28c086..fb19e12abf 100644 --- a/test/schemas/llm.schema/3.0/ObjectDate.json +++ b/test/schemas/llm.schema/3.0/ObjectDate.json @@ -3,28 +3,28 @@ "properties": { "classDate": { "type": "string", - "description": "@format date-time", + "format": "date-time", "nullable": true }, "date": { "type": "string", - "nullable": true, - "description": "@format date" + "format": "date", + "nullable": true }, "datetime": { "type": "string", - "nullable": true, - "description": "@format date-time" + "format": "date-time", + "nullable": true }, "time": { "type": "string", - "nullable": true, - "description": "@format time" + "format": "time", + "nullable": true }, "duration": { "type": "string", - "nullable": true, - "description": "@format duration" + "format": "duration", + "nullable": true } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/ObjectDescription.json b/test/schemas/llm.schema/3.0/ObjectDescription.json index 189cba9269..8b23dbd652 100644 --- a/test/schemas/llm.schema/3.0/ObjectDescription.json +++ b/test/schemas/llm.schema/3.0/ObjectDescription.json @@ -3,8 +3,9 @@ "properties": { "id": { "type": "string", + "format": "uuid", "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid" + "description": "Primary Key." }, "deprecated": { "type": "boolean", diff --git a/test/schemas/llm.schema/3.0/TemplateAtomic.json b/test/schemas/llm.schema/3.0/TemplateAtomic.json index 78776186f8..99e3f3ba0f 100644 --- a/test/schemas/llm.schema/3.0/TemplateAtomic.json +++ b/test/schemas/llm.schema/3.0/TemplateAtomic.json @@ -3,23 +3,23 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, "postfix": { "type": "string", - "description": "@pattern ((.*)_postfix)$" + "pattern": "((.*)_postfix)$" }, "middle_string": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { "type": "string", - "description": "@pattern ^(the_(.*)_value)$" + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "type": "string", @@ -30,11 +30,11 @@ }, "ipv4": { "type": "string", - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { "type": "string", - "description": "@pattern ((.*)@(.*)\\.(.*))" + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/TemplateUnion.json b/test/schemas/llm.schema/3.0/TemplateUnion.json index 8846f096b7..ae3c5031ab 100644 --- a/test/schemas/llm.schema/3.0/TemplateUnion.json +++ b/test/schemas/llm.schema/3.0/TemplateUnion.json @@ -8,29 +8,29 @@ "properties": { "prefix": { "type": "string", - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { "type": "string", - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_false_value", "the_true_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, "mixed": { "oneOf": [ { "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", "enum": [ "the_A_value", "the_B_value" - ], - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + ] }, { "type": "number" diff --git a/test/schemas/llm.schema/3.0/TypeTagArray.json b/test/schemas/llm.schema/3.0/TypeTagArray.json index 920e6be0cc..fd0d97b857 100644 --- a/test/schemas/llm.schema/3.0/TypeTagArray.json +++ b/test/schemas/llm.schema/3.0/TypeTagArray.json @@ -10,7 +10,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -19,7 +19,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -27,7 +27,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 @@ -36,7 +36,8 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 }, "minItems": 10, "maxItems": 10 diff --git a/test/schemas/llm.schema/3.0/TypeTagArrayUnion.json b/test/schemas/llm.schema/3.0/TypeTagArrayUnion.json index 9743855d22..ce33f90c2d 100644 --- a/test/schemas/llm.schema/3.0/TypeTagArrayUnion.json +++ b/test/schemas/llm.schema/3.0/TypeTagArrayUnion.json @@ -7,7 +7,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 3 @@ -16,7 +16,7 @@ "type": "array", "items": { "type": "number", - "description": "@minimum 3" + "minimum": 3 }, "minItems": 3 }, @@ -26,11 +26,11 @@ "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] }, @@ -40,7 +40,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 3, "maxItems": 7 diff --git a/test/schemas/llm.schema/3.0/TypeTagAtomicUnion.json b/test/schemas/llm.schema/3.0/TypeTagAtomicUnion.json index bcd2339f64..4d814e123d 100644 --- a/test/schemas/llm.schema/3.0/TypeTagAtomicUnion.json +++ b/test/schemas/llm.schema/3.0/TypeTagAtomicUnion.json @@ -10,11 +10,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.schema/3.0/TypeTagCustom.json b/test/schemas/llm.schema/3.0/TypeTagCustom.json index be155bc1ba..9f9c6e6cab 100644 --- a/test/schemas/llm.schema/3.0/TypeTagCustom.json +++ b/test/schemas/llm.schema/3.0/TypeTagCustom.json @@ -3,7 +3,7 @@ "properties": { "id": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "dollar": { "type": "string", diff --git a/test/schemas/llm.schema/3.0/TypeTagDefault.json b/test/schemas/llm.schema/3.0/TypeTagDefault.json index f270782139..8325218b4d 100644 --- a/test/schemas/llm.schema/3.0/TypeTagDefault.json +++ b/test/schemas/llm.schema/3.0/TypeTagDefault.json @@ -6,25 +6,25 @@ }, "number": { "type": "number", - "description": "@default 1" + "default": 1 }, "string": { "type": "string", - "description": "@default two" + "default": "two" }, "text": { "type": "string", - "description": "@default Very long text, can you understand it?" + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -51,7 +51,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -65,7 +65,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -76,11 +76,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" diff --git a/test/schemas/llm.schema/3.0/TypeTagFormat.json b/test/schemas/llm.schema/3.0/TypeTagFormat.json index 719a81cd8d..3822e1a6bd 100644 --- a/test/schemas/llm.schema/3.0/TypeTagFormat.json +++ b/test/schemas/llm.schema/3.0/TypeTagFormat.json @@ -3,91 +3,91 @@ "properties": { "byte": { "type": "string", - "description": "@format byte" + "format": "byte" }, "password": { "type": "string", - "description": "@format password" + "format": "password" }, "regex": { "type": "string", - "description": "@format regex" + "format": "regex" }, "uuid": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "email": { "type": "string", - "description": "@format email" + "format": "email" }, "hostname": { "type": "string", - "description": "@format hostname" + "format": "hostname" }, "idnEmail": { "type": "string", - "description": "@format idn-email" + "format": "idn-email" }, "idnHostname": { "type": "string", - "description": "@format idn-hostname" + "format": "idn-hostname" }, "iri": { "type": "string", - "description": "@format iri" + "format": "iri" }, "iriReference": { "type": "string", - "description": "@format iri-reference" + "format": "iri-reference" }, "ipv4": { "type": "string", - "description": "@format ipv4" + "format": "ipv4" }, "ipv6": { "type": "string", - "description": "@format ipv6" + "format": "ipv6" }, "uri": { "type": "string", - "description": "@format uri" + "format": "uri" }, "uriReference": { "type": "string", - "description": "@format uri-reference" + "format": "uri-reference" }, "uriTemplate": { "type": "string", - "description": "@format uri-template" + "format": "uri-template" }, "url": { "type": "string", - "description": "@format url" + "format": "url" }, "datetime": { "type": "string", - "description": "@format date-time" + "format": "date-time" }, "date": { "type": "string", - "description": "@format date" + "format": "date" }, "time": { "type": "string", - "description": "@format time" + "format": "time" }, "duration": { "type": "string", - "description": "@format duration" + "format": "duration" }, "jsonPointer": { "type": "string", - "description": "@format json-pointer" + "format": "json-pointer" }, "relativeJsonPointer": { "type": "string", - "description": "@format relative-json-pointer" + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/TypeTagLength.json b/test/schemas/llm.schema/3.0/TypeTagLength.json index 048f961d79..79018d4b80 100644 --- a/test/schemas/llm.schema/3.0/TypeTagLength.json +++ b/test/schemas/llm.schema/3.0/TypeTagLength.json @@ -8,23 +8,26 @@ "properties": { "fixed": { "type": "string", - "description": "@minLength 5\n@maxLength 5" + "minLength": 5, + "maxLength": 5 }, "minimum": { "type": "string", - "description": "@minLength 3" + "minLength": 3 }, "maximum": { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, "minimum_and_maximum": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, "equal": { "type": "string", - "description": "@minLength 10\n@maxLength 19" + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/TypeTagMatrix.json b/test/schemas/llm.schema/3.0/TypeTagMatrix.json index 279d765e9d..716980859a 100644 --- a/test/schemas/llm.schema/3.0/TypeTagMatrix.json +++ b/test/schemas/llm.schema/3.0/TypeTagMatrix.json @@ -7,7 +7,7 @@ "type": "array", "items": { "type": "string", - "description": "@format uuid" + "format": "uuid" }, "minItems": 4, "maxItems": 4 diff --git a/test/schemas/llm.schema/3.0/TypeTagObjectUnion.json b/test/schemas/llm.schema/3.0/TypeTagObjectUnion.json index 4fbc4a2af7..ec0ecdcc99 100644 --- a/test/schemas/llm.schema/3.0/TypeTagObjectUnion.json +++ b/test/schemas/llm.schema/3.0/TypeTagObjectUnion.json @@ -7,7 +7,7 @@ "properties": { "value": { "type": "number", - "description": "@minimum 3" + "minimum": 3 } }, "required": [ @@ -20,7 +20,8 @@ "properties": { "value": { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/TypeTagPattern.json b/test/schemas/llm.schema/3.0/TypeTagPattern.json index 7718afdf10..f1d194ec67 100644 --- a/test/schemas/llm.schema/3.0/TypeTagPattern.json +++ b/test/schemas/llm.schema/3.0/TypeTagPattern.json @@ -3,19 +3,19 @@ "properties": { "uuid": { "type": "string", - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { "type": "string", - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { "type": "string", - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { "type": "string", - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.schema/3.0/TypeTagRange.json b/test/schemas/llm.schema/3.0/TypeTagRange.json index 0731556940..f81fad64de 100644 --- a/test/schemas/llm.schema/3.0/TypeTagRange.json +++ b/test/schemas/llm.schema/3.0/TypeTagRange.json @@ -8,39 +8,50 @@ "properties": { "greater": { "type": "integer", - "description": "@minimum 3\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { "type": "integer", - "description": "@minimum 3" + "minimum": 3 }, "less": { "type": "integer", - "description": "@maximum 7\n@exclusiveMaximum true" + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { "type": "integer", - "description": "@maximum 7" + "maximum": 7 }, "greater_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true" + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true" + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true" + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { "type": "integer", - "description": "@minimum 3\n@maximum 7" + "minimum": 3, + "maximum": 7 }, "equal": { "type": "integer", - "description": "@minimum 10\n@maximum 10" + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagArray.json b/test/schemas/llm.schema/3.1/CommentTagArray.json index e401a8fb3e..02717ca4b6 100644 --- a/test/schemas/llm.schema/3.1/CommentTagArray.json +++ b/test/schemas/llm.schema/3.1/CommentTagArray.json @@ -7,39 +7,42 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { "type": "number" - } + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagArrayUnion.json b/test/schemas/llm.schema/3.1/CommentTagArrayUnion.json index b5a2e16f5e..3977d0b338 100644 --- a/test/schemas/llm.schema/3.1/CommentTagArrayUnion.json +++ b/test/schemas/llm.schema/3.1/CommentTagArrayUnion.json @@ -4,21 +4,21 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { "type": "number" - } + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ @@ -29,14 +29,16 @@ "type": "number" } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { "type": "string" - } + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagAtomicUnion.json b/test/schemas/llm.schema/3.1/CommentTagAtomicUnion.json index 75a5502ce9..678bd0ebf7 100644 --- a/test/schemas/llm.schema/3.1/CommentTagAtomicUnion.json +++ b/test/schemas/llm.schema/3.1/CommentTagAtomicUnion.json @@ -10,11 +10,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.schema/3.1/CommentTagDefault.json b/test/schemas/llm.schema/3.1/CommentTagDefault.json index 89f7455ad0..c08b918b05 100644 --- a/test/schemas/llm.schema/3.1/CommentTagDefault.json +++ b/test/schemas/llm.schema/3.1/CommentTagDefault.json @@ -83,8 +83,10 @@ }, "vulnerable_range": { "title": "Default value on union typed property", - "description": "Default value on union typed property.\n\n\n@minimum 3\n@maximum 5", - "type": "number" + "description": "Default value on union typed property.", + "type": "number", + "minimum": 3, + "maximum": 5 }, "boolean_and_number_and_template": { "title": "Default value on union typed property", @@ -92,7 +94,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number" diff --git a/test/schemas/llm.schema/3.1/CommentTagFormat.json b/test/schemas/llm.schema/3.1/CommentTagFormat.json index 875e10b47b..08cc786259 100644 --- a/test/schemas/llm.schema/3.1/CommentTagFormat.json +++ b/test/schemas/llm.schema/3.1/CommentTagFormat.json @@ -2,92 +2,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagLength.json b/test/schemas/llm.schema/3.1/CommentTagLength.json index 87e6d7161c..89566bad51 100644 --- a/test/schemas/llm.schema/3.1/CommentTagLength.json +++ b/test/schemas/llm.schema/3.1/CommentTagLength.json @@ -7,24 +7,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagObjectUnion.json b/test/schemas/llm.schema/3.1/CommentTagObjectUnion.json index fab8bc3c33..2f27b4791d 100644 --- a/test/schemas/llm.schema/3.1/CommentTagObjectUnion.json +++ b/test/schemas/llm.schema/3.1/CommentTagObjectUnion.json @@ -6,8 +6,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -18,8 +18,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagPattern.json b/test/schemas/llm.schema/3.1/CommentTagPattern.json index 9ca149e0c0..726c05d109 100644 --- a/test/schemas/llm.schema/3.1/CommentTagPattern.json +++ b/test/schemas/llm.schema/3.1/CommentTagPattern.json @@ -2,20 +2,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern [0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$", - "type": "string" + "type": "string", + "pattern": "[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[4][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern (?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern (([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/CommentTagRange.json b/test/schemas/llm.schema/3.1/CommentTagRange.json index f0e228d30e..8ef35191dc 100644 --- a/test/schemas/llm.schema/3.1/CommentTagRange.json +++ b/test/schemas/llm.schema/3.1/CommentTagRange.json @@ -7,40 +7,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/ConstantAtomicAbsorbed.json b/test/schemas/llm.schema/3.1/ConstantAtomicAbsorbed.json index 9755afb7c7..258b28561f 100644 --- a/test/schemas/llm.schema/3.1/ConstantAtomicAbsorbed.json +++ b/test/schemas/llm.schema/3.1/ConstantAtomicAbsorbed.json @@ -2,12 +2,12 @@ "type": "object", "properties": { "id": { - "description": "@default something", - "type": "string" + "type": "string", + "default": "something" }, "age": { - "description": "@default 20", - "type": "number" + "type": "number", + "default": 20 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/ConstantAtomicTagged.json b/test/schemas/llm.schema/3.1/ConstantAtomicTagged.json index 45b727ab27..26a46307ab 100644 --- a/test/schemas/llm.schema/3.1/ConstantAtomicTagged.json +++ b/test/schemas/llm.schema/3.1/ConstantAtomicTagged.json @@ -8,7 +8,7 @@ }, { "type": "string", - "description": "@format uuid" + "format": "uuid" } ] }, @@ -19,7 +19,7 @@ }, { "type": "integer", - "description": "@maximum 100" + "maximum": 100 } ] } diff --git a/test/schemas/llm.schema/3.1/ObjectDate.json b/test/schemas/llm.schema/3.1/ObjectDate.json index b1ff9ea820..71c2fc6305 100644 --- a/test/schemas/llm.schema/3.1/ObjectDate.json +++ b/test/schemas/llm.schema/3.1/ObjectDate.json @@ -8,7 +8,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -19,7 +19,7 @@ }, { "type": "string", - "description": "@format date" + "format": "date" } ] }, @@ -30,7 +30,7 @@ }, { "type": "string", - "description": "@format date-time" + "format": "date-time" } ] }, @@ -41,7 +41,7 @@ }, { "type": "string", - "description": "@format time" + "format": "time" } ] }, @@ -52,7 +52,7 @@ }, { "type": "string", - "description": "@format duration" + "format": "duration" } ] } diff --git a/test/schemas/llm.schema/3.1/ObjectDescription.json b/test/schemas/llm.schema/3.1/ObjectDescription.json index 77a6b1dd53..4d09bd5808 100644 --- a/test/schemas/llm.schema/3.1/ObjectDescription.json +++ b/test/schemas/llm.schema/3.1/ObjectDescription.json @@ -5,8 +5,9 @@ "properties": { "id": { "title": "Primary Key", - "description": "Primary Key.\n\n\n@format uuid", - "type": "string" + "description": "Primary Key.", + "type": "string", + "format": "uuid" }, "deprecated": { "title": "Deprecated property", diff --git a/test/schemas/llm.schema/3.1/TemplateAtomic.json b/test/schemas/llm.schema/3.1/TemplateAtomic.json index 3c4c7d2f5f..c1660b8945 100644 --- a/test/schemas/llm.schema/3.1/TemplateAtomic.json +++ b/test/schemas/llm.schema/3.1/TemplateAtomic.json @@ -2,24 +2,24 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^(prefix_(.*))", - "type": "string" + "type": "string", + "pattern": "^(prefix_(.*))" }, "postfix": { - "description": "@pattern ((.*)_postfix)$", - "type": "string" + "type": "string", + "pattern": "((.*)_postfix)$" }, "middle_string": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_string_empty": { - "description": "@pattern ^(the_(.*)_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_(.*)_value)$" }, "middle_numeric": { - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$", - "type": "string" + "type": "string", + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, "middle_boolean": { "oneOf": [ @@ -32,12 +32,12 @@ ] }, "ipv4": { - "description": "@pattern ^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$", - "type": "string" + "type": "string", + "pattern": "^([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?\\.[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)$" }, "email": { - "description": "@pattern ((.*)@(.*)\\.(.*))", - "type": "string" + "type": "string", + "pattern": "((.*)@(.*)\\.(.*))" } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TemplateUnion.json b/test/schemas/llm.schema/3.1/TemplateUnion.json index bfe1d86f8c..f64a7f0470 100644 --- a/test/schemas/llm.schema/3.1/TemplateUnion.json +++ b/test/schemas/llm.schema/3.1/TemplateUnion.json @@ -7,18 +7,18 @@ "type": "object", "properties": { "prefix": { - "description": "@pattern ^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$", - "type": "string" + "type": "string", + "pattern": "^((prefix_(.*))|(prefix_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?))$" }, "postfix": { - "description": "@pattern (((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$", - "type": "string" + "type": "string", + "pattern": "(((.*)_postfix)|([+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_postfix))$" }, "middle": { "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_false_value" @@ -32,7 +32,7 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" + "pattern": "^(the_[+-]?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?_value)$" }, { "const": "the_A_value" diff --git a/test/schemas/llm.schema/3.1/TypeTagArray.json b/test/schemas/llm.schema/3.1/TypeTagArray.json index 93c805ab09..c308c83995 100644 --- a/test/schemas/llm.schema/3.1/TypeTagArray.json +++ b/test/schemas/llm.schema/3.1/TypeTagArray.json @@ -7,43 +7,47 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 }, "equal": { - "description": "@minItems 10\n@maxItems 10", "type": "array", "items": { - "description": "@minimum 10\n@maximum 10", - "type": "number" - } + "type": "number", + "minimum": 10, + "maximum": 10 + }, + "minItems": 10, + "maxItems": 10 }, "unique": { - "description": "@uniqueItems", "type": "array", "items": { "type": "string" - } + }, + "uniqueItems": true } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagArrayUnion.json b/test/schemas/llm.schema/3.1/TypeTagArrayUnion.json index ba4209bcc5..54286f02ed 100644 --- a/test/schemas/llm.schema/3.1/TypeTagArrayUnion.json +++ b/test/schemas/llm.schema/3.1/TypeTagArrayUnion.json @@ -4,44 +4,46 @@ "type": "object", "properties": { "items": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 3 }, "minItems": { - "description": "@minItems 3", "type": "array", "items": { - "description": "@minimum 3", - "type": "number" - } + "type": "number", + "minimum": 3 + }, + "minItems": 3 }, "maxItems": { - "description": "@maxItems 7", "type": "array", "items": { "oneOf": [ { "type": "string", - "description": "@maxLength 7" + "maxLength": 7 }, { "type": "number", - "description": "@maximum 7" + "maximum": 7 } ] - } + }, + "maxItems": 7 }, "both": { - "description": "@minItems 3\n@maxItems 7", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } + "type": "string", + "format": "uuid" + }, + "minItems": 3, + "maxItems": 7 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagAtomicUnion.json b/test/schemas/llm.schema/3.1/TypeTagAtomicUnion.json index 75a5502ce9..678bd0ebf7 100644 --- a/test/schemas/llm.schema/3.1/TypeTagAtomicUnion.json +++ b/test/schemas/llm.schema/3.1/TypeTagAtomicUnion.json @@ -10,11 +10,12 @@ "oneOf": [ { "type": "string", - "description": "@minLength 3\n@maxLength 7" + "minLength": 3, + "maxLength": 7 }, { "type": "number", - "description": "@minimum 3" + "minimum": 3 } ] } diff --git a/test/schemas/llm.schema/3.1/TypeTagCustom.json b/test/schemas/llm.schema/3.1/TypeTagCustom.json index 51b952cc9d..097ed0035e 100644 --- a/test/schemas/llm.schema/3.1/TypeTagCustom.json +++ b/test/schemas/llm.schema/3.1/TypeTagCustom.json @@ -2,8 +2,8 @@ "type": "object", "properties": { "id": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "dollar": { "x-typia-monetary": "dollar", diff --git a/test/schemas/llm.schema/3.1/TypeTagDefault.json b/test/schemas/llm.schema/3.1/TypeTagDefault.json index 7b4aa000a8..844a308f6e 100644 --- a/test/schemas/llm.schema/3.1/TypeTagDefault.json +++ b/test/schemas/llm.schema/3.1/TypeTagDefault.json @@ -5,26 +5,26 @@ "type": "boolean" }, "number": { - "description": "@default 1", - "type": "number" + "type": "number", + "default": 1 }, "string": { - "description": "@default two", - "type": "string" + "type": "string", + "default": "two" }, "text": { - "description": "@default Very long text, can you understand it?", - "type": "string" + "type": "string", + "default": "Very long text, can you understand it?" }, "boolean_and_number_and_string": { "oneOf": [ { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -51,7 +51,7 @@ }, { "type": "number", - "description": "@default 1" + "default": 1 }, { "type": "boolean" @@ -65,7 +65,7 @@ }, { "type": "string", - "description": "@default two" + "default": "two" }, { "type": "boolean" @@ -76,11 +76,11 @@ "oneOf": [ { "type": "string", - "description": "@pattern ^(prefix_(.*))" + "pattern": "^(prefix_(.*))" }, { "type": "number", - "description": "@default 2" + "default": 2 }, { "type": "boolean" diff --git a/test/schemas/llm.schema/3.1/TypeTagFormat.json b/test/schemas/llm.schema/3.1/TypeTagFormat.json index 875e10b47b..08cc786259 100644 --- a/test/schemas/llm.schema/3.1/TypeTagFormat.json +++ b/test/schemas/llm.schema/3.1/TypeTagFormat.json @@ -2,92 +2,92 @@ "type": "object", "properties": { "byte": { - "description": "@format byte", - "type": "string" + "type": "string", + "format": "byte" }, "password": { - "description": "@format password", - "type": "string" + "type": "string", + "format": "password" }, "regex": { - "description": "@format regex", - "type": "string" + "type": "string", + "format": "regex" }, "uuid": { - "description": "@format uuid", - "type": "string" + "type": "string", + "format": "uuid" }, "email": { - "description": "@format email", - "type": "string" + "type": "string", + "format": "email" }, "hostname": { - "description": "@format hostname", - "type": "string" + "type": "string", + "format": "hostname" }, "idnEmail": { - "description": "@format idn-email", - "type": "string" + "type": "string", + "format": "idn-email" }, "idnHostname": { - "description": "@format idn-hostname", - "type": "string" + "type": "string", + "format": "idn-hostname" }, "iri": { - "description": "@format iri", - "type": "string" + "type": "string", + "format": "iri" }, "iriReference": { - "description": "@format iri-reference", - "type": "string" + "type": "string", + "format": "iri-reference" }, "ipv4": { - "description": "@format ipv4", - "type": "string" + "type": "string", + "format": "ipv4" }, "ipv6": { - "description": "@format ipv6", - "type": "string" + "type": "string", + "format": "ipv6" }, "uri": { - "description": "@format uri", - "type": "string" + "type": "string", + "format": "uri" }, "uriReference": { - "description": "@format uri-reference", - "type": "string" + "type": "string", + "format": "uri-reference" }, "uriTemplate": { - "description": "@format uri-template", - "type": "string" + "type": "string", + "format": "uri-template" }, "url": { - "description": "@format url", - "type": "string" + "type": "string", + "format": "url" }, "datetime": { - "description": "@format date-time", - "type": "string" + "type": "string", + "format": "date-time" }, "date": { - "description": "@format date", - "type": "string" + "type": "string", + "format": "date" }, "time": { - "description": "@format time", - "type": "string" + "type": "string", + "format": "time" }, "duration": { - "description": "@format duration", - "type": "string" + "type": "string", + "format": "duration" }, "jsonPointer": { - "description": "@format json-pointer", - "type": "string" + "type": "string", + "format": "json-pointer" }, "relativeJsonPointer": { - "description": "@format relative-json-pointer", - "type": "string" + "type": "string", + "format": "relative-json-pointer" } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagLength.json b/test/schemas/llm.schema/3.1/TypeTagLength.json index 87e6d7161c..89566bad51 100644 --- a/test/schemas/llm.schema/3.1/TypeTagLength.json +++ b/test/schemas/llm.schema/3.1/TypeTagLength.json @@ -7,24 +7,27 @@ "type": "object", "properties": { "fixed": { - "description": "@minLength 5\n@maxLength 5", - "type": "string" + "type": "string", + "minLength": 5, + "maxLength": 5 }, "minimum": { - "description": "@minLength 3", - "type": "string" + "type": "string", + "minLength": 3 }, "maximum": { - "description": "@maxLength 7", - "type": "string" + "type": "string", + "maxLength": 7 }, "minimum_and_maximum": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 }, "equal": { - "description": "@minLength 10\n@maxLength 19", - "type": "string" + "type": "string", + "minLength": 10, + "maxLength": 19 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagMatrix.json b/test/schemas/llm.schema/3.1/TypeTagMatrix.json index 49f227de0e..0ed4ca50e5 100644 --- a/test/schemas/llm.schema/3.1/TypeTagMatrix.json +++ b/test/schemas/llm.schema/3.1/TypeTagMatrix.json @@ -2,16 +2,18 @@ "type": "object", "properties": { "matrix": { - "description": "@minItems 3\n@maxItems 3", "type": "array", "items": { - "description": "@minItems 4\n@maxItems 4", "type": "array", "items": { - "description": "@format uuid", - "type": "string" - } - } + "type": "string", + "format": "uuid" + }, + "minItems": 4, + "maxItems": 4 + }, + "minItems": 3, + "maxItems": 3 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagObjectUnion.json b/test/schemas/llm.schema/3.1/TypeTagObjectUnion.json index fab8bc3c33..2f27b4791d 100644 --- a/test/schemas/llm.schema/3.1/TypeTagObjectUnion.json +++ b/test/schemas/llm.schema/3.1/TypeTagObjectUnion.json @@ -6,8 +6,8 @@ "type": "object", "properties": { "value": { - "description": "@minimum 3", - "type": "number" + "type": "number", + "minimum": 3 } }, "required": [ @@ -18,8 +18,9 @@ "type": "object", "properties": { "value": { - "description": "@minLength 3\n@maxLength 7", - "type": "string" + "type": "string", + "minLength": 3, + "maxLength": 7 } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagPattern.json b/test/schemas/llm.schema/3.1/TypeTagPattern.json index 90d601480a..6c054bbde4 100644 --- a/test/schemas/llm.schema/3.1/TypeTagPattern.json +++ b/test/schemas/llm.schema/3.1/TypeTagPattern.json @@ -2,20 +2,20 @@ "type": "object", "properties": { "uuid": { - "description": "@pattern ^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$", - "type": "string" + "type": "string", + "pattern": "^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$" }, "email": { - "description": "@pattern ^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$", - "type": "string" + "type": "string", + "pattern": "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$" }, "ipv4": { - "description": "@pattern ^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", - "type": "string" + "type": "string", + "pattern": "^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$" }, "ipv6": { - "description": "@pattern ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$", - "type": "string" + "type": "string", + "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$" } }, "required": [ diff --git a/test/schemas/llm.schema/3.1/TypeTagRange.json b/test/schemas/llm.schema/3.1/TypeTagRange.json index f0e228d30e..8ef35191dc 100644 --- a/test/schemas/llm.schema/3.1/TypeTagRange.json +++ b/test/schemas/llm.schema/3.1/TypeTagRange.json @@ -7,40 +7,51 @@ "type": "object", "properties": { "greater": { - "description": "@minimum 3\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3 }, "greater_equal": { - "description": "@minimum 3", - "type": "integer" + "type": "integer", + "minimum": 3 }, "less": { - "description": "@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMaximum": true, + "maximum": 7 }, "less_equal": { - "description": "@maximum 7", - "type": "integer" + "type": "integer", + "maximum": 7 }, "greater_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_equal_less": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMaximum true", - "type": "integer" + "type": "integer", + "minimum": 3, + "exclusiveMaximum": true, + "maximum": 7 }, "greater_less_equal": { - "description": "@minimum 3\n@maximum 7\n@exclusiveMinimum true", - "type": "integer" + "type": "integer", + "exclusiveMinimum": true, + "minimum": 3, + "maximum": 7 }, "greater_equal_less_equal": { - "description": "@minimum 3\n@maximum 7", - "type": "integer" + "type": "integer", + "minimum": 3, + "maximum": 7 }, "equal": { - "description": "@minimum 10\n@maximum 10", - "type": "integer" + "type": "integer", + "minimum": 10, + "maximum": 10 } }, "required": [ diff --git a/test/schemas/llm.schema/gemini/ArrayRecursive.json b/test/schemas/llm.schema/gemini/ArrayRecursive.json index 4354674d36..17e6c19fa7 100644 --- a/test/schemas/llm.schema/gemini/ArrayRecursive.json +++ b/test/schemas/llm.schema/gemini/ArrayRecursive.json @@ -19,7 +19,7 @@ "children": { "type": "array", "items": {}, - "maxItems": 0 + "description": "@maxItems 0" }, "id": { "type": "number" diff --git a/test/schemas/llm.schema/gemini/CommentTagArray.json b/test/schemas/llm.schema/gemini/CommentTagArray.json index 02717ca4b6..1ec6025f01 100644 --- a/test/schemas/llm.schema/gemini/CommentTagArray.json +++ b/test/schemas/llm.schema/gemini/CommentTagArray.json @@ -11,38 +11,35 @@ "items": { "type": "string" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", "items": { "type": "number" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", "items": { "type": "string" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", "items": { "type": "number" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ diff --git a/test/schemas/llm.schema/gemini/TypeTagArray.json b/test/schemas/llm.schema/gemini/TypeTagArray.json index d4d6add70d..c1f30ee8ca 100644 --- a/test/schemas/llm.schema/gemini/TypeTagArray.json +++ b/test/schemas/llm.schema/gemini/TypeTagArray.json @@ -12,8 +12,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" }, "minItems": { "type": "array", @@ -21,7 +20,7 @@ "type": "number", "description": "@minimum 3" }, - "minItems": 3 + "description": "@minItems 3" }, "both": { "type": "array", @@ -29,8 +28,7 @@ "type": "string", "description": "@format uuid" }, - "minItems": 3, - "maxItems": 7 + "description": "@minItems 3\n@maxItems 7" }, "equal": { "type": "array", @@ -38,15 +36,14 @@ "type": "number", "description": "@minimum 10\n@maximum 10" }, - "minItems": 10, - "maxItems": 10 + "description": "@minItems 10\n@maxItems 10" }, "unique": { "type": "array", "items": { "type": "string" }, - "uniqueItems": true + "description": "@uniqueItems" } }, "required": [ diff --git a/test/schemas/llm.schema/gemini/TypeTagMatrix.json b/test/schemas/llm.schema/gemini/TypeTagMatrix.json index 896c910786..3f5efda801 100644 --- a/test/schemas/llm.schema/gemini/TypeTagMatrix.json +++ b/test/schemas/llm.schema/gemini/TypeTagMatrix.json @@ -9,11 +9,9 @@ "type": "string", "description": "@format uuid" }, - "minItems": 4, - "maxItems": 4 + "description": "@minItems 4\n@maxItems 4" }, - "minItems": 3, - "maxItems": 3 + "description": "@minItems 3\n@maxItems 3" } }, "required": [ diff --git a/test/schemas/reflect/metadata/ArraySimpleProtobuf.json b/test/schemas/reflect/metadata/ArraySimpleProtobuf.json index e1ff56fde7..0cc35029d2 100644 --- a/test/schemas/reflect/metadata/ArraySimpleProtobuf.json +++ b/test/schemas/reflect/metadata/ArraySimpleProtobuf.json @@ -529,7 +529,7 @@ "rest": null, "arrays": [ { - "name": "Array", + "name": "Array>", "tags": [] } ], @@ -952,7 +952,7 @@ "index": null }, { - "name": "Array", + "name": "Array>", "value": { "any": false, "required": true, diff --git a/test/schemas/reflect/metadata/ArraySimpleProtobufNullable.json b/test/schemas/reflect/metadata/ArraySimpleProtobufNullable.json index 9dd23047e5..fd42c73cc4 100644 --- a/test/schemas/reflect/metadata/ArraySimpleProtobufNullable.json +++ b/test/schemas/reflect/metadata/ArraySimpleProtobufNullable.json @@ -529,7 +529,7 @@ "rest": null, "arrays": [ { - "name": "Array", + "name": "Array>", "tags": [] } ], @@ -952,7 +952,7 @@ "index": null }, { - "name": "Array", + "name": "Array>", "value": { "any": false, "required": true, diff --git a/test/schemas/reflect/metadata/ArraySimpleProtobufOptional.json b/test/schemas/reflect/metadata/ArraySimpleProtobufOptional.json index 7b017d90c5..5ab5c6368a 100644 --- a/test/schemas/reflect/metadata/ArraySimpleProtobufOptional.json +++ b/test/schemas/reflect/metadata/ArraySimpleProtobufOptional.json @@ -529,7 +529,7 @@ "rest": null, "arrays": [ { - "name": "Array", + "name": "Array>", "tags": [] } ], @@ -952,7 +952,7 @@ "index": null }, { - "name": "Array", + "name": "Array>", "value": { "any": false, "required": true, diff --git a/test/schemas/reflect/metadata/MapUnion.json b/test/schemas/reflect/metadata/MapUnion.json index 0fbcb2e0eb..14015e3eb9 100644 --- a/test/schemas/reflect/metadata/MapUnion.json +++ b/test/schemas/reflect/metadata/MapUnion.json @@ -241,7 +241,7 @@ "functions": [], "atomics": [ { - "type": "string", + "type": "boolean", "tags": [] } ], @@ -292,7 +292,7 @@ "functions": [], "atomics": [ { - "type": "boolean", + "type": "number", "tags": [] } ], @@ -343,7 +343,7 @@ "functions": [], "atomics": [ { - "type": "number", + "type": "string", "tags": [] } ], diff --git a/test/schemas/reflect/metadata/NativeAlias.json b/test/schemas/reflect/metadata/NativeAlias.json deleted file mode 100644 index b833533637..0000000000 --- a/test/schemas/reflect/metadata/NativeAlias.json +++ /dev/null @@ -1,945 +0,0 @@ -{ - "metadatas": [ - { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [ - { - "name": "NativeAlias", - "tags": [] - } - ], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - } - ], - "components": { - "objects": [ - { - "name": "NativeAlias", - "properties": [ - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "date", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": { - "original": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Date", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "returns": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [ - { - "type": "string", - "tags": [] - } - ], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - } - }, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "uint8Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Uint8Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "uint8ClampedArray", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Uint8ClampedArray", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "uint16Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Uint16Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "uint32Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Uint32Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "bigUint64Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "BigUint64Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "int8Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Int8Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "int16Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Int16Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "int32Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Int32Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "bigInt64Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "BigInt64Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "float32Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Float32Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "float64Array", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "Float64Array", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "arrayBuffer", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "ArrayBuffer", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "sharedArrayBuffer", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "SharedArrayBuffer", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - }, - { - "key": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [ - { - "type": "string", - "values": [ - { - "value": "dataView", - "tags": [] - } - ] - } - ], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [], - "sets": [], - "maps": [] - }, - "value": { - "any": false, - "required": true, - "optional": false, - "nullable": false, - "functions": [], - "atomics": [], - "constants": [], - "templates": [], - "escaped": null, - "rest": null, - "arrays": [], - "tuples": [], - "objects": [], - "aliases": [], - "natives": [ - { - "name": "DataView", - "tags": [] - } - ], - "sets": [], - "maps": [] - }, - "description": null, - "jsDocTags": [] - } - ], - "jsDocTags": [], - "index": 0, - "recursive": false, - "nullables": [ - false - ] - } - ], - "aliases": [], - "arrays": [], - "tuples": [] - } -} \ No newline at end of file diff --git a/test/schemas/reflect/metadata/ObjectHttpNullable.json b/test/schemas/reflect/metadata/ObjectHttpNullable.json index fea21d0ed4..0012eeffe5 100644 --- a/test/schemas/reflect/metadata/ObjectHttpNullable.json +++ b/test/schemas/reflect/metadata/ObjectHttpNullable.json @@ -519,7 +519,7 @@ "type": "string", "values": [ { - "value": "one", + "value": "three", "tags": [] }, { @@ -527,7 +527,7 @@ "tags": [] }, { - "value": "three", + "value": "one", "tags": [] } ] diff --git a/test/schemas/reflect/metadata/ObjectHttpUndefindable.json b/test/schemas/reflect/metadata/ObjectHttpUndefindable.json index 57f8114422..c88559726b 100644 --- a/test/schemas/reflect/metadata/ObjectHttpUndefindable.json +++ b/test/schemas/reflect/metadata/ObjectHttpUndefindable.json @@ -502,7 +502,7 @@ "type": "string", "values": [ { - "value": "one", + "value": "three", "tags": [] }, { @@ -510,7 +510,7 @@ "tags": [] }, { - "value": "three", + "value": "one", "tags": [] } ] diff --git a/test/schemas/reflect/metadata/SetUnion.json b/test/schemas/reflect/metadata/SetUnion.json index 535b58d0c2..3835695dfc 100644 --- a/test/schemas/reflect/metadata/SetUnion.json +++ b/test/schemas/reflect/metadata/SetUnion.json @@ -240,7 +240,7 @@ "functions": [], "atomics": [ { - "type": "number", + "type": "boolean", "tags": [] } ], @@ -267,7 +267,7 @@ "functions": [], "atomics": [ { - "type": "boolean", + "type": "number", "tags": [] } ], diff --git a/test/src/debug/example.js b/test/src/debug/example.js deleted file mode 100644 index 14af2b7ae8..0000000000 --- a/test/src/debug/example.js +++ /dev/null @@ -1,192 +0,0 @@ -import typia from "typia"; - -const app = { - model: "chatgpt", - options: { - reference: false, - separate: null, - }, - functions: [ - { - name: "create", - parameters: { - type: "object", - properties: { - input: { - description: - "Information of the article to create.\n\n------------------------------\n\nDescription of the current {@link IBbsArticle.ICreate} type:\n\n> Information of the article to create.\n\n------------------------------\n\nDescription of the parent {@link IBbsArticle} type:\n\n> Article entity.\n> \n> `IBbsArticle` is an entity representing an article in the BBS (Bulletin Board System).", - type: "object", - properties: { - title: { - title: "Title of the article", - description: - "Title of the article.\n\nRepresentative title of the article.", - type: "string", - }, - body: { - title: "Content body", - description: - "Content body.\n\nContent body of the article writtn in the markdown format.", - type: "string", - }, - thumbnail: { - title: "Thumbnail image URI", - description: - "Thumbnail image URI.\n\nThumbnail image URI which can represent the article.\n\nIf configured as `null`, it means that no thumbnail image in the article.", - anyOf: [ - { - type: "null", - }, - { - type: "string", - description: "@format uri\n@contentMediaType image/*", - }, - ], - }, - }, - required: ["title", "body", "thumbnail"], - additionalProperties: false, - }, - }, - required: ["input"], - additionalProperties: false, - $defs: {}, - }, - output: { - description: - "Article entity.\n\n`IBbsArticle` is an entity representing an article in the BBS (Bulletin Board System).", - type: "object", - properties: { - id: { - title: "Primary Key", - description: "Primary Key.\n\n\n@format uuid", - type: "string", - }, - created_at: { - title: "Creation time of the article", - description: "Creation time of the article.\n\n\n@format date-time", - type: "string", - }, - updated_at: { - title: "Last updated time of the article", - description: - "Last updated time of the article.\n\n\n@format date-time", - type: "string", - }, - title: { - title: "Title of the article", - description: - "Title of the article.\n\nRepresentative title of the article.", - type: "string", - }, - body: { - title: "Content body", - description: - "Content body.\n\nContent body of the article writtn in the markdown format.", - type: "string", - }, - thumbnail: { - title: "Thumbnail image URI", - description: - "Thumbnail image URI.\n\nThumbnail image URI which can represent the article.\n\nIf configured as `null`, it means that no thumbnail image in the article.", - anyOf: [ - { - type: "null", - }, - { - type: "string", - description: "@format uri\n@contentMediaType image/*", - }, - ], - }, - }, - required: [ - "id", - "created_at", - "updated_at", - "title", - "body", - "thumbnail", - ], - additionalProperties: false, - }, - description: - "Create a new article.\n\nWrites a new article and archives it into the DB.", - strict: true, - }, - { - name: "update", - parameters: { - type: "object", - properties: { - id: { - title: "Target article's {@link IBbsArticle.id}", - description: - "Target article's {@link IBbsArticle.id}.\n\n\n@format uuid", - type: "string", - }, - input: { - description: - "Make all properties in T optional\n\n------------------------------\n\nDescription of the current {@link PartialIBbsArticle.ICreate} type:\n\n> Make all properties in T optional", - type: "object", - properties: { - title: { - title: "Title of the article", - description: - "Title of the article.\n\nRepresentative title of the article.", - type: "string", - }, - body: { - title: "Content body", - description: - "Content body.\n\nContent body of the article writtn in the markdown format.", - type: "string", - }, - thumbnail: { - title: "Thumbnail image URI", - description: - "Thumbnail image URI.\n\nThumbnail image URI which can represent the article.\n\nIf configured as `null`, it means that no thumbnail image in the article.", - anyOf: [ - { - type: "null", - }, - { - type: "string", - description: "@format uri\n@contentMediaType image/*", - }, - ], - }, - }, - required: ["title", "body", "thumbnail"], - additionalProperties: false, - }, - }, - required: ["id", "input"], - additionalProperties: false, - $defs: {}, - }, - description: "Update an article.\n\nUpdates an article with new content.", - strict: true, - }, - { - name: "erase", - parameters: { - type: "object", - properties: { - id: { - title: "Target article's {@link IBbsArticle.id}", - description: - "Target article's {@link IBbsArticle.id}.\n\n\n@format uuid", - type: "string", - }, - }, - required: ["id"], - additionalProperties: false, - $defs: {}, - }, - description: "Erase an article.\n\nErases an article from the DB.", - strict: true, - }, - ], -}; -console.log(app); diff --git a/test/src/debug/llm.application.separate.ts b/test/src/debug/llm.application.separate.ts deleted file mode 100644 index 0efda1a7c3..0000000000 --- a/test/src/debug/llm.application.separate.ts +++ /dev/null @@ -1,127 +0,0 @@ -import { - ClaudeTypeChecker, - ILlmApplication, - ILlmSchema, -} from "@samchon/openapi"; -import typia, { tags } from "typia"; - -const app: ILlmApplication<"claude"> = typia.llm.application< - BbsArticleController, - "claude" ->({ - separate: (schema: ILlmSchema<"claude">) => - ClaudeTypeChecker.isString(schema) && schema.contentMediaType !== undefined, -}); - -console.log(app); - -interface BbsArticleController { - /** - * Create a new article. - * - * Writes a new article and archives it into the DB. - * - * @param props Properties of create function - * @returns Newly created article - */ - create(props: { - /** - * Information of the article to create - */ - input: IBbsArticle.ICreate; - }): Promise; - - /** - * Update an article. - * - * Updates an article with new content. - * - * @param props Properties of update function - * @param input New content to update - */ - update(props: { - /** - * Target article's {@link IBbsArticle.id}. - */ - id: string & tags.Format<"uuid">; - - /** - * New content to update. - */ - input: IBbsArticle.IUpdate; - }): Promise; - - /** - * Erase an article. - * - * Erases an article from the DB. - * - * @param props Properties of erase function - */ - erase(props: { - /** - * Target article's {@link IBbsArticle.id}. - */ - id: string & tags.Format<"uuid">; - }): Promise; -} - -/** - * Article entity. - * - * `IBbsArticle` is an entity representing an article in the BBS (Bulletin Board System). - */ -interface IBbsArticle extends IBbsArticle.ICreate { - /** - * Primary Key. - */ - id: string & tags.Format<"uuid">; - - /** - * Creation time of the article. - */ - created_at: string & tags.Format<"date-time">; - - /** - * Last updated time of the article. - */ - updated_at: string & tags.Format<"date-time">; -} -namespace IBbsArticle { - /** - * Information of the article to create. - */ - export interface ICreate { - /** - * Title of the article. - * - * Representative title of the article. - */ - title: string; - - /** - * Content body. - * - * Content body of the article writtn in the markdown format. - */ - body: string; - - /** - * Thumbnail image URI. - * - * Thumbnail image URI which can represent the article. - * - * If configured as `null`, it means that no thumbnail image in the article. - */ - thumbnail: - | null - | (string & tags.Format<"uri"> & tags.ContentMediaType<"image/*">); - } - - /** - * Information of the article to update. - * - * Only the filled properties will be updated. - */ - export type IUpdate = Partial; -} diff --git a/test/src/debug/llm.schema.ts b/test/src/debug/llm.schema.ts deleted file mode 100644 index f33e8c0785..0000000000 --- a/test/src/debug/llm.schema.ts +++ /dev/null @@ -1,13 +0,0 @@ -import typia from "typia"; - -import { ArrayRecursive } from "../structures/ArrayRecursive"; - -const $defs: Record = {}; -const schema = typia.llm.schema< - ArrayRecursive, - "3.1", - { - reference: false; - } ->($defs); -console.log($defs, schema); diff --git a/test/src/debug/protobuf.ts b/test/src/debug/protobuf.ts deleted file mode 100644 index c3bd65f2e3..0000000000 --- a/test/src/debug/protobuf.ts +++ /dev/null @@ -1,7 +0,0 @@ -import typia from "typia"; - -import { ObjectIntersection } from "../structures/ObjectIntersection"; -import { ObjectPartialAndRequired } from "../structures/ObjectPartialAndRequired"; - -typia.protobuf.createEncode(); -typia.protobuf.createEncode(); diff --git a/test/src/debug/reflect.ts b/test/src/debug/reflect.ts deleted file mode 100644 index 9339581d02..0000000000 --- a/test/src/debug/reflect.ts +++ /dev/null @@ -1,4 +0,0 @@ -import typia, { tags } from "typia"; - -const m = typia.reflect.metadata<[string & tags.Format<"uuid">]>(); -console.log(JSON.stringify(m.metadatas[0]?.atomics[0], null, 2)); diff --git a/test/src/debug/uniqueItems.ts b/test/src/debug/uniqueItems.ts deleted file mode 100644 index 42a6b2158a..0000000000 --- a/test/src/debug/uniqueItems.ts +++ /dev/null @@ -1,178 +0,0 @@ -import typia, { tags } from "typia"; -import { v4 } from "uuid"; - -import { TestValidator } from "../helpers/TestValidator"; - -TestValidator.equals("implicit")([true, true, true, false])([ - typia.is([]), - typia.is(["one"]), - typia.is(["one", "two", "three"]), - typia.is(["one", "two", "one"]), -]); -TestValidator.equals("explicit true")([true, true, true, false])([ - typia.is>([]), - typia.is>(["one"]), - typia.is>(["one", "two", "three"]), - typia.is>(["one", "two", "one"]), -]); -TestValidator.equals("explicit false")([true, true, true, true])([ - typia.is>([]), - typia.is>(["one"]), - typia.is>(["one", "two", "three"]), - typia.is>(["one", "two", "one"]), -]); -TestValidator.equals("objects")([true, true, false])([ - typia.is>([ - { email: "a@a.com", name: "a", age: 1 }, - { email: "b@b.com", name: "b", age: 2 }, - ]), - typia.is>([ - { email: "a@a.com", name: "a", age: 1 }, - { email: "b@b.com", name: "b", age: 2 }, - { email: "b@b.com", name: "b", age: 3 }, - ]), - typia.is>([ - { email: "a@a.com", name: "a", age: 1 }, - { email: "b@b.com", name: "b", age: 2 }, - { email: "b@b.com", name: "b", age: 2 }, - ]), -]); -TestValidator.equals("arrays")([true, true, false])([ - typia.is>([ - [1, 2], - [3, 4], - ]), - typia.is>([ - [1, 2], - [3, 4], - [5, 6], - ]), - typia.is>([ - [1, 2], - [3, 4], - [1, 2], - ]), -]); -TestValidator.equals("dates")([true, false])([ - typia.is>([ - new Date(0), - new Date(1), - new Date(2), - ]), - typia.is>([ - new Date(0), - new Date(1), - new Date(1), - ]), -]); -TestValidator.equals("sets")([true, true, false])([ - typia.is[] & tags.UniqueItems>([ - new Set([1, 2, 3]), - new Set([4, 5, 6]), - new Set([7, 8, 9]), - ]), - typia.is[] & tags.UniqueItems>([ - new Set([1, 2, 3, 4]), - new Set([1, 2, 3, 5]), - new Set([1, 2, 3, 6]), - ]), - typia.is[] & tags.UniqueItems>([ - new Set([1, 2, 3]), - new Set([4, 5, 6]), - new Set([1, 2, 3]), - ]), -]); -TestValidator.equals("maps")([true, true, false])([ - typia.is[] & tags.UniqueItems>([ - new Map([ - ["a", 1], - ["b", 2], - ]), - new Map([ - ["c", 3], - ["d", 4], - ]), - new Map([ - ["e", 5], - ["f", 6], - ]), - ]), - typia.is[] & tags.UniqueItems>([ - new Map([ - ["a", 1], - ["b", 2], - ]), - new Map([ - ["c", 3], - ["d", 4], - ]), - new Map([ - ["e", 5], - ["f", 6], - ]), - ]), - typia.is[] & tags.UniqueItems>([ - new Map([ - ["a", 1], - ["b", 2], - ]), - new Map([ - ["c", 3], - ["d", 4], - ]), - new Map([ - ["a", 1], - ["b", 2], - ]), - ]), -]); -TestValidator.equals("deep")([true, true, false])([ - typia.is>([ - typia.random(), - typia.random(), - typia.random(), - ]), - typia.is>( - (() => { - const first = typia.random(); - first.children = new Array(3) - .fill(0) - .map(() => typia.random()); - return [ - first, - { - ...first, - children: [ - ...first.children.slice(0, 2), - { - ...first.children[2]!, - id: v4(), - }, - ], - }, - ]; - })(), - ), - typia.is>( - (() => { - const first = typia.random(); - const second = typia.random(); - const third = typia.misc.clone(first); - return [first, second, third]; - })(), - ), -]); - -interface IMember { - email: string; - name: string; - age: number; -} - -interface IDepartment { - id: string; - members: Map; - children: IDepartment[]; - logo: Uint8Array; - created_at: Date; -} diff --git a/test/src/features/assert/test_assert_NativeAlias.ts b/test/src/features/assert/test_assert_NativeAlias.ts deleted file mode 100644 index 4c327a6379..0000000000 --- a/test/src/features/assert/test_assert_NativeAlias.ts +++ /dev/null @@ -1,9 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_assert } from "../../internal/_test_assert"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_assert_NativeAlias = _test_assert(TypeGuardError)( - "NativeAlias", -)(NativeAlias)((input) => typia.assert(input)); diff --git a/test/src/features/assertCustom/test_assertCustom_NativeAlias.ts b/test/src/features/assertCustom/test_assertCustom_NativeAlias.ts deleted file mode 100644 index 0813caaf51..0000000000 --- a/test/src/features/assertCustom/test_assertCustom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_assert } from "../../internal/_test_assert"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_assertCustom_NativeAlias = _test_assert(CustomGuardError)( - "NativeAlias", -)(NativeAlias)((input) => - typia.assert(input, (p) => new CustomGuardError(p)), -); diff --git a/test/src/features/assertGuard/test_assertGuard_NativeAlias.ts b/test/src/features/assertGuard/test_assertGuard_NativeAlias.ts deleted file mode 100644 index 33bf931af6..0000000000 --- a/test/src/features/assertGuard/test_assertGuard_NativeAlias.ts +++ /dev/null @@ -1,9 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_assertGuard } from "../../internal/_test_assertGuard"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_assertGuard_NativeAlias = _test_assertGuard(TypeGuardError)( - "NativeAlias", -)(NativeAlias)((input) => typia.assertGuard(input)); diff --git a/test/src/features/assertGuardCustom/test_assertGuardCustom_NativeAlias.ts b/test/src/features/assertGuardCustom/test_assertGuardCustom_NativeAlias.ts deleted file mode 100644 index 0293b9b599..0000000000 --- a/test/src/features/assertGuardCustom/test_assertGuardCustom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_assertGuard } from "../../internal/_test_assertGuard"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_assertGuardCustom_NativeAlias = _test_assertGuard( - CustomGuardError, -)("NativeAlias")(NativeAlias)((input) => - typia.assertGuard(input, (p) => new CustomGuardError(p)), -); diff --git a/test/src/features/createAssert/test_createAssert_NativeAlias.ts b/test/src/features/createAssert/test_createAssert_NativeAlias.ts deleted file mode 100644 index cc38646488..0000000000 --- a/test/src/features/createAssert/test_createAssert_NativeAlias.ts +++ /dev/null @@ -1,9 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_assert } from "../../internal/_test_assert"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createAssert_NativeAlias = _test_assert(TypeGuardError)( - "NativeAlias", -)(NativeAlias)(typia.createAssert()); diff --git a/test/src/features/createAssertCustom/test_createAssertCustom_NativeAlias.ts b/test/src/features/createAssertCustom/test_createAssertCustom_NativeAlias.ts deleted file mode 100644 index 43b7b1eedf..0000000000 --- a/test/src/features/createAssertCustom/test_createAssertCustom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_assert } from "../../internal/_test_assert"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createAssertCustom_NativeAlias = _test_assert( - CustomGuardError, -)("NativeAlias")(NativeAlias)( - typia.createAssert((p) => new CustomGuardError(p)), -); diff --git a/test/src/features/createAssertGuard/test_createAssertGuard_NativeAlias.ts b/test/src/features/createAssertGuard/test_createAssertGuard_NativeAlias.ts deleted file mode 100644 index 009f8fbacb..0000000000 --- a/test/src/features/createAssertGuard/test_createAssertGuard_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_assertGuard } from "../../internal/_test_assertGuard"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createAssertGuard_NativeAlias = _test_assertGuard( - TypeGuardError, -)("NativeAlias")(NativeAlias)( - typia.createAssertGuard(), -); diff --git a/test/src/features/createAssertGuardCustom/test_createAssertGuardCustom_NativeAlias.ts b/test/src/features/createAssertGuardCustom/test_createAssertGuardCustom_NativeAlias.ts deleted file mode 100644 index 1386063710..0000000000 --- a/test/src/features/createAssertGuardCustom/test_createAssertGuardCustom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_assertGuard } from "../../internal/_test_assertGuard"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createAssertGuardCustom_NativeAlias = _test_assertGuard( - CustomGuardError, -)("NativeAlias")(NativeAlias)( - typia.createAssertGuard((p) => new CustomGuardError(p)), -); diff --git a/test/src/features/createIs/test_createIs_NativeAlias.ts b/test/src/features/createIs/test_createIs_NativeAlias.ts deleted file mode 100644 index e7573404bc..0000000000 --- a/test/src/features/createIs/test_createIs_NativeAlias.ts +++ /dev/null @@ -1,8 +0,0 @@ -import typia from "typia"; - -import { _test_is } from "../../internal/_test_is"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createIs_NativeAlias = _test_is("NativeAlias")( - NativeAlias, -)(typia.createIs()); diff --git a/test/src/features/createRandom/test_createRandom_NativeAlias.ts b/test/src/features/createRandom/test_createRandom_NativeAlias.ts deleted file mode 100644 index 8a23b94c6f..0000000000 --- a/test/src/features/createRandom/test_createRandom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { _test_random } from "../../internal/_test_random"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createRandom_NativeAlias = _test_random( - "NativeAlias", -)(NativeAlias)({ - random: typia.createRandom((NativeAlias as any).RANDOM), - assert: typia.createAssert(), -}); diff --git a/test/src/features/createValidate/test_createValidate_NativeAlias.ts b/test/src/features/createValidate/test_createValidate_NativeAlias.ts deleted file mode 100644 index 73bb0b09e3..0000000000 --- a/test/src/features/createValidate/test_createValidate_NativeAlias.ts +++ /dev/null @@ -1,8 +0,0 @@ -import typia from "typia"; - -import { _test_validate } from "../../internal/_test_validate"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_createValidate_NativeAlias = _test_validate( - "NativeAlias", -)(NativeAlias)(typia.createValidate()); diff --git a/test/src/features/functional.assertFunction/test_functional_assertFunction_NativeAlias.ts b/test/src/features/functional.assertFunction/test_functional_assertFunction_NativeAlias.ts deleted file mode 100644 index 88208dd650..0000000000 --- a/test/src/features/functional.assertFunction/test_functional_assertFunction_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_functional_assertFunction } from "../../internal/_test_functional_assertFunction"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertFunction_NativeAlias = - _test_functional_assertFunction(TypeGuardError)("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.assertFunction(p), - ); diff --git a/test/src/features/functional.assertFunctionAsync/test_functional_assertFunctionAsync_NativeAlias.ts b/test/src/features/functional.assertFunctionAsync/test_functional_assertFunctionAsync_NativeAlias.ts deleted file mode 100644 index 92760f67a4..0000000000 --- a/test/src/features/functional.assertFunctionAsync/test_functional_assertFunctionAsync_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_functional_assertFunctionAsync } from "../../internal/_test_functional_assertFunctionAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertFunctionAsync_NativeAlias = - _test_functional_assertFunctionAsync(TypeGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => Promise) => - typia.functional.assertFunction(p), - ); diff --git a/test/src/features/functional.assertFunctionAsyncCustom/test_functional_assertFunctionAsyncCustom_NativeAlias.ts b/test/src/features/functional.assertFunctionAsyncCustom/test_functional_assertFunctionAsyncCustom_NativeAlias.ts deleted file mode 100644 index a43f0e7173..0000000000 --- a/test/src/features/functional.assertFunctionAsyncCustom/test_functional_assertFunctionAsyncCustom_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_functional_assertFunctionAsync } from "../../internal/_test_functional_assertFunctionAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertFunctionAsyncCustom_NativeAlias = - _test_functional_assertFunctionAsync(CustomGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => Promise) => - typia.functional.assertFunction(p, (p) => new CustomGuardError(p)), - ); diff --git a/test/src/features/functional.assertFunctionCustom/test_functional_assertFunctionCustom_NativeAlias.ts b/test/src/features/functional.assertFunctionCustom/test_functional_assertFunctionCustom_NativeAlias.ts deleted file mode 100644 index 04f43394a4..0000000000 --- a/test/src/features/functional.assertFunctionCustom/test_functional_assertFunctionCustom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_functional_assertFunction } from "../../internal/_test_functional_assertFunction"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertFunctionCustom_NativeAlias = - _test_functional_assertFunction(CustomGuardError)("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.assertFunction(p, (p) => new CustomGuardError(p)), - ); diff --git a/test/src/features/functional.assertParameters/test_functional_assertParameters_NativeAlias.ts b/test/src/features/functional.assertParameters/test_functional_assertParameters_NativeAlias.ts deleted file mode 100644 index e39890704a..0000000000 --- a/test/src/features/functional.assertParameters/test_functional_assertParameters_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_functional_assertParameters } from "../../internal/_test_functional_assertParameters"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertParameters_NativeAlias = - _test_functional_assertParameters(TypeGuardError)("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.assertParameters(p), - ); diff --git a/test/src/features/functional.assertParametersAsync/test_functional_assertParametersAsync_NativeAlias.ts b/test/src/features/functional.assertParametersAsync/test_functional_assertParametersAsync_NativeAlias.ts deleted file mode 100644 index 5262984f6e..0000000000 --- a/test/src/features/functional.assertParametersAsync/test_functional_assertParametersAsync_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_functional_assertParametersAsync } from "../../internal/_test_functional_assertParametersAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertParametersAsync_NativeAlias = - _test_functional_assertParametersAsync(TypeGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => Promise) => - typia.functional.assertParameters(p), - ); diff --git a/test/src/features/functional.assertParametersAsyncCustom/test_functional_assertParametersAsyncCustom_NativeAlias.ts b/test/src/features/functional.assertParametersAsyncCustom/test_functional_assertParametersAsyncCustom_NativeAlias.ts deleted file mode 100644 index d5fdb408d9..0000000000 --- a/test/src/features/functional.assertParametersAsyncCustom/test_functional_assertParametersAsyncCustom_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_functional_assertParametersAsync } from "../../internal/_test_functional_assertParametersAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertParametersAsyncCustom_NativeAlias = - _test_functional_assertParametersAsync(CustomGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => Promise) => - typia.functional.assertParameters(p, (p) => new CustomGuardError(p)), - ); diff --git a/test/src/features/functional.assertParametersCustom/test_functional_assertParametersCustom_NativeAlias.ts b/test/src/features/functional.assertParametersCustom/test_functional_assertParametersCustom_NativeAlias.ts deleted file mode 100644 index be04f6301f..0000000000 --- a/test/src/features/functional.assertParametersCustom/test_functional_assertParametersCustom_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_functional_assertParameters } from "../../internal/_test_functional_assertParameters"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertParametersCustom_NativeAlias = - _test_functional_assertParameters(CustomGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => NativeAlias) => - typia.functional.assertParameters(p, (p) => new CustomGuardError(p)), - ); diff --git a/test/src/features/functional.assertReturn/test_functional_assertReturn_NativeAlias.ts b/test/src/features/functional.assertReturn/test_functional_assertReturn_NativeAlias.ts deleted file mode 100644 index c53171537b..0000000000 --- a/test/src/features/functional.assertReturn/test_functional_assertReturn_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_functional_assertReturn } from "../../internal/_test_functional_assertReturn"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertReturn_NativeAlias = - _test_functional_assertReturn(TypeGuardError)("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.assertReturn(p), - ); diff --git a/test/src/features/functional.assertReturnAsync/test_functional_assertReturnAsync_NativeAlias.ts b/test/src/features/functional.assertReturnAsync/test_functional_assertReturnAsync_NativeAlias.ts deleted file mode 100644 index 1ced5c04b2..0000000000 --- a/test/src/features/functional.assertReturnAsync/test_functional_assertReturnAsync_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; -import { TypeGuardError } from "typia"; - -import { _test_functional_assertReturnAsync } from "../../internal/_test_functional_assertReturnAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertReturnAsync_NativeAlias = - _test_functional_assertReturnAsync(TypeGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => Promise) => - typia.functional.assertReturn(p), - ); diff --git a/test/src/features/functional.assertReturnAsyncCustom/test_functional_assertReturnAsyncCustom_NativeAlias.ts b/test/src/features/functional.assertReturnAsyncCustom/test_functional_assertReturnAsyncCustom_NativeAlias.ts deleted file mode 100644 index 6a6adb3dee..0000000000 --- a/test/src/features/functional.assertReturnAsyncCustom/test_functional_assertReturnAsyncCustom_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_functional_assertReturnAsync } from "../../internal/_test_functional_assertReturnAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertReturnAsyncCustom_NativeAlias = - _test_functional_assertReturnAsync(CustomGuardError)("NativeAlias")( - NativeAlias, - )((p: (input: NativeAlias) => Promise) => - typia.functional.assertReturn(p, (p) => new CustomGuardError(p)), - ); diff --git a/test/src/features/functional.assertReturnCustom/test_functional_assertReturnCustom_NativeAlias.ts b/test/src/features/functional.assertReturnCustom/test_functional_assertReturnCustom_NativeAlias.ts deleted file mode 100644 index 77ef61c7d0..0000000000 --- a/test/src/features/functional.assertReturnCustom/test_functional_assertReturnCustom_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { CustomGuardError } from "../../internal/CustomGuardError"; -import { _test_functional_assertReturn } from "../../internal/_test_functional_assertReturn"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_assertReturnCustom_NativeAlias = - _test_functional_assertReturn(CustomGuardError)("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.assertReturn(p, (p) => new CustomGuardError(p)), - ); diff --git a/test/src/features/functional.isFunction/test_functional_isFunction_NativeAlias.ts b/test/src/features/functional.isFunction/test_functional_isFunction_NativeAlias.ts deleted file mode 100644 index 46a8f4bf8b..0000000000 --- a/test/src/features/functional.isFunction/test_functional_isFunction_NativeAlias.ts +++ /dev/null @@ -1,9 +0,0 @@ -import typia from "typia"; - -import { _test_functional_isFunction } from "../../internal/_test_functional_isFunction"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_isFunction_NativeAlias = - _test_functional_isFunction("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => typia.functional.isFunction(p), - ); diff --git a/test/src/features/functional.isFunctionAsync/test_functional_isFunctionAsync_NativeAlias.ts b/test/src/features/functional.isFunctionAsync/test_functional_isFunctionAsync_NativeAlias.ts deleted file mode 100644 index d41acc227f..0000000000 --- a/test/src/features/functional.isFunctionAsync/test_functional_isFunctionAsync_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_isFunctionAsync } from "../../internal/_test_functional_isFunctionAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_isFunctionAsync_NativeAlias = - _test_functional_isFunctionAsync("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => Promise) => - typia.functional.isFunction(p), - ); diff --git a/test/src/features/functional.isParameters/test_functional_isParameters_NativeAlias.ts b/test/src/features/functional.isParameters/test_functional_isParameters_NativeAlias.ts deleted file mode 100644 index d9b1d6881a..0000000000 --- a/test/src/features/functional.isParameters/test_functional_isParameters_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_isParameters } from "../../internal/_test_functional_isParameters"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_isParameters_NativeAlias = - _test_functional_isParameters("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.isParameters(p), - ); diff --git a/test/src/features/functional.isParametersAsync/test_functional_isParametersAsync_NativeAlias.ts b/test/src/features/functional.isParametersAsync/test_functional_isParametersAsync_NativeAlias.ts deleted file mode 100644 index ae9a6cb048..0000000000 --- a/test/src/features/functional.isParametersAsync/test_functional_isParametersAsync_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_isParametersAsync } from "../../internal/_test_functional_isParametersAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_isParametersAsync_NativeAlias = - _test_functional_isParametersAsync("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => Promise) => - typia.functional.isParameters(p), - ); diff --git a/test/src/features/functional.isReturn/test_functional_isReturn_NativeAlias.ts b/test/src/features/functional.isReturn/test_functional_isReturn_NativeAlias.ts deleted file mode 100644 index ab102613ba..0000000000 --- a/test/src/features/functional.isReturn/test_functional_isReturn_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_isReturn } from "../../internal/_test_functional_isReturn"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_isReturn_NativeAlias = _test_functional_isReturn( - "NativeAlias", -)(NativeAlias)((p: (input: NativeAlias) => NativeAlias) => - typia.functional.isReturn(p), -); diff --git a/test/src/features/functional.isReturnAsync/test_functional_isReturnAsync_NativeAlias.ts b/test/src/features/functional.isReturnAsync/test_functional_isReturnAsync_NativeAlias.ts deleted file mode 100644 index 3ee11b7226..0000000000 --- a/test/src/features/functional.isReturnAsync/test_functional_isReturnAsync_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_isReturnAsync } from "../../internal/_test_functional_isReturnAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_isReturnAsync_NativeAlias = - _test_functional_isReturnAsync("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => Promise) => - typia.functional.isReturn(p), - ); diff --git a/test/src/features/functional.validateFunction/test_functional_validateFunction_NativeAlias.ts b/test/src/features/functional.validateFunction/test_functional_validateFunction_NativeAlias.ts deleted file mode 100644 index 86ef8ea97c..0000000000 --- a/test/src/features/functional.validateFunction/test_functional_validateFunction_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_validateFunction } from "../../internal/_test_functional_validateFunction"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_validateFunction_NativeAlias = - _test_functional_validateFunction("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.validateFunction(p), - ); diff --git a/test/src/features/functional.validateFunctionAsync/test_functional_validateFunctionAsync_NativeAlias.ts b/test/src/features/functional.validateFunctionAsync/test_functional_validateFunctionAsync_NativeAlias.ts deleted file mode 100644 index 44482c0cac..0000000000 --- a/test/src/features/functional.validateFunctionAsync/test_functional_validateFunctionAsync_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_validateFunctionAsync } from "../../internal/_test_functional_validateFunctionAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_validateFunctionAsync_NativeAlias = - _test_functional_validateFunctionAsync("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => Promise) => - typia.functional.validateFunction(p), - ); diff --git a/test/src/features/functional.validateParameters/test_functional_validateParameters_NativeAlias.ts b/test/src/features/functional.validateParameters/test_functional_validateParameters_NativeAlias.ts deleted file mode 100644 index 3d9786bfdd..0000000000 --- a/test/src/features/functional.validateParameters/test_functional_validateParameters_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_validateParameters } from "../../internal/_test_functional_validateParameters"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_validateParameters_NativeAlias = - _test_functional_validateParameters("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.validateParameters(p), - ); diff --git a/test/src/features/functional.validateParametersAsync/test_functional_validateParametersAsync_NativeAlias.ts b/test/src/features/functional.validateParametersAsync/test_functional_validateParametersAsync_NativeAlias.ts deleted file mode 100644 index 018818b9a4..0000000000 --- a/test/src/features/functional.validateParametersAsync/test_functional_validateParametersAsync_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_validateParametersAsync } from "../../internal/_test_functional_validateParametersAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_validateParametersAsync_NativeAlias = - _test_functional_validateParametersAsync("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => Promise) => - typia.functional.validateParameters(p), - ); diff --git a/test/src/features/functional.validateReturn/test_functional_validateReturn_NativeAlias.ts b/test/src/features/functional.validateReturn/test_functional_validateReturn_NativeAlias.ts deleted file mode 100644 index b500d03d1b..0000000000 --- a/test/src/features/functional.validateReturn/test_functional_validateReturn_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_validateReturn } from "../../internal/_test_functional_validateReturn"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_validateReturn_NativeAlias = - _test_functional_validateReturn("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => NativeAlias) => - typia.functional.validateReturn(p), - ); diff --git a/test/src/features/functional.validateReturnAsync/test_functional_validateReturnAsync_NativeAlias.ts b/test/src/features/functional.validateReturnAsync/test_functional_validateReturnAsync_NativeAlias.ts deleted file mode 100644 index 3e2c052203..0000000000 --- a/test/src/features/functional.validateReturnAsync/test_functional_validateReturnAsync_NativeAlias.ts +++ /dev/null @@ -1,10 +0,0 @@ -import typia from "typia"; - -import { _test_functional_validateReturnAsync } from "../../internal/_test_functional_validateReturnAsync"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_functional_validateReturnAsync_NativeAlias = - _test_functional_validateReturnAsync("NativeAlias")(NativeAlias)( - (p: (input: NativeAlias) => Promise) => - typia.functional.validateReturn(p), - ); diff --git a/test/src/features/is/test_is_NativeAlias.ts b/test/src/features/is/test_is_NativeAlias.ts deleted file mode 100644 index 8813e26bcd..0000000000 --- a/test/src/features/is/test_is_NativeAlias.ts +++ /dev/null @@ -1,8 +0,0 @@ -import typia from "typia"; - -import { _test_is } from "../../internal/_test_is"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_is_NativeAlias = _test_is("NativeAlias")( - NativeAlias, -)((input) => typia.is(input)); diff --git a/test/src/features/issues/test_issue_912_protobuf_decode.ts b/test/src/features/issues/test_issue_912_protobuf_decode.ts deleted file mode 100644 index 7ec99fcdbb..0000000000 --- a/test/src/features/issues/test_issue_912_protobuf_decode.ts +++ /dev/null @@ -1,38 +0,0 @@ -import typia, { tags } from "typia"; - -import { protobuf_equal_to } from "../../helpers/protobuf_equal_to"; - -export const test_issue_912_protobuf_decode = () => { - type Foo = { id: number & tags.Type<"int64"> }; - - const obj = { id: 12 }; - const encoded = typia.protobuf.encode(obj); - const padded = Buffer.concat([ - Buffer.from("head"), - Buffer.from(encoded, encoded.byteOffset, encoded.byteLength), - Buffer.from("tail"), - ]); - const buffer = padded.subarray(4, 4 + encoded.length); - - let decoded1: Foo; - let decoded2: Foo; - - try { - decoded1 = typia.protobuf.decode(encoded); - decoded2 = typia.protobuf.decode(buffer); - } catch (e) { - throw new Error( - "Bug on typia.protobuf.decode(): decode Buffer with shared ArrayBuffer throws.", - ); - } - - if (false === protobuf_equal_to("equal")(decoded1, obj)) - throw new Error( - "Bug on typia.protobuf.decode(): failed to decode Uint8Array.", - ); - - if (false === protobuf_equal_to("equal")(decoded2, obj)) - throw new Error( - "Bug on typia.protobuf.decode(): failed to decode Buffer with shared ArrayBuffer.", - ); -}; diff --git a/test/src/features/notation.camel/test_notation_camel_NativeAlias.ts b/test/src/features/notation.camel/test_notation_camel_NativeAlias.ts deleted file mode 100644 index 6bcbd0cba6..0000000000 --- a/test/src/features/notation.camel/test_notation_camel_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { _test_notation_validateGeneral } from "../../internal/_test_notation_validateGeneral"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_notation_validateCamel_NativeAlias = - _test_notation_validateGeneral("NativeAlias")(NativeAlias)< - typia.CamelCase - >({ - convert: (input) => typia.notations.validateCamel(input), - assert: typia.createAssert>(), - }); diff --git a/test/src/features/notation.createCamel/test_notation_createCamel_NativeAlias.ts b/test/src/features/notation.createCamel/test_notation_createCamel_NativeAlias.ts deleted file mode 100644 index 3672a74f1b..0000000000 --- a/test/src/features/notation.createCamel/test_notation_createCamel_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { _test_notation_validateGeneral } from "../../internal/_test_notation_validateGeneral"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_notation_createValidateCamel_NativeAlias = - _test_notation_validateGeneral("NativeAlias")(NativeAlias)< - typia.CamelCase - >({ - convert: typia.notations.createValidateCamel(), - assert: typia.createAssert>(), - }); diff --git a/test/src/features/notation.createPascal/test_notation_createPascal_NativeAlias.ts b/test/src/features/notation.createPascal/test_notation_createPascal_NativeAlias.ts deleted file mode 100644 index 4013de97cb..0000000000 --- a/test/src/features/notation.createPascal/test_notation_createPascal_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { _test_notation_validateGeneral } from "../../internal/_test_notation_validateGeneral"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_notation_createValidatePascal_NativeAlias = - _test_notation_validateGeneral("NativeAlias")(NativeAlias)< - typia.PascalCase - >({ - convert: typia.notations.createValidatePascal(), - assert: typia.createAssert>(), - }); diff --git a/test/src/features/notation.createSnake/test_notation_createSnake_NativeAlias.ts b/test/src/features/notation.createSnake/test_notation_createSnake_NativeAlias.ts deleted file mode 100644 index 9b0ad1321e..0000000000 --- a/test/src/features/notation.createSnake/test_notation_createSnake_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { _test_notation_validateGeneral } from "../../internal/_test_notation_validateGeneral"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_notation_createValidateSnake_NativeAlias = - _test_notation_validateGeneral("NativeAlias")(NativeAlias)< - typia.SnakeCase - >({ - convert: typia.notations.createValidateSnake(), - assert: typia.createAssert>(), - }); diff --git a/test/src/features/notation.pascal/test_notation_pascal_NativeAlias.ts b/test/src/features/notation.pascal/test_notation_pascal_NativeAlias.ts deleted file mode 100644 index bed586e8cf..0000000000 --- a/test/src/features/notation.pascal/test_notation_pascal_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { _test_notation_validateGeneral } from "../../internal/_test_notation_validateGeneral"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_notation_validatePascal_NativeAlias = - _test_notation_validateGeneral("NativeAlias")(NativeAlias)< - typia.PascalCase - >({ - convert: (input) => typia.notations.validatePascal(input), - assert: typia.createAssert>(), - }); diff --git a/test/src/features/notation.snake/test_notation_snake_NativeAlias.ts b/test/src/features/notation.snake/test_notation_snake_NativeAlias.ts deleted file mode 100644 index abc6881e24..0000000000 --- a/test/src/features/notation.snake/test_notation_snake_NativeAlias.ts +++ /dev/null @@ -1,12 +0,0 @@ -import typia from "typia"; - -import { _test_notation_validateGeneral } from "../../internal/_test_notation_validateGeneral"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_notation_validateSnake_NativeAlias = - _test_notation_validateGeneral("NativeAlias")(NativeAlias)< - typia.SnakeCase - >({ - convert: (input) => typia.notations.validateSnake(input), - assert: typia.createAssert>(), - }); diff --git a/test/src/features/random/test_random_NativeAlias.ts b/test/src/features/random/test_random_NativeAlias.ts deleted file mode 100644 index 6e4cd99daf..0000000000 --- a/test/src/features/random/test_random_NativeAlias.ts +++ /dev/null @@ -1,11 +0,0 @@ -import typia from "typia"; - -import { _test_random } from "../../internal/_test_random"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_random_NativeAlias = _test_random("NativeAlias")( - NativeAlias, -)({ - random: () => typia.random((NativeAlias as any).RANDOM), - assert: typia.createAssert(), -}); diff --git a/test/src/features/reflect.metadata/test_reflect_metadata_NativeAlias.ts b/test/src/features/reflect.metadata/test_reflect_metadata_NativeAlias.ts deleted file mode 100644 index 052e9167a7..0000000000 --- a/test/src/features/reflect.metadata/test_reflect_metadata_NativeAlias.ts +++ /dev/null @@ -1,8 +0,0 @@ -import typia from "typia"; - -import { _test_reflect_metadata } from "../../internal/_test_reflect_metadata"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_reflect_metadata_NativeAlias = _test_reflect_metadata( - "NativeAlias", -)(typia.reflect.metadata<[NativeAlias]>()); diff --git a/test/src/features/validate/test_validate_NativeAlias.ts b/test/src/features/validate/test_validate_NativeAlias.ts deleted file mode 100644 index 65c33ee8a8..0000000000 --- a/test/src/features/validate/test_validate_NativeAlias.ts +++ /dev/null @@ -1,8 +0,0 @@ -import typia from "typia"; - -import { _test_validate } from "../../internal/_test_validate"; -import { NativeAlias } from "../../structures/NativeAlias"; - -export const test_validate_NativeAlias = _test_validate( - "NativeAlias", -)(NativeAlias)((input) => typia.validate(input)); diff --git a/test/src/structures/NativeAlias.ts b/test/src/structures/NativeAlias.ts deleted file mode 100644 index b16eac9d28..0000000000 --- a/test/src/structures/NativeAlias.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { NativeSimple } from "./NativeSimple"; - -export interface NativeAlias { - date: NativeAlias.DATE; - uint8Array: NativeAlias.UINT8ARRAY; - uint8ClampedArray: NativeAlias.UINT8CLAMPEDARRAY; - uint16Array: NativeAlias.UINT16ARRAY; - uint32Array: NativeAlias.UINT32ARRAY; - bigUint64Array: NativeAlias.BIGUINT64ARRAY; - int8Array: NativeAlias.INT8ARRAY; - int16Array: NativeAlias.INT16ARRAY; - int32Array: NativeAlias.INT32ARRAY; - bigInt64Array: NativeAlias.BIGINT64ARRAY; - float32Array: NativeAlias.FLOAT32ARRAY; - float64Array: NativeAlias.FLOAT64ARRAY; - arrayBuffer: NativeAlias.ARRAYBUFFER; - sharedArrayBuffer: NativeAlias.SHAREDARRAYBUFFER; - dataView: NativeAlias.DATAVIEW; -} -export namespace NativeAlias { - export const ADDABLE = false; - export const BINARABLE = false; - export const JSONABLE = false; - export const PRIMITIVE = false; - - export type DATE = Date; - export type UINT8ARRAY = Uint8Array; - export type UINT8CLAMPEDARRAY = Uint8ClampedArray; - export type UINT16ARRAY = Uint16Array; - export type UINT32ARRAY = Uint32Array; - export type BIGUINT64ARRAY = BigUint64Array; - export type INT8ARRAY = Int8Array; - export type INT16ARRAY = Int16Array; - export type INT32ARRAY = Int32Array; - export type BIGINT64ARRAY = BigInt64Array; - export type FLOAT32ARRAY = Float32Array; - export type FLOAT64ARRAY = Float64Array; - export type ARRAYBUFFER = ArrayBuffer; - export type SHAREDARRAYBUFFER = SharedArrayBuffer; - export type DATAVIEW = DataView; - - export function generate(): NativeAlias { - return NativeSimple.generate(); - } - - export const SPOILERS = NativeSimple.SPOILERS; -} diff --git a/website/package.json b/website/package.json index e90dbb6b8a..fb0d903a6f 100644 --- a/website/package.json +++ b/website/package.json @@ -38,7 +38,7 @@ "react-dom": "^18.2.0", "tgrid": "^1.0.3", "tstl": "^3.0.0", - "typescript": "^5.6.3", + "typescript": "^5.7.2", "typia": "latest" }, "devDependencies": { diff --git a/website/pages/docs/setup.mdx b/website/pages/docs/setup.mdx index ec97678a45..f95f5353b5 100644 --- a/website/pages/docs/setup.mdx +++ b/website/pages/docs/setup.mdx @@ -214,20 +214,6 @@ Be sure to run `npm run prepare` once you have made these changes. For reference, [`ts-patch`](https://github.com/nonara/ts-patch) is an helper library of TypeScript compiler that supporting custom transformations by plugins. From now on, whenever you run `tsc` command, your `typia` function call statements would be transformed to the optimal operation codes in the compiled JavaScript files. -{/*
- - - **`npx typia patch`** - - -Since TypeScript v5.3 update, `tsc` no more parses `JSDocComment`s. Therefore, `typia` also cannot utilize those `JSDocComment` related features either, especially ["Comment Tags"](./validators/tags/#comment-tags) and ["JSON schema generator"](./json/schema). - -The `npx typia patch` command has been developed to revive the `JSDocComment` parsing feature of `tsc`. It is temporary solution for the TypeScript v5.3 update instead of [`ts-patch`](https://github.com/nonara/ts-patch), and will be disabled after [`ts-patch`](https://github.com/nonara/ts-patch) starts supporting such TypeScript v5.3 update. - -Of course, if you don't use any ["Comment Tags"](./validators/tags/#comment-tags) and ["JSON schema generator"](./json/schema), you don't need to run `npx typia patch` command. This is not mandatory command, but just optional command. - - */} - @@ -532,7 +518,7 @@ bun typia setup --manager bun -After installing `typia` like above, and ensuring the `prepare` script is something similar to `ts-patch install && typia patch` you have to modify the `tsconfig.lib.json` on each `@nx/js` package to be similar to the below. +After installing `typia` like above, and ensuring the `prepare` script is something similar to `ts-patch install` you have to modify the `tsconfig.lib.json` on each `@nx/js` package to be similar to the below. ```json filename="tsconfig.lib.json" showLineNumbers copy {