From 8e968afe864bc6887eaa8705dbca28285f40f7eb Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 30 Oct 2024 12:46:30 -0400 Subject: [PATCH] Speed up compilation by caching commonly referenced schemas Fixes: https://github.com/sourcemeta/jsonschema/issues/182 Signed-off-by: Juan Cruz Viotti --- DEPENDENCIES | 4 +- test/compile/pass_1.sh | 4 +- vendor/blaze/LICENSE | 673 +----------------- vendor/blaze/LICENSE-COMMERCIAL | 2 - vendor/blaze/src/compiler/CMakeLists.txt | 4 +- vendor/blaze/src/compiler/compile.cc | 241 ++++--- vendor/blaze/src/compiler/compile_describe.cc | 428 ++++++----- vendor/blaze/src/compiler/compile_helpers.h | 116 ++- vendor/blaze/src/compiler/compile_json.cc | 46 +- vendor/blaze/src/compiler/compile_output.cc | 76 ++ .../src/compiler/default_compiler_2019_09.h | 149 +++- .../src/compiler/default_compiler_2020_12.h | 23 +- .../src/compiler/default_compiler_draft4.h | 600 +++++++++------- .../src/compiler/default_compiler_draft6.h | 84 ++- .../src/compiler/default_compiler_draft7.h | 12 +- .../include/sourcemeta/blaze/compiler.h | 113 +-- .../sourcemeta/blaze/compiler_output.h | 119 ++++ vendor/blaze/src/evaluator/context.cc | 201 +++--- vendor/blaze/src/evaluator/evaluator.cc | 651 ++++++++++++----- .../sourcemeta/blaze/evaluator_context.h | 73 +- .../sourcemeta/blaze/evaluator_template.h | 129 +++- .../sourcemeta/blaze/evaluator_value.h | 9 +- .../jsontoolkit/jsonpointer_pointer.h | 46 ++ 23 files changed, 2037 insertions(+), 1766 deletions(-) delete mode 100644 vendor/blaze/LICENSE-COMMERCIAL create mode 100644 vendor/blaze/src/compiler/compile_output.cc create mode 100644 vendor/blaze/src/compiler/include/sourcemeta/blaze/compiler_output.h diff --git a/DEPENDENCIES b/DEPENDENCIES index 648a646..7ea1b38 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,7 +1,7 @@ vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4 noa https://github.com/sourcemeta/noa caad2e1ceedf9fd1a18686a6a6d1e2b9757ead75 -jsontoolkit https://github.com/sourcemeta/jsontoolkit 2d78929faf0f96110edfb67fa3ddf6916cf35ef7 +jsontoolkit https://github.com/sourcemeta/jsontoolkit 7654c30ef2f0a0ccb36affa810ffebebd6179ebd hydra https://github.com/sourcemeta/hydra a4a74f3cabd32f2f829f449d67339dac33f9910e alterschema https://github.com/sourcemeta/alterschema 92e370ce9c1f0582014b54d43e388ee012dfe13d jsonbinpack https://github.com/sourcemeta/jsonbinpack d777179441d3c703e1fda1187742541aa26836b5 -blaze https://github.com/sourcemeta/blaze b438b45e453562d882786dee0b7658f81e6fb6a0 +blaze https://github.com/sourcemeta/blaze df43a0886184e5826036983f536b6f9ea06362a7 diff --git a/test/compile/pass_1.sh b/test/compile/pass_1.sh index 3087055..1c4cd93 100755 --- a/test/compile/pass_1.sh +++ b/test/compile/pass_1.sh @@ -32,8 +32,8 @@ cat << 'EOF' > "$TMP/expected.json" "absoluteKeywordLocation": "#/properties/foo/type", "relativeSchemaLocation": "/properties/foo/type", "relativeInstanceLocation": "/foo", - "report": true, - "dynamic": false + "dynamic": false, + "track": false } ] EOF diff --git a/vendor/blaze/LICENSE b/vendor/blaze/LICENSE index 0be6f02..9348973 100644 --- a/vendor/blaze/LICENSE +++ b/vendor/blaze/LICENSE @@ -1,661 +1,12 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - JSON Toolkit - The swiss army knife for JSON applications - Copyright (C) 2022 Juan Cruz Viotti - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. +This software is dual-licensed: you can redistribute it and/or modify it under +the terms of the GNU Affero General Public License as published by the Free +Software Foundation, either version 3 of the License, or (at your option) any +later version. For the terms of this license, see +. + +You are free to use this software under the terms of the GNU Affero General +Public License WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +Alternatively, you can use this software under a commercial license, as set out +in . diff --git a/vendor/blaze/LICENSE-COMMERCIAL b/vendor/blaze/LICENSE-COMMERCIAL deleted file mode 100644 index 2b3c48a..0000000 --- a/vendor/blaze/LICENSE-COMMERCIAL +++ /dev/null @@ -1,2 +0,0 @@ -Refer to https://www.sourcemeta.com/licensing/ for learning more about -obtaining a commercial license. diff --git a/vendor/blaze/src/compiler/CMakeLists.txt b/vendor/blaze/src/compiler/CMakeLists.txt index 845b01a..e3c4040 100644 --- a/vendor/blaze/src/compiler/CMakeLists.txt +++ b/vendor/blaze/src/compiler/CMakeLists.txt @@ -1,9 +1,9 @@ noa_library(NAMESPACE sourcemeta PROJECT blaze NAME compiler FOLDER "Blaze/Compiler" - PRIVATE_HEADERS error.h + PRIVATE_HEADERS error.h output.h SOURCES compile.cc compile_json.cc compile_describe.cc - compile_helpers.h default_compiler.cc + compile_output.cc compile_helpers.h default_compiler.cc default_compiler_2020_12.h default_compiler_2019_09.h default_compiler_draft7.h diff --git a/vendor/blaze/src/compiler/compile.cc b/vendor/blaze/src/compiler/compile.cc index db0e7c0..6d6a00c 100644 --- a/vendor/blaze/src/compiler/compile.cc +++ b/vendor/blaze/src/compiler/compile.cc @@ -3,7 +3,7 @@ #include -#include // std::move, std::any_of, std::sort, std::unique +#include // std::move, std::sort, std::unique #include // assert #include // std::back_inserter #include // std::move @@ -26,8 +26,8 @@ auto compile_subschema(const sourcemeta::blaze::Context &context, if (schema_context.schema.to_boolean()) { return {}; } else { - return {make(true, context, schema_context, - dynamic_context, ValueNone{})}; + return {make(context, schema_context, dynamic_context, + ValueNone{})}; } } @@ -59,6 +59,43 @@ auto compile_subschema(const sourcemeta::blaze::Context &context, return steps; } +auto precompile( + const sourcemeta::blaze::Context &context, + sourcemeta::blaze::SchemaContext &schema_context, + const sourcemeta::blaze::DynamicContext &dynamic_context, + const sourcemeta::jsontoolkit::ReferenceFrame::value_type &entry) + -> sourcemeta::blaze::Template { + const sourcemeta::jsontoolkit::URI anchor_uri{entry.first.second}; + const auto label{sourcemeta::blaze::EvaluationContext{}.hash( + schema_resource_id(context, + anchor_uri.recompose_without_fragment().value_or("")), + std::string{anchor_uri.fragment().value_or("")})}; + schema_context.labels.insert(label); + + // Configure a schema context that corresponds to the + // schema resource that we are precompiling + auto subschema{ + sourcemeta::jsontoolkit::get(context.root, entry.second.pointer)}; + auto nested_vocabularies{sourcemeta::jsontoolkit::vocabularies( + subschema, context.resolver, entry.second.dialect)}; + const sourcemeta::blaze::SchemaContext nested_schema_context{ + entry.second.relative_pointer, + std::move(subschema), + std::move(nested_vocabularies), + entry.second.base, + {}, + {}}; + + return {make( + context, nested_schema_context, dynamic_context, + sourcemeta::blaze::ValueUnsignedInteger{label}, + sourcemeta::blaze::compile(context, nested_schema_context, + sourcemeta::blaze::relative_dynamic_context, + sourcemeta::jsontoolkit::empty_pointer, + sourcemeta::jsontoolkit::empty_pointer, + entry.first.second))}; +} + } // namespace namespace sourcemeta::blaze { @@ -117,8 +154,9 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema, {}, {}}; - bool uses_unevaluated_properties{false}; - bool uses_unevaluated_items{false}; + std::set unevaluated_properties_schemas; + std::set unevaluated_items_schemas; + if (schema_context.vocabularies.contains( "https://json-schema.org/draft/2019-09/vocab/core") || schema_context.vocabularies.contains( @@ -138,17 +176,54 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema, continue; } - if (!uses_unevaluated_properties && - subschema.defines("unevaluatedProperties") && + if (subschema.defines("unevaluatedProperties") && sourcemeta::jsontoolkit::is_schema( subschema.at("unevaluatedProperties"))) { - uses_unevaluated_properties = true; + + // No need to consider `unevaluatedProperties` if it has a sibling + // `additionalProperties`. By definition, nothing could remain + // unevaluated. + + if (entry.vocabularies.contains( + "https://json-schema.org/draft/2019-09/vocab/applicator") && + subschema.defines("additionalProperties")) { + continue; + } + + if (entry.vocabularies.contains( + "https://json-schema.org/draft/2020-12/vocab/applicator") && + subschema.defines("additionalProperties")) { + continue; + } + + unevaluated_properties_schemas.insert(entry.pointer); } - if (!uses_unevaluated_items && subschema.defines("unevaluatedItems") && + if (subschema.defines("unevaluatedItems") && sourcemeta::jsontoolkit::is_schema( subschema.at("unevaluatedItems"))) { - uses_unevaluated_items = true; + + // No need to consider `unevaluatedItems` if it has a + // sibling `items` schema (or its older equivalents). + // By definition, nothing could remain unevaluated. + + if (entry.vocabularies.contains( + "https://json-schema.org/draft/2020-12/vocab/applicator") && + subschema.defines("items")) { + continue; + } else if (entry.vocabularies.contains("https://json-schema.org/draft/" + "2019-09/vocab/applicator")) { + if (subschema.defines("items") && + sourcemeta::jsontoolkit::is_schema(subschema.at("items"))) { + continue; + } else if (subschema.defines("items") && + subschema.at("items").is_array() && + subschema.defines("additionalItems")) { + continue; + } + } + + unevaluated_items_schemas.insert(entry.pointer); } } } @@ -169,6 +244,43 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema, assert(resources.size() == std::set(resources.cbegin(), resources.cend()).size()); + // Calculate the top static reference destinations for precompilation purposes + std::map static_references_count; + for (const auto &reference : references) { + if (reference.first.first != + sourcemeta::jsontoolkit::ReferenceType::Static || + !frame.contains({sourcemeta::jsontoolkit::ReferenceType::Static, + reference.second.destination})) { + continue; + } + + const auto &entry{frame.at({sourcemeta::jsontoolkit::ReferenceType::Static, + reference.second.destination})}; + for (const auto &subreference : references) { + if (subreference.first.second.starts_with(entry.pointer)) { + static_references_count[reference.second.destination] += 1; + } + } + } + std::vector> top_static_destinations( + static_references_count.cbegin(), static_references_count.cend()); + std::sort(top_static_destinations.begin(), top_static_destinations.end(), + [](const auto &left, const auto &right) { + return left.second > right.second; + }); + constexpr auto MAXIMUM_NUMBER_OF_SCHEMAS_TO_PRECOMPILE{5}; + std::set precompiled_static_schemas; + for (auto iterator = top_static_destinations.cbegin(); + iterator != top_static_destinations.cend() && + iterator != top_static_destinations.cbegin() + + MAXIMUM_NUMBER_OF_SCHEMAS_TO_PRECOMPILE; + ++iterator) { + // Only consider highly referenced schemas + if (iterator->second > 100) { + precompiled_static_schemas.insert(iterator->first); + } + } + const Context context{result, frame, references, @@ -178,11 +290,23 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema, compiler, mode, uses_dynamic_scopes, - uses_unevaluated_properties, - uses_unevaluated_items}; + unevaluated_properties_schemas, + unevaluated_items_schemas, + std::move(precompiled_static_schemas)}; const DynamicContext dynamic_context{relative_dynamic_context}; Template compiler_template; + for (const auto &destination : context.precompiled_static_schemas) { + assert(frame.contains( + {sourcemeta::jsontoolkit::ReferenceType::Static, destination})); + const auto match{frame.find( + {sourcemeta::jsontoolkit::ReferenceType::Static, destination})}; + for (auto &&substep : + precompile(context, schema_context, dynamic_context, *match)) { + compiler_template.push_back(std::move(substep)); + } + } + if (uses_dynamic_scopes && (schema_context.vocabularies.contains( "https://json-schema.org/draft/2019-09/vocab/core") || @@ -197,31 +321,10 @@ auto compile(const sourcemeta::jsontoolkit::JSON &schema, continue; } - const sourcemeta::jsontoolkit::URI anchor_uri{entry.first.second}; - const auto label{EvaluationContext{}.hash( - schema_resource_id( - context, anchor_uri.recompose_without_fragment().value_or("")), - std::string{anchor_uri.fragment().value_or("")})}; - schema_context.labels.insert(label); - - // Configure a schema context that corresponds to the - // schema resource that we are precompiling - auto subschema{get(result, entry.second.pointer)}; - auto nested_vocabularies{ - vocabularies(subschema, resolver, entry.second.dialect)}; - const SchemaContext nested_schema_context{entry.second.relative_pointer, - std::move(subschema), - std::move(nested_vocabularies), - entry.second.base, - {}, - {}}; - - compiler_template.push_back(make( - true, context, nested_schema_context, dynamic_context, - ValueUnsignedInteger{label}, - compile(context, nested_schema_context, relative_dynamic_context, - sourcemeta::jsontoolkit::empty_pointer, - sourcemeta::jsontoolkit::empty_pointer, entry.first.second))); + for (auto &&substep : + precompile(context, schema_context, dynamic_context, entry)) { + compiler_template.push_back(std::move(substep)); + } } } @@ -290,68 +393,4 @@ auto compile(const Context &context, const SchemaContext &schema_context, entry.dialect); } -ErrorTraceOutput::ErrorTraceOutput( - const sourcemeta::jsontoolkit::JSON &instance, - const sourcemeta::jsontoolkit::WeakPointer &base) - : instance_{instance}, base_{base} {} - -auto ErrorTraceOutput::begin() const -> const_iterator { - return this->output.begin(); -} - -auto ErrorTraceOutput::end() const -> const_iterator { - return this->output.end(); -} - -auto ErrorTraceOutput::cbegin() const -> const_iterator { - return this->output.cbegin(); -} - -auto ErrorTraceOutput::cend() const -> const_iterator { - return this->output.cend(); -} - -auto ErrorTraceOutput::operator()( - const EvaluationType type, const bool result, - const Template::value_type &step, - const sourcemeta::jsontoolkit::WeakPointer &evaluate_path, - const sourcemeta::jsontoolkit::WeakPointer &instance_location, - const sourcemeta::jsontoolkit::JSON &annotation) -> void { - if (evaluate_path.empty()) { - return; - } - - assert(evaluate_path.back().is_property()); - - if (type == EvaluationType::Pre) { - assert(result); - const auto &keyword{evaluate_path.back().to_property()}; - // To ease the output - if (keyword == "oneOf" || keyword == "not") { - this->mask.insert(evaluate_path); - } - } else if (type == EvaluationType::Post && - this->mask.contains(evaluate_path)) { - this->mask.erase(evaluate_path); - } - - // Ignore successful or masked steps - if (result || std::any_of(this->mask.cbegin(), this->mask.cend(), - [&evaluate_path](const auto &entry) { - return evaluate_path.starts_with(entry); - })) { - return; - } - - auto effective_evaluate_path{evaluate_path.resolve_from(this->base_)}; - if (effective_evaluate_path.empty()) { - return; - } - - this->output.push_back( - {describe(result, step, evaluate_path, instance_location, this->instance_, - annotation), - instance_location, std::move(effective_evaluate_path)}); -} - } // namespace sourcemeta::blaze diff --git a/vendor/blaze/src/compiler/compile_describe.cc b/vendor/blaze/src/compiler/compile_describe.cc index 51c8822..116e80c 100644 --- a/vendor/blaze/src/compiler/compile_describe.cc +++ b/vendor/blaze/src/compiler/compile_describe.cc @@ -231,7 +231,10 @@ struct DescribeVisitor { } auto operator()(const LogicalCondition &) const -> std::string { - return unknown(); + std::ostringstream message; + message << "The " << to_string(this->target.type()) + << " value was expected to validate against the given conditional"; + return message.str(); } auto operator()(const LogicalNot &) const -> std::string { @@ -246,6 +249,18 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const LogicalNotEvaluate &) const -> std::string { + std::ostringstream message; + message + << "The " << to_string(this->target.type()) + << " value was expected to not validate against the given subschema"; + if (!this->valid) { + message << ", but it did"; + } + + return message.str(); + } + auto operator()(const ControlLabel &) const -> std::string { return describe_reference(this->target); } @@ -295,10 +310,7 @@ struct DescribeVisitor { if ((this->keyword == "items" || this->keyword == "additionalItems") && this->annotation.is_boolean() && this->annotation.to_boolean()) { assert(this->target.is_array()); - std::ostringstream message; - message << "At least one item of the array value successfully validated " - "against the given subschema"; - return message.str(); + return "Every item in the array value was successfully validated"; } if ((this->keyword == "prefixItems" || this->keyword == "items") && @@ -320,6 +332,15 @@ struct DescribeVisitor { return message.str(); } + if (this->keyword == "prefixItems" && this->annotation.is_boolean() && + this->annotation.to_boolean()) { + assert(this->target.is_array()); + std::ostringstream message; + message << "Every item of the array value validated against the given " + "positional subschemas"; + return message.str(); + } + if (this->keyword == "title" || this->keyword == "description") { assert(this->annotation.is_string()); std::ostringstream message; @@ -490,51 +511,6 @@ struct DescribeVisitor { return message.str(); } - auto operator()(const AnnotationWhenArraySizeEqual &) const -> std::string { - if (this->keyword == "items" && this->annotation.is_boolean() && - this->annotation.to_boolean()) { - assert(this->target.is_array()); - std::ostringstream message; - message << "At least one item of the array value successfully validated " - "against the given subschema"; - return message.str(); - } - - if (this->keyword == "prefixItems" && this->annotation.is_boolean() && - this->annotation.to_boolean()) { - assert(this->target.is_array()); - std::ostringstream message; - message << "Every item of the array value validated against the given " - "positional subschemas"; - return message.str(); - } - - return unknown(); - } - - auto operator()(const AnnotationWhenArraySizeGreater &) const -> std::string { - if ((this->keyword == "prefixItems" || this->keyword == "items") && - this->annotation.is_integer()) { - assert(this->target.is_array()); - assert(this->annotation.is_positive()); - std::ostringstream message; - if (this->annotation.to_integer() == 0) { - message << "The first item of the array value successfully validated " - "against the first " - "positional subschema"; - } else { - message << "The first " << this->annotation.to_integer() + 1 - << " items of the array value successfully validated against " - "the given " - "positional subschemas"; - } - - return message.str(); - } - - return unknown(); - } - auto operator()(const AnnotationToParent &) const -> std::string { if (this->keyword == "unevaluatedItems" && this->annotation.is_boolean() && this->annotation.to_boolean()) { @@ -607,6 +583,21 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const LoopPropertiesEvaluate &step) const -> std::string { + assert(this->keyword == "additionalProperties"); + std::ostringstream message; + if (step.children.size() == 1 && + std::holds_alternative(step.children.front())) { + message << "The object value was not expected to define additional " + "properties"; + } else { + message << "The object properties not covered by other adjacent object " + "keywords were expected to validate against this subschema"; + } + + return message.str(); + } + auto operator()(const LoopPropertiesUnevaluated &step) const -> std::string { if (this->keyword == "unevaluatedProperties") { std::ostringstream message; @@ -625,6 +616,25 @@ struct DescribeVisitor { return unknown(); } + auto operator()(const LoopPropertiesUnevaluatedExcept &step) const + -> std::string { + if (this->keyword == "unevaluatedProperties") { + std::ostringstream message; + if (!step.children.empty() && + std::holds_alternative(step.children.front())) { + message << "The object value was not expected to define unevaluated " + "properties"; + } else { + message << "The object properties not covered by other object " + "keywords were expected to validate against this subschema"; + } + + return message.str(); + } + + return unknown(); + } + auto operator()(const LoopPropertiesExcept &step) const -> std::string { assert(this->keyword == "additionalProperties"); std::ostringstream message; @@ -647,6 +657,13 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const LoopPropertiesTypeEvaluate &step) const -> std::string { + std::ostringstream message; + message << "The object properties were expected to be of type " + << to_string(step.value); + return message.str(); + } + auto operator()(const LoopPropertiesTypeStrict &step) const -> std::string { std::ostringstream message; message << "The object properties were expected to be of type " @@ -654,6 +671,14 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const LoopPropertiesTypeStrictEvaluate &step) const + -> std::string { + std::ostringstream message; + message << "The object properties were expected to be of type " + << to_string(step.value); + return message.str(); + } + auto operator()(const LoopKeys &) const -> std::string { assert(this->keyword == "propertyNames"); assert(this->target.is_object()); @@ -1029,35 +1054,31 @@ struct DescribeVisitor { } auto operator()(const AssertionArraySizeGreater &step) const -> std::string { - if (this->keyword == "minItems") { - assert(this->target.is_array()); - std::ostringstream message; - const auto minimum{step_value(step) + 1}; - message << "The array value was expected to contain at least " << minimum; - assert(minimum > 0); - if (minimum == 1) { - message << " item"; - } else { - message << " items"; - } - - if (this->valid) { - message << " and"; - } else { - message << " but"; - } + assert(this->target.is_array()); + std::ostringstream message; + const auto minimum{step_value(step) + 1}; + message << "The array value was expected to contain at least " << minimum; + assert(minimum > 0); + if (minimum == 1) { + message << " item"; + } else { + message << " items"; + } - message << " it contained " << this->target.size(); - if (this->target.size() == 1) { - message << " item"; - } else { - message << " items"; - } + if (this->valid) { + message << " and"; + } else { + message << " but"; + } - return message.str(); + message << " it contained " << this->target.size(); + if (this->target.size() == 1) { + message << " item"; + } else { + message << " items"; } - return unknown(); + return message.str(); } auto operator()(const AssertionObjectSizeLess &step) const -> std::string { @@ -1340,6 +1361,27 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const AssertionPropertyTypeEvaluate &step) const + -> std::string { + std::ostringstream message; + const auto &value{step_value(step)}; + if (!this->valid && value == sourcemeta::jsontoolkit::JSON::Type::Real && + this->target.type() == sourcemeta::jsontoolkit::JSON::Type::Integer) { + message + << "The value was expected to be a real number but it was an integer"; + } else if (!this->valid && + value == sourcemeta::jsontoolkit::JSON::Type::Integer && + this->target.type() == + sourcemeta::jsontoolkit::JSON::Type::Real) { + message + << "The value was expected to be an integer but it was a real number"; + } else { + describe_type_check(this->valid, this->target.type(), value, message); + } + + return message.str(); + } + auto operator()(const AssertionPropertyTypeStrict &step) const -> std::string { std::ostringstream message; @@ -1361,6 +1403,62 @@ struct DescribeVisitor { return message.str(); } + auto operator()(const AssertionPropertyTypeStrictEvaluate &step) const + -> std::string { + std::ostringstream message; + const auto &value{step_value(step)}; + if (!this->valid && value == sourcemeta::jsontoolkit::JSON::Type::Real && + this->target.type() == sourcemeta::jsontoolkit::JSON::Type::Integer) { + message + << "The value was expected to be a real number but it was an integer"; + } else if (!this->valid && + value == sourcemeta::jsontoolkit::JSON::Type::Integer && + this->target.type() == + sourcemeta::jsontoolkit::JSON::Type::Real) { + message + << "The value was expected to be an integer but it was a real number"; + } else { + describe_type_check(this->valid, this->target.type(), value, message); + } + + return message.str(); + } + + auto operator()(const AssertionArrayPrefix &step) const -> std::string { + assert(this->keyword == "items" || this->keyword == "prefixItems"); + assert(!step.children.empty()); + assert(this->target.is_array()); + + std::ostringstream message; + message << "The first "; + if (step.children.size() <= 2) { + message << "item of the array value was"; + } else { + message << (step.children.size() - 1) << " items of the array value were"; + } + + message << " expected to validate against the corresponding subschemas"; + return message.str(); + } + + auto operator()(const AssertionArrayPrefixEvaluate &step) const + -> std::string { + assert(this->keyword == "items" || this->keyword == "prefixItems"); + assert(!step.children.empty()); + assert(this->target.is_array()); + + std::ostringstream message; + message << "The first "; + if (step.children.size() <= 2) { + message << "item of the array value was"; + } else { + message << (step.children.size() - 1) << " items of the array value were"; + } + + message << " expected to validate against the corresponding subschemas"; + return message.str(); + } + auto operator()(const LoopPropertiesMatch &step) const -> std::string { assert(!step.children.empty()); assert(this->target.is_object()); @@ -1382,34 +1480,31 @@ struct DescribeVisitor { return message.str(); } - auto operator()(const LogicalWhenType &step) const -> std::string { - if (this->keyword == "patternProperties") { - assert(!step.children.empty()); - assert(this->target.is_object()); - std::ostringstream message; - message << "The object value was expected to validate against the "; - if (step.children.size() == 1) { - message << "single defined pattern property subschema"; - } else { - message << step.children.size() - << " defined pattern properties subschemas"; - } + auto operator()(const LoopPropertiesRegex &step) const -> std::string { + assert(this->target.is_object()); + std::ostringstream message; + message << "The object properties that match the regular expression \"" + << step_value(step).second + << "\" were expected to validate against the defined pattern " + "property subschema"; + return message.str(); + } - return message.str(); - } + auto operator()(const LoopPropertiesStartsWith &step) const -> std::string { + assert(this->target.is_object()); + std::ostringstream message; + message << "The object properties that start with the string \"" + << step_value(step) + << "\" were expected to validate against the defined pattern " + "property subschema"; + return message.str(); + } - if (this->keyword == "items" || this->keyword == "prefixItems") { - assert(!step.children.empty()); - assert(this->target.is_array()); + auto operator()(const LogicalWhenType &step) const -> std::string { + if (this->keyword == "items") { std::ostringstream message; - message << "The first "; - if (step.children.size() == 1) { - message << "item of the array value was"; - } else { - message << step.children.size() << " items of the array value were"; - } - - message << " expected to validate against the corresponding subschemas"; + describe_type_check(this->valid, this->target.type(), step_value(step), + message); return message.str(); } @@ -1608,76 +1703,93 @@ struct DescribeVisitor { auto operator()(const AssertionPropertyDependencies &step) const -> std::string { - if (this->keyword == "dependentRequired") { - assert(this->target.is_object()); - std::set present; - std::set all_dependencies; - std::set required; + assert(this->target.is_object()); + std::set present; + std::set all_dependencies; + std::set required; - for (const auto &[property, dependencies] : step.value) { - all_dependencies.insert(property); - if (this->target.defines(property)) { - present.insert(property); - for (const auto &dependency : dependencies) { - if (this->valid || !this->target.defines(dependency)) { - required.insert(dependency); - } + for (const auto &[property, dependencies] : step.value) { + all_dependencies.insert(property); + if (this->target.defines(property)) { + present.insert(property); + for (const auto &dependency : dependencies) { + if (this->valid || !this->target.defines(dependency)) { + required.insert(dependency); } } } + } - std::ostringstream message; - - if (present.empty()) { - message << "The object value did not define the"; - assert(!all_dependencies.empty()); - if (all_dependencies.size() == 1) { - message << " property " - << escape_string(*(all_dependencies.cbegin())); - } else { - message << " properties "; - for (auto iterator = all_dependencies.cbegin(); - iterator != all_dependencies.cend(); ++iterator) { - if (std::next(iterator) == all_dependencies.cend()) { - message << "or " << escape_string(*iterator); - } else { - message << escape_string(*iterator) << ", "; - } - } - } + std::ostringstream message; - return message.str(); - } else if (present.size() == 1) { - message << "Because the object value defined the"; - message << " property " << escape_string(*(present.cbegin())); + if (present.empty()) { + message << "The object value did not define the"; + assert(!all_dependencies.empty()); + if (all_dependencies.size() == 1) { + message << " property " << escape_string(*(all_dependencies.cbegin())); } else { - message << "Because the object value defined the"; message << " properties "; - for (auto iterator = present.cbegin(); iterator != present.cend(); - ++iterator) { - if (std::next(iterator) == present.cend()) { - message << "and " << escape_string(*iterator); + for (auto iterator = all_dependencies.cbegin(); + iterator != all_dependencies.cend(); ++iterator) { + if (std::next(iterator) == all_dependencies.cend()) { + message << "or " << escape_string(*iterator); } else { message << escape_string(*iterator) << ", "; } } } - assert(!required.empty()); - message << ", it was also expected to define the"; - if (required.size() == 1) { - message << " property " << escape_string(*(required.cbegin())); - } else { - message << " properties "; - for (auto iterator = required.cbegin(); iterator != required.cend(); - ++iterator) { - if (std::next(iterator) == required.cend()) { - message << "and " << escape_string(*iterator); - } else { - message << escape_string(*iterator) << ", "; - } + return message.str(); + } else if (present.size() == 1) { + message << "Because the object value defined the"; + message << " property " << escape_string(*(present.cbegin())); + } else { + message << "Because the object value defined the"; + message << " properties "; + for (auto iterator = present.cbegin(); iterator != present.cend(); + ++iterator) { + if (std::next(iterator) == present.cend()) { + message << "and " << escape_string(*iterator); + } else { + message << escape_string(*iterator) << ", "; + } + } + } + + assert(!required.empty()); + message << ", it was also expected to define the"; + if (required.size() == 1) { + message << " property " << escape_string(*(required.cbegin())); + } else { + message << " properties "; + for (auto iterator = required.cbegin(); iterator != required.cend(); + ++iterator) { + if (std::next(iterator) == required.cend()) { + message << "and " << escape_string(*iterator); + } else { + message << escape_string(*iterator) << ", "; } } + } + + return message.str(); + } + + auto operator()(const LogicalWhenArraySizeGreater &step) const + -> std::string { + if (this->keyword == "additionalItems" || this->keyword == "items") { + assert(this->target.is_array()); + std::ostringstream message; + + if (this->target.size() > step_value(step)) { + const auto rest{this->target.size() - step_value(step)}; + message << "The array value contains " << rest << " additional" + << (rest == 1 ? " item" : " items") + << " not described by related keywords"; + } else { + message << "The array value does not contain additional items not " + "described by related keywords"; + } return message.str(); } @@ -1687,13 +1799,11 @@ struct DescribeVisitor { // These steps are never described, at least not right now - auto operator()(const LogicalWhenArraySizeGreater &) const -> std::string { - return unknown(); - } - auto operator()(const LogicalWhenArraySizeEqual &) const -> std::string { + auto operator()(const ControlGroup &) const -> std::string { return unknown(); } - auto operator()(const LoopPropertiesRegex &) const -> std::string { + + auto operator()(const ControlGroupWhenDefines &) const -> std::string { return unknown(); } }; diff --git a/vendor/blaze/src/compiler/compile_helpers.h b/vendor/blaze/src/compiler/compile_helpers.h index 8f0ad4f..5890b3b 100644 --- a/vendor/blaze/src/compiler/compile_helpers.h +++ b/vendor/blaze/src/compiler/compile_helpers.h @@ -7,6 +7,7 @@ #include // std::find #include // assert #include // std::distance +#include // std::regex, std::regex_match, std::smatch #include // std::declval, std::move namespace sourcemeta::blaze { @@ -31,8 +32,7 @@ inline auto schema_resource_id(const Context &context, // Instantiate a value-oriented step template -auto make(const bool report, const Context &context, - const SchemaContext &schema_context, +auto make(const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context, // Take the value type from the "type" property of the step struct const decltype(std::declval().value) &value) -> Step { @@ -45,14 +45,15 @@ auto make(const bool report, const Context &context, to_uri(schema_context.relative_pointer, schema_context.base).recompose(), schema_resource_id(context, schema_context.base.recompose()), context.uses_dynamic_scopes, - report, + context.mode != Mode::FastValidation || + !context.unevaluated_properties_schemas.empty() || + !context.unevaluated_items_schemas.empty(), value}; } // Instantiate an applicator step template -auto make(const bool report, const Context &context, - const SchemaContext &schema_context, +auto make(const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context, // Take the value type from the "value" property of the step struct decltype(std::declval().value) &&value, Template &&children) @@ -66,7 +67,9 @@ auto make(const bool report, const Context &context, to_uri(schema_context.relative_pointer, schema_context.base).recompose(), schema_resource_id(context, schema_context.base.recompose()), context.uses_dynamic_scopes, - report, + context.mode != Mode::FastValidation || + !context.unevaluated_properties_schemas.empty() || + !context.unevaluated_items_schemas.empty(), std::move(value), std::move(children)}; } @@ -86,7 +89,7 @@ auto unroll(const DynamicContext &dynamic_context, const Step &step, std::get(step).keyword_location, std::get(step).schema_resource, std::get(step).dynamic, - std::get(step).report, + std::get(step).track, std::get(step).value}; } @@ -110,6 +113,105 @@ unsigned_integer_property(const sourcemeta::jsontoolkit::JSON &document, return unsigned_integer_property(document, property).value_or(otherwise); } +inline auto static_frame_entry(const Context &context, + const SchemaContext &schema_context) + -> const sourcemeta::jsontoolkit::ReferenceFrameEntry & { + const auto type{sourcemeta::jsontoolkit::ReferenceType::Static}; + const auto current{ + to_uri(schema_context.relative_pointer, schema_context.base).recompose()}; + assert(context.frame.contains({type, current})); + return context.frame.at({type, current}); +} + +inline auto walk_subschemas(const Context &context, + const SchemaContext &schema_context, + const DynamicContext &dynamic_context) -> auto { + const auto &entry{static_frame_entry(context, schema_context)}; + return sourcemeta::jsontoolkit::SchemaIterator{ + schema_context.schema.at(dynamic_context.keyword), context.walker, + context.resolver, entry.dialect}; +} + +inline auto pattern_as_prefix(const std::string &pattern) + -> std::optional { + static const std::regex starts_with_regex{R"(^\^([a-zA-Z0-9-_/]+)$)"}; + std::smatch matches; + if (std::regex_match(pattern, matches, starts_with_regex)) { + return matches[1].str(); + } else { + return std::nullopt; + } +} + +inline auto find_adjacent(const Context &context, + const SchemaContext &schema_context, + const std::set &vocabularies, + const std::string &keyword, + const sourcemeta::jsontoolkit::JSON::Type type) + -> auto { + std::vector possible_keyword_uris; + possible_keyword_uris.push_back( + to_uri(schema_context.relative_pointer.initial().concat({keyword}), + schema_context.base) + .recompose()); + + // TODO: Do something similar with `allOf` + + // Attempt to statically follow references + if (schema_context.schema.defines("$ref")) { + const auto reference_type{sourcemeta::jsontoolkit::ReferenceType::Static}; + const auto destination_uri{ + to_uri(schema_context.relative_pointer.initial().concat({"$ref"}), + schema_context.base) + .recompose()}; + assert(context.frame.contains({reference_type, destination_uri})); + const auto &destination{ + context.frame.at({reference_type, destination_uri})}; + assert(context.references.contains({reference_type, destination.pointer})); + const auto &reference{ + context.references.at({reference_type, destination.pointer})}; + const auto keyword_uri{ + sourcemeta::jsontoolkit::to_uri( + sourcemeta::jsontoolkit::to_pointer(reference.fragment.value_or("")) + .concat({keyword})) + .resolve_from_if_absolute(reference.base.value_or(""))}; + + // TODO: When this logic is used by + // `unevaluatedProperties`/`unevaluatedItems`, how can we let the + // applicators we detect here know that they have already been taken into + // consideration and thus do not have to track evaluation? + possible_keyword_uris.push_back(keyword_uri.recompose()); + } + + std::vector> + result; + + for (const auto &possible_keyword_uri : possible_keyword_uris) { + if (!context.frame.contains({sourcemeta::jsontoolkit::ReferenceType::Static, + possible_keyword_uri})) { + continue; + } + + const auto &frame_entry{ + context.frame.at({sourcemeta::jsontoolkit::ReferenceType::Static, + possible_keyword_uri})}; + const auto &subschema{ + sourcemeta::jsontoolkit::get(context.root, frame_entry.pointer)}; + const auto &subschema_vocabularies{sourcemeta::jsontoolkit::vocabularies( + subschema, context.resolver, frame_entry.dialect)}; + + if (std::any_of(vocabularies.cbegin(), vocabularies.cend(), + [&subschema_vocabularies](const auto &vocabulary) { + return subschema_vocabularies.contains(vocabulary); + }) && + subschema.type() == type) { + result.emplace_back(subschema); + } + } + + return result; +} + } // namespace sourcemeta::blaze #endif diff --git a/vendor/blaze/src/compiler/compile_json.cc b/vendor/blaze/src/compiler/compile_json.cc index e5f0718..16e3891 100644 --- a/vendor/blaze/src/compiler/compile_json.cc +++ b/vendor/blaze/src/compiler/compile_json.cc @@ -113,26 +113,23 @@ auto value_to_json(const T &value) -> sourcemeta::jsontoolkit::JSON { result.assign("value", std::move(map)); return result; - } else if constexpr (std::is_same_v) { - result.assign("type", sourcemeta::jsontoolkit::JSON{"indexed-json"}); - sourcemeta::jsontoolkit::JSON data{ - sourcemeta::jsontoolkit::JSON::make_object()}; - data.assign("index", sourcemeta::jsontoolkit::JSON{value.first}); - data.assign("value", value.second); - result.assign("value", std::move(data)); - return result; } else if constexpr (std::is_same_v) { result.assign("type", sourcemeta::jsontoolkit::JSON{"property-filter"}); sourcemeta::jsontoolkit::JSON data{ sourcemeta::jsontoolkit::JSON::make_object()}; data.assign("names", sourcemeta::jsontoolkit::JSON::make_array()); + data.assign("prefixes", sourcemeta::jsontoolkit::JSON::make_array()); data.assign("patterns", sourcemeta::jsontoolkit::JSON::make_array()); - for (const auto &name : value.first) { + for (const auto &name : std::get<0>(value)) { data.at("names").push_back(sourcemeta::jsontoolkit::JSON{name}); } - for (const auto &pattern : value.second) { + for (const auto &prefix : std::get<1>(value)) { + data.at("prefixes").push_back(sourcemeta::jsontoolkit::JSON{prefix}); + } + + for (const auto &pattern : std::get<2>(value)) { data.at("patterns") .push_back(sourcemeta::jsontoolkit::JSON{pattern.second}); } @@ -195,7 +192,7 @@ auto encode_step(const std::string_view category, const std::string_view type, result.assign("schemaResource", sourcemeta::jsontoolkit::JSON{step.schema_resource}); result.assign("dynamic", sourcemeta::jsontoolkit::JSON{step.dynamic}); - result.assign("report", sourcemeta::jsontoolkit::JSON{step.report}); + result.assign("track", sourcemeta::jsontoolkit::JSON{step.track}); result.assign("value", value_to_json(step.value)); if constexpr (requires { step.children; }) { @@ -243,16 +240,20 @@ struct StepVisitor { HANDLE_STEP("assertion", "divisible", AssertionDivisible) HANDLE_STEP("assertion", "string-type", AssertionStringType) HANDLE_STEP("assertion", "property-type", AssertionPropertyType) + HANDLE_STEP("assertion", "property-type-evaluate", + AssertionPropertyTypeEvaluate) HANDLE_STEP("assertion", "property-type-strict", AssertionPropertyTypeStrict) + HANDLE_STEP("assertion", "property-type-strict-evaluate", + AssertionPropertyTypeStrictEvaluate) + HANDLE_STEP("assertion", "array-prefix", AssertionArrayPrefix) + HANDLE_STEP("assertion", "array-prefix-evaluate", + AssertionArrayPrefixEvaluate) HANDLE_STEP("assertion", "equals-any", AssertionEqualsAny) HANDLE_STEP("annotation", "emit", AnnotationEmit) - HANDLE_STEP("annotation", "when-array-size-equal", - AnnotationWhenArraySizeEqual) - HANDLE_STEP("annotation", "when-array-size-greater", - AnnotationWhenArraySizeGreater) HANDLE_STEP("annotation", "to-parent", AnnotationToParent) HANDLE_STEP("annotation", "basename-to-parent", AnnotationBasenameToParent) HANDLE_STEP("logical", "not", LogicalNot) + HANDLE_STEP("logical", "not-evaluate", LogicalNotEvaluate) HANDLE_STEP("logical", "or", LogicalOr) HANDLE_STEP("logical", "and", LogicalAnd) HANDLE_STEP("logical", "xor", LogicalXor) @@ -260,18 +261,26 @@ struct StepVisitor { HANDLE_STEP("logical", "when-type", LogicalWhenType) HANDLE_STEP("logical", "when-defines", LogicalWhenDefines) HANDLE_STEP("logical", "when-array-size-greater", LogicalWhenArraySizeGreater) - HANDLE_STEP("logical", "when-array-size-equal", LogicalWhenArraySizeEqual) HANDLE_STEP("loop", "properties-unevaluated", LoopPropertiesUnevaluated) + HANDLE_STEP("loop", "properties-unevaluated-except", + LoopPropertiesUnevaluatedExcept) HANDLE_STEP("loop", "items-unevaluated", LoopItemsUnevaluated) HANDLE_STEP("loop", "properties-match", LoopPropertiesMatch) HANDLE_STEP("loop", "properties", LoopProperties) + HANDLE_STEP("loop", "properties-evaluate", LoopPropertiesEvaluate) HANDLE_STEP("loop", "properties-regex", LoopPropertiesRegex) + HANDLE_STEP("loop", "properties-starts-with", LoopPropertiesStartsWith) HANDLE_STEP("loop", "properties-except", LoopPropertiesExcept) HANDLE_STEP("loop", "properties-type", LoopPropertiesType) + HANDLE_STEP("loop", "properties-type-evaluate", LoopPropertiesTypeEvaluate) HANDLE_STEP("loop", "properties-type-strict", LoopPropertiesTypeStrict) + HANDLE_STEP("loop", "properties-type-strict-evaluate", + LoopPropertiesTypeStrictEvaluate) HANDLE_STEP("loop", "keys", LoopKeys) HANDLE_STEP("loop", "items", LoopItems) HANDLE_STEP("loop", "contains", LoopContains) + HANDLE_STEP("control", "group", ControlGroup) + HANDLE_STEP("control", "group-when-defines", ControlGroupWhenDefines) HANDLE_STEP("control", "label", ControlLabel) HANDLE_STEP("control", "mark", ControlMark) HANDLE_STEP("control", "evaluate", ControlEvaluate) @@ -310,9 +319,10 @@ auto template_format_compare(const sourcemeta::jsontoolkit::JSON::String &left, {"absoluteKeywordLocation", 4}, {"relativeSchemaLocation", 5}, {"relativeInstanceLocation", 6}, - {"report", 7}, + {"evaluatePath", 7}, {"dynamic", 8}, - {"children", 9}}; + {"track", 9}, + {"children", 10}}; constexpr std::uint64_t DEFAULT_RANK{999}; const auto left_rank{rank.contains(left) ? rank.at(left) : DEFAULT_RANK}; diff --git a/vendor/blaze/src/compiler/compile_output.cc b/vendor/blaze/src/compiler/compile_output.cc new file mode 100644 index 0000000..e3612c8 --- /dev/null +++ b/vendor/blaze/src/compiler/compile_output.cc @@ -0,0 +1,76 @@ +#include + +#include + +#include // std::any_of, std::sort +#include // assert +#include // std::back_inserter +#include // std::move + +namespace sourcemeta::blaze { + +ErrorTraceOutput::ErrorTraceOutput( + const sourcemeta::jsontoolkit::JSON &instance, + const sourcemeta::jsontoolkit::WeakPointer &base) + : instance_{instance}, base_{base} {} + +auto ErrorTraceOutput::begin() const -> const_iterator { + return this->output.begin(); +} + +auto ErrorTraceOutput::end() const -> const_iterator { + return this->output.end(); +} + +auto ErrorTraceOutput::cbegin() const -> const_iterator { + return this->output.cbegin(); +} + +auto ErrorTraceOutput::cend() const -> const_iterator { + return this->output.cend(); +} + +auto ErrorTraceOutput::operator()( + const EvaluationType type, const bool result, + const Template::value_type &step, + const sourcemeta::jsontoolkit::WeakPointer &evaluate_path, + const sourcemeta::jsontoolkit::WeakPointer &instance_location, + const sourcemeta::jsontoolkit::JSON &annotation) -> void { + if (evaluate_path.empty()) { + return; + } + + assert(evaluate_path.back().is_property()); + + if (type == EvaluationType::Pre) { + assert(result); + const auto &keyword{evaluate_path.back().to_property()}; + // To ease the output + if (keyword == "oneOf" || keyword == "not" || keyword == "if") { + this->mask.insert(evaluate_path); + } + } else if (type == EvaluationType::Post && + this->mask.contains(evaluate_path)) { + this->mask.erase(evaluate_path); + } + + // Ignore successful or masked steps + if (result || std::any_of(this->mask.cbegin(), this->mask.cend(), + [&evaluate_path](const auto &entry) { + return evaluate_path.starts_with(entry); + })) { + return; + } + + auto effective_evaluate_path{evaluate_path.resolve_from(this->base_)}; + if (effective_evaluate_path.empty()) { + return; + } + + this->output.push_back( + {describe(result, step, evaluate_path, instance_location, this->instance_, + annotation), + instance_location, std::move(effective_evaluate_path)}); +} + +} // namespace sourcemeta::blaze diff --git a/vendor/blaze/src/compiler/default_compiler_2019_09.h b/vendor/blaze/src/compiler/default_compiler_2019_09.h index 591c7ad..734c87e 100644 --- a/vendor/blaze/src/compiler/default_compiler_2019_09.h +++ b/vendor/blaze/src/compiler/default_compiler_2019_09.h @@ -39,14 +39,15 @@ auto compiler_2019_09_applicator_dependentschemas( if (!dependency.is_boolean() || !dependency.to_boolean()) { children.push_back(make( - true, context, schema_context, relative_dynamic_context, + context, schema_context, relative_dynamic_context, ValueString{dependent}, compile(context, schema_context, relative_dynamic_context, {dependent}, sourcemeta::jsontoolkit::empty_pointer))); } } - return {make(true, context, schema_context, dynamic_context, + // TODO: Is this wrapper really necessary? + return {make(context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Object, std::move(children))}; } @@ -87,7 +88,7 @@ auto compiler_2019_09_validation_dependentrequired( } return {make( - true, context, schema_context, dynamic_context, std::move(dependencies))}; + context, schema_context, dynamic_context, std::move(dependencies))}; } auto compiler_2019_09_core_annotation(const Context &context, @@ -95,7 +96,7 @@ auto compiler_2019_09_core_annotation(const Context &context, const DynamicContext &dynamic_context) -> Template { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON{ schema_context.schema.at(dynamic_context.keyword)})}; } @@ -135,7 +136,7 @@ auto compiler_2019_09_applicator_contains_with_options( } if (maximum.has_value() && minimum > maximum.value()) { - return {make(true, context, schema_context, dynamic_context, + return {make(context, schema_context, dynamic_context, ValueNone{})}; } @@ -149,7 +150,7 @@ auto compiler_2019_09_applicator_contains_with_options( if (annotate) { children.push_back(make( - true, context, schema_context, relative_dynamic_context, ValueNone{})); + context, schema_context, relative_dynamic_context, ValueNone{})); // TODO: If after emitting the above annotation, the number of annotations // for the current schema location + instance location is equal to the @@ -158,13 +159,18 @@ auto compiler_2019_09_applicator_contains_with_options( } if (track_evaluation) { - children.push_back(make(true, context, schema_context, - relative_dynamic_context, - ValuePointer{})); + children.push_back(make( + context, schema_context, relative_dynamic_context, ValuePointer{})); + } + + if (children.empty()) { + // We still need to check the instance is not empty + return {make( + context, schema_context, dynamic_context, ValueUnsignedInteger{0})}; } return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, ValueRange{minimum, maximum, annotate || track_evaluation}, std::move(children))}; } @@ -182,7 +188,8 @@ auto compiler_2019_09_applicator_additionalproperties( const DynamicContext &dynamic_context) -> Template { return compiler_draft4_applicator_additionalproperties_with_options( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_properties); + context.mode == Mode::Exhaustive, + !context.unevaluated_properties_schemas.empty()); } auto compiler_2019_09_applicator_items(const Context &context, @@ -191,7 +198,8 @@ auto compiler_2019_09_applicator_items(const Context &context, -> Template { return compiler_draft4_applicator_items_with_options( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_items); + context.mode == Mode::Exhaustive, + !context.unevaluated_items_schemas.empty()); } auto compiler_2019_09_applicator_additionalitems( @@ -199,7 +207,8 @@ auto compiler_2019_09_applicator_additionalitems( const DynamicContext &dynamic_context) -> Template { return compiler_draft4_applicator_additionalitems_with_options( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_items); + context.mode == Mode::Exhaustive, + !context.unevaluated_items_schemas.empty()); } auto compiler_2019_09_applicator_unevaluateditems( @@ -211,19 +220,31 @@ auto compiler_2019_09_applicator_unevaluateditems( return {}; } + if (!context.unevaluated_items_schemas.contains( + static_frame_entry(context, schema_context).pointer.initial())) { + return {}; + } + Template children{compile(context, schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::empty_pointer, sourcemeta::jsontoolkit::empty_pointer)}; if (context.mode == Mode::Exhaustive) { children.push_back(make( - true, context, schema_context, relative_dynamic_context, + context, schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::JSON{true})); } - return {make(true, context, schema_context, - dynamic_context, ValueNone{}, - std::move(children))}; + if (children.empty()) { + return {make(context, schema_context, dynamic_context, + ValuePointer{})}; + } + + // TODO: Attempt to short-circuit evaluation tracking by looking at sibling + // and adjacent keywords like we do for `unevaluatedProperties` + + return {make(context, schema_context, dynamic_context, + ValueNone{}, std::move(children))}; } auto compiler_2019_09_applicator_unevaluatedproperties( @@ -235,54 +256,122 @@ auto compiler_2019_09_applicator_unevaluatedproperties( return {}; } + if (!context.unevaluated_properties_schemas.contains( + static_frame_entry(context, schema_context).pointer.initial())) { + return {}; + } + Template children{compile(context, schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::empty_pointer, sourcemeta::jsontoolkit::empty_pointer)}; if (context.mode == Mode::Exhaustive) { children.push_back(make( - true, context, schema_context, relative_dynamic_context, ValueNone{})); + context, schema_context, relative_dynamic_context, ValueNone{})); + } + + ValueStrings filter_strings; + ValueStrings filter_prefixes; + std::vector filter_regexes; + + for (const auto &entry : find_adjacent( + context, schema_context, + {"https://json-schema.org/draft/2019-09/vocab/applicator", + "https://json-schema.org/draft/2020-12/vocab/applicator"}, + "properties", sourcemeta::jsontoolkit::JSON::Type::Object)) { + for (const auto &property : entry.get().as_object()) { + filter_strings.push_back(property.first); + } + } + + for (const auto &entry : find_adjacent( + context, schema_context, + {"https://json-schema.org/draft/2019-09/vocab/applicator", + "https://json-schema.org/draft/2020-12/vocab/applicator"}, + "patternProperties", sourcemeta::jsontoolkit::JSON::Type::Object)) { + for (const auto &property : entry.get().as_object()) { + const auto maybe_prefix{pattern_as_prefix(property.first)}; + if (maybe_prefix.has_value()) { + filter_prefixes.push_back(maybe_prefix.value()); + } else { + filter_regexes.push_back( + {parse_regex(property.first, schema_context.base, + schema_context.relative_pointer.initial().concat( + {"patternProperties"})), + property.first}); + } + } } - return {make(true, context, schema_context, - dynamic_context, ValueNone{}, - std::move(children))}; + if (children.empty()) { + return {make(context, schema_context, dynamic_context, + ValuePointer{})}; + } else if (!filter_strings.empty() || !filter_prefixes.empty() || + !filter_regexes.empty()) { + return {make( + context, schema_context, dynamic_context, + ValuePropertyFilter{std::move(filter_strings), + std::move(filter_prefixes), + std::move(filter_regexes)}, + std::move(children))}; + } else { + return {make(context, schema_context, + dynamic_context, ValueNone{}, + std::move(children))}; + } } auto compiler_2019_09_core_recursiveref(const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context) -> Template { - const auto current{ - to_uri(schema_context.relative_pointer, schema_context.base).recompose()}; - assert(context.frame.contains( - {sourcemeta::jsontoolkit::ReferenceType::Static, current})); - const auto &entry{context.frame.at( - {sourcemeta::jsontoolkit::ReferenceType::Static, current})}; + const auto &entry{static_frame_entry(context, schema_context)}; // In this case, just behave as a normal static reference if (!context.references.contains( {sourcemeta::jsontoolkit::ReferenceType::Dynamic, entry.pointer})) { return compiler_draft4_core_ref(context, schema_context, dynamic_context); } - return {make(true, context, schema_context, + return {make(context, schema_context, dynamic_context, "")}; } auto compiler_2019_09_applicator_properties( const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context) -> Template { + // If there is a sibling `unevaluatedProperties`, then no need + // to track evaluation, as that keyword will statically consider + // these properties through `ValuePropertyFilter` + if (context.unevaluated_properties_schemas.contains( + static_frame_entry(context, schema_context).pointer.initial())) { + return compiler_draft4_applicator_properties_with_options( + context, schema_context, dynamic_context, + context.mode == Mode::Exhaustive, false); + } + return compiler_draft4_applicator_properties_with_options( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_properties); + context.mode == Mode::Exhaustive, + !context.unevaluated_properties_schemas.empty()); } auto compiler_2019_09_applicator_patternproperties( const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context) -> Template { + // If there is a sibling `unevaluatedProperties`, then no need + // to track evaluation, as that keyword will statically consider + // these properties through `ValuePropertyFilter` + if (context.unevaluated_properties_schemas.contains( + static_frame_entry(context, schema_context).pointer.initial())) { + return compiler_draft4_applicator_patternproperties_with_options( + context, schema_context, dynamic_context, + context.mode == Mode::Exhaustive, false); + } + return compiler_draft4_applicator_patternproperties_with_options( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_properties); + context.mode == Mode::Exhaustive, + !context.unevaluated_properties_schemas.empty()); } } // namespace internal diff --git a/vendor/blaze/src/compiler/default_compiler_2020_12.h b/vendor/blaze/src/compiler/default_compiler_2020_12.h index 755149d..0a5a116 100644 --- a/vendor/blaze/src/compiler/default_compiler_2020_12.h +++ b/vendor/blaze/src/compiler/default_compiler_2020_12.h @@ -15,7 +15,8 @@ auto compiler_2020_12_applicator_prefixitems( const DynamicContext &dynamic_context) -> Template { return compiler_draft4_applicator_items_array( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_items); + context.mode == Mode::Exhaustive, + !context.unevaluated_items_schemas.empty()); } auto compiler_2020_12_applicator_items(const Context &context, @@ -29,7 +30,8 @@ auto compiler_2020_12_applicator_items(const Context &context, return compiler_draft4_applicator_additionalitems_from_cursor( context, schema_context, dynamic_context, cursor, - context.mode == Mode::Exhaustive, context.uses_unevaluated_items); + context.mode == Mode::Exhaustive, + !context.unevaluated_items_schemas.empty()); } auto compiler_2020_12_applicator_contains(const Context &context, @@ -38,19 +40,15 @@ auto compiler_2020_12_applicator_contains(const Context &context, -> Template { return compiler_2019_09_applicator_contains_with_options( context, schema_context, dynamic_context, - context.mode == Mode::Exhaustive, context.uses_unevaluated_items); + context.mode == Mode::Exhaustive, + !context.unevaluated_items_schemas.empty()); } auto compiler_2020_12_core_dynamicref(const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context) -> Template { - const auto current{ - to_uri(schema_context.relative_pointer, schema_context.base).recompose()}; - assert(context.frame.contains( - {sourcemeta::jsontoolkit::ReferenceType::Static, current})); - const auto &entry{context.frame.at( - {sourcemeta::jsontoolkit::ReferenceType::Static, current})}; + const auto &entry{static_frame_entry(context, schema_context)}; // In this case, just behave as a normal static reference if (!context.references.contains( {sourcemeta::jsontoolkit::ReferenceType::Dynamic, entry.pointer})) { @@ -65,11 +63,16 @@ auto compiler_2020_12_core_dynamicref(const Context &context, // We handle the non-anchor variant by not treating it as a dynamic reference assert(reference.fragment().has_value()); + // TODO: Here we can potentially optimize `$dynamicRef` as a static reference + // if we determine (by traversing the frame) that the given dynamic anchor + // is only defined once. That means there is only one schema resource, and + // the jump and be always statically determined + // Note we don't need to even care about the static part of the dynamic // reference (if any), as even if we jump first there, we will still // look for the oldest dynamic anchor in the schema resource chain. return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, std::string{reference.fragment().value()})}; } diff --git a/vendor/blaze/src/compiler/default_compiler_draft4.h b/vendor/blaze/src/compiler/default_compiler_draft4.h index bd657be..58da6e3 100644 --- a/vendor/blaze/src/compiler/default_compiler_draft4.h +++ b/vendor/blaze/src/compiler/default_compiler_draft4.h @@ -35,11 +35,8 @@ auto compiler_draft4_core_ref(const Context &context, const DynamicContext &dynamic_context) -> Template { // Determine the label + const auto &entry{static_frame_entry(context, schema_context)}; const auto type{sourcemeta::jsontoolkit::ReferenceType::Static}; - const auto current{ - to_uri(schema_context.relative_pointer, schema_context.base).recompose()}; - assert(context.frame.contains({type, current})); - const auto &entry{context.frame.at({type, current})}; if (!context.references.contains({type, entry.pointer})) { assert(schema_context.schema.at(dynamic_context.keyword).is_string()); throw sourcemeta::jsontoolkit::SchemaReferenceError( @@ -53,8 +50,9 @@ auto compiler_draft4_core_ref(const Context &context, reference.fragment.value_or(""))}; // The label is already registered, so just jump to it - if (schema_context.labels.contains(label)) { - return {make(true, context, schema_context, dynamic_context, + if (schema_context.labels.contains(label) || + context.precompiled_static_schemas.contains(reference.destination)) { + return {make(context, schema_context, dynamic_context, ValueUnsignedInteger{label})}; } @@ -94,7 +92,7 @@ auto compiler_draft4_core_ref(const Context &context, reference.destination); } else { return {make( - true, context, schema_context, dynamic_context, ValueNone{}, + context, schema_context, dynamic_context, ValueNone{}, compile(context, new_schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::empty_pointer, sourcemeta::jsontoolkit::empty_pointer, @@ -110,8 +108,7 @@ auto compiler_draft4_core_ref(const Context &context, // whether something points to them and add the "checkpoint" themselves. new_schema_context.labels.insert(label); return {make( - true, context, schema_context, dynamic_context, - ValueUnsignedInteger{label}, + context, schema_context, dynamic_context, ValueUnsignedInteger{label}, compile(context, new_schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::empty_pointer, sourcemeta::jsontoolkit::empty_pointer, reference.destination))}; @@ -125,12 +122,12 @@ auto compiler_draft4_validation_type(const Context &context, const auto &type{ schema_context.schema.at(dynamic_context.keyword).to_string()}; if (type == "null") { - return {make( - true, context, schema_context, dynamic_context, - sourcemeta::jsontoolkit::JSON::Type::Null)}; + return { + make(context, schema_context, dynamic_context, + sourcemeta::jsontoolkit::JSON::Type::Null)}; } else if (type == "boolean") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Boolean)}; } else if (type == "object") { const auto minimum{ @@ -139,13 +136,13 @@ auto compiler_draft4_validation_type(const Context &context, unsigned_integer_property(schema_context.schema, "maxProperties")}; if (context.mode == Mode::FastValidation && (minimum > 0 || maximum.has_value())) { - return {make(true, context, schema_context, + return {make(context, schema_context, dynamic_context, {minimum, maximum, false})}; } return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Object)}; } else if (type == "array") { const auto minimum{ @@ -154,23 +151,23 @@ auto compiler_draft4_validation_type(const Context &context, unsigned_integer_property(schema_context.schema, "maxItems")}; if (context.mode == Mode::FastValidation && (minimum > 0 || maximum.has_value())) { - return {make(true, context, schema_context, + return {make(context, schema_context, dynamic_context, {minimum, maximum, false})}; } return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Array)}; } else if (type == "number") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, std::vector{ sourcemeta::jsontoolkit::JSON::Type::Real, sourcemeta::jsontoolkit::JSON::Type::Integer})}; } else if (type == "integer") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Integer)}; } else if (type == "string") { const auto minimum{ @@ -179,13 +176,13 @@ auto compiler_draft4_validation_type(const Context &context, unsigned_integer_property(schema_context.schema, "maxLength")}; if (context.mode == Mode::FastValidation && (minimum > 0 || maximum.has_value())) { - return {make(true, context, schema_context, + return {make(context, schema_context, dynamic_context, {minimum, maximum, false})}; } return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::String)}; } else { return {}; @@ -198,34 +195,34 @@ auto compiler_draft4_validation_type(const Context &context, const auto &type{ schema_context.schema.at(dynamic_context.keyword).front().to_string()}; if (type == "null") { - return {make( - true, context, schema_context, dynamic_context, - sourcemeta::jsontoolkit::JSON::Type::Null)}; + return { + make(context, schema_context, dynamic_context, + sourcemeta::jsontoolkit::JSON::Type::Null)}; } else if (type == "boolean") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Boolean)}; } else if (type == "object") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Object)}; } else if (type == "array") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Array)}; } else if (type == "number") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, std::vector{ sourcemeta::jsontoolkit::JSON::Type::Real, sourcemeta::jsontoolkit::JSON::Type::Integer})}; } else if (type == "integer") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::Integer)}; } else if (type == "string") { return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, sourcemeta::jsontoolkit::JSON::Type::String)}; } else { return {}; @@ -256,7 +253,7 @@ auto compiler_draft4_validation_type(const Context &context, assert(types.size() >= schema_context.schema.at(dynamic_context.keyword).size()); - return {make(true, context, schema_context, + return {make(context, schema_context, dynamic_context, std::move(types))}; } @@ -286,19 +283,17 @@ auto compiler_draft4_validation_required(const Context &context, } if (properties.size() == 1) { - return {make(true, context, schema_context, - dynamic_context, + return {make(context, schema_context, dynamic_context, ValueString{*(properties.cbegin())})}; } else { - return {make(true, context, schema_context, - dynamic_context, - std::move(properties))}; + return {make( + context, schema_context, dynamic_context, std::move(properties))}; } } else { assert( schema_context.schema.at(dynamic_context.keyword).front().is_string()); return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, ValueString{schema_context.schema.at(dynamic_context.keyword) .front() .to_string()})}; @@ -324,7 +319,7 @@ auto compiler_draft4_applicator_allof(const Context &context, } } - return {make(true, context, schema_context, dynamic_context, + return {make(context, schema_context, dynamic_context, ValueNone{}, std::move(children))}; } @@ -339,18 +334,19 @@ auto compiler_draft4_applicator_anyof(const Context &context, for (std::uint64_t index = 0; index < schema_context.schema.at(dynamic_context.keyword).size(); index++) { - disjunctors.push_back(make( - false, context, schema_context, relative_dynamic_context, ValueNone{}, + disjunctors.push_back(make( + context, schema_context, relative_dynamic_context, ValueNone{}, compile(context, schema_context, relative_dynamic_context, {static_cast( index)}))); } - const auto requires_exhaustive{context.mode == Mode::Exhaustive || - context.uses_unevaluated_properties || - context.uses_unevaluated_items}; + const auto requires_exhaustive{ + context.mode == Mode::Exhaustive || + !context.unevaluated_properties_schemas.empty() || + !context.unevaluated_items_schemas.empty()}; - return {make(true, context, schema_context, dynamic_context, + return {make(context, schema_context, dynamic_context, ValueBoolean{requires_exhaustive}, std::move(disjunctors))}; } @@ -366,18 +362,19 @@ auto compiler_draft4_applicator_oneof(const Context &context, for (std::uint64_t index = 0; index < schema_context.schema.at(dynamic_context.keyword).size(); index++) { - disjunctors.push_back(make( - false, context, schema_context, relative_dynamic_context, ValueNone{}, + disjunctors.push_back(make( + context, schema_context, relative_dynamic_context, ValueNone{}, compile(context, schema_context, relative_dynamic_context, {static_cast( index)}))); } - const auto requires_exhaustive{context.mode == Mode::Exhaustive || - context.uses_unevaluated_properties || - context.uses_unevaluated_items}; + const auto requires_exhaustive{ + context.mode == Mode::Exhaustive || + !context.unevaluated_properties_schemas.empty() || + !context.unevaluated_items_schemas.empty()}; - return {make(true, context, schema_context, dynamic_context, + return {make(context, schema_context, dynamic_context, ValueBoolean{requires_exhaustive}, std::move(disjunctors))}; } @@ -481,36 +478,36 @@ auto compiler_draft4_applicator_properties_with_options( for (auto &&[name, substeps] : properties) { indexes.emplace(name, cursor); + + if (track_evaluation) { + substeps.push_back(make(context, schema_context, + relative_dynamic_context, + ValuePointer{name})); + } + if (annotate) { substeps.push_back(make( - true, context, schema_context, relative_dynamic_context, + context, schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::JSON{name})); } // Note that the evaluator completely ignores this wrapper anyway - children.push_back(make(false, context, schema_context, - relative_dynamic_context, ValueNone{}, - std::move(substeps))); + children.push_back(make(context, schema_context, + relative_dynamic_context, + ValueNone{}, std::move(substeps))); cursor += 1; } - return {make(true, context, schema_context, - dynamic_context, std::move(indexes), - std::move(children))}; + return {make(context, schema_context, dynamic_context, + std::move(indexes), std::move(children))}; } Template children; for (auto &&[name, substeps] : properties) { - if (track_evaluation) { - substeps.push_back(make(true, context, schema_context, - relative_dynamic_context, - ValuePointer{name})); - } - if (annotate) { substeps.push_back(make( - true, context, schema_context, relative_dynamic_context, + context, schema_context, relative_dynamic_context, sourcemeta::jsontoolkit::JSON{name})); } @@ -520,38 +517,46 @@ auto compiler_draft4_applicator_properties_with_options( schema_context.schema.at("type").to_string() == "object"}; - // We can avoid this "defines" condition if the property is a required one - if (imports_validation_vocabulary && assume_object && - schema_context.schema.defines("required") && - schema_context.schema.at("required").is_array() && - schema_context.schema.at("required") - .contains(sourcemeta::jsontoolkit::JSON{name})) { - // We can avoid the container too and just inline these steps - for (auto &&substep : substeps) { - children.push_back(std::move(substep)); - } - - // Optimize `properties` where its subschemas just include a type check, - // as that's a very common pattern + // Optimize `properties` where its subschemas just include a type check, + // as that's a very common pattern - } else if (context.mode == Mode::FastValidation && substeps.size() == 1 && - std::holds_alternative(substeps.front())) { + if (context.mode == Mode::FastValidation && substeps.size() == 1 && + std::holds_alternative(substeps.front())) { const auto &type_step{std::get(substeps.front())}; - children.push_back(AssertionPropertyTypeStrict{ - type_step.relative_schema_location, - dynamic_context.base_instance_location.concat( - type_step.relative_instance_location), - type_step.keyword_location, type_step.schema_resource, - type_step.dynamic, type_step.report, type_step.value}); + if (track_evaluation) { + children.push_back(AssertionPropertyTypeStrictEvaluate{ + type_step.relative_schema_location, + dynamic_context.base_instance_location.concat( + type_step.relative_instance_location), + type_step.keyword_location, type_step.schema_resource, + type_step.dynamic, type_step.track, type_step.value}); + } else { + children.push_back(AssertionPropertyTypeStrict{ + type_step.relative_schema_location, + dynamic_context.base_instance_location.concat( + type_step.relative_instance_location), + type_step.keyword_location, type_step.schema_resource, + type_step.dynamic, type_step.track, type_step.value}); + } } else if (context.mode == Mode::FastValidation && substeps.size() == 1 && std::holds_alternative(substeps.front())) { const auto &type_step{std::get(substeps.front())}; - children.push_back(AssertionPropertyType{ - type_step.relative_schema_location, - dynamic_context.base_instance_location.concat( - type_step.relative_instance_location), - type_step.keyword_location, type_step.schema_resource, - type_step.dynamic, type_step.report, type_step.value}); + if (track_evaluation) { + children.push_back(AssertionPropertyTypeEvaluate{ + type_step.relative_schema_location, + dynamic_context.base_instance_location.concat( + type_step.relative_instance_location), + type_step.keyword_location, type_step.schema_resource, + type_step.dynamic, type_step.track, type_step.value}); + } else { + children.push_back(AssertionPropertyType{ + type_step.relative_schema_location, + dynamic_context.base_instance_location.concat( + type_step.relative_instance_location), + type_step.keyword_location, type_step.schema_resource, + type_step.dynamic, type_step.track, type_step.value}); + } + } else if (context.mode == Mode::FastValidation && substeps.size() == 1 && std::holds_alternative( substeps.front())) { @@ -566,9 +571,26 @@ auto compiler_draft4_applicator_properties_with_options( dynamic_context.base_instance_location)); } else { - children.push_back(make( - false, context, schema_context, relative_dynamic_context, - ValueString{name}, std::move(substeps))); + if (track_evaluation) { + substeps.push_back(make(context, schema_context, + relative_dynamic_context, + ValuePointer{name})); + } + + if (imports_validation_vocabulary && assume_object && + schema_context.schema.defines("required") && + schema_context.schema.at("required").is_array() && + schema_context.schema.at("required") + .contains(sourcemeta::jsontoolkit::JSON{name})) { + // We can avoid the container too and just inline these steps + for (auto &&substep : substeps) { + children.push_back(std::move(substep)); + } + } else { + children.push_back(make( + context, schema_context, relative_dynamic_context, + ValueString{name}, std::move(substeps))); + } } } @@ -577,9 +599,14 @@ auto compiler_draft4_applicator_properties_with_options( std::holds_alternative(children.front())) { return { unroll(dynamic_context, children.front())}; + } else if (context.mode == Mode::FastValidation && children.size() == 1 && + std::holds_alternative( + children.front())) { + return {unroll(dynamic_context, + children.front())}; } - return {make(true, context, schema_context, dynamic_context, + return {make(context, schema_context, dynamic_context, ValueNone{}, std::move(children))}; } @@ -623,38 +650,34 @@ auto compiler_draft4_applicator_patternproperties_with_options( if (annotate) { substeps.push_back(make( - true, context, schema_context, relative_dynamic_context, - ValueNone{})); + context, schema_context, relative_dynamic_context, ValueNone{})); } if (track_evaluation) { - substeps.push_back(make(true, context, schema_context, - relative_dynamic_context, - ValuePointer{})); + substeps.push_back(make( + context, schema_context, relative_dynamic_context, ValuePointer{})); } // If the `patternProperties` subschema for the given pattern does // nothing, then we can avoid generating an entire loop for it if (!substeps.empty()) { - // Loop over the instance properties - children.push_back(make( - // Treat this as an internal step - false, context, schema_context, relative_dynamic_context, - ValueRegex{parse_regex(pattern, schema_context.base, - schema_context.relative_pointer), - pattern}, - std::move(substeps))); + const auto maybe_prefix{pattern_as_prefix(pattern)}; + if (maybe_prefix.has_value()) { + children.push_back(make( + context, schema_context, dynamic_context, + ValueString{maybe_prefix.value()}, std::move(substeps))); + } else { + children.push_back(make( + context, schema_context, dynamic_context, + ValueRegex{parse_regex(pattern, schema_context.base, + schema_context.relative_pointer), + pattern}, + std::move(substeps))); + } } } - if (children.empty()) { - return {}; - } - - // If the instance is an object... - return {make(true, context, schema_context, dynamic_context, - sourcemeta::jsontoolkit::JSON::Type::Object, - std::move(children))}; + return children; } auto compiler_draft4_applicator_patternproperties( @@ -680,22 +703,18 @@ auto compiler_draft4_applicator_additionalproperties_with_options( if (annotate) { children.push_back(make( - true, context, schema_context, relative_dynamic_context, ValueNone{})); + context, schema_context, relative_dynamic_context, ValueNone{})); } - if (track_evaluation) { - children.push_back(make(true, context, schema_context, - relative_dynamic_context, - ValuePointer{})); - } - - ValuePropertyFilter filter; + ValueStrings filter_strings; + ValueStrings filter_prefixes; + std::vector filter_regexes; if (schema_context.schema.defines("properties") && schema_context.schema.at("properties").is_object()) { for (const auto &entry : schema_context.schema.at("properties").as_object()) { - filter.first.push_back(entry.first); + filter_strings.push_back(entry.first); } } @@ -703,40 +722,73 @@ auto compiler_draft4_applicator_additionalproperties_with_options( schema_context.schema.at("patternProperties").is_object()) { for (const auto &entry : schema_context.schema.at("patternProperties").as_object()) { - filter.second.push_back( - {parse_regex(entry.first, schema_context.base, - schema_context.relative_pointer.initial().concat( - {"patternProperties"})), - entry.first}); + const auto maybe_prefix{pattern_as_prefix(entry.first)}; + if (maybe_prefix.has_value()) { + filter_prefixes.push_back(maybe_prefix.value()); + } else { + filter_regexes.push_back( + {parse_regex(entry.first, schema_context.base, + schema_context.relative_pointer.initial().concat( + {"patternProperties"})), + entry.first}); + } } } // For performance, if a schema sets `additionalProperties: true` (or its // variants), we don't need to do anything - if (children.empty()) { + if (!track_evaluation && children.empty()) { return {}; } - if (!filter.first.empty() || !filter.second.empty()) { - return {make(true, context, schema_context, - dynamic_context, std::move(filter), - std::move(children))}; - } else { - if (context.mode == Mode::FastValidation && children.size() == 1) { - // Optimize `additionalProperties` set to just `type`, which is a - // pretty common pattern - if (std::holds_alternative(children.front())) { - const auto &type_step{std::get(children.front())}; - return {make( - true, context, schema_context, dynamic_context, type_step.value)}; - } else if (std::holds_alternative(children.front())) { - const auto &type_step{std::get(children.front())}; - return {make(true, context, schema_context, - dynamic_context, type_step.value)}; - } + if (!filter_strings.empty() || !filter_prefixes.empty() || + !filter_regexes.empty()) { + if (track_evaluation) { + children.push_back(make( + context, schema_context, relative_dynamic_context, ValuePointer{})); } - return {make(true, context, schema_context, dynamic_context, + return {make( + context, schema_context, dynamic_context, + ValuePropertyFilter{std::move(filter_strings), + std::move(filter_prefixes), + std::move(filter_regexes)}, + std::move(children))}; + + // Optimize `additionalProperties` set to just `type`, which is a + // pretty common pattern + } else if (context.mode == Mode::FastValidation && children.size() == 1 && + std::holds_alternative(children.front())) { + const auto &type_step{std::get(children.front())}; + if (track_evaluation) { + return {make( + context, schema_context, dynamic_context, type_step.value)}; + } else { + return {make(context, schema_context, + dynamic_context, type_step.value)}; + } + } else if (context.mode == Mode::FastValidation && children.size() == 1 && + std::holds_alternative(children.front())) { + const auto &type_step{std::get(children.front())}; + if (track_evaluation) { + return {make( + context, schema_context, dynamic_context, type_step.value)}; + } else { + return {make(context, schema_context, dynamic_context, + type_step.value)}; + } + + } else if (track_evaluation) { + if (children.empty()) { + return {make(context, schema_context, dynamic_context, + ValuePointer{})}; + } + + return {make(context, schema_context, + dynamic_context, ValueNone{}, + std::move(children))}; + } else { + return {make(context, schema_context, dynamic_context, ValueNone{}, std::move(children))}; } } @@ -763,7 +815,7 @@ auto compiler_draft4_validation_pattern(const Context &context, const auto ®ex_string{ schema_context.schema.at(dynamic_context.keyword).to_string()}; return {make( - true, context, schema_context, dynamic_context, + context, schema_context, dynamic_context, ValueRegex{parse_regex(regex_string, schema_context.base, schema_context.relative_pointer), regex_string})}; @@ -794,14 +846,14 @@ auto compiler_draft4_validation_format(const Context &context, schema_context.schema.at(dynamic_context.keyword).to_string()}; if (format == "uri") { - return {make(true, context, schema_context, - dynamic_context, ValueStringType::URI)}; + return {make(context, schema_context, dynamic_context, + ValueStringType::URI)}; } #define COMPILE_FORMAT_REGEX(name, regular_expression) \ if (format == (name)) { \ return {make( \ - true, context, schema_context, dynamic_context, \ + context, schema_context, dynamic_context, \ ValueRegex{parse_regex(regular_expression, schema_context.base, \ schema_context.relative_pointer), \ (regular_expression)})}; \ @@ -818,15 +870,32 @@ auto compiler_draft4_applicator_not(const Context &context, const SchemaContext &schema_context, const DynamicContext &dynamic_context) -> Template { - return {make(true, context, schema_context, dynamic_context, - // Only emit a `not` instruction that keeps track of - // evaluation if we really need it - ValueBoolean{context.uses_unevaluated_properties || - context.uses_unevaluated_items}, - compile(context, schema_context, - relative_dynamic_context, - sourcemeta::jsontoolkit::empty_pointer, - sourcemeta::jsontoolkit::empty_pointer))}; + std::size_t subschemas{0}; + for (const auto &subschema : + walk_subschemas(context, schema_context, dynamic_context)) { + if (subschema.pointer.empty()) { + continue; + } + + subschemas += 1; + } + + Template children{compile(context, schema_context, relative_dynamic_context, + sourcemeta::jsontoolkit::empty_pointer, + sourcemeta::jsontoolkit::empty_pointer)}; + + // Only emit a `not` instruction that keeps track of + // evaluation if we really need it. If the "not" subschema + // does not define applicators, then that's an easy case + // we can skip + if (subschemas > 0 && (!context.unevaluated_properties_schemas.empty() || + !context.unevaluated_items_schemas.empty())) { + return {make(context, schema_context, dynamic_context, + ValueNone{}, std::move(children))}; + } else { + return {make(context, schema_context, dynamic_context, + ValueNone{}, std::move(children))}; + } } auto compiler_draft4_applicator_items_array( @@ -846,72 +915,65 @@ auto compiler_draft4_applicator_items_array( return {}; } - // The idea here is to precompile all possibilities depending on the size - // of the instance array up to the size of the `items` keyword array. - // For example, if `items` is set to `[ {}, {}, {} ]`, we create 3 - // conjunctions: - // - [ {}, {}, {} ] if the instance array size is >= 3 - // - [ {}, {} ] if the instance array size is == 2 - // - [ {} ] if the instance array size is == 1 - // Precompile subschemas std::vector