diff --git a/CMakeLists.txt b/CMakeLists.txt index a42bac9..e252f4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ option(JSONSCHEMA_DEVELOPMENT "Build the JSON Schema CLI in development mode" OF option(JSONSCHEMA_CONTINUOUS "Perform a continuous JSON Schema CLI release" ON) find_package(JSONToolkit REQUIRED) +find_package(AlterSchema REQUIRED) find_package(Hydra REQUIRED) add_subdirectory(src) diff --git a/DEPENDENCIES b/DEPENDENCIES index 3b8ca33..bc15030 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,4 +1,5 @@ vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4 noa https://github.com/sourcemeta/noa 7e26abce7a4e31e86a16ef2851702a56773ca527 -jsontoolkit https://github.com/sourcemeta/jsontoolkit 760aecee95213152bfea907c19cdaa43f616dc9b +jsontoolkit https://github.com/sourcemeta/jsontoolkit 9a88c7331742360abc06317bbce4df6afd11c61b hydra https://github.com/sourcemeta/hydra 3c53d3fdef79e9ba603d48470a508cc45472a0dc +alterschema https://github.com/sourcemeta/alterschema a31722f04ae2d7e57f2fe5bbb0613670866c0840 diff --git a/cmake/FindAlterSchema.cmake b/cmake/FindAlterSchema.cmake new file mode 100644 index 0000000..ba9bef4 --- /dev/null +++ b/cmake/FindAlterSchema.cmake @@ -0,0 +1,5 @@ +if(NOT Alterschema_FOUND) + set(ALTERSCHEMA_INSTALL OFF CACHE BOOL "disable installation") + add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/alterschema") + set(Alterschema_FOUND ON) +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6848a31..60be8e8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,8 @@ target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsontoolkit::uri) target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsontoolkit::json) target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsontoolkit::jsonl) target_link_libraries(jsonschema_cli PRIVATE sourcemeta::jsontoolkit::jsonschema) +target_link_libraries(jsonschema_cli PRIVATE sourcemeta::alterschema::engine) +target_link_libraries(jsonschema_cli PRIVATE sourcemeta::alterschema::linter) target_link_libraries(jsonschema_cli PRIVATE sourcemeta::hydra::httpclient) configure_file(configure.h.in configure.h @ONLY) diff --git a/src/command_lint.cc b/src/command_lint.cc index fd899df..0b4589b 100644 --- a/src/command_lint.cc +++ b/src/command_lint.cc @@ -1,3 +1,5 @@ +#include +#include #include #include @@ -12,11 +14,15 @@ auto intelligence::jsonschema::cli::lint( const std::span &arguments) -> int { const auto options{parse_options(arguments, {"f", "fix"})}; - sourcemeta::jsontoolkit::SchemaTransformBundle bundle; - bundle.add( - sourcemeta::jsontoolkit::SchemaTransformBundle::Category::Modernize); - bundle.add( - sourcemeta::jsontoolkit::SchemaTransformBundle::Category::AntiPattern); + sourcemeta::alterschema::Bundle bundle; + sourcemeta::alterschema::add( + bundle, sourcemeta::alterschema::LinterCategory::Modernize); + sourcemeta::alterschema::add( + bundle, sourcemeta::alterschema::LinterCategory::AntiPattern); + sourcemeta::alterschema::add( + bundle, sourcemeta::alterschema::LinterCategory::Simplify); + sourcemeta::alterschema::add( + bundle, sourcemeta::alterschema::LinterCategory::Redundant); bool result{true}; diff --git a/vendor/alterschema/CMakeLists.txt b/vendor/alterschema/CMakeLists.txt new file mode 100644 index 0000000..6d7c064 --- /dev/null +++ b/vendor/alterschema/CMakeLists.txt @@ -0,0 +1,73 @@ +cmake_minimum_required(VERSION 3.16) +project(alterschema VERSION 0.0.1 LANGUAGES CXX + DESCRIPTION "Perform advanced transformations on JSON Schemas" + HOMEPAGE_URL "https://alterschema.sourcemeta.com") +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +include(vendor/noa/cmake/noa.cmake) + +# Options +option(ALTERSCHEMA_ENGINE "Build the AlterSchema Engine library" ON) +option(ALTERSCHEMA_LINTER "Build the AlterSchema Linter library" ON) +option(ALTERSCHEMA_TESTS "Build the AlterSchema tests" OFF) +option(ALTERSCHEMA_DOCS "Build the AlterSchema docs" OFF) +option(ALTERSCHEMA_INSTALL "Install the AlterSchema library" ON) +option(ALTERSCHEMA_ADDRESS_SANITIZER "Build AlterSchema with an address sanitizer" OFF) +option(ALTERSCHEMA_UNDEFINED_SANITIZER "Build AlterSchema with an undefined behavior sanitizer" OFF) + +if(ALTERSCHEMA_INSTALL) + include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + configure_package_config_file( + config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" + INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" + COMPATIBILITY SameMajorVersion) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" + COMPONENT sourcemeta_alterschema_dev) +endif() + +if(ALTERSCHEMA_ENGINE OR ALTERSCHEMA_LINTER) + find_package(JSONToolkit REQUIRED) + add_subdirectory(src/engine) +endif() + +if(ALTERSCHEMA_LINTER) + add_subdirectory(src/linter) +endif() + +if(ALTERSCHEMA_ADDRESS_SANITIZER) + noa_sanitizer(TYPE address) +elseif(ALTERSCHEMA_UNDEFINED_SANITIZER) + noa_sanitizer(TYPE undefined) +endif() + +if(ALTERSCHEMA_DOCS) + # TODO +endif() + +if(PROJECT_IS_TOP_LEVEL) + noa_target_clang_format(SOURCES + src/*.h src/*.cc + test/*.h test/*.cc) + noa_target_clang_tidy(SOURCES + src/*.h src/*.cc) +endif() + +# Testing +if(ALTERSCHEMA_TESTS) + find_package(GoogleTest REQUIRED) + enable_testing() + + if(ALTERSCHEMA_ENGINE) + add_subdirectory(test/engine) + endif() + + if(ALTERSCHEMA_LINTER) + add_subdirectory(test/linter) + endif() +endif() diff --git a/vendor/alterschema/LICENSE b/vendor/alterschema/LICENSE new file mode 100644 index 0000000..0be6f02 --- /dev/null +++ b/vendor/alterschema/LICENSE @@ -0,0 +1,661 @@ + 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 +. diff --git a/vendor/alterschema/LICENSE-COMMERCIAL b/vendor/alterschema/LICENSE-COMMERCIAL new file mode 100644 index 0000000..2b3c48a --- /dev/null +++ b/vendor/alterschema/LICENSE-COMMERCIAL @@ -0,0 +1,2 @@ +Refer to https://www.sourcemeta.com/licensing/ for learning more about +obtaining a commercial license. diff --git a/vendor/alterschema/config.cmake.in b/vendor/alterschema/config.cmake.in new file mode 100644 index 0000000..200afdd --- /dev/null +++ b/vendor/alterschema/config.cmake.in @@ -0,0 +1,24 @@ +@PACKAGE_INIT@ + +# Support both casing styles +list(APPEND ALTERSCHEMA_COMPONENTS ${AlterSchema_FIND_COMPONENTS}) +list(APPEND ALTERSCHEMA_COMPONENTS ${alterschema_FIND_COMPONENTS}) +if(NOT ALTERSCHEMA_COMPONENTS) + list(APPEND ALTERSCHEMA_COMPONENTS engine) + list(APPEND ALTERSCHEMA_COMPONENTS linter) +endif() + +include(CMakeFindDependencyMacro) + +foreach(component ${ALTERSCHEMA_COMPONENTS}) + if(component STREQUAL "engine") + find_dependency(JSONToolkit COMPONENTS uri json jsonpointer jsonschema) + include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_alterschema_engine.cmake") + elseif(component STREQUAL "linter") + include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_alterschema_linter.cmake") + else() + message(FATAL_ERROR "Unknown AlterSchema component: ${component}") + endif() +endforeach() + +check_required_components("@PROJECT_NAME@") diff --git a/vendor/alterschema/src/engine/CMakeLists.txt b/vendor/alterschema/src/engine/CMakeLists.txt new file mode 100644 index 0000000..52bf07e --- /dev/null +++ b/vendor/alterschema/src/engine/CMakeLists.txt @@ -0,0 +1,15 @@ +noa_library(NAMESPACE sourcemeta PROJECT alterschema NAME engine + FOLDER "AlterSchema/Engine" + PRIVATE_HEADERS bundle.h rule.h transformer.h + SOURCES bundle.cc rule.cc transformer.cc) + +if(ALTERSCHEMA_INSTALL) + noa_library_install(NAMESPACE sourcemeta PROJECT alterschema NAME engine) +endif() + +target_link_libraries(sourcemeta_alterschema_engine PUBLIC + sourcemeta::jsontoolkit::json) +target_link_libraries(sourcemeta_alterschema_engine PUBLIC + sourcemeta::jsontoolkit::jsonpointer) +target_link_libraries(sourcemeta_alterschema_engine PUBLIC + sourcemeta::jsontoolkit::jsonschema) diff --git a/vendor/jsontoolkit/src/jsonschema/transform_bundle.cc b/vendor/alterschema/src/engine/bundle.cc similarity index 50% rename from vendor/jsontoolkit/src/jsonschema/transform_bundle.cc rename to vendor/alterschema/src/engine/bundle.cc index 3bf2330..07e5d92 100644 --- a/vendor/jsontoolkit/src/jsonschema/transform_bundle.cc +++ b/vendor/alterschema/src/engine/bundle.cc @@ -1,78 +1,10 @@ -#include +#include #include // std::set #include // std::ostringstream #include // std::runtime_error -// For built-in rules -#include // std::any_of -#include // std::cbegin, std::cend -namespace sourcemeta::jsontoolkit { -template -auto contains_any(const T &container, const T &values) -> bool { - return std::any_of( - std::cbegin(container), std::cend(container), - [&values](const auto &element) { return values.contains(element); }); -} - -// Modernize -#include "rules/enum_to_const.h" -// AntiPattern -#include "rules/const_with_type.h" -#include "rules/enum_with_type.h" -// Simplify -#include "rules/single_type_array.h" -// Redundant -#include "rules/additional_properties_default.h" -#include "rules/content_media_type_without_encoding.h" -#include "rules/content_schema_default.h" -#include "rules/content_schema_without_media_type.h" -#include "rules/else_without_if.h" -#include "rules/items_array_default.h" -#include "rules/items_schema_default.h" -#include "rules/max_contains_without_contains.h" -#include "rules/min_contains_without_contains.h" -#include "rules/then_without_if.h" -#include "rules/unevaluated_items_default.h" -#include "rules/unevaluated_properties_default.h" -} // namespace sourcemeta::jsontoolkit - -auto sourcemeta::jsontoolkit::SchemaTransformBundle::add( - const sourcemeta::jsontoolkit::SchemaTransformBundle::Category category) - -> void { - switch (category) { - case sourcemeta::jsontoolkit::SchemaTransformBundle::Category::Modernize: - this->template add(); - break; - case sourcemeta::jsontoolkit::SchemaTransformBundle::Category::AntiPattern: - this->template add(); - this->template add(); - break; - case sourcemeta::jsontoolkit::SchemaTransformBundle::Category::Simplify: - this->template add(); - break; - case sourcemeta::jsontoolkit::SchemaTransformBundle::Category::Redundant: - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - this->template add(); - break; - default: - // We should never get here - assert(false); - break; - } -} - -auto sourcemeta::jsontoolkit::SchemaTransformBundle::apply( +auto sourcemeta::alterschema::Bundle::apply( sourcemeta::jsontoolkit::JSON &schema, const sourcemeta::jsontoolkit::SchemaWalker &walker, const sourcemeta::jsontoolkit::SchemaResolver &resolver, @@ -120,12 +52,11 @@ auto sourcemeta::jsontoolkit::SchemaTransformBundle::apply( } } -auto sourcemeta::jsontoolkit::SchemaTransformBundle::check( +auto sourcemeta::alterschema::Bundle::check( const sourcemeta::jsontoolkit::JSON &schema, const sourcemeta::jsontoolkit::SchemaWalker &walker, const sourcemeta::jsontoolkit::SchemaResolver &resolver, - const sourcemeta::jsontoolkit::SchemaTransformBundle::CheckCallback - &callback, + const sourcemeta::alterschema::Bundle::CheckCallback &callback, const sourcemeta::jsontoolkit::Pointer &pointer, const std::optional &default_dialect) const -> bool { const auto ¤t{sourcemeta::jsontoolkit::get(schema, pointer)}; diff --git a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine.h new file mode 100644 index 0000000..c00eb5e --- /dev/null +++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine.h @@ -0,0 +1,17 @@ +#ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_H_ +#define SOURCEMETA_ALTERSCHEMA_ENGINE_H_ + +/// @defgroup engine Engine +/// @brief A general-purpose extensible schema transformation engine. +/// +/// This functionality is included as follows: +/// +/// ```cpp +/// #include +/// ``` + +#include +#include +#include + +#endif diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transform_bundle.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h similarity index 62% rename from vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transform_bundle.h rename to vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h index f34144f..39a5e56 100644 --- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transform_bundle.h +++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_bundle.h @@ -1,11 +1,13 @@ -#ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_TRANSFORM_BUNDLE_H_ -#define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_TRANSFORM_BUNDLE_H_ +#ifndef SOURCEMETA_ALTERSCHEMA_BUNDLE_H_ +#define SOURCEMETA_ALTERSCHEMA_BUNDLE_H_ -#include "jsonschema_export.h" +#include "engine_export.h" #include #include -#include +#include + +#include #include // assert #include // std::derived_from @@ -17,20 +19,21 @@ #include // std::string_view #include // std::move -namespace sourcemeta::jsontoolkit { -/// @ingroup jsonschema +namespace sourcemeta::alterschema { +/// @ingroup engine +/// /// You can use this class to perform top-down transformations on subschemas /// given a set of rules. For example, we can remove every property `foo` as /// follows: /// /// ```cpp -/// #include +/// #include /// #include /// /// // Declare one or more rules -/// class MyRule final : public sourcemeta::jsontoolkit::SchemaTransformRule { +/// class MyRule final : public sourcemeta::alterschema::Rule { /// public: -/// MyRule() : sourcemeta::jsontoolkit::SchemaTransformRule("my_rule") {}; +/// MyRule() : sourcemeta::alterschema::Rule("my_rule") {}; /// /// [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema, /// const std::string &dialect, @@ -41,14 +44,14 @@ namespace sourcemeta::jsontoolkit { /// return schema.defines("foo"); /// } /// -/// auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) +/// auto transform(sourcemeta::alterschema::Transformer &transformer) /// const -> void override { /// transformer.erase("foo"); /// } /// }; /// /// // Create a bundle -/// sourcemeta::jsontoolkit::SchemaTransformBundle bundle; +/// sourcemeta::alterschema::Bundle bundle; /// /// // Register every rule /// bundle.add(); @@ -75,53 +78,36 @@ namespace sourcemeta::jsontoolkit { /// /// Every registered rule is applied to every subschema of the passed schema /// until no longer of them applies. -class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformBundle { +class SOURCEMETA_ALTERSCHEMA_ENGINE_EXPORT Bundle { public: /// Create a transform bundle - SchemaTransformBundle() = default; + Bundle() = default; // Not worth documenting these details #if !defined(DOXYGEN) // Explicitly disallow copying, as this class makes use of unique pointers, // which by definition do not support copying. MSVC gets confused unless we // are explicit about it here. - SchemaTransformBundle(const SchemaTransformBundle &) = delete; - auto - operator=(const SchemaTransformBundle &) -> SchemaTransformBundle & = delete; - SchemaTransformBundle(SchemaTransformBundle &&) = default; - auto operator=(SchemaTransformBundle &&) -> SchemaTransformBundle & = default; + Bundle(const Bundle &) = delete; + auto operator=(const Bundle &) -> Bundle & = delete; + Bundle(Bundle &&) = default; + auto operator=(Bundle &&) -> Bundle & = default; #endif /// Add a rule to the bundle - template T> auto add() -> void { + template T> auto add() -> void { auto rule{std::make_unique()}; // Rules must only be defined once assert(!this->rules.contains(rule->name())); this->rules.emplace(rule->name(), std::move(rule)); } - /// The category of a built-in transformation rule - enum class Category { - /// Rules that make use of newer features within the same dialect - Modernize, - - /// Rules that detect common anti-patterns - AntiPattern, - - /// Rules that simplify the given schema - Simplify, - - /// Rules that remove schema redundancies - Redundant - }; - - /// Add a set of built-in rules given a category - auto add(const Category category) -> void; - /// Apply the bundle of rules to a schema - auto apply(JSON &schema, const SchemaWalker &walker, - const SchemaResolver &resolver, - const Pointer &pointer = empty_pointer, + auto apply(sourcemeta::jsontoolkit::JSON &schema, + const sourcemeta::jsontoolkit::SchemaWalker &walker, + const sourcemeta::jsontoolkit::SchemaResolver &resolver, + const sourcemeta::jsontoolkit::Pointer &pointer = + sourcemeta::jsontoolkit::empty_pointer, const std::optional &default_dialect = std::nullopt) const -> void; @@ -131,13 +117,17 @@ class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformBundle { /// - The JSON Pointer to the given subschema /// - The name of the rule /// - The message of the rule - using CheckCallback = std::function; + using CheckCallback = + std::function; /// Report back the rules from the bundle that need to be applied to a schema - auto check(const JSON &schema, const SchemaWalker &walker, - const SchemaResolver &resolver, const CheckCallback &callback, - const Pointer &pointer = empty_pointer, + auto check(const sourcemeta::jsontoolkit::JSON &schema, + const sourcemeta::jsontoolkit::SchemaWalker &walker, + const sourcemeta::jsontoolkit::SchemaResolver &resolver, + const CheckCallback &callback, + const sourcemeta::jsontoolkit::Pointer &pointer = + sourcemeta::jsontoolkit::empty_pointer, const std::optional &default_dialect = std::nullopt) const -> bool; @@ -148,11 +138,11 @@ class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformBundle { #if defined(_MSC_VER) #pragma warning(disable : 4251) #endif - std::map> rules; + std::map> rules; #if defined(_MSC_VER) #pragma warning(default : 4251) #endif }; -} // namespace sourcemeta::jsontoolkit +} // namespace sourcemeta::alterschema #endif diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transform_rule.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h similarity index 57% rename from vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transform_rule.h rename to vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h index 27994b5..24ddafa 100644 --- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transform_rule.h +++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_rule.h @@ -1,21 +1,24 @@ -#ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_TRANSFORM_RULE_H_ -#define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_TRANSFORM_RULE_H_ +#ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_RULE_H_ +#define SOURCEMETA_ALTERSCHEMA_ENGINE_RULE_H_ -#include "jsonschema_export.h" +#include "engine_export.h" #include #include -#include +#include + +#include #include // std::optional, std::nullopt #include // std::set #include // std::string #include // std::vector -namespace sourcemeta::jsontoolkit { -/// @ingroup jsonschema +namespace sourcemeta::alterschema { +/// @ingroup engine +/// /// A class that represents a transformation rule to be used with -/// sourcemeta::jsontoolkit::SchemaTransformBundle. Clients of this class +/// sourcemeta::alterschema::Bundle. Clients of this class /// are expected to subclass and implement their own condition and /// transformation methods. /// @@ -23,11 +26,11 @@ namespace sourcemeta::jsontoolkit { /// subschema: /// /// ```cpp -/// #include +/// #include /// -/// class MyRule final : public sourcemeta::jsontoolkit::SchemaTransformRule { +/// class MyRule final : public sourcemeta::alterschema::Rule { /// public: -/// MyRule() : sourcemeta::jsontoolkit::SchemaTransformRule("my_rule") {}; +/// MyRule() : sourcemeta::alterschema::Rule("my_rule") {}; /// /// [[nodiscard]] auto condition(const sourcemeta::jsontoolkit::JSON &schema, /// const std::string &dialect, @@ -38,29 +41,28 @@ namespace sourcemeta::jsontoolkit { /// return schema.defines("foo"); /// } /// -/// auto transform(sourcemeta::jsontoolkit::SchemaTransformer &transformer) +/// auto transform(sourcemeta::alterschema::Transformer &transformer) /// const -> void override { /// transformer.erase("foo"); /// } /// }; /// ``` -class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformRule { +class SOURCEMETA_ALTERSCHEMA_ENGINE_EXPORT Rule { public: /// Create a transformation rule. Each rule must have a unique name. - SchemaTransformRule(std::string &&name, - std::string &&message = "Condition matched"); + Rule(std::string &&name, std::string &&message = "Condition matched"); // Necessary to wrap rules on smart pointers - virtual ~SchemaTransformRule() = default; + virtual ~Rule() = default; // We don't need any of these - SchemaTransformRule(const SchemaTransformRule &) = delete; - SchemaTransformRule(SchemaTransformRule &&) = delete; - auto operator=(const SchemaTransformRule &) -> SchemaTransformRule & = delete; - auto operator=(SchemaTransformRule &&) -> SchemaTransformRule & = delete; + Rule(const Rule &) = delete; + Rule(Rule &&) = delete; + auto operator=(const Rule &) -> Rule & = delete; + auto operator=(Rule &&) -> Rule & = delete; /// Compare a rule against another rule. - auto operator==(const SchemaTransformRule &other) const -> bool; + auto operator==(const Rule &other) const -> bool; /// Fetch the name of a rule [[nodiscard]] auto name() const -> const std::string &; @@ -69,26 +71,29 @@ class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformRule { [[nodiscard]] auto message() const -> const std::string &; /// Apply the rule to a schema - auto apply(JSON &schema, const Pointer &pointer, - const SchemaResolver &resolver, + auto apply(sourcemeta::jsontoolkit::JSON &schema, + const sourcemeta::jsontoolkit::Pointer &pointer, + const sourcemeta::jsontoolkit::SchemaResolver &resolver, const std::optional &default_dialect = - std::nullopt) const -> std::vector; + std::nullopt) const -> std::vector; /// Check if the rule applies to a schema - auto check(const JSON &schema, const Pointer &pointer, - const SchemaResolver &resolver, + auto check(const sourcemeta::jsontoolkit::JSON &schema, + const sourcemeta::jsontoolkit::Pointer &pointer, + const sourcemeta::jsontoolkit::SchemaResolver &resolver, const std::optional &default_dialect = std::nullopt) const -> bool; private: /// The rule condition [[nodiscard]] virtual auto - condition(const JSON &schema, const std::string &dialect, + condition(const sourcemeta::jsontoolkit::JSON &schema, + const std::string &dialect, const std::set &vocabularies, - const Pointer &pointer) const -> bool = 0; + const sourcemeta::jsontoolkit::Pointer &pointer) const -> bool = 0; /// The rule transformation - virtual auto transform(SchemaTransformer &transformer) const -> void = 0; + virtual auto transform(Transformer &transformer) const -> void = 0; // Exporting symbols that depends on the standard C++ library is considered // safe. @@ -102,6 +107,6 @@ class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformRule { #pragma warning(default : 4251) #endif }; -} // namespace sourcemeta::jsontoolkit +} // namespace sourcemeta::alterschema #endif diff --git a/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h new file mode 100644 index 0000000..80ebd1c --- /dev/null +++ b/vendor/alterschema/src/engine/include/sourcemeta/alterschema/engine_transformer.h @@ -0,0 +1,114 @@ +#ifndef SOURCEMETA_ALTERSCHEMA_ENGINE_TRANSFORMER_H_ +#define SOURCEMETA_ALTERSCHEMA_ENGINE_TRANSFORMER_H_ + +#include "engine_export.h" + +#include +#include + +#include // std::variant +#include // std::vector + +namespace sourcemeta::alterschema { + +/// @ingroup engine +/// Represents a schema transformation operation that consists in deleting a +/// property from a schema +struct OperationErase { + const sourcemeta::jsontoolkit::Pointer pointer; +}; + +/// @ingroup engine +/// Represents a schema transformation operation that consists in adding a new +/// property to a schema +struct OperationAssign { + const sourcemeta::jsontoolkit::Pointer pointer; +}; + +/// @ingroup engine +/// Represents a schema transformation operation that consists in replacing a +/// part of a schema +struct OperationReplace { + const sourcemeta::jsontoolkit::Pointer pointer; +}; + +/// @ingroup engine +/// Represents a schema transformation operation +using Operation = + std::variant; + +/// @ingroup engine +/// This is a proxy class to intercept transformations applied to a schema. We +/// use it to keep track of what changed to fix up schema references. +class SOURCEMETA_ALTERSCHEMA_ENGINE_EXPORT Transformer { +public: + /// Construct a transformer given a schema + Transformer(sourcemeta::jsontoolkit::JSON &schema); + + /// Get the underlying schema + auto schema() const -> const sourcemeta::jsontoolkit::JSON &; + /// Trace the operations applied to the schema + auto traces() const -> const std::vector &; + + /// Replace a subschema with another value + auto replace(const sourcemeta::jsontoolkit::Pointer &path, + const sourcemeta::jsontoolkit::JSON &value) -> void; + /// Replace a subschema with another value + auto replace(const sourcemeta::jsontoolkit::Pointer &path, + sourcemeta::jsontoolkit::JSON &&value) -> void; + /// Assign an object property + auto assign(const sourcemeta::jsontoolkit::Pointer &path, + const sourcemeta::jsontoolkit::JSON::String &key, + const sourcemeta::jsontoolkit::JSON &value) -> void; + /// Assign an object property + auto assign(const sourcemeta::jsontoolkit::Pointer &path, + const sourcemeta::jsontoolkit::JSON::String &key, + sourcemeta::jsontoolkit::JSON &&value) -> void; + /// Remove an object property + auto erase(const sourcemeta::jsontoolkit::Pointer &path, + const sourcemeta::jsontoolkit::JSON::String &key) -> void; + /// Remove multiple object properties + template + auto erase_keys(const sourcemeta::jsontoolkit::Pointer &path, Iterator first, + Iterator last) -> void { + for (auto iterator = first; iterator != last; ++iterator) { + this->erase(path, *iterator); + } + } + + // For convenience + + /// Replace a schema with another value + auto replace(const sourcemeta::jsontoolkit::JSON &value) -> void; + /// Replace a schema with another value + auto replace(sourcemeta::jsontoolkit::JSON &&value) -> void; + /// Assign an object property + auto assign(const sourcemeta::jsontoolkit::JSON::String &key, + const sourcemeta::jsontoolkit::JSON &value) -> void; + /// Assign an object property + auto assign(const sourcemeta::jsontoolkit::JSON::String &key, + sourcemeta::jsontoolkit::JSON &&value) -> void; + /// Remove an object property + auto erase(const sourcemeta::jsontoolkit::JSON::String &key) -> void; + /// Remove multiple object properties + template + auto erase_keys(Iterator first, Iterator last) -> void { + this->erase_keys(sourcemeta::jsontoolkit::empty_pointer, first, last); + } + +private: + sourcemeta::jsontoolkit::JSON &data; +// Exporting symbols that depends on the standard C++ library is considered +// safe. +// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN +#if defined(_MSC_VER) +#pragma warning(disable : 4251) +#endif + std::vector operations; +#if defined(_MSC_VER) +#pragma warning(default : 4251) +#endif +}; +} // namespace sourcemeta::alterschema + +#endif diff --git a/vendor/jsontoolkit/src/jsonschema/transform_rule.cc b/vendor/alterschema/src/engine/rule.cc similarity index 77% rename from vendor/jsontoolkit/src/jsonschema/transform_rule.cc rename to vendor/alterschema/src/engine/rule.cc index 8861412..669d3a5 100644 --- a/vendor/jsontoolkit/src/jsonschema/transform_rule.cc +++ b/vendor/alterschema/src/engine/rule.cc @@ -1,4 +1,4 @@ -#include +#include #include // assert #include // std::ostringstream @@ -19,31 +19,28 @@ auto vocabularies_to_set(const std::map &vocabularies) } // namespace -sourcemeta::jsontoolkit::SchemaTransformRule::SchemaTransformRule( - std::string &&name, std::string &&message) +sourcemeta::alterschema::Rule::Rule(std::string &&name, std::string &&message) : name_{std::move(name)}, message_{std::move(message)} {} -auto sourcemeta::jsontoolkit::SchemaTransformRule::operator==( - const sourcemeta::jsontoolkit::SchemaTransformRule &other) const -> bool { +auto sourcemeta::alterschema::Rule::operator==( + const sourcemeta::alterschema::Rule &other) const -> bool { return this->name() == other.name(); } -auto sourcemeta::jsontoolkit::SchemaTransformRule::name() const - -> const std::string & { +auto sourcemeta::alterschema::Rule::name() const -> const std::string & { return this->name_; } -auto sourcemeta::jsontoolkit::SchemaTransformRule::message() const - -> const std::string & { +auto sourcemeta::alterschema::Rule::message() const -> const std::string & { return this->message_; } -auto sourcemeta::jsontoolkit::SchemaTransformRule::apply( +auto sourcemeta::alterschema::Rule::apply( sourcemeta::jsontoolkit::JSON &schema, const sourcemeta::jsontoolkit::Pointer &pointer, const sourcemeta::jsontoolkit::SchemaResolver &resolver, const std::optional &default_dialect) const - -> std::vector { + -> std::vector { const std::optional dialect{ sourcemeta::jsontoolkit::dialect(schema, default_dialect)}; if (!dialect.has_value()) { @@ -58,7 +55,7 @@ auto sourcemeta::jsontoolkit::SchemaTransformRule::apply( return {}; } - sourcemeta::jsontoolkit::SchemaTransformer transformer{schema}; + sourcemeta::alterschema::Transformer transformer{schema}; this->transform(transformer); // Otherwise the transformation didn't do anything assert(!transformer.traces().empty()); @@ -74,7 +71,7 @@ auto sourcemeta::jsontoolkit::SchemaTransformRule::apply( return transformer.traces(); } -auto sourcemeta::jsontoolkit::SchemaTransformRule::check( +auto sourcemeta::alterschema::Rule::check( const sourcemeta::jsontoolkit::JSON &schema, const sourcemeta::jsontoolkit::Pointer &pointer, const sourcemeta::jsontoolkit::SchemaResolver &resolver, diff --git a/vendor/jsontoolkit/src/jsonschema/transformer.cc b/vendor/alterschema/src/engine/transformer.cc similarity index 63% rename from vendor/jsontoolkit/src/jsonschema/transformer.cc rename to vendor/alterschema/src/engine/transformer.cc index bfd905d..df47ea1 100644 --- a/vendor/jsontoolkit/src/jsonschema/transformer.cc +++ b/vendor/alterschema/src/engine/transformer.cc @@ -1,90 +1,87 @@ -#include +#include #include // std::move -sourcemeta::jsontoolkit::SchemaTransformer::SchemaTransformer( +sourcemeta::alterschema::Transformer::Transformer( sourcemeta::jsontoolkit::JSON &schema) : data{schema} {} -auto sourcemeta::jsontoolkit::SchemaTransformer::schema() const +auto sourcemeta::alterschema::Transformer::schema() const -> const sourcemeta::jsontoolkit::JSON & { return this->data; } -auto sourcemeta::jsontoolkit::SchemaTransformer::replace( +auto sourcemeta::alterschema::Transformer::replace( const sourcemeta::jsontoolkit::Pointer &path, const sourcemeta::jsontoolkit::JSON &value) -> void { // TODO: Check that the path exists with an assert sourcemeta::jsontoolkit::set(this->data, path, value); - this->operations.push_back(SchemaTransformerOperationReplace{path}); + this->operations.push_back(OperationReplace{path}); } -auto sourcemeta::jsontoolkit::SchemaTransformer::replace( +auto sourcemeta::alterschema::Transformer::replace( const sourcemeta::jsontoolkit::Pointer &path, sourcemeta::jsontoolkit::JSON &&value) -> void { // TODO: Check that the path exists with an assert sourcemeta::jsontoolkit::set(this->data, path, std::move(value)); - this->operations.push_back(SchemaTransformerOperationReplace{path}); + this->operations.push_back(OperationReplace{path}); } -auto sourcemeta::jsontoolkit::SchemaTransformer::replace( +auto sourcemeta::alterschema::Transformer::replace( const sourcemeta::jsontoolkit::JSON &value) -> void { this->replace(sourcemeta::jsontoolkit::empty_pointer, value); } -auto sourcemeta::jsontoolkit::SchemaTransformer::replace( +auto sourcemeta::alterschema::Transformer::replace( sourcemeta::jsontoolkit::JSON &&value) -> void { this->replace(sourcemeta::jsontoolkit::empty_pointer, std::move(value)); } -auto sourcemeta::jsontoolkit::SchemaTransformer::erase( +auto sourcemeta::alterschema::Transformer::erase( const sourcemeta::jsontoolkit::Pointer &path, const sourcemeta::jsontoolkit::JSON::String &key) -> void { // TODO: Check that the path exists with an assert sourcemeta::jsontoolkit::get(this->data, path).erase(key); - this->operations.push_back( - SchemaTransformerOperationErase{path.concat({key})}); + this->operations.push_back(OperationErase{path.concat({key})}); } -auto sourcemeta::jsontoolkit::SchemaTransformer::erase( +auto sourcemeta::alterschema::Transformer::erase( const sourcemeta::jsontoolkit::JSON::String &key) -> void { this->erase(sourcemeta::jsontoolkit::empty_pointer, key); } -auto sourcemeta::jsontoolkit::SchemaTransformer::assign( +auto sourcemeta::alterschema::Transformer::assign( const sourcemeta::jsontoolkit::Pointer &path, const sourcemeta::jsontoolkit::JSON::String &key, const sourcemeta::jsontoolkit::JSON &value) -> void { const auto destination{path.concat({key})}; // TODO: Check that the path DOES NOT exist with an assert sourcemeta::jsontoolkit::get(this->data, path).assign(key, value); - this->operations.push_back( - SchemaTransformerOperationAssign{path.concat({key})}); + this->operations.push_back(OperationAssign{path.concat({key})}); } -auto sourcemeta::jsontoolkit::SchemaTransformer::assign( +auto sourcemeta::alterschema::Transformer::assign( const sourcemeta::jsontoolkit::Pointer &path, const sourcemeta::jsontoolkit::JSON::String &key, sourcemeta::jsontoolkit::JSON &&value) -> void { // TODO: Check that the path DOES NOT exist with an assert sourcemeta::jsontoolkit::get(this->data, path).assign(key, std::move(value)); - this->operations.push_back( - SchemaTransformerOperationAssign{path.concat({key})}); + this->operations.push_back(OperationAssign{path.concat({key})}); } -auto sourcemeta::jsontoolkit::SchemaTransformer::assign( +auto sourcemeta::alterschema::Transformer::assign( const sourcemeta::jsontoolkit::JSON::String &key, const sourcemeta::jsontoolkit::JSON &value) -> void { this->assign(sourcemeta::jsontoolkit::empty_pointer, key, value); } -auto sourcemeta::jsontoolkit::SchemaTransformer::assign( +auto sourcemeta::alterschema::Transformer::assign( const sourcemeta::jsontoolkit::JSON::String &key, sourcemeta::jsontoolkit::JSON &&value) -> void { this->assign(sourcemeta::jsontoolkit::empty_pointer, key, std::move(value)); } -auto sourcemeta::jsontoolkit::SchemaTransformer::traces() const - -> const std::vector & { +auto sourcemeta::alterschema::Transformer::traces() const + -> const std::vector & { return this->operations; } diff --git a/vendor/alterschema/src/linter/CMakeLists.txt b/vendor/alterschema/src/linter/CMakeLists.txt new file mode 100644 index 0000000..37a8312 --- /dev/null +++ b/vendor/alterschema/src/linter/CMakeLists.txt @@ -0,0 +1,33 @@ +noa_library(NAMESPACE sourcemeta PROJECT alterschema NAME linter + FOLDER "AlterSchema/Linter" + SOURCES linter.cc + # Modernize + modernize/enum_to_const.h + + # Antipattern + antipattern/const_with_type.h + antipattern/enum_with_type.h + + # Simplify + simplify/single_type_array.h + + # Redundant + redundant/additional_properties_default.h + redundant/content_media_type_without_encoding.h + redundant/content_schema_default.h + redundant/content_schema_without_media_type.h + redundant/else_without_if.h + redundant/items_array_default.h + redundant/items_schema_default.h + redundant/max_contains_without_contains.h + redundant/min_contains_without_contains.h + redundant/then_without_if.h + redundant/unevaluated_items_default.h + redundant/unevaluated_properties_default.h) + +if(ALTERSCHEMA_INSTALL) + noa_library_install(NAMESPACE sourcemeta PROJECT alterschema NAME linter) +endif() + +target_link_libraries(sourcemeta_alterschema_linter PUBLIC + sourcemeta::alterschema::engine) diff --git a/vendor/alterschema/src/linter/antipattern/const_with_type.h b/vendor/alterschema/src/linter/antipattern/const_with_type.h new file mode 100644 index 0000000..51fe69d --- /dev/null +++ b/vendor/alterschema/src/linter/antipattern/const_with_type.h @@ -0,0 +1,25 @@ +class ConstWithType final : public Rule { +public: + ConstWithType() + : Rule{"const_with_type", + "Setting `type` alongside `const` is considered an anti-pattern, " + "as the constant already implies its respective type"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any( + vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/validation", + "https://json-schema.org/draft/2019-09/vocab/validation", + "http://json-schema.org/draft-07/schema#", + "http://json-schema.org/draft-06/schema#"}) && + schema.is_object() && schema.defines("type") && + schema.defines("const"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("type"); + } +}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/enum_with_type.h b/vendor/alterschema/src/linter/antipattern/enum_with_type.h similarity index 71% rename from vendor/jsontoolkit/src/jsonschema/rules/enum_with_type.h rename to vendor/alterschema/src/linter/antipattern/enum_with_type.h index 357f0a3..002969f 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/enum_with_type.h +++ b/vendor/alterschema/src/linter/antipattern/enum_with_type.h @@ -1,14 +1,15 @@ -class EnumWithType final : public SchemaTransformRule { +class EnumWithType final : public Rule { public: EnumWithType() - : SchemaTransformRule{ + : Rule{ "enum_with_type", "Setting `type` alongside `enum` is considered an anti-pattern, as " "the enumeration choices already imply their respective types"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/validation", @@ -23,7 +24,7 @@ class EnumWithType final : public SchemaTransformRule { schema.defines("enum"); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("type"); } }; diff --git a/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h b/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h new file mode 100644 index 0000000..22f4b52 --- /dev/null +++ b/vendor/alterschema/src/linter/include/sourcemeta/alterschema/linter.h @@ -0,0 +1,64 @@ +#ifndef SOURCEMETA_ALTERSCHEMA_LINTER_H_ +#define SOURCEMETA_ALTERSCHEMA_LINTER_H_ + +/// @defgroup linter Linter +/// @brief A growing collection of linter rules. +/// +/// This functionality is included as follows: +/// +/// ```cpp +/// #include +/// ``` + +#include "linter_export.h" + +#include + +namespace sourcemeta::alterschema { + +/// @ingroup linter +/// The category of a built-in transformation rule +enum class LinterCategory { + /// Rules that make use of newer features within the same dialect + Modernize, + + /// Rules that detect common anti-patterns + AntiPattern, + + /// Rules that simplify the given schema + Simplify, + + /// Rules that remove schema redundancies + Redundant +}; + +/// @ingroup linter +/// Add a set of built-in linter rules given a category. For example: +/// +/// ```cpp +/// #include +/// #include +/// +/// sourcemeta::alterschema::Bundle bundle; +/// +/// sourcemeta::alterschema::add(bundle, +/// sourcemeta::alterschema::LinterCategory::Modernize); +/// +/// auto schema = sourcemeta::jsontoolkit::parse(R"JSON({ +/// "$schema": "https://json-schema.org/draft/2020-12/schema", +/// "foo": 1, +/// "items": { +/// "type": "string", +/// "foo": 2 +/// } +/// })JSON"); +/// +/// bundle.apply(schema, sourcemeta::jsontoolkit::default_schema_walker, +/// sourcemeta::jsontoolkit::official_resolver); +/// ``` +SOURCEMETA_ALTERSCHEMA_LINTER_EXPORT +auto add(Bundle &bundle, const LinterCategory category) -> void; + +} // namespace sourcemeta::alterschema + +#endif diff --git a/vendor/alterschema/src/linter/linter.cc b/vendor/alterschema/src/linter/linter.cc new file mode 100644 index 0000000..62a1cfa --- /dev/null +++ b/vendor/alterschema/src/linter/linter.cc @@ -0,0 +1,73 @@ +#include + +#include // assert + +// For built-in rules +#include // std::any_of +#include // std::cbegin, std::cend +namespace sourcemeta::alterschema { +template +auto contains_any(const T &container, const T &values) -> bool { + return std::any_of( + std::cbegin(container), std::cend(container), + [&values](const auto &element) { return values.contains(element); }); +} + +// Modernize +#include "modernize/enum_to_const.h" +// AntiPattern +#include "antipattern/const_with_type.h" +#include "antipattern/enum_with_type.h" +// Simplify +#include "simplify/single_type_array.h" +// Redundant +#include "redundant/additional_properties_default.h" +#include "redundant/content_media_type_without_encoding.h" +#include "redundant/content_schema_default.h" +#include "redundant/content_schema_without_media_type.h" +#include "redundant/else_without_if.h" +#include "redundant/items_array_default.h" +#include "redundant/items_schema_default.h" +#include "redundant/max_contains_without_contains.h" +#include "redundant/min_contains_without_contains.h" +#include "redundant/then_without_if.h" +#include "redundant/unevaluated_items_default.h" +#include "redundant/unevaluated_properties_default.h" +} // namespace sourcemeta::alterschema + +namespace sourcemeta::alterschema { + +auto add(Bundle &bundle, const LinterCategory category) -> void { + switch (category) { + case LinterCategory::Modernize: + bundle.add(); + break; + case LinterCategory::AntiPattern: + bundle.add(); + bundle.add(); + break; + case LinterCategory::Simplify: + bundle.add(); + break; + case LinterCategory::Redundant: + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + bundle.add(); + break; + default: + // We should never get here + assert(false); + break; + } +} + +} // namespace sourcemeta::alterschema diff --git a/vendor/jsontoolkit/src/jsonschema/rules/enum_to_const.h b/vendor/alterschema/src/linter/modernize/enum_to_const.h similarity index 57% rename from vendor/jsontoolkit/src/jsonschema/rules/enum_to_const.h rename to vendor/alterschema/src/linter/modernize/enum_to_const.h index 9cafc33..d7c5694 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/enum_to_const.h +++ b/vendor/alterschema/src/linter/modernize/enum_to_const.h @@ -1,13 +1,13 @@ -class EnumToConst final : public SchemaTransformRule { +class EnumToConst final : public Rule { public: EnumToConst() - : SchemaTransformRule( - "enum_to_const", - "An `enum` of a single value can be expressed as `const`") {}; + : Rule("enum_to_const", + "An `enum` of a single value can be expressed as `const`") {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/validation", @@ -19,7 +19,7 @@ class EnumToConst final : public SchemaTransformRule { schema.at("enum").size() == 1; } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.assign("const", transformer.schema().at("enum").front()); transformer.erase("enum"); } diff --git a/vendor/jsontoolkit/src/jsonschema/rules/additional_properties_default.h b/vendor/alterschema/src/linter/redundant/additional_properties_default.h similarity index 63% rename from vendor/jsontoolkit/src/jsonschema/rules/additional_properties_default.h rename to vendor/alterschema/src/linter/redundant/additional_properties_default.h index 9ccee24..9443eb2 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/additional_properties_default.h +++ b/vendor/alterschema/src/linter/redundant/additional_properties_default.h @@ -1,14 +1,14 @@ -class AdditionalPropertiesDefault final : public SchemaTransformRule { +class AdditionalPropertiesDefault final : public Rule { public: AdditionalPropertiesDefault() - : SchemaTransformRule{ - "additional_properties_default", - "Setting the `additionalProperties` keyword to the true schema " - "does not add any further constraint"} {}; + : Rule{"additional_properties_default", + "Setting the `additionalProperties` keyword to the true schema " + "does not add any further constraint"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/applicator", @@ -26,7 +26,7 @@ class AdditionalPropertiesDefault final : public SchemaTransformRule { schema.at("additionalProperties").empty())); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("additionalProperties"); } }; diff --git a/vendor/alterschema/src/linter/redundant/content_media_type_without_encoding.h b/vendor/alterschema/src/linter/redundant/content_media_type_without_encoding.h new file mode 100644 index 0000000..8a9f47d --- /dev/null +++ b/vendor/alterschema/src/linter/redundant/content_media_type_without_encoding.h @@ -0,0 +1,23 @@ +class ContentMediaTypeWithoutEncoding final : public Rule { +public: + ContentMediaTypeWithoutEncoding() + : Rule{"content_media_type_without_encoding", + "The `contentMediaType` keyword is meaningless " + "without the presence of the `contentEncoding` keyword"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any(vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/content", + "https://json-schema.org/draft/2019-09/vocab/content", + "http://json-schema.org/draft-07/schema#"}) && + schema.is_object() && schema.defines("contentMediaType") && + !schema.defines("contentEncoding"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("contentMediaType"); + } +}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/content_schema_default.h b/vendor/alterschema/src/linter/redundant/content_schema_default.h similarity index 51% rename from vendor/jsontoolkit/src/jsonschema/rules/content_schema_default.h rename to vendor/alterschema/src/linter/redundant/content_schema_default.h index d9c8929..1228b23 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/content_schema_default.h +++ b/vendor/alterschema/src/linter/redundant/content_schema_default.h @@ -1,14 +1,14 @@ -class ContentSchemaDefault final : public SchemaTransformRule { +class ContentSchemaDefault final : public Rule { public: ContentSchemaDefault() - : SchemaTransformRule{ - "content_schema_default", - "Setting the `contentSchema` keyword to the true schema " - "does not add any further constraint"} {}; + : Rule{"content_schema_default", + "Setting the `contentSchema` keyword to the true schema " + "does not add any further constraint"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/content", @@ -20,7 +20,7 @@ class ContentSchemaDefault final : public SchemaTransformRule { schema.at("contentSchema").empty())); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("contentSchema"); } }; diff --git a/vendor/alterschema/src/linter/redundant/content_schema_without_media_type.h b/vendor/alterschema/src/linter/redundant/content_schema_without_media_type.h new file mode 100644 index 0000000..f39d6d2 --- /dev/null +++ b/vendor/alterschema/src/linter/redundant/content_schema_without_media_type.h @@ -0,0 +1,23 @@ +class ContentSchemaWithoutMediaType final : public Rule { +public: + ContentSchemaWithoutMediaType() + : Rule{"content_schema_without_media_type", + "The `contentSchema` keyword is meaningless without the presence " + "of the `contentMediaType` keyword"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any( + vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/content", + "https://json-schema.org/draft/2019-09/vocab/content"}) && + schema.is_object() && schema.defines("contentSchema") && + !schema.defines("contentMediaType"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("contentSchema"); + } +}; diff --git a/vendor/alterschema/src/linter/redundant/else_without_if.h b/vendor/alterschema/src/linter/redundant/else_without_if.h new file mode 100644 index 0000000..83f2526 --- /dev/null +++ b/vendor/alterschema/src/linter/redundant/else_without_if.h @@ -0,0 +1,23 @@ +class ElseWithoutIf final : public Rule { +public: + ElseWithoutIf() + : Rule{"else_without_if", "The `else` keyword is meaningless " + "without the presence of the `if` keyword"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any( + vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/applicator", + "https://json-schema.org/draft/2019-09/vocab/applicator", + "http://json-schema.org/draft-07/schema#"}) && + schema.is_object() && schema.defines("else") && + !schema.defines("if"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("else"); + } +}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/items_array_default.h b/vendor/alterschema/src/linter/redundant/items_array_default.h similarity index 55% rename from vendor/jsontoolkit/src/jsonschema/rules/items_array_default.h rename to vendor/alterschema/src/linter/redundant/items_array_default.h index 932cfbe..b903c51 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/items_array_default.h +++ b/vendor/alterschema/src/linter/redundant/items_array_default.h @@ -1,13 +1,14 @@ -class ItemsArrayDefault final : public SchemaTransformRule { +class ItemsArrayDefault final : public Rule { public: ItemsArrayDefault() - : SchemaTransformRule{"items_array_default", - "Setting the `items` keyword to the empty array " - "does not add any further constraint"} {}; + : Rule{"items_array_default", + "Setting the `items` keyword to the empty array " + "does not add any further constraint"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2019-09/vocab/applicator", @@ -21,7 +22,7 @@ class ItemsArrayDefault final : public SchemaTransformRule { schema.at("items").is_array() && schema.at("items").empty(); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("items"); } }; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/items_schema_default.h b/vendor/alterschema/src/linter/redundant/items_schema_default.h similarity index 61% rename from vendor/jsontoolkit/src/jsonschema/rules/items_schema_default.h rename to vendor/alterschema/src/linter/redundant/items_schema_default.h index e9c4aa2..abc716b 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/items_schema_default.h +++ b/vendor/alterschema/src/linter/redundant/items_schema_default.h @@ -1,13 +1,14 @@ -class ItemsSchemaDefault final : public SchemaTransformRule { +class ItemsSchemaDefault final : public Rule { public: ItemsSchemaDefault() - : SchemaTransformRule{"items_schema_default", - "Setting the `items` keyword to the true schema " - "does not add any further constraint"} {}; + : Rule{"items_schema_default", + "Setting the `items` keyword to the true schema " + "does not add any further constraint"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/applicator", @@ -24,7 +25,7 @@ class ItemsSchemaDefault final : public SchemaTransformRule { (schema.at("items").is_object() && schema.at("items").empty())); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("items"); } }; diff --git a/vendor/alterschema/src/linter/redundant/max_contains_without_contains.h b/vendor/alterschema/src/linter/redundant/max_contains_without_contains.h new file mode 100644 index 0000000..3cc9249 --- /dev/null +++ b/vendor/alterschema/src/linter/redundant/max_contains_without_contains.h @@ -0,0 +1,23 @@ +class MaxContainsWithoutContains final : public Rule { +public: + MaxContainsWithoutContains() + : Rule{"max_contains_without_contains", + "The `maxContains` keyword is meaningless " + "without the presence of the `contains` keyword"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any( + vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/validation", + "https://json-schema.org/draft/2019-09/vocab/validation"}) && + schema.is_object() && schema.defines("maxContains") && + !schema.defines("contains"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("maxContains"); + } +}; diff --git a/vendor/alterschema/src/linter/redundant/min_contains_without_contains.h b/vendor/alterschema/src/linter/redundant/min_contains_without_contains.h new file mode 100644 index 0000000..73246c6 --- /dev/null +++ b/vendor/alterschema/src/linter/redundant/min_contains_without_contains.h @@ -0,0 +1,23 @@ +class MinContainsWithoutContains final : public Rule { +public: + MinContainsWithoutContains() + : Rule{"min_contains_without_contains", + "The `minContains` keyword is meaningless " + "without the presence of the `contains` keyword"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any( + vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/validation", + "https://json-schema.org/draft/2019-09/vocab/validation"}) && + schema.is_object() && schema.defines("minContains") && + !schema.defines("contains"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("minContains"); + } +}; diff --git a/vendor/alterschema/src/linter/redundant/then_without_if.h b/vendor/alterschema/src/linter/redundant/then_without_if.h new file mode 100644 index 0000000..f952f59 --- /dev/null +++ b/vendor/alterschema/src/linter/redundant/then_without_if.h @@ -0,0 +1,23 @@ +class ThenWithoutIf final : public Rule { +public: + ThenWithoutIf() + : Rule{"then_without_if", "The `then` keyword is meaningless " + "without the presence of the `if` keyword"} {}; + + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { + return contains_any( + vocabularies, + {"https://json-schema.org/draft/2020-12/vocab/applicator", + "https://json-schema.org/draft/2019-09/vocab/applicator", + "http://json-schema.org/draft-07/schema#"}) && + schema.is_object() && schema.defines("then") && + !schema.defines("if"); + } + + auto transform(Transformer &transformer) const -> void override { + transformer.erase("then"); + } +}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/unevaluated_items_default.h b/vendor/alterschema/src/linter/redundant/unevaluated_items_default.h similarity index 51% rename from vendor/jsontoolkit/src/jsonschema/rules/unevaluated_items_default.h rename to vendor/alterschema/src/linter/redundant/unevaluated_items_default.h index 78834a5..548ba45 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/unevaluated_items_default.h +++ b/vendor/alterschema/src/linter/redundant/unevaluated_items_default.h @@ -1,14 +1,14 @@ -class UnevaluatedItemsDefault final : public SchemaTransformRule { +class UnevaluatedItemsDefault final : public Rule { public: UnevaluatedItemsDefault() - : SchemaTransformRule{ - "unevaluated_items_default", - "Setting the `unevaluatedItems` keyword to the true schema " - "does not add any further constraint"} {}; + : Rule{"unevaluated_items_default", + "Setting the `unevaluatedItems` keyword to the true schema " + "does not add any further constraint"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/unevaluated", @@ -20,7 +20,7 @@ class UnevaluatedItemsDefault final : public SchemaTransformRule { schema.at("unevaluatedItems").empty())); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("unevaluatedItems"); } }; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/unevaluated_properties_default.h b/vendor/alterschema/src/linter/redundant/unevaluated_properties_default.h similarity index 52% rename from vendor/jsontoolkit/src/jsonschema/rules/unevaluated_properties_default.h rename to vendor/alterschema/src/linter/redundant/unevaluated_properties_default.h index 66f14a0..ca5da92 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/unevaluated_properties_default.h +++ b/vendor/alterschema/src/linter/redundant/unevaluated_properties_default.h @@ -1,14 +1,14 @@ -class UnevaluatedPropertiesDefault final : public SchemaTransformRule { +class UnevaluatedPropertiesDefault final : public Rule { public: UnevaluatedPropertiesDefault() - : SchemaTransformRule{ - "unevaluated_properties_default", - "Setting the `unevaluatedProperties` keyword to the true schema " - "does not add any further constraint"} {}; + : Rule{"unevaluated_properties_default", + "Setting the `unevaluatedProperties` keyword to the true schema " + "does not add any further constraint"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/unevaluated", @@ -20,7 +20,7 @@ class UnevaluatedPropertiesDefault final : public SchemaTransformRule { schema.at("unevaluatedProperties").empty())); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.erase("unevaluatedProperties"); } }; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/single_type_array.h b/vendor/alterschema/src/linter/simplify/single_type_array.h similarity index 62% rename from vendor/jsontoolkit/src/jsonschema/rules/single_type_array.h rename to vendor/alterschema/src/linter/simplify/single_type_array.h index 56d1a11..01a3399 100644 --- a/vendor/jsontoolkit/src/jsonschema/rules/single_type_array.h +++ b/vendor/alterschema/src/linter/simplify/single_type_array.h @@ -1,13 +1,14 @@ -class SingleTypeArray final : public SchemaTransformRule { +class SingleTypeArray final : public Rule { public: SingleTypeArray() - : SchemaTransformRule{"single_type_array", - "Setting `type` to an array of a single type is " - "the same as directly declaring such type"} {}; + : Rule{"single_type_array", + "Setting `type` to an array of a single type is " + "the same as directly declaring such type"} {}; - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { + [[nodiscard]] auto + condition(const sourcemeta::jsontoolkit::JSON &schema, const std::string &, + const std::set &vocabularies, + const sourcemeta::jsontoolkit::Pointer &) const -> bool override { return contains_any( vocabularies, {"https://json-schema.org/draft/2020-12/vocab/validation", @@ -24,7 +25,7 @@ class SingleTypeArray final : public SchemaTransformRule { schema.at("type").front().is_string(); } - auto transform(SchemaTransformer &transformer) const -> void override { + auto transform(Transformer &transformer) const -> void override { transformer.replace({"type"}, transformer.schema().at("type").front()); } }; diff --git a/vendor/alterschema/vendor/noa/LICENSE b/vendor/alterschema/vendor/noa/LICENSE new file mode 100644 index 0000000..efbd81c --- /dev/null +++ b/vendor/alterschema/vendor/noa/LICENSE @@ -0,0 +1,661 @@ + 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. + + Noa - A set of re-usable and opinionated utilities for Sourcemeta projects + 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 +. diff --git a/vendor/alterschema/vendor/noa/cmake/noa.cmake b/vendor/alterschema/vendor/noa/cmake/noa.cmake new file mode 100644 index 0000000..d55ca54 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa.cmake @@ -0,0 +1,13 @@ +set(NOA_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/noa") +include("${NOA_DIRECTORY}/shim.cmake") +include("${NOA_DIRECTORY}/variables.cmake") +include("${NOA_DIRECTORY}/defaults.cmake") +include("${NOA_DIRECTORY}/compiler/sanitizer.cmake") +include("${NOA_DIRECTORY}/compiler/options.cmake") +include("${NOA_DIRECTORY}/library.cmake") +include("${NOA_DIRECTORY}/options/enum.cmake") +include("${NOA_DIRECTORY}/commands/copy-file.cmake") +include("${NOA_DIRECTORY}/targets/clang-format.cmake") +include("${NOA_DIRECTORY}/targets/clang-tidy.cmake") +include("${NOA_DIRECTORY}/targets/shellcheck.cmake") +include("${NOA_DIRECTORY}/targets/doxygen.cmake") diff --git a/vendor/alterschema/vendor/noa/cmake/noa/commands/copy-file.cmake b/vendor/alterschema/vendor/noa/cmake/noa/commands/copy-file.cmake new file mode 100644 index 0000000..bed4cb8 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/commands/copy-file.cmake @@ -0,0 +1,17 @@ +function(noa_command_copy_file) + cmake_parse_arguments(NOA_COMMAND_COPY_FILE "" "FROM;TO" "" ${ARGN}) + + if(NOT NOA_COMMAND_COPY_FILE_FROM) + message(FATAL_ERROR "You must pass the file to copy using the FROM option") + endif() + if(NOT NOA_COMMAND_COPY_FILE_TO) + message(FATAL_ERROR "You must pass the destination to copy to using the TO option") + endif() + + add_custom_command( + OUTPUT "${NOA_COMMAND_COPY_FILE_TO}" + COMMAND "${CMAKE_COMMAND}" -E copy "${NOA_COMMAND_COPY_FILE_FROM}" "${NOA_COMMAND_COPY_FILE_TO}" + MAIN_DEPENDENCY "${NOA_COMMAND_COPY_FILE_FROM}" + DEPENDS "${NOA_COMMAND_COPY_FILE_FROM}" + COMMENT "Copying ${NOA_COMMAND_COPY_FILE_FROM} ot ${NOA_COMMAND_COPY_FILE_TO}") +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/compiler/options.cmake b/vendor/alterschema/vendor/noa/cmake/noa/compiler/options.cmake new file mode 100644 index 0000000..c859781 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/compiler/options.cmake @@ -0,0 +1,73 @@ +function(noa_add_default_options visibility target) + if(NOA_COMPILER_MSVC) + # See https://learn.microsoft.com/en-us/cpp/build/reference/compiler-options-listed-by-category + target_compile_options("${target}" ${visibility} + /options:strict + /permissive- + /W4 + /WL + /MP + /sdl) + else() + target_compile_options("${target}" ${visibility} + -Wall + -Wextra + -Wpedantic + -Wshadow + -Wdouble-promotion + -Wconversion + -Wunused-parameter + -Wtrigraphs + -Wunreachable-code + -Wmissing-braces + -Wparentheses + -Wswitch + -Wunused-function + -Wunused-label + -Wunused-parameter + -Wunused-variable + -Wunused-value + -Wempty-body + -Wuninitialized + -Wshadow + -Wconversion + -Wenum-conversion + -Wfloat-conversion + -Wimplicit-fallthrough + -Wsign-compare + -Wsign-conversion + -Wunknown-pragmas + -Wnon-virtual-dtor + -Woverloaded-virtual + -Winvalid-offsetof + + # Assume that signed arithmetic overflow of addition, subtraction and + # multiplication wraps around using twos-complement representation + # See https://users.cs.utah.edu/~regehr/papers/overflow12.pdf + # See https://www.postgresql.org/message-id/1689.1134422394@sss.pgh.pa.us + -fwrapv) + endif() + + if(NOA_COMPILER_LLVM) + target_compile_options("${target}" ${visibility} + -Wbool-conversion + -Wint-conversion + -Wpointer-sign + -Wconditional-uninitialized + -Wconstant-conversion + -Wnon-literal-null-conversion + -Wshorten-64-to-32 + -Wdeprecated-implementations + -Winfinite-recursion + -Wnewline-eof + -Wfour-char-constants + -Wselector + -Wundeclared-selector + -Wdocumentation + -Wmove + -Wc++11-extensions + -Wcomma + -Wno-exit-time-destructors + -Wrange-loop-analysis) + endif() +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/compiler/sanitizer.cmake b/vendor/alterschema/vendor/noa/cmake/noa/compiler/sanitizer.cmake new file mode 100644 index 0000000..37ff6f9 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/compiler/sanitizer.cmake @@ -0,0 +1,40 @@ +function(noa_sanitizer) + cmake_parse_arguments(NOA_SANITIZER "" "TYPE" "" ${ARGN}) + + if(NOT NOA_SANITIZER_TYPE) + message(FATAL_ERROR "You must pass the intended sanitizer") + endif() + + if(NOA_COMPILER_LLVM AND "${NOA_SANITIZER_TYPE}" STREQUAL "address") + # See https://clang.llvm.org/docs/AddressSanitizer.html + message(STATUS "Enabling sanitizer: Clang AddressSanitizer") + add_compile_options(-fsanitize=address -fsanitize-address-use-after-scope) + add_link_options(-fsanitize=address) + # Get nicer stack traces with the Address sanitizer + add_compile_options(-fno-omit-frame-pointer -fno-optimize-sibling-calls) + add_compile_options(-O1) + elseif(NOA_COMPILER_LLVM AND "${NOA_SANITIZER_TYPE}" STREQUAL "memory") + if(APPLE) + message(FATAL_ERROR "Clang MemorySanitizer is not available on Apple platforms") + endif() + + # See https://clang.llvm.org/docs/MemorySanitizer.html + message(STATUS "Enabling sanitizer: Clang MemorySanitizer") + add_compile_options(-fsanitize=memory -fno-sanitize-memory-use-after-dtor) + add_link_options(-fsanitize=memory) + # Get nicer stack traces with the Memory sanitizer + add_compile_options(-fno-omit-frame-pointer -fno-optimize-sibling-calls) + add_compile_options(-O1) + elseif(NOA_COMPILER_LLVM AND "${NOA_SANITIZER_TYPE}" STREQUAL "undefined") + # See https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html + message(STATUS "Enabling sanitizer: Clang UndefinedBehaviorSanitizer") + add_compile_options(-fsanitize=undefined,nullability,integer,implicit-conversion,local-bounds + -fno-sanitize=unsigned-integer-overflow) + add_link_options(-fsanitize=undefined,nullability,integer,implicit-conversion,local-bounds + -fno-sanitize=unsigned-integer-overflow) + # Exit after an error, otherwise this sanitizer only prints warnings + add_compile_options(-fno-sanitize-recover=all) + else() + message(FATAL_ERROR "Unrecognized compiler and/or sanitizer combination") + endif() +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/defaults.cmake b/vendor/alterschema/vendor/noa/cmake/noa/defaults.cmake new file mode 100644 index 0000000..0709ee2 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/defaults.cmake @@ -0,0 +1,94 @@ +# Standards (sane modern defaults) +if("CXX" IN_LIST NOA_LANGUAGES) + set(CMAKE_CXX_STANDARD 20) +endif() +if("C" IN_LIST NOA_LANGUAGES) + set(CMAKE_C_STANDARD 11) +endif() +if("OBJCXX" IN_LIST NOA_LANGUAGES) + set(CMAKE_OBJCXX_STANDARD "${CMAKE_CXX_STANDARD}") +endif() + +# Hide symbols from shared libraries by default +# In certain compilers, like GCC and Clang, +# symbols are visible by default. +set(CMAKE_VISIBILITY_INLINES_HIDDEN YES) +if("CXX" IN_LIST NOA_LANGUAGES) + set(CMAKE_CXX_VISIBILITY_PRESET hidden) +endif() +if("C" IN_LIST NOA_LANGUAGES) + set(CMAKE_C_VISIBILITY_PRESET hidden) +endif() +if("OBJCXX" IN_LIST NOA_LANGUAGES) + set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden) +endif() + +# By default, stay within ISO C++ +if("CXX" IN_LIST NOA_LANGUAGES) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) +endif() +if("C" IN_LIST NOA_LANGUAGES) + set(CMAKE_C_STANDARD_REQUIRED ON) + set(CMAKE_C_EXTENSIONS OFF) +endif() +if("OBJCXX" IN_LIST NOA_LANGUAGES) + set(CMAKE_OBJCXX_STANDARD_REQUIRED ON) + set(CMAKE_OBJCXX_EXTENSIONS OFF) +endif() + +# Export compile commands by default. +# It is very useful for IDE integration, linting, etc +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + +# Prevent DT_RPATH/DT_RUNPATH problem +# This problem is not present on Apple platforms. +# See https://www.youtube.com/watch?v=m0DwB4OvDXk +if(NOT APPLE) + set(CMAKE_INSTALL_RPATH $ORIGIN) +endif() + +# Delay GoogleTest discovery until before running the tests +# See https://discourse.cmake.org/t/default-value-for-new-discovery-mode-option-for-gtest-discover-tests/1422 +set(CMAKE_GTEST_DISCOVER_TESTS_DISCOVERY_MODE PRE_TEST) + +# Always use folders in IDE +# See https://cmake.org/cmake/help/latest/prop_gbl/USE_FOLDERS.html +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# On Windows, during build, put executables and libraries in the same directory. +# Otherwise, if there is any shared library being generated, the binaries +# linking to it will not be able to find it and i.e. unit tests will fail. +# Note that GoogleTest does this already to a non-configurable top-level +# `bin` directory, so adopting that convention here. +# See https://stackoverflow.com/q/39807664 +# See https://github.com/google/googletest/blob/e47544ad31cb3ceecd04cc13e8fe556f8df9fe0b/googletest/cmake/internal_utils.cmake#L173-L174 +if(WIN32) + # For EXE files + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" CACHE STRING "") + # For DLL files + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" CACHE STRING "") +endif() + +# Enable IPO/LTO to help the compiler optimize across modules. +# Only do so in release, given these optimizations can significantly +# increase build times. +# See: https://cmake.org/cmake/help/latest/module/CheckIPOSupported.html +if(CMAKE_BUILD_TYPE STREQUAL "Release" AND NOT BUILD_SHARED_LIBS) + include(CheckIPOSupported) + check_ipo_supported(RESULT ipo_supported OUTPUT ipo_supported_error) + if(ipo_supported) + # TODO: Make IPO/LTO work on Linux + LLVM + if(APPLE OR NOT NOA_COMPILER_LLVM) + message(STATUS "Enabling IPO") + cmake_policy(SET CMP0069 NEW) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON) + else() + message(WARNING "Avoiding IPO on this configuration") + endif() + else() + message(WARNING "IPO not supported: ${ipo_supported_error}") + endif() + unset(ipo_supported) + unset(ipo_supported_error) +endif() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/library.cmake b/vendor/alterschema/vendor/noa/cmake/noa/library.cmake new file mode 100644 index 0000000..56e152b --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/library.cmake @@ -0,0 +1,134 @@ +function(noa_library) + cmake_parse_arguments(NOA_LIBRARY "" + "NAMESPACE;PROJECT;NAME;FOLDER" "PRIVATE_HEADERS;SOURCES" ${ARGN}) + + if(NOT NOA_LIBRARY_PROJECT) + message(FATAL_ERROR "You must pass the project name using the PROJECT option") + endif() + if(NOT NOA_LIBRARY_NAME) + message(FATAL_ERROR "You must pass the library name using the NAME option") + endif() + if(NOT NOA_LIBRARY_FOLDER) + message(FATAL_ERROR "You must pass the folder name using the FOLDER option") + endif() + + if(NOA_LIBRARY_NAMESPACE) + set(INCLUDE_PREFIX "include/${NOA_LIBRARY_NAMESPACE}/${NOA_LIBRARY_PROJECT}") + else() + set(INCLUDE_PREFIX "include/${NOA_LIBRARY_PROJECT}") + endif() + + set(PUBLIC_HEADER "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}.h") + + if(NOA_LIBRARY_SOURCES) + set(ABSOLUTE_PRIVATE_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/${NOA_LIBRARY_NAME}_export.h") + foreach(private_header IN LISTS NOA_LIBRARY_PRIVATE_HEADERS) + list(APPEND ABSOLUTE_PRIVATE_HEADERS "${INCLUDE_PREFIX}/${NOA_LIBRARY_NAME}_${private_header}") + endforeach() + else() + set(ABSOLUTE_PRIVATE_HEADERS) + endif() + + if(NOA_LIBRARY_NAMESPACE) + set(TARGET_NAME "${NOA_LIBRARY_NAMESPACE}_${NOA_LIBRARY_PROJECT}_${NOA_LIBRARY_NAME}") + set(ALIAS_NAME "${NOA_LIBRARY_NAMESPACE}::${NOA_LIBRARY_PROJECT}::${NOA_LIBRARY_NAME}") + else() + set(TARGET_NAME "${NOA_LIBRARY_PROJECT}_${NOA_LIBRARY_NAME}") + set(ALIAS_NAME "${NOA_LIBRARY_PROJECT}::${NOA_LIBRARY_NAME}") + endif() + + if(NOA_LIBRARY_SOURCES) + add_library(${TARGET_NAME} + ${PUBLIC_HEADER} ${ABSOLUTE_PRIVATE_HEADERS} ${NOA_LIBRARY_SOURCES}) + noa_add_default_options(PRIVATE ${TARGET_NAME}) + else() + add_library(${TARGET_NAME} INTERFACE + ${PUBLIC_HEADER} ${ABSOLUTE_PRIVATE_HEADERS}) + noa_add_default_options(INTERFACE ${TARGET_NAME}) + endif() + + add_library(${ALIAS_NAME} ALIAS ${TARGET_NAME}) + + if(NOA_LIBRARY_SOURCES) + target_include_directories(${TARGET_NAME} PUBLIC + "$" + "$") + else() + target_include_directories(${TARGET_NAME} INTERFACE + "$" + "$") + endif() + + if(NOA_LIBRARY_SOURCES) + set_target_properties(${TARGET_NAME} + PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + PUBLIC_HEADER "${PUBLIC_HEADER}" + PRIVATE_HEADER "${ABSOLUTE_PRIVATE_HEADERS}" + EXPORT_NAME "${NOA_LIBRARY_PROJECT}::${NOA_LIBRARY_NAME}" + FOLDER "${NOA_LIBRARY_FOLDER}") + else() + set_target_properties(${TARGET_NAME} + PROPERTIES + OUTPUT_NAME ${TARGET_NAME} + PUBLIC_HEADER "${PUBLIC_HEADER}" + PRIVATE_HEADER "${ABSOLUTE_PRIVATE_HEADERS}" + FOLDER "${NOA_LIBRARY_FOLDER}") + endif() + + if(NOA_LIBRARY_SOURCES) + include(GenerateExportHeader) + generate_export_header(${TARGET_NAME} + EXPORT_FILE_NAME ${NOA_LIBRARY_NAME}_export.h) + set_target_properties(${TARGET_NAME} + PROPERTIES + SOVERSION "${PROJECT_VERSION_MAJOR}" + VERSION "${PROJECT_VERSION}") + + # To find the generated files + target_include_directories(${TARGET_NAME} + PUBLIC "$") + endif() +endfunction() + +function(noa_library_install) + cmake_parse_arguments(NOA_LIBRARY "" "NAMESPACE;PROJECT;NAME" "" ${ARGN}) + + if(NOT NOA_LIBRARY_PROJECT) + message(FATAL_ERROR "You must pass the project name using the PROJECT option") + endif() + if(NOT NOA_LIBRARY_NAME) + message(FATAL_ERROR "You must pass the library name using the NAME option") + endif() + + if(NOA_LIBRARY_NAMESPACE) + set(COMPONENT_NAME "${NOA_LIBRARY_NAMESPACE}_${NOA_LIBRARY_PROJECT}") + set(TARGET_NAME "${NOA_LIBRARY_NAMESPACE}_${NOA_LIBRARY_PROJECT}_${NOA_LIBRARY_NAME}") + set(INCLUDE_PATH "${CMAKE_INSTALL_INCLUDEDIR}/${NOA_LIBRARY_NAMESPACE}/${NOA_LIBRARY_PROJECT}") + set(NAMESPACE_PREFIX "${NOA_LIBRARY_NAMESPACE}::") + else() + set(COMPONENT_NAME "${NOA_LIBRARY_PROJECT}") + set(TARGET_NAME "${NOA_LIBRARY_PROJECT}_${NOA_LIBRARY_NAME}") + set(INCLUDE_PATH "${CMAKE_INSTALL_INCLUDEDIR}/${NOA_LIBRARY_PROJECT}") + set(NAMESPACE_PREFIX "") + endif() + + include(GNUInstallDirs) + install(TARGETS ${TARGET_NAME} + EXPORT ${TARGET_NAME} + PUBLIC_HEADER DESTINATION "${INCLUDE_PATH}" + COMPONENT ${COMPONENT_NAME}_dev + PRIVATE_HEADER DESTINATION "${INCLUDE_PATH}" + COMPONENT ${COMPONENT_NAME}_dev + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT ${COMPONENT_NAME} + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + COMPONENT ${COMPONENT_NAME} + NAMELINK_COMPONENT ${COMPONENT_NAME}_dev + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + COMPONENT ${COMPONENT_NAME}_dev) + install(EXPORT ${TARGET_NAME} + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${NOA_LIBRARY_PROJECT}" + NAMESPACE ${NAMESPACE_PREFIX} + COMPONENT ${COMPONENT_NAME}_dev) +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/options/enum.cmake b/vendor/alterschema/vendor/noa/cmake/noa/options/enum.cmake new file mode 100644 index 0000000..b75eb2a --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/options/enum.cmake @@ -0,0 +1,32 @@ +function(noa_option_enum) + cmake_parse_arguments(NOA_OPTION_ENUM "" "NAME;DEFAULT;DESCRIPTION" "CHOICES" ${ARGN}) + + if(NOT NOA_OPTION_ENUM_NAME) + message(FATAL_ERROR "You must pass the option name as NAME") + endif() + if(NOT NOA_OPTION_ENUM_DEFAULT) + message(FATAL_ERROR "You must pass the option default value as DEFAULT") + endif() + if(NOT "${NOA_OPTION_ENUM_DEFAULT}" IN_LIST NOA_OPTION_ENUM_CHOICES) + message(FATAL_ERROR "Default value of ${NOA_OPTION_ENUM_NAME} must be one of these: ${NOA_OPTION_ENUM_CHOICES}") + endif() + if(NOT NOA_OPTION_ENUM_DESCRIPTION) + message(FATAL_ERROR "You must pass the option description as DESCRIPTION") + endif() + if(NOT NOA_OPTION_ENUM_CHOICES) + message(FATAL_ERROR "You must pass the option enum choices as CHOICES") + endif() + + # Declare the option + set("${NOA_OPTION_ENUM_NAME}" "${NOA_OPTION_ENUM_DEFAULT}" + CACHE STRING "${NOA_OPTION_ENUM_DESCRIPTION}") + + # Display a nice set of options in `cmake-gui` + set_property(CACHE "${NOA_OPTION_ENUM_NAME}" + PROPERTY STRINGS ${NOA_OPTION_ENUM_CHOICES}) + + # Perform validation + if(NOT "${${NOA_OPTION_ENUM_NAME}}" IN_LIST NOA_OPTION_ENUM_CHOICES) + message(FATAL_ERROR "Value of ${NOA_OPTION_ENUM_NAME} must be one of these: ${NOA_OPTION_ENUM_CHOICES}") + endif() +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/shim.cmake b/vendor/alterschema/vendor/noa/cmake/noa/shim.cmake new file mode 100644 index 0000000..e2b6325 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/shim.cmake @@ -0,0 +1,5 @@ +# The PROJECT_IS_TOP_LEVEL handy variable is only +# available on CMake >=3.21. +if(NOT DEFINED PROJECT_IS_TOP_LEVEL AND "${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}") + set(PROJECT_IS_TOP_LEVEL YES) +endif() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-format.cmake b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-format.cmake new file mode 100644 index 0000000..c12b1c5 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-format.cmake @@ -0,0 +1,48 @@ +set(NOA_TARGET_CLANG_FORMAT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}") + +function(noa_target_clang_format) + cmake_parse_arguments(NOA_TARGET_CLANG_FORMAT "REQUIRED" "" "SOURCES" ${ARGN}) + + if(NOA_TARGET_CLANG_FORMAT_REQUIRED) + find_program(CLANG_FORMAT_BIN NAMES clang-format REQUIRED) + else() + find_program(CLANG_FORMAT_BIN NAMES clang-format) + endif() + + # This covers the empty list too + if(NOT NOA_TARGET_CLANG_FORMAT_SOURCES) + message(FATAL_ERROR "You must pass file globs to format in the SOURCES option") + endif() + file(GLOB_RECURSE NOA_TARGET_CLANG_FORMAT_FILES + ${NOA_TARGET_CLANG_FORMAT_SOURCES}) + + set(CLANG_FORMAT_CONFIG "${NOA_TARGET_CLANG_FORMAT_DIRECTORY}/clang-format.config") + if(CLANG_FORMAT_BIN) + add_custom_target(clang_format + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CLANG_FORMAT_BIN}" "--style=file:${CLANG_FORMAT_CONFIG}" + -i ${NOA_TARGET_CLANG_FORMAT_FILES} + COMMENT "Formatting sources using ClangFormat") + add_custom_target(clang_format_test + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CLANG_FORMAT_BIN}" "--style=file:${CLANG_FORMAT_CONFIG}" + --dry-run -Werror + -i ${NOA_TARGET_CLANG_FORMAT_FILES} + COMMENT "Checking for ClangFormat compliance") + else() + add_custom_target(clang_format + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CMAKE_COMMAND}" -E echo "Could not locate ClangFormat" + COMMAND "${CMAKE_COMMAND}" -E false) + add_custom_target(clang_format_test + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CMAKE_COMMAND}" -E echo "Could not locate ClangFormat" + COMMAND "${CMAKE_COMMAND}" -E false) + endif() + + set_target_properties(clang_format clang_format_test PROPERTIES FOLDER "Formatting") +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-format.config b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-format.config new file mode 100644 index 0000000..d9c695c --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-format.config @@ -0,0 +1,3 @@ +--- +BasedOnStyle: LLVM +IndentCaseLabels: true diff --git a/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-tidy.cmake b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-tidy.cmake new file mode 100644 index 0000000..6dbb43b --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-tidy.cmake @@ -0,0 +1,58 @@ +set(NOA_TARGET_CLANG_TIDY_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}") + +function(noa_target_clang_tidy) + cmake_parse_arguments(NOA_TARGET_CLANG_TIDY "REQUIRED" "" "SOURCES" ${ARGN}) + + set(CLANG_TIDY_FIND_PATHS "") + + # Locate ClangTidy on default Homebrew installations, + # given that the LLVM formula won't symlink `clang-tidy` + # to any available path by default. + if(APPLE) + if(IS_DIRECTORY "/opt/homebrew/Cellar/llvm") + set(HOMEBREW_LLVM "/opt/homebrew/Cellar/llvm") + elseif(IS_DIRECTORY "/usr/local/Cellar/llvm") + set(HOMEBREW_LLVM "/opt/local/Cellar/llvm") + endif() + if(HOMEBREW_LLVM) + file(GLOB llvm_version_paths LIST_DIRECTORIES true "${HOMEBREW_LLVM}/*") + foreach(llvm_version_path ${llvm_version_paths}) + list(APPEND CLANG_TIDY_FIND_PATHS "${llvm_version_path}/bin") + endforeach() + endif() + endif() + + if(NOA_TARGET_CLANG_TIDY_REQUIRED) + find_program(CLANG_TIDY_BIN NAMES clang-tidy REQUIRED + PATHS ${CLANG_TIDY_FIND_PATHS}) + else() + find_program(CLANG_TIDY_BIN NAMES clang-tidy + PATHS ${CLANG_TIDY_FIND_PATHS}) + endif() + + # This covers the empty list too + if(NOT NOA_TARGET_CLANG_TIDY_SOURCES) + message(FATAL_ERROR "You must pass file globs to analyze in the SOURCES option") + endif() + file(GLOB_RECURSE NOA_TARGET_CLANG_TIDY_FILES + ${NOA_TARGET_CLANG_TIDY_SOURCES}) + + set(CLANG_TIDY_CONFIG "${NOA_TARGET_CLANG_TIDY_DIRECTORY}/clang-tidy.config") + if(CLANG_TIDY_BIN) + add_custom_target(clang_tidy + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CLANG_TIDY_BIN}" -p "${PROJECT_BINARY_DIR}" + --config-file "${CLANG_TIDY_CONFIG}" + ${NOA_TARGET_CLANG_TIDY_FILES} + COMMENT "Analyzing sources using ClangTidy") + else() + add_custom_target(clang_tidy + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CMAKE_COMMAND}" -E echo "Could not locate ClangTidy" + COMMAND "${CMAKE_COMMAND}" -E false) + endif() + + set_target_properties(clang_tidy PROPERTIES FOLDER "Linting") +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-tidy.config b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-tidy.config new file mode 100644 index 0000000..1ea469b --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/targets/clang-tidy.config @@ -0,0 +1,7 @@ +--- +# See https://clang.llvm.org/extra/clang-tidy/index.html +# First disable all default checks (with -*) +Checks: '-*,bugprone-*,clang-analyzer-*,clang-diagnostic-*,modernize-*,concurrency-*,cppcoreguidelines-*,performance-*,portability-*,objc-*,misc-*,-misc-no-recursion,-bugprone-easily-swappable-parameters' +WarningsAsErrors: '*' +HeaderFilterRegex: '' +FormatStyle: none diff --git a/vendor/alterschema/vendor/noa/cmake/noa/targets/doxygen.cmake b/vendor/alterschema/vendor/noa/cmake/noa/targets/doxygen.cmake new file mode 100644 index 0000000..1a3bfc2 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/targets/doxygen.cmake @@ -0,0 +1,26 @@ +function(noa_target_doxygen) + cmake_parse_arguments(NOA_TARGET_DOXYGEN "" "CONFIG;OUTPUT" "" ${ARGN}) + + if(NOT NOA_TARGET_DOXYGEN_CONFIG) + message(FATAL_ERROR "You must pass an input config file using the CONFIG option") + endif() + if(NOT NOA_TARGET_DOXYGEN_OUTPUT) + message(FATAL_ERROR "You must pass an output directory using the OUTPUT option") + endif() + + find_package(Doxygen) + if(DOXYGEN_FOUND) + set(DOXYGEN_IN "${NOA_TARGET_DOXYGEN_CONFIG}") + set(DOXYGEN_OUT "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile") + configure_file("${DOXYGEN_IN}" "${DOXYGEN_OUT}" @ONLY) + add_custom_target(doxygen + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CMAKE_COMMAND}" -E make_directory "${NOA_TARGET_DOXYGEN_OUTPUT}" + COMMAND "${DOXYGEN_EXECUTABLE}" "${DOXYGEN_OUT}") + else() + add_custom_target(doxygen VERBATIM + COMMAND "${CMAKE_COMMAND}" -E echo "Could not locate Doxygen" + COMMAND "${CMAKE_COMMAND}" -E false) + endif() +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/targets/shellcheck.cmake b/vendor/alterschema/vendor/noa/cmake/noa/targets/shellcheck.cmake new file mode 100644 index 0000000..03f0a10 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/targets/shellcheck.cmake @@ -0,0 +1,34 @@ +set(NOA_TARGET_SHELLCHECK_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}") + +function(noa_target_shellcheck) + cmake_parse_arguments(NOA_TARGET_SHELLCHECK "REQUIRED" "" "SOURCES" ${ARGN}) + + if(NOA_TARGET_SHELLCHECK_REQUIRED) + find_program(SHELLCHECK_BIN NAMES shellcheck REQUIRED) + else() + find_program(SHELLCHECK_BIN NAMES shellcheck) + endif() + + # This covers the empty list too + if(NOT NOA_TARGET_SHELLCHECK_SOURCES) + message(FATAL_ERROR "You must pass file globs to lint in the SOURCES option") + endif() + file(GLOB_RECURSE NOA_TARGET_SHELLCHECK_FILES + ${NOA_TARGET_SHELLCHECK_SOURCES}) + + if(SHELLCHECK_BIN) + add_custom_target(shellcheck + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${SHELLCHECK_BIN}" ${NOA_TARGET_SHELLCHECK_FILES} + COMMENT "Analyzing sources using ShellCheck") + else() + add_custom_target(shellcheck + WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" + VERBATIM + COMMAND "${CMAKE_COMMAND}" -E echo "Could not locate ShellCheck" + COMMAND "${CMAKE_COMMAND}" -E false) + endif() + + set_target_properties(shellcheck PROPERTIES FOLDER "Linting") +endfunction() diff --git a/vendor/alterschema/vendor/noa/cmake/noa/variables.cmake b/vendor/alterschema/vendor/noa/cmake/noa/variables.cmake new file mode 100644 index 0000000..d294898 --- /dev/null +++ b/vendor/alterschema/vendor/noa/cmake/noa/variables.cmake @@ -0,0 +1,12 @@ +# Get the list of languages defined in the project +get_property(NOA_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES) + +# Compiler detection (C++) +# TODO: Detect compilers on programming languages other than C++ +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") + set(NOA_COMPILER_LLVM ON) +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + set(NOA_COMPILER_GCC ON) +elseif(MSVC) + set(NOA_COMPILER_MSVC ON) +endif() diff --git a/vendor/jsontoolkit/src/jsonschema/CMakeLists.txt b/vendor/jsontoolkit/src/jsonschema/CMakeLists.txt index 2aaed1d..cd9f901 100644 --- a/vendor/jsontoolkit/src/jsonschema/CMakeLists.txt +++ b/vendor/jsontoolkit/src/jsonschema/CMakeLists.txt @@ -4,11 +4,12 @@ include(./official_resolver.cmake) noa_library(NAMESPACE sourcemeta PROJECT jsontoolkit NAME jsonschema FOLDER "JSON Toolkit/JSON Schema" - PRIVATE_HEADERS anchor.h bundle.h resolver.h walker.h reference.h - error.h transformer.h transform_rule.h transform_bundle.h compile.h - SOURCES jsonschema.cc default_walker.cc reference.cc anchor.cc resolver.cc - walker.cc bundle.cc transformer.cc transform_rule.cc transform_bundle.cc - compile.cc compile_evaluate.cc compile_json.cc compile_describe.cc + PRIVATE_HEADERS anchor.h bundle.h resolver.h + walker.h reference.h error.h compile.h + SOURCES jsonschema.cc default_walker.cc reference.cc + anchor.cc resolver.cc + walker.cc bundle.cc compile.cc compile_evaluate.cc + compile_json.cc compile_describe.cc compile_helpers.h default_compiler.cc default_compiler_2020_12.h @@ -17,23 +18,6 @@ noa_library(NAMESPACE sourcemeta PROJECT jsontoolkit NAME jsonschema default_compiler_draft6.h default_compiler_draft4.h - rules/additional_properties_default.h - rules/const_with_type.h - rules/content_media_type_without_encoding.h - rules/content_schema_default.h - rules/content_schema_without_media_type.h - rules/else_without_if.h - rules/enum_to_const.h - rules/enum_with_type.h - rules/items_array_default.h - rules/items_schema_default.h - rules/max_contains_without_contains.h - rules/min_contains_without_contains.h - rules/single_type_array.h - rules/then_without_if.h - rules/unevaluated_items_default.h - rules/unevaluated_properties_default.h - "${CMAKE_CURRENT_BINARY_DIR}/official_resolver.cc") if(JSONTOOLKIT_INSTALL) diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h index 10f88fb..502385c 100644 --- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h +++ b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h @@ -10,9 +10,6 @@ #include #include #include -#include -#include -#include #include #include // std::future diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transformer.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transformer.h deleted file mode 100644 index d7af025..0000000 --- a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_transformer.h +++ /dev/null @@ -1,108 +0,0 @@ -#ifndef SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_TRANSFORMER_H_ -#define SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_TRANSFORMER_H_ - -#include "jsonschema_export.h" - -#include -#include - -#include // std::variant -#include // std::vector - -namespace sourcemeta::jsontoolkit { - -/// @ingroup jsonschema -/// Represents a schema transformation operation that consists in deleting a -/// property from a schema -struct SchemaTransformerOperationErase { - const Pointer pointer; -}; - -/// @ingroup jsonschema -/// Represents a schema transformation operation that consists in adding a new -/// property to a schema -struct SchemaTransformerOperationAssign { - const Pointer pointer; -}; - -/// @ingroup jsonschema -/// Represents a schema transformation operation that consists in replacing a -/// part of a schema -struct SchemaTransformerOperationReplace { - const Pointer pointer; -}; - -/// @ingroup jsonschema -/// Represents a schema transformation operation -using SchemaTransformerOperation = - std::variant; - -/// @ingroup jsonschema -/// This is a proxy class to intercept transformations applied to a schema. We -/// use it to keep track of what changed to fix up schema references. -class SOURCEMETA_JSONTOOLKIT_JSONSCHEMA_EXPORT SchemaTransformer { -public: - /// Construct a transformer given a schema - SchemaTransformer(JSON &schema); - - /// Get the underlying schema - auto schema() const -> const JSON &; - /// Trace the operations applied to the schema - auto traces() const -> const std::vector &; - - /// Replace a subschema with another value - auto replace(const Pointer &path, const JSON &value) -> void; - /// Replace a subschema with another value - auto replace(const Pointer &path, JSON &&value) -> void; - /// Assign an object property - auto assign(const Pointer &path, const JSON::String &key, - const JSON &value) -> void; - /// Assign an object property - auto assign(const Pointer &path, const JSON::String &key, - JSON &&value) -> void; - /// Remove an object property - auto erase(const Pointer &path, const JSON::String &key) -> void; - /// Remove multiple object properties - template - auto erase_keys(const Pointer &path, Iterator first, Iterator last) -> void { - for (auto iterator = first; iterator != last; ++iterator) { - this->erase(path, *iterator); - } - } - - // For convenience - - /// Replace a schema with another value - auto replace(const JSON &value) -> void; - /// Replace a schema with another value - auto replace(JSON &&value) -> void; - /// Assign an object property - auto assign(const JSON::String &key, const JSON &value) -> void; - /// Assign an object property - auto assign(const JSON::String &key, JSON &&value) -> void; - /// Remove an object property - auto erase(const JSON::String &key) -> void; - /// Remove multiple object properties - template - auto erase_keys(Iterator first, Iterator last) -> void { - this->erase_keys(empty_pointer, first, last); - } - -private: - JSON &data; -// Exporting symbols that depends on the standard C++ library is considered -// safe. -// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN -#if defined(_MSC_VER) -#pragma warning(disable : 4251) -#endif - std::vector operations; -#if defined(_MSC_VER) -#pragma warning(default : 4251) -#endif -}; -} // namespace sourcemeta::jsontoolkit - -#endif diff --git a/vendor/jsontoolkit/src/jsonschema/rules/const_with_type.h b/vendor/jsontoolkit/src/jsonschema/rules/const_with_type.h deleted file mode 100644 index e88559f..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/const_with_type.h +++ /dev/null @@ -1,25 +0,0 @@ -class ConstWithType final : public SchemaTransformRule { -public: - ConstWithType() - : SchemaTransformRule{ - "const_with_type", - "Setting `type` alongside `const` is considered an anti-pattern, " - "as the constant already implies its respective type"} {}; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any( - vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/validation", - "https://json-schema.org/draft/2019-09/vocab/validation", - "http://json-schema.org/draft-07/schema#", - "http://json-schema.org/draft-06/schema#"}) && - schema.is_object() && schema.defines("type") && - schema.defines("const"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("type"); - } -}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/content_media_type_without_encoding.h b/vendor/jsontoolkit/src/jsonschema/rules/content_media_type_without_encoding.h deleted file mode 100644 index 797148c..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/content_media_type_without_encoding.h +++ /dev/null @@ -1,23 +0,0 @@ -class ContentMediaTypeWithoutEncoding final : public SchemaTransformRule { -public: - ContentMediaTypeWithoutEncoding() - : SchemaTransformRule{ - "content_media_type_without_encoding", - "The `contentMediaType` keyword is meaningless " - "without the presence of the `contentEncoding` keyword"} {}; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any(vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/content", - "https://json-schema.org/draft/2019-09/vocab/content", - "http://json-schema.org/draft-07/schema#"}) && - schema.is_object() && schema.defines("contentMediaType") && - !schema.defines("contentEncoding"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("contentMediaType"); - } -}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/content_schema_without_media_type.h b/vendor/jsontoolkit/src/jsonschema/rules/content_schema_without_media_type.h deleted file mode 100644 index 0eb6f94..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/content_schema_without_media_type.h +++ /dev/null @@ -1,23 +0,0 @@ -class ContentSchemaWithoutMediaType final : public SchemaTransformRule { -public: - ContentSchemaWithoutMediaType() - : SchemaTransformRule{ - "content_schema_without_media_type", - "The `contentSchema` keyword is meaningless without the presence " - "of the `contentMediaType` keyword"} {}; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any( - vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/content", - "https://json-schema.org/draft/2019-09/vocab/content"}) && - schema.is_object() && schema.defines("contentSchema") && - !schema.defines("contentMediaType"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("contentSchema"); - } -}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/else_without_if.h b/vendor/jsontoolkit/src/jsonschema/rules/else_without_if.h deleted file mode 100644 index de28fa3..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/else_without_if.h +++ /dev/null @@ -1,23 +0,0 @@ -class ElseWithoutIf final : public SchemaTransformRule { -public: - ElseWithoutIf() - : SchemaTransformRule{"else_without_if", - "The `else` keyword is meaningless " - "without the presence of the `if` keyword"} {}; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any( - vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/applicator", - "https://json-schema.org/draft/2019-09/vocab/applicator", - "http://json-schema.org/draft-07/schema#"}) && - schema.is_object() && schema.defines("else") && - !schema.defines("if"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("else"); - } -}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/max_contains_without_contains.h b/vendor/jsontoolkit/src/jsonschema/rules/max_contains_without_contains.h deleted file mode 100644 index 92fad30..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/max_contains_without_contains.h +++ /dev/null @@ -1,23 +0,0 @@ -class MaxContainsWithoutContains final : public SchemaTransformRule { -public: - MaxContainsWithoutContains() - : SchemaTransformRule{"max_contains_without_contains", - "The `maxContains` keyword is meaningless " - "without the presence of the `contains` keyword"} { - }; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any( - vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/validation", - "https://json-schema.org/draft/2019-09/vocab/validation"}) && - schema.is_object() && schema.defines("maxContains") && - !schema.defines("contains"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("maxContains"); - } -}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/min_contains_without_contains.h b/vendor/jsontoolkit/src/jsonschema/rules/min_contains_without_contains.h deleted file mode 100644 index d287714..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/min_contains_without_contains.h +++ /dev/null @@ -1,23 +0,0 @@ -class MinContainsWithoutContains final : public SchemaTransformRule { -public: - MinContainsWithoutContains() - : SchemaTransformRule{"min_contains_without_contains", - "The `minContains` keyword is meaningless " - "without the presence of the `contains` keyword"} { - }; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any( - vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/validation", - "https://json-schema.org/draft/2019-09/vocab/validation"}) && - schema.is_object() && schema.defines("minContains") && - !schema.defines("contains"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("minContains"); - } -}; diff --git a/vendor/jsontoolkit/src/jsonschema/rules/then_without_if.h b/vendor/jsontoolkit/src/jsonschema/rules/then_without_if.h deleted file mode 100644 index 4b53e5e..0000000 --- a/vendor/jsontoolkit/src/jsonschema/rules/then_without_if.h +++ /dev/null @@ -1,23 +0,0 @@ -class ThenWithoutIf final : public SchemaTransformRule { -public: - ThenWithoutIf() - : SchemaTransformRule{"then_without_if", - "The `then` keyword is meaningless " - "without the presence of the `if` keyword"} {}; - - [[nodiscard]] auto condition(const JSON &schema, const std::string &, - const std::set &vocabularies, - const Pointer &) const -> bool override { - return contains_any( - vocabularies, - {"https://json-schema.org/draft/2020-12/vocab/applicator", - "https://json-schema.org/draft/2019-09/vocab/applicator", - "http://json-schema.org/draft-07/schema#"}) && - schema.is_object() && schema.defines("then") && - !schema.defines("if"); - } - - auto transform(SchemaTransformer &transformer) const -> void override { - transformer.erase("then"); - } -}; diff --git a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h index 0585f2e..3067a2f 100644 --- a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h +++ b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h @@ -93,6 +93,17 @@ class SOURCEMETA_JSONTOOLKIT_URI_EXPORT URI { /// ``` auto is_tag() const -> bool; + /// Check if the URI has the `mailto` scheme. For example: + /// + /// ```cpp + /// #include + /// #include + /// + /// const sourcemeta::jsontoolkit::URI uri{"mailto:joe@example.com"}; + /// assert(uri.is_mailto()); + /// ``` + auto is_mailto() const -> bool; + /// Check if the URI only consists of a fragment. For example: /// /// ```cpp @@ -115,6 +126,17 @@ class SOURCEMETA_JSONTOOLKIT_URI_EXPORT URI { /// ``` auto is_relative() const -> bool; + /// Check if the host is an ipv6 address. For example: + /// + /// ```cpp + /// #include + /// #include + /// + /// sourcemeta::jsontoolkit::URI uri{"http://[::1]"}; + /// assert(uri.is_ipv6()); + /// ``` + auto is_ipv6() const -> bool; + /// Get the scheme part of the URI, if any. For example: /// /// ```cpp @@ -379,6 +401,7 @@ class SOURCEMETA_JSONTOOLKIT_URI_EXPORT URI { std::optional scheme_; std::optional fragment_; std::optional query_; + bool is_ipv6_ = false; // Use PIMPL idiom to hide `urlparser` struct Internal; diff --git a/vendor/jsontoolkit/src/uri/uri.cc b/vendor/jsontoolkit/src/uri/uri.cc index 1ae7c08..27b5160 100644 --- a/vendor/jsontoolkit/src/uri/uri.cc +++ b/vendor/jsontoolkit/src/uri/uri.cc @@ -154,12 +154,28 @@ auto URI::parse() -> void { uriFreeUriMembersA(&this->internal->uri); } + // NOTE: we don't skip this line for fast path + // as the internal structure of uriparser could still + // be used by resolve_from and relative_to methods uri_parse(this->data, &this->internal->uri); - this->scheme_ = uri_text_range(&this->internal->uri.scheme); + // Fast path for the root path + if (this->data == "/") { + this->path_ = "/"; + this->parsed = true; + return; + } + + // Fast path for empty URI + if (this->data.empty()) { + this->parsed = true; + return; + }; + this->scheme_ = uri_text_range(&this->internal->uri.scheme); this->userinfo_ = uri_text_range(&this->internal->uri.userInfo); this->host_ = uri_text_range(&this->internal->uri.hostText); + this->is_ipv6_ = this->internal->uri.hostData.ip6 != nullptr; this->fragment_ = uri_text_range(&this->internal->uri.fragment); this->query_ = uri_text_range(&this->internal->uri.query); const auto port_text{uri_text_range(&this->internal->uri.portText)}; @@ -219,6 +235,13 @@ auto URI::is_tag() const -> bool { return scheme.has_value() && scheme.value() == "tag"; } +auto URI::is_mailto() const -> bool { + const auto scheme{this->scheme()}; + return scheme.has_value() && scheme.value() == "mailto"; +} + +auto URI::is_ipv6() const -> bool { return this->is_ipv6_; } + auto URI::is_fragment_only() const -> bool { return !this->scheme().has_value() && !this->host().has_value() && !this->port().has_value() && !this->path().has_value() && @@ -246,7 +269,12 @@ auto URI::path() const -> std::optional { return std::nullopt; } - if (!this->is_urn() && !this->is_tag() && this->scheme().has_value()) { + if (!this->is_urn() && !this->is_tag() && !this->is_mailto() && + this->scheme().has_value()) { + return "/" + this->path_.value(); + } + + if (this->port().has_value() || this->host().has_value()) { return "/" + this->path_.value(); } @@ -315,7 +343,7 @@ auto URI::recompose_without_fragment() const -> std::optional { const auto result_scheme{this->scheme()}; if (result_scheme.has_value()) { result << result_scheme.value(); - if (this->is_urn() || this->is_tag()) { + if (this->is_urn() || this->is_tag() || this->is_mailto()) { result << ":"; } else { result << "://"; @@ -330,7 +358,16 @@ auto URI::recompose_without_fragment() const -> std::optional { // Host const auto result_host{this->host()}; if (result_host.has_value()) { - result << result_host.value(); + if (this->is_ipv6()) { + // By default uriparser will parse the IPv6 address without brackets + // so we need to add them manually, as said in the RFC 2732: + // "To use a literal IPv6 address in a URL, the literal address should be + // enclosed in "[" and "]" characters." + // See https://tools.ietf.org/html/rfc2732#section-2 + result << '[' << result_host.value() << ']'; + } else { + result << result_host.value(); + } } // Port