diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,675 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 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 General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is 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. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ 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.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ 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 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. Use with the GNU Affero General Public License.
+
+ 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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ 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 GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
+
diff --git a/app/Main.hs b/app/Main.hs
new file mode 100644
--- /dev/null
+++ b/app/Main.hs
@@ -0,0 +1,67 @@
+module Main where
+
+import Control.Monad
+import Data.Maybe
+import Data.Text.IO qualified as TIO
+import Data.Time.Format
+import Options.Applicative qualified as Cli
+import System.Exit
+import Text.Megaparsec (errorBundlePretty)
+
+import Caliper.Cli
+import Caliper.Syntax
+
+main :: IO ()
+main = do
+ args@(CliArgs {filepaths, action}) <- Cli.execParser cliParser
+ parseResults <- traverse parseAndResolve filepaths
+
+ let (parseFailures, parseOkWithSemErrs) = foldr g ([], []) parseResults
+ where
+ g (src, Right ok) (bad, good) = (bad, (src, ok) : good)
+ g (_, Left err) (bad, good) = (err : bad, good)
+
+ unless (null parseFailures) $ do
+ forM_ parseFailures $ putStrLn . errorBundlePretty
+ exitWith $ ExitFailure 1
+
+ let (semErrs, outputs) = foldr g ([], []) parseOkWithSemErrs
+ where
+ g (_, ([], out)) (bad, good) = (bad, out : good)
+ g (src, (errs, _)) (bad, good) = ((src, errs) : bad, good)
+
+ unless (null semErrs) $ do
+ forM_ semErrs $ \(src, errs) ->
+ forM_ errs $ \err ->
+ TIO.putStrLn $ resolutionErrorPretty src err
+ exitWith $ ExitFailure 1
+
+ let mergedOutputs =
+ applyCliArgs args $
+ sortResolvedEntriesAbsolute $
+ mconcat $
+ outputs
+ ( case action of
+ Summation sumArgs -> handleSummation sumArgs
+ Histogram -> handleHistogram
+ )
+ mergedOutputs
+
+handleSummation :: SummationArgs -> [ResolvedEntry] -> IO ()
+handleSummation (SummationArgs {summationFormat}) output = do
+ let durationFormat = fromMaybe "%hh %Mm %Ss" summationFormat
+ duration = sumDuration output
+ putStrLn $ formatTime defaultTimeLocale durationFormat duration
+
+handleHistogram :: [ResolvedEntry] -> IO ()
+handleHistogram output = do
+ let dailyEntries' = groupEntriesByDay output
+
+ forM_ dailyEntries' $ \entriesOfDay -> do
+ putStrLn $ histogramLine entriesOfDay
+
+applyCliArgs :: CliArgs -> [ResolvedEntry] -> [ResolvedEntry]
+applyCliArgs (CliArgs {filters, begin, end}) =
+ maybe id entriesAfter begin
+ . maybe id entriesBefore end
+ . filterByTags filters
diff --git a/caliper.cabal b/caliper.cabal
new file mode 100644
--- /dev/null
+++ b/caliper.cabal
@@ -0,0 +1,88 @@
+cabal-version: 3.0
+name: caliper
+version: 0.1.0.0
+category: CLI
+
+synopsis:
+ A time tracker that is way too precise.
+
+description:
+ Reads from caliper format and can generate histogram and time summation.
+ Supports query syntax to filter entries.
+
+author: Léana 江
+maintainer: leana.jiang@icloud.com
+
+license: GPL-3.0-or-later
+license-files: ./LICENSE
+
+extra-source-files:
+ -- golden test files
+ ./test/data/**/*.clp
+ ./test/data/**/*.expr
+
+common common
+ default-language: GHC2021
+ default-extensions:
+ OverloadedStrings
+
+ ghc-options:
+ -Wall -Wcompat -Widentities -Wincomplete-record-updates
+ -Wincomplete-patterns -Wincomplete-uni-patterns
+ -Wredundant-constraints -Werror=missing-fields
+
+ build-depends: base >=4 && <5
+
+library caliper-lib
+ import: common
+ hs-source-dirs: src
+ exposed-modules:
+ Caliper.Cli
+ Caliper.Cli.Parsing
+ Caliper.Cli.Printing
+ Caliper.Syntax
+ Caliper.Syntax.Ast
+ Caliper.Syntax.Parsing
+ Caliper.Syntax.Position
+ Caliper.Syntax.Resolution
+ Caliper.Syntax.Transform
+
+ build-depends:
+ , containers >=0.6.8 && <0.8
+ , deepseq >=1.5 && <2
+ , filepath >=1.4.100.3 && <1.5.4
+ , megaparsec >=9.5 && <9.7
+ , optparse-applicative >=0.15 && <0.19
+ , text >=2.1.2 && <2.1.3
+ , time >=1.9 && <1.15
+ , transformers >=0.5.6 && <0.6.3
+
+executable caliper
+ import: common
+ hs-source-dirs: app/
+ main-is: Main.hs
+ build-depends:
+ , megaparsec >=9.5 && <9.7
+ , optparse-applicative >=0.15 && <0.19
+ , caliper-lib
+ , text >=2.1.2 && <2.1.3
+ , time >=1.9 && <1.15
+
+ other-modules:
+
+test-suite caliper-spec
+ import: common
+ type: exitcode-stdio-1.0
+ main-is: Main.hs
+ hs-source-dirs: test
+ other-modules: Data.TreeDiff.Instances.Caliper
+ build-depends:
+ , containers >=0.6.8 && <0.8
+ , filepath >=1.4.100.3 && <1.5.4
+ , megaparsec >=9.5 && <9.7
+ , caliper-lib
+ , tasty >=1.4.2.2 && <1.5.3
+ , tasty-golden >=2.3.1.1 && <2.3.5
+ , text >=2.1.2 && <2.1.3
+ , time >=1.9 && <1.15
+ , tree-diff >=0.3.1 && <0.3.4
diff --git a/src/Caliper/Cli.hs b/src/Caliper/Cli.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Cli.hs
@@ -0,0 +1,8 @@
+module Caliper.Cli (
+ module Caliper.Cli.Parsing,
+ module Caliper.Cli.Printing,
+)
+where
+
+import Caliper.Cli.Parsing
+import Caliper.Cli.Printing
diff --git a/src/Caliper/Cli/Parsing.hs b/src/Caliper/Cli/Parsing.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Cli/Parsing.hs
@@ -0,0 +1,109 @@
+{-# LANGUAGE ApplicativeDo #-}
+{-# LANGUAGE RecordWildCards #-}
+
+module Caliper.Cli.Parsing where
+
+import Control.Applicative
+import Data.List.NonEmpty qualified as NE
+import Data.Text qualified as T
+import Data.Time.Calendar
+import Data.Time.LocalTime
+import Options.Applicative qualified as Cli
+import Text.Read
+
+import Caliper.Syntax
+
+data CliArgs = CliArgs
+ { action :: CliAction
+ , filepaths :: NE.NonEmpty String
+ , filters :: [TagPredicate]
+ , begin :: Maybe LocalTime
+ , end :: Maybe LocalTime
+ }
+
+data CliAction
+ = Summation SummationArgs
+ | Histogram
+
+newtype SummationArgs = SummationArgs
+ { summationFormat :: Maybe String
+ }
+
+cliParser :: Cli.ParserInfo CliArgs
+cliParser = Cli.info subcommands (Cli.progDesc "Track the amount of work time you have done")
+ where
+ subcommands :: Cli.Parser CliArgs
+ subcommands =
+ (Cli.helper <*>) $
+ Cli.subparser
+ ( Cli.command
+ "sum"
+ (Cli.info (parseCommonCommandWith summationArgsP) (Cli.progDesc "Sum the amount of work time"))
+ <> Cli.command
+ "histogram"
+ (Cli.info (parseCommonCommandWith (pure Histogram)) (Cli.progDesc "Show a histogram"))
+ )
+
+ summationArgsP :: Cli.Parser CliAction
+ summationArgsP = do
+ fmt <- optional formatP
+ pure $ Summation (SummationArgs fmt)
+
+ formatP :: Cli.Parser String
+ formatP =
+ Cli.strOption $
+ Cli.long "format"
+ <> Cli.metavar "FORMAT"
+ <> Cli.help "Format of the output time, defaults to \"%hh %Mm %Ss\""
+
+ parseCommonCommandWith :: Cli.Parser CliAction -> Cli.Parser CliArgs
+ parseCommonCommandWith actionP =
+ Cli.helper <*> do
+ filepaths <-
+ NE.some1 $
+ Cli.strArgument $
+ Cli.metavar "FILE"
+ <> Cli.help "Path to the timetrack file"
+
+ action <- actionP
+
+ begin <-
+ optional $
+ Cli.option localTimeReader $
+ Cli.long "begin"
+ <> Cli.short 'b'
+ <> Cli.metavar "BEGIN"
+ <> Cli.help "Truncate operation from a given moment"
+
+ end <-
+ optional $
+ Cli.option localTimeReader $
+ Cli.long "end"
+ <> Cli.short 'e'
+ <> Cli.metavar "END"
+ <> Cli.help "Truncate operation to a given moment"
+
+ filters <-
+ many . Cli.option keyValueReader $
+ Cli.metavar "QUERY"
+ <> Cli.short 'q'
+ <> Cli.long "query"
+ <> Cli.help "A \"key:value\" pair to constraint the result"
+
+ pure $ CliArgs {..}
+
+ localTimeReader :: Cli.ReadM LocalTime
+ localTimeReader = Cli.maybeReader $ \x ->
+ let readDay :: Maybe Day
+ readDay = readMaybe x
+ readLocalTime :: Maybe LocalTime
+ readLocalTime = readMaybe x
+ in readLocalTime <|> (LocalTime <$> readDay <*> pure (TimeOfDay 0 0 0))
+
+ keyValueReader :: Cli.ReadM TagPredicate
+ keyValueReader =
+ let f s = case break (== ':') s of
+ ("not", ':' : s') -> Negate <$> f s'
+ (k, ':' : v) -> Just $ HasKeyValue (T.pack k) (T.pack v)
+ _ -> Nothing
+ in Cli.maybeReader f
diff --git a/src/Caliper/Cli/Printing.hs b/src/Caliper/Cli/Printing.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Cli/Printing.hs
@@ -0,0 +1,94 @@
+module Caliper.Cli.Printing where
+
+import Data.Function ((&))
+import Data.List ((!?))
+import Data.List.NonEmpty qualified as NE
+import Data.Maybe
+import Data.Text qualified as T
+import Data.Time.LocalTime
+
+import Caliper.Syntax
+
+{- | Precondition: entries must be all of the same day
+Each + symbol is a quarter of an hour, a dot is anything less than a quarter.
+-}
+histogramLine :: NE.NonEmpty ResolvedEntry -> String
+histogramLine es =
+ let spnSeconds :: Rational
+ spnSeconds = realToFrac (sumDuration $ NE.toList es)
+ spnQuarterOfHour :: Rational
+ spnQuarterOfHour = (/ 15) $ (/ 60) spnSeconds
+
+ go :: Rational -> String
+ go 0 = ""
+ go n
+ | n < 1 = "."
+ | n <= 1 = "+"
+ | n <= 2 = "++"
+ | n <= 3 = "+++"
+ | n <= 4 = "+++$"
+ | otherwise = go 4 <> go (n - 4)
+ in show (localDay $ zonedTimeToLocalTime d)
+ <> " "
+ <> show (zonedTimeZone d)
+ <> " | "
+ <> go spnQuarterOfHour
+ where
+ d = entryStart $ NE.head es
+
+-- TODO: parameterize to show more context on demand
+withFencedHelp :: T.Text -> SrcSpan -> T.Text -> T.Text
+withFencedHelp src (SrcSpan fname startPos endPos) message =
+ let SrcPosition startLine startCol = startPos
+ SrcPosition _ endCol = endPos
+
+ srcLines :: [T.Text]
+ srcLines = T.lines src
+
+ header :: T.Text
+ header = fname <> ":" <> lineNumber <> ":"
+
+ lineNumber :: T.Text
+ lineNumber = T.show startLine
+ emptyLineNumber :: T.Text
+ emptyLineNumber = T.replicate (T.length lineNumber) " "
+
+ mkLine :: Int -> T.Text
+ mkLine n =
+ let numberingOrEmpty :: T.Text
+ numberingOrEmpty = if n == startLine then lineNumber else emptyLineNumber
+ maybeContent :: T.Text
+ maybeContent = fromMaybe "" $ srcLines !? (n - 1)
+ in numberingOrEmpty <> " | " <> maybeContent
+
+ undercurl :: T.Text
+ undercurl = emptyLineNumber <> " | " <> T.replicate (startCol - 1) " " <> T.replicate (endCol - startCol) "^"
+ in message
+ <> "\n"
+ <> T.unlines
+ [ header
+ , mkLine $ startLine - 1
+ , mkLine startLine
+ , undercurl
+ , mkLine $ startLine + 1
+ ]
+
+resolutionErrorPretty :: T.Text -> ResolutionError -> T.Text
+resolutionErrorPretty src (ResolutionError kind spn) = case kind of
+ NegativeTimeSpan duration ->
+ "user error: Timespan has negative or null duration of " <> T.show duration
+ & withFencedHelp src spn
+ InvalidTime t ->
+ "user error: time " <> quote t <> " is a not valid date time"
+ & withFencedHelp src spn
+ UndeclaredType ty ->
+ "user error: event has undeclared type " <> quote ty
+ & withFencedHelp src spn
+ DuplicatedType ty ty2 ->
+ "user error: event has duplicate types "
+ <> quote ty2
+ <> " while it already bears the type "
+ <> quote ty
+ & withFencedHelp src spn
+ where
+ quote s = "\"" <> s <> "\""
diff --git a/src/Caliper/Syntax.hs b/src/Caliper/Syntax.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Syntax.hs
@@ -0,0 +1,14 @@
+module Caliper.Syntax (
+ module Caliper.Syntax.Ast,
+ module Caliper.Syntax.Resolution,
+ module Caliper.Syntax.Position,
+ module Caliper.Syntax.Parsing,
+ module Caliper.Syntax.Transform,
+)
+where
+
+import Caliper.Syntax.Ast
+import Caliper.Syntax.Parsing
+import Caliper.Syntax.Position
+import Caliper.Syntax.Resolution
+import Caliper.Syntax.Transform
diff --git a/src/Caliper/Syntax/Ast.hs b/src/Caliper/Syntax/Ast.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Syntax/Ast.hs
@@ -0,0 +1,55 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Caliper.Syntax.Ast where
+
+import Control.DeepSeq
+import Data.Function
+import Data.List.NonEmpty qualified as NE
+import Data.Map qualified as M
+import Data.Text qualified as T
+import Data.Time.Clock
+import Data.Time.LocalTime
+import GHC.Generics
+
+import Caliper.Syntax.Position
+
+-- TODO: (not urgent) not export the accessor and constructor
+
+data RawAst = RawAst
+ { rawAstCurrentFilePath :: T.Text {- FilePath -}
+ , rawAstTypeDecls :: [T.Text]
+ -- ^ type declarations
+ , rawAstEntriesOrTZ :: [EntriesOrTZ]
+ }
+ deriving (Show, Generic)
+
+instance NFData RawAst
+
+data EntriesOrTZ
+ = -- | allow user to specify a timezone to interpret the following entries
+ TZDecl TimeZone
+ | RawEntries [RawEntry]
+ deriving (Show, Generic)
+
+instance NFData EntriesOrTZ
+
+-- | Parsed data structure from the parser
+data RawEntry = RawEntry
+ { rawEntryStart :: LocalTime
+ , rawEntryEnd :: (LocalTime, SrcSpan)
+ , rawEntryMetadata :: M.Map T.Text (NE.NonEmpty (T.Text, SrcSpan))
+ }
+ deriving (Show, Generic)
+
+instance NFData RawEntry
+
+-- | Entry resolved enriched data
+data ResolvedEntry = ResolvedEntry
+ { entryStart :: ZonedTime
+ , entryEnd :: ZonedTime
+ , entryMetadata :: M.Map T.Text (NE.NonEmpty T.Text)
+ }
+ deriving (Show, Generic)
+
+entrySpan :: ResolvedEntry -> NominalDiffTime
+entrySpan e = (diffLocalTime `on` zonedTimeToLocalTime) (entryEnd e) (entryStart e)
diff --git a/src/Caliper/Syntax/Parsing.hs b/src/Caliper/Syntax/Parsing.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Syntax/Parsing.hs
@@ -0,0 +1,195 @@
+module Caliper.Syntax.Parsing where
+
+import Control.DeepSeq
+import Control.Monad
+import Data.Bifunctor qualified as Bi
+import Data.Char
+import Data.Function
+import Data.List.NonEmpty qualified as NE
+import Data.Map qualified as M
+import Data.Text qualified as T
+import Data.Time.Calendar
+import Data.Time.LocalTime
+import Data.Void
+import Text.Megaparsec hiding (ParseError)
+import Text.Megaparsec.Char
+
+import Caliper.Syntax.Ast
+import Caliper.Syntax.Position
+
+type Parser = Parsec Void T.Text
+
+drainLine :: Parser prefix -> Parser ()
+drainLine p = do
+ _ <- many (p & consumeCommentBlock)
+ -- Think of sequence as products, failure is mzero and would make the entire chain 0.
+ -- Here, if there are some spaces followed by something /not eol/, eol would fail.
+ -- This would make entire part fail whilst hspace has consumed some space.
+ -- We then backtrack the parser in such case.
+ _ <- (p & consumeCommentLine) <|> try (hspace *> void eol)
+ pure ()
+
+consumeCommentBlock :: Parser prefix -> Parser ()
+consumeCommentBlock p = hidden $ do
+ _ <- try $ p *> "{-"
+ _ <- manyTill (nested <|> void anySingle) (void "-}")
+ pure ()
+ where
+ nested = pure () & consumeCommentBlock
+
+consumeCommentLine :: Parser prefix -> Parser ()
+consumeCommentLine p = hidden $ do
+ _ <- try $ p *> "--"
+ _ <- manyTill anySingle (void eol <|> eof)
+ pure ()
+
+caliperAst :: Parser RawAst
+caliperAst =
+ many (pure () & drainLine)
+ *> ( RawAst
+ <$> (T.pack . sourceName <$> getSourcePos)
+ <*> typeDecls
+ <*> entriesOrTZ
+ )
+ <* eof
+
+typeDecls :: Parser [T.Text]
+typeDecls = typeDecl `sepEndBy` many (hspace & drainLine)
+
+typeDecl :: Parser T.Text
+typeDecl = label "type declaration" $ do
+ _ <- "type" *> hspace1
+ t <- T.pack <$> some valueChar
+ _ <- hspace & drainLine
+ pure t
+
+entriesOrTZ :: Parser [EntriesOrTZ]
+entriesOrTZ =
+ many $
+ (RawEntries <$> entries)
+ <|> (TZDecl <$> tzDecl)
+
+entries :: Parser [RawEntry]
+entries = entry `sepEndBy1` many (hspace & drainLine)
+
+tzDecl :: Parser TimeZone
+tzDecl = do
+ _ <- "timezone" *> hspace1
+ sign <- (-1) <$ char '-' <|> 1 <$ char '+' <|> pure 1
+ hh <- (try (decimalOfLength 2) <|> decimalOfLength 1) <* sep
+ mm <- decimalOfLength 2
+ _ <- many (hspace & drainLine)
+ pure $ TimeZone (sign * (hh * 60 + mm)) False ""
+ where
+ sep :: Parser Char
+ sep = satisfy (not . isDigit) "non-digit separator"
+
+entry :: Parser RawEntry
+entry = label "entry" $ do
+ entryStart <- localTime
+ _ <- sep *> "..." <* sep
+ entryEnd <- localTime
+ _ <- hspace & drainLine -- End of line comment
+ tags <-
+ many (hspace & drainLine) -- Leading inner comment
+ *> metadata
+
+ -- This part creates thunk build-up, force the thunk here
+ let re =
+ RawEntry
+ { rawEntryStart = fst entryStart
+ , rawEntryEnd = entryEnd
+ , rawEntryMetadata = tags
+ }
+ re `deepseq` pure re
+ where
+ sep :: Parser ()
+ sep = void $ many go
+ where
+ go = hspace1 <|> (pure () & consumeCommentBlock)
+
+-- | A time in the format of yyyy-mm-dd-hh-mm-ss, where dashes are a single non digit separator.
+localTime :: Parser (LocalTime, SrcSpan)
+localTime = do
+ mkSrcSpan <- srcSpan
+ startPos <- srcPosition
+ t <- LocalTime <$> (parseDay <* sep) <*> parseTime
+ endPos <- srcPosition
+ pure (t, mkSrcSpan startPos endPos)
+ where
+ sep :: Parser Char
+ sep = satisfy (not . isDigit) "non-digit separator"
+
+ parseDay :: Parser Day
+ parseDay = do
+ backtrack <- getOffset
+ yyyy <- decimalOfLength 4 <* sep
+ mm <- decimalOfLength 2 <* sep
+ dd <- decimalOfLength 2
+ case fromGregorianValid yyyy mm dd of
+ Nothing -> do
+ setOffset backtrack
+ unexpected (Label $ 'i' NE.:| "nvalid calendar date")
+ Just x -> pure x
+
+ parseTime :: Parser TimeOfDay
+ parseTime = do
+ backtrack <- getOffset
+ hh <- decimalOfLength 2 <* sep
+ mm <- decimalOfLength 2 <* sep
+ ss <- (decimalOfLength 2) <|> (0 <$ "__") -- unknown second notation
+ case makeTimeOfDayValid hh mm ss of
+ Nothing -> do
+ setOffset backtrack
+ unexpected (Label $ 'i' NE.:| "nvalid time")
+ Just x -> pure x
+
+decimalOfLength :: Num a => Int -> Parser a
+decimalOfLength = fmap (fromIntegral . foldl' go 0) . flip replicateM (satisfy isDigit)
+ where
+ go :: Int -> Char -> Int
+ go acc x = acc * 10 + fromEnum x - fromEnum '0'
+
+metadata :: Parser (M.Map T.Text (NE.NonEmpty (T.Text, SrcSpan)))
+metadata =
+ finalize
+ . M.fromListWith (<>)
+ . nonEmptyValue
+ <$> (hspace1 & keyValuePair) `sepEndBy` many (hspace & drainLine)
+ where
+ finalize = fmap NE.reverse
+
+ nonEmptyValue :: [(a, b)] -> [(a, NE.NonEmpty b)]
+ nonEmptyValue = map (Bi.second pure)
+
+keyValuePair :: Parser prefix -> Parser (T.Text, (T.Text, SrcSpan))
+keyValuePair p = do
+ mkSrcSpan <- srcSpan
+ (startPos, k) <- try $ do
+ _ <- p
+ liftA2 (,) srcPosition (T.pack <$> some keyChar)
+ _ <- single ':'
+ v <- T.pack <$> some valueChar
+ endPos <- srcPosition
+ let spn = mkSrcSpan startPos endPos
+ pure (k, (v, spn))
+
+keyChar :: Parser Char
+keyChar = letterChar
+
+valueChar :: Parser Char
+valueChar = alphaNumChar <|> char '\'' -- we haskellers gotta allow ' in names
+
+srcSpan :: Parser (SrcPosition -> SrcPosition -> SrcSpan)
+srcSpan = do
+ SourcePos {sourceName = fname} <- getSourcePos
+ pure (SrcSpan (T.pack fname))
+
+srcPosition :: Parser SrcPosition
+srcPosition = do
+ SourcePos
+ { sourceLine = l
+ , sourceColumn = c
+ } <-
+ getSourcePos
+ pure (SrcPosition (unPos l) (unPos c))
diff --git a/src/Caliper/Syntax/Position.hs b/src/Caliper/Syntax/Position.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Syntax/Position.hs
@@ -0,0 +1,19 @@
+{-# LANGUAGE DeriveGeneric #-}
+
+module Caliper.Syntax.Position where
+
+import Control.DeepSeq
+import Data.Text qualified as T
+import GHC.Generics
+
+-- | Line, column
+data SrcPosition = SrcPosition !Int !Int
+ deriving (Show, Generic)
+
+instance NFData SrcPosition
+
+-- TODO: don't save this path multiple times, read from the bigger AST
+data SrcSpan = SrcSpan T.Text {-FilePath-} SrcPosition SrcPosition
+ deriving (Show, Generic)
+
+instance NFData SrcSpan
diff --git a/src/Caliper/Syntax/Resolution.hs b/src/Caliper/Syntax/Resolution.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Syntax/Resolution.hs
@@ -0,0 +1,121 @@
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE ViewPatterns #-}
+
+module Caliper.Syntax.Resolution where
+
+import Control.Monad
+import Control.Monad.Trans.State.Strict
+import Data.Either
+import Data.List (sortOn)
+import Data.List.NonEmpty qualified as NE
+import Data.Map qualified as M
+import Data.Maybe
+import Data.Text qualified as T
+import Data.Text.IO qualified as TIO
+import Data.Time.Clock
+import Data.Time.LocalTime
+import Data.Void
+import GHC.Generics
+import Text.Megaparsec hiding (ParseError, State)
+
+import Caliper.Syntax.Ast
+import Caliper.Syntax.Parsing
+import Caliper.Syntax.Position
+
+-- | Necessary information to emit a helpful error
+data ResolutionError = ResolutionError ResolutionErrorKind SrcSpan
+ deriving (Show, Generic)
+
+data ResolutionErrorKind
+ = -- | fail when time span is negative
+ NegativeTimeSpan NominalDiffTime
+ | InvalidTime T.Text
+ | UndeclaredType T.Text
+ | DuplicatedType T.Text T.Text
+ deriving (Show, Generic)
+
+data ResolveState = ResolveState
+ { rsTimezone :: Maybe TimeZone
+ -- ^ Timezone as it was last seen
+ }
+initialResolveState :: ResolveState
+initialResolveState =
+ ResolveState
+ { rsTimezone = Nothing
+ }
+
+type ResolveResult = ([ResolutionError], [ResolvedEntry])
+
+parseAndResolve
+ :: FilePath
+ -> IO
+ ( T.Text
+ , Either (ParseErrorBundle T.Text Void) ResolveResult
+ )
+parseAndResolve filepath = do
+ content <- TIO.readFile filepath
+ let parsedRes = runParser caliperAst filepath content
+ pure
+ ( content
+ , resolve <$> parsedRes
+ )
+
+resolve :: RawAst -> ResolveResult
+resolve ast = evalState (resolve' ast) initialResolveState
+
+resolve' :: RawAst -> State ResolveState ResolveResult
+resolve' ast = fmap sortResolvedEntriesAbsolute . mconcat <$> traverse go (rawAstEntriesOrTZ ast)
+ where
+ go (RawEntries es) = do
+ maybeTZ <- gets rsTimezone
+ pure $ resolveEntries (rawAstTypeDecls ast) maybeTZ es
+ go (TZDecl tzStr) = do
+ put ResolveState {rsTimezone = Just tzStr}
+ pure mempty
+
+sortResolvedEntriesAbsolute :: [ResolvedEntry] -> [ResolvedEntry]
+sortResolvedEntriesAbsolute = sortOn (zonedTimeToUTC . entryStart)
+
+-- | Postcondition: the entries are sortied
+resolveEntries
+ :: [T.Text]
+ -> Maybe TimeZone
+ -> [RawEntry]
+ -> ([ResolutionError], [ResolvedEntry])
+resolveEntries typeDeclarations maybeTZ =
+ partitionEithers . map (resolveEntry typeDeclarations maybeTZ)
+
+-- TODO: maybe add a warning for zero spans?
+resolveEntry
+ :: [T.Text]
+ -> Maybe TimeZone
+ -> RawEntry
+ -> Either ResolutionError ResolvedEntry
+resolveEntry typeDeclarations maybeTZ (RawEntry {..}) = do
+ let spn :: NominalDiffTime
+ spn = fst rawEntryEnd `diffLocalTime` rawEntryStart
+ when (spn <= 0) $
+ Left $
+ ResolutionError (NegativeTimeSpan spn) (snd rawEntryEnd)
+ tagOk <- checkTypeUnicity rawEntryMetadata
+
+ ResolvedEntry
+ <$> (toZonedTime rawEntryStart)
+ <*> (toZonedTime $ fst rawEntryEnd)
+ <*> (pure (fmap fst <$> tagOk))
+ where
+ checkTypeUnicity
+ :: M.Map T.Text (NE.NonEmpty (T.Text, SrcSpan))
+ -> Either ResolutionError (M.Map T.Text (NE.NonEmpty (T.Text, SrcSpan)))
+ checkTypeUnicity m = case m M.!? "type" of
+ Nothing -> Right m
+ Just types -> case types of
+ (ty, pos) NE.:| [] ->
+ if (not . null) typeDeclarations -- If no type is declared, disable undeclared type checking
+ && ty `elem` typeDeclarations
+ then Right m
+ else Left $ ResolutionError (UndeclaredType ty) pos
+ (ty, _) NE.:| ((ty2, pos2) : _) -> Left $ ResolutionError (DuplicatedType ty ty2) pos2
+
+ toZonedTime :: LocalTime -> Either ResolutionError ZonedTime
+ toZonedTime t = pure $ ZonedTime t (fromMaybe utc maybeTZ) -- TODO: make an error for this?
diff --git a/src/Caliper/Syntax/Transform.hs b/src/Caliper/Syntax/Transform.hs
new file mode 100644
--- /dev/null
+++ b/src/Caliper/Syntax/Transform.hs
@@ -0,0 +1,46 @@
+module Caliper.Syntax.Transform where
+
+import Data.Function
+import Data.List.NonEmpty qualified as NE
+import Data.Map qualified as M
+import Data.Maybe
+import Data.Text qualified as T
+import Data.Time.Clock
+import Data.Time.LocalTime
+
+import Caliper.Syntax.Ast
+
+data TagPredicate
+ = HasKeyValue T.Text T.Text
+ | Negate TagPredicate
+
+applyTagPredicate :: TagPredicate -> M.Map T.Text (NE.NonEmpty T.Text) -> Bool
+applyTagPredicate (HasKeyValue k v) = maybe False (v `elem`) . M.lookup k
+applyTagPredicate (Negate f) = not . applyTagPredicate f
+
+sumDuration :: (Foldable f, Functor f) => f ResolvedEntry -> NominalDiffTime
+sumDuration = sum . fmap entrySpan
+
+filterByTags :: [TagPredicate] -> [ResolvedEntry] -> [ResolvedEntry]
+filterByTags = foldr ((.) . filterByTag) id
+
+filterByTag :: TagPredicate -> [ResolvedEntry] -> [ResolvedEntry]
+filterByTag p = filter (applyTagPredicate p . entryMetadata)
+
+{- | Precondition: input entries must be sorted in ascending order in absolute time
+We group by perceived day, that is, the local day experienced in a given timezone
+-}
+groupEntriesByDay :: [ResolvedEntry] -> [NE.NonEmpty ResolvedEntry]
+groupEntriesByDay = NE.groupBy ((==) `on` localDay . zonedTimeToLocalTime . entryStart)
+
+entriesAfter :: LocalTime -> [ResolvedEntry] -> [ResolvedEntry]
+entriesAfter thres = mapMaybe $ \e ->
+ let ZonedTime l tz = entryStart e
+ e' = e {entryStart = ZonedTime (max l thres) tz}
+ in if entrySpan e' > 0 then Just e' else Nothing
+
+entriesBefore :: LocalTime -> [ResolvedEntry] -> [ResolvedEntry]
+entriesBefore thres = mapMaybe $ \e ->
+ let ZonedTime l tz = entryEnd e
+ e' = e {entryEnd = ZonedTime (min l thres) tz}
+ in if entrySpan e' > 0 then Just e' else Nothing
diff --git a/test/Data/TreeDiff/Instances/Caliper.hs b/test/Data/TreeDiff/Instances/Caliper.hs
new file mode 100644
--- /dev/null
+++ b/test/Data/TreeDiff/Instances/Caliper.hs
@@ -0,0 +1,22 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Data.TreeDiff.Instances.Caliper where
+
+import Data.Time.Clock
+import Data.Time.LocalTime
+import Data.TreeDiff
+
+import Caliper.Syntax
+
+instance ToExpr SrcPosition
+instance ToExpr SrcSpan
+instance ToExpr EntriesOrTZ
+instance ToExpr RawAst
+instance ToExpr RawEntry
+instance ToExpr ResolvedEntry
+instance ToExpr NominalDiffTime where toExpr = defaultExprViaShow
+instance ToExpr ResolutionError
+instance ToExpr ResolutionErrorKind
+instance ToExpr TimeZone where toExpr = defaultExprViaShow
+instance ToExpr LocalTime where toExpr = defaultExprViaShow
+instance ToExpr ZonedTime where toExpr = defaultExprViaShow
diff --git a/test/Main.hs b/test/Main.hs
new file mode 100644
--- /dev/null
+++ b/test/Main.hs
@@ -0,0 +1,181 @@
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE ViewPatterns #-}
+
+module Main where
+
+import Data.TreeDiff
+import Data.TreeDiff.Golden
+import Data.TreeDiff.Instances.Caliper ()
+import Data.Void
+import System.FilePath
+import Test.Tasty
+import Test.Tasty.Golden.Advanced
+
+import Data.Text qualified as T
+import Data.Text.IO qualified as TIO
+import Data.Time.LocalTime
+import Text.Megaparsec
+
+import Caliper.Cli
+import Caliper.Syntax
+
+main :: IO ()
+main = defaultMain tests
+
+type ParseResult = Either (ParseErrorBundle T.Text Void)
+
+tests :: TestTree
+tests =
+ testGroup
+ "Tests"
+ [ parserTests
+ , resolutionTests
+ , queryTests
+ , histogramTests
+ ]
+
+parserTests :: TestTree
+parserTests =
+ testGroup
+ "Parser"
+ [ parserTestOk "ok_001" "ok_001.clp"
+ , parserTestOk "ok_002" "ok_002.clp"
+ , parserTestOk "ok_003" "ok_003.clp"
+ , parserTestOk "ok_004" "ok_004.clp"
+ , parserTestOk "ok_005" "ok_005.clp"
+ , parserTestOk "ok_006" "ok_006.clp"
+ , parserTestOk "ok_007" "ok_007.clp"
+ , parserTestOk "ok_008" "ok_008.clp"
+ , parserTestOk "ok_009" "ok_009.clp"
+ , parserTestOk "ok_010" "ok_010.clp"
+ , parserTestOk "ok_012" "ok_012.clp"
+ , rawParserTestErr "err_003" "err_003.clp"
+ , rawParserTestErr "err_005" "err_005.clp"
+ , parserTestOk "ok_013" "ok_013.clp"
+ , parserTestOk "ok_014" "ok_014.clp"
+ , rawParserTestOk "ok_014_raw" "ok_014.clp"
+ , parserTestOk "ok_015" "ok_015.clp"
+ ]
+
+-- Doesn't resolve
+rawParserTestOk :: String -> FilePath -> TestTree
+rawParserTestOk name fp = mkGoldenTestOk (\_src -> pure) name ("parser" fp)
+
+rawParserTestErr :: String -> FilePath -> TestTree
+rawParserTestErr name fp = mkGoldenTestErr name ("parser" fp)
+
+-- Resolves
+parserTestOk :: String -> FilePath -> TestTree
+parserTestOk name fp = mkGoldenTestOk (\_src -> pure . resolve) name ("parser" fp)
+
+resolutionTests :: TestTree
+resolutionTests =
+ testGroup
+ "Resolution"
+ [ resolveTestErr "err_001" "err_001.clp"
+ , resolveTestErr "err_002" "err_002.clp"
+ , resolveTestErr "err_004" "err_004.clp"
+ ]
+
+-- Parses but shouldn't resolve because of semantic errors
+resolveTestErr :: String -> FilePath -> TestTree
+resolveTestErr name fp = mkGoldenTestOk resolveShouldError name ("parser" fp)
+ where
+ resolveShouldError :: T.Text -> RawAst -> IO T.Text
+ resolveShouldError src (resolve -> (errs, _)) = pure $ mconcat $ map (resolutionErrorPretty src) errs
+
+histogramTests :: TestTree
+histogramTests =
+ testGroup
+ "histogram"
+ [ histogramTest groupEntriesByDay "001_groupByDay" "001.clp"
+ , histogramTest (fmap histogramLine . groupEntriesByDay) "001_groupByDay_cli" "001.clp"
+ ]
+
+histogramTest
+ :: ToExpr expr
+ => ([ResolvedEntry] -> expr)
+ -> String
+ -> FilePath
+ -> TestTree
+histogramTest f name fp = mkGoldenTestOk (\_src -> pure . fmap f . resolve) name ("histogram" fp)
+
+queryTests :: TestTree
+queryTests =
+ testGroup
+ "Query"
+ [ queryTest [HasKeyValue "foo" "bar"] "001_foobar" "001.clp"
+ , queryTest [Negate $ HasKeyValue "foo" "bar"] "001_notfoobar" "001.clp"
+ , beforeFilterTest (read "2025-10-02 22:59:06") "001_before_complete" "001.clp"
+ , beforeFilterTest (read "2025-10-02 22:59:55") "001_before_truncate" "001.clp"
+ , afterFilterTest (read "2025-10-02 22:59:06") "001_after_complete" "001.clp"
+ , afterFilterTest (read "2025-10-02 22:59:55") "001_after_truncate" "001.clp"
+ , beforeFilterTest (read "2025-10-02 22:59:06") "002_before_complete" "002.clp"
+ , beforeFilterTest (read "2025-10-02 22:59:55") "002_before_truncate" "002.clp"
+ , afterFilterTest (read "2025-10-02 22:59:06") "002_after_complete" "002.clp"
+ , afterFilterTest (read "2025-10-02 22:59:55") "002_after_truncate" "002.clp"
+ ]
+
+queryTest :: [TagPredicate] -> String -> FilePath -> TestTree
+queryTest filters name fp =
+ mkGoldenTestOk
+ (\_src -> pure . fmap (filterByTags filters) . resolve)
+ name
+ ("query" fp)
+
+beforeFilterTest :: LocalTime -> String -> FilePath -> TestTree
+beforeFilterTest thres name fp =
+ mkGoldenTestOk
+ (\_src -> pure . fmap (entriesBefore thres) . resolve)
+ name
+ ("query" fp)
+
+afterFilterTest :: LocalTime -> String -> FilePath -> TestTree
+afterFilterTest thres name fp =
+ mkGoldenTestOk
+ (\_src -> pure . fmap (entriesAfter thres) . resolve)
+ name
+ ("query" fp)
+
+parsedRight :: IO (ParseResult a) -> IO a
+parsedRight x =
+ x >>= \case
+ Left err -> fail $ errorBundlePretty err
+ Right ok -> pure ok
+
+mkGoldenTestOk
+ :: ToExpr expr
+ => (T.Text -> RawAst -> IO expr)
+ -> String
+ -> FilePath
+ -> TestTree
+mkGoldenTestOk f = mkGoldenTest $ \src -> \case
+ Right output -> do
+ output' <- f src output
+ pure $ toExpr output'
+ Left err -> fail $ errorBundlePretty err
+
+mkGoldenTestErr :: String -> FilePath -> TestTree
+mkGoldenTestErr = mkGoldenTest $ \_src -> \case
+ Right output -> fail $ "Unexpected success:\n" <> show output
+ Left err -> pure $ errorBundlePretty err
+
+mkGoldenTest
+ :: (Eq expr, ToExpr expr)
+ => ( forall s e
+ . (VisualStream s, TraversableStream s, ShowErrorComponent e)
+ => T.Text
+ -> Either (ParseErrorBundle s e) RawAst
+ -> IO expr
+ )
+ -- ^ handle the parse result
+ -> String
+ -> FilePath
+ -> TestTree
+mkGoldenTest f name fname =
+ ediffGolden goldenTest name outFilePath $ do
+ content <- TIO.readFile inFilePath
+ f content $ runParser caliperAst inFilePath content
+ where
+ inFilePath = "test" "data" fname
+ outFilePath = inFilePath `replaceFileName` name `addExtension` ".expr"
diff --git a/test/data/histogram/001.clp b/test/data/histogram/001.clp
new file mode 100644
--- /dev/null
+++ b/test/data/histogram/001.clp
@@ -0,0 +1,6 @@
+0000-01-01 00:00:00 ... 0000-01-01 00:14:00 -- .
+0000-01-02 00:00:00 ... 0000-01-02 00:15:00 -- +
+0000-01-03 00:00:00 ... 0000-01-03 02:00:00 -- 2 $
+
+0000-01-04 00:00:00 ... 0000-01-04 02:14:00 -- 2 $ .
+0000-01-05 00:00:00 ... 0000-01-05 02:15:00 -- 2 $ +
diff --git a/test/data/histogram/001_groupByDay.expr b/test/data/histogram/001_groupByDay.expr
new file mode 100644
--- /dev/null
+++ b/test/data/histogram/001_groupByDay.expr
@@ -0,0 +1,48 @@
+_×_
+ []
+ [
+ NE.fromList
+ [
+ ResolvedEntry {
+ entryStart =
+ `0000-01-01 00:00:00 UTC`,
+ entryEnd =
+ `0000-01-01 00:14:00 UTC`,
+ entryMetadata = Map.fromList
+ []}],
+ NE.fromList
+ [
+ ResolvedEntry {
+ entryStart =
+ `0000-01-02 00:00:00 UTC`,
+ entryEnd =
+ `0000-01-02 00:15:00 UTC`,
+ entryMetadata = Map.fromList
+ []}],
+ NE.fromList
+ [
+ ResolvedEntry {
+ entryStart =
+ `0000-01-03 00:00:00 UTC`,
+ entryEnd =
+ `0000-01-03 02:00:00 UTC`,
+ entryMetadata = Map.fromList
+ []}],
+ NE.fromList
+ [
+ ResolvedEntry {
+ entryStart =
+ `0000-01-04 00:00:00 UTC`,
+ entryEnd =
+ `0000-01-04 02:14:00 UTC`,
+ entryMetadata = Map.fromList
+ []}],
+ NE.fromList
+ [
+ ResolvedEntry {
+ entryStart =
+ `0000-01-05 00:00:00 UTC`,
+ entryEnd =
+ `0000-01-05 02:15:00 UTC`,
+ entryMetadata = Map.fromList
+ []}]]
diff --git a/test/data/histogram/001_groupByDay_cli.expr b/test/data/histogram/001_groupByDay_cli.expr
new file mode 100644
--- /dev/null
+++ b/test/data/histogram/001_groupByDay_cli.expr
@@ -0,0 +1,8 @@
+_×_
+ []
+ [
+ "0000-01-01 UTC | .",
+ "0000-01-02 UTC | +",
+ "0000-01-03 UTC | +++$+++$",
+ "0000-01-04 UTC | +++$+++$.",
+ "0000-01-05 UTC | +++$+++$+"]
diff --git a/test/data/parser/err_001.clp b/test/data/parser/err_001.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_001.clp
@@ -0,0 +1,3 @@
+
+-- This has a duration of 0
+2025-10-02 22:59:05 ... 2025-10-02 22:59:05
diff --git a/test/data/parser/err_001.expr b/test/data/parser/err_001.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_001.expr
@@ -0,0 +1,8 @@
+T.concat
+ [
+ "user error: Timespan has negative or null duration of 0s\n",
+ "test/data/parser/err_001.clp:3:\n",
+ " | -- This has a duration of 0\n",
+ "3 | 2025-10-02 22:59:05 ... 2025-10-02 22:59:05\n",
+ " | ^^^^^^^^^^^^^^^^^^^\n",
+ " | \n"]
diff --git a/test/data/parser/err_002.clp b/test/data/parser/err_002.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_002.clp
@@ -0,0 +1,6 @@
+type foo
+type bar
+
+-- This type is not declared
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+ type:baz
diff --git a/test/data/parser/err_002.expr b/test/data/parser/err_002.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_002.expr
@@ -0,0 +1,8 @@
+T.concat
+ [
+ "user error: event has undeclared type \"baz\"\n",
+ "test/data/parser/err_002.clp:6:\n",
+ " | 2025-10-02 22:59:05 ... 2025-10-02 22:59:06\n",
+ "6 | type:baz\n",
+ " | ^^^^^^^^\n",
+ " | \n"]
diff --git a/test/data/parser/err_003.clp b/test/data/parser/err_003.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_003.clp
@@ -0,0 +1,5 @@
+-- invalid end date
+2025-10-02 22:59:05 ... 2025-10-00 22:59:06
+
+-- invalid start date
+2025-10-00 22:59:05 ... 2025-10-01 22:59:06
diff --git a/test/data/parser/err_003.expr b/test/data/parser/err_003.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_003.expr
@@ -0,0 +1,7 @@
+concat
+ [
+ "test/data/parser/err_003.clp:2:25:\n",
+ " |\n",
+ "2 | 2025-10-02 22:59:05 ... 2025-10-00 22:59:06\n",
+ " | ^\n",
+ "unexpected invalid calendar date\n"]
diff --git a/test/data/parser/err_004.clp b/test/data/parser/err_004.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_004.clp
@@ -0,0 +1,3 @@
+2025-10-02 22:59:05 ... 2025-10-02 22:59:08
+ type:foo
+ type:bar
diff --git a/test/data/parser/err_004.expr b/test/data/parser/err_004.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_004.expr
@@ -0,0 +1,8 @@
+T.concat
+ [
+ "user error: event has duplicate types \"bar\" while it already bears the type \"foo\"\n",
+ "test/data/parser/err_004.clp:3:\n",
+ " | type:foo\n",
+ "3 | type:bar\n",
+ " | ^^^^^^^^\n",
+ " | \n"]
diff --git a/test/data/parser/err_005.clp b/test/data/parser/err_005.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_005.clp
@@ -0,0 +1,3 @@
+
+-- Valid number but leading 0, doesn't fit in the grammar
+2025-10-02 22:59:05 ... 2025-10-02 022:59:05
diff --git a/test/data/parser/err_005.expr b/test/data/parser/err_005.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/err_005.expr
@@ -0,0 +1,8 @@
+concat
+ [
+ "test/data/parser/err_005.clp:3:38:\n",
+ " |\n",
+ "3 | 2025-10-02 22:59:05 ... 2025-10-02 022:59:05\n",
+ " | ^\n",
+ "unexpected '2'\n",
+ "expecting non-digit separator\n"]
diff --git a/test/data/parser/ok_001.clp b/test/data/parser/ok_001.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_001.clp
@@ -0,0 +1,1 @@
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
diff --git a/test/data/parser/ok_001.expr b/test/data/parser/ok_001.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_001.expr
@@ -0,0 +1,10 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_002.clp b/test/data/parser/ok_002.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_002.clp
@@ -0,0 +1,2 @@
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
diff --git a/test/data/parser/ok_002.expr b/test/data/parser/ok_002.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_002.expr
@@ -0,0 +1,17 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_003.clp b/test/data/parser/ok_003.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_003.clp
@@ -0,0 +1,5 @@
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
diff --git a/test/data/parser/ok_003.expr b/test/data/parser/ok_003.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_003.expr
@@ -0,0 +1,17 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_004.clp b/test/data/parser/ok_004.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_004.clp
@@ -0,0 +1,7 @@
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+-- This is a comment
+
diff --git a/test/data/parser/ok_004.expr b/test/data/parser/ok_004.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_004.expr
@@ -0,0 +1,17 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_005.clp b/test/data/parser/ok_005.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_005.clp
@@ -0,0 +1,14 @@
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+ -- a inner comment
+ -- I can mess up the indent as long it's indented
+-- another inner comment
+ foo:bar
+-- foo
+ bar:baz
+
+
+-- This is a comment
+
diff --git a/test/data/parser/ok_005.expr b/test/data/parser/ok_005.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_005.expr
@@ -0,0 +1,21 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/parser/ok_006.clp b/test/data/parser/ok_006.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_006.clp
@@ -0,0 +1,13 @@
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+ -- a inner comment
+ -- I can mess up the indent as long it's indented
+ -- another inner comment
+ foo:bar
+ bar:baz
+
+
+-- This is a comment
+
diff --git a/test/data/parser/ok_006.expr b/test/data/parser/ok_006.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_006.expr
@@ -0,0 +1,21 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/parser/ok_007.clp b/test/data/parser/ok_007.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_007.clp
@@ -0,0 +1,18 @@
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+ {-
+ this is a multiline comment
+ this can be useful for long paragraphs -}
+
+ {-
+ it can end on the same line of the inner document or not
+
+ -}
+ foo:bar
+ bar:baz
+
+
+-- This is a comment
+
diff --git a/test/data/parser/ok_007.expr b/test/data/parser/ok_007.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_007.expr
@@ -0,0 +1,21 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/parser/ok_008.clp b/test/data/parser/ok_008.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_008.clp
@@ -0,0 +1,25 @@
+2025-10-08 16:51:19 ... 2025-10-08 18:48:49
+ -- fixed Comment being nested inside
+ --
+ -- foo
+
+2025-10-09 10:18:13 {-
+ multiline comment where space is allowed
+ -} ... 2025-10-09 11:25:57 {-
+ - [ ] make all parser tests pass
+ - [ ] test braces
+ - [ ] ask hecate where to find brace layout examples
+ - [ ] fix roundtrip tests
+ -}
+
+
+2025-10-09 10:18:13 {- comment anywhere space is allowed -} ... 2025-10-09 11:25:57 {-
+ - [ ] make all parser tests pass
+ - [ ] test braces
+ - [ ] ask hecate where to find brace layout examples
+ - [ ] fix roundtrip tests
+ -}
+ foo:bar
+ -- comment
+ bar:baz
+ -- after comment
diff --git a/test/data/parser/ok_008.expr b/test/data/parser/ok_008.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_008.expr
@@ -0,0 +1,28 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-08 16:51:19 UTC`,
+ entryEnd =
+ `2025-10-08 18:48:49 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-09 10:18:13 UTC`,
+ entryEnd =
+ `2025-10-09 11:25:57 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-09 10:18:13 UTC`,
+ entryEnd =
+ `2025-10-09 11:25:57 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/parser/ok_009.clp b/test/data/parser/ok_009.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_009.clp
@@ -0,0 +1,1 @@
+2025-10-02 22:58:05 ... 2025-10-02 22:59:__
diff --git a/test/data/parser/ok_009.expr b/test/data/parser/ok_009.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_009.expr
@@ -0,0 +1,10 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:58:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:00 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_010.clp b/test/data/parser/ok_010.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_010.clp
@@ -0,0 +1,27 @@
+2025-10-08 16:51:19 ... 2025-10-08 18:48:49
+
+-- leading comment in metadata
+-- fixed Comment being nested inside
+ --
+ -- foo
+
+2025-10-09 10:18:13 {-
+ multiline comment where space is allowed
+ -} ... 2025-10-09 11:25:57 {-
+ - [ ] make all parser tests pass
+ - [ ] test braces
+ - [ ] ask hecate where to find brace layout examples
+ - [ ] fix roundtrip tests
+ -} -- following trailing line comment
+
+
+2025-10-09 10:18:13 {- comment anywhere space is allowed -} ... 2025-10-09 11:25:57 {-
+ - [ ] make all parser tests pass
+ - [ ] test braces
+ - [ ] ask hecate where to find brace layout examples
+ - [ ] fix roundtrip tests
+ -}
+ foo:bar
+ -- comment
+ bar:baz
+ -- after comment
diff --git a/test/data/parser/ok_010.expr b/test/data/parser/ok_010.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_010.expr
@@ -0,0 +1,28 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-08 16:51:19 UTC`,
+ entryEnd =
+ `2025-10-08 18:48:49 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-09 10:18:13 UTC`,
+ entryEnd =
+ `2025-10-09 11:25:57 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-09 10:18:13 UTC`,
+ entryEnd =
+ `2025-10-09 11:25:57 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/parser/ok_012.clp b/test/data/parser/ok_012.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_012.clp
@@ -0,0 +1,5 @@
+
+type foo
+
+type bar
+
diff --git a/test/data/parser/ok_012.expr b/test/data/parser/ok_012.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_012.expr
@@ -0,0 +1,1 @@
+_×_ [] []
diff --git a/test/data/parser/ok_013.clp b/test/data/parser/ok_013.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_013.clp
@@ -0,0 +1,21 @@
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+{-
+A comment
+
+{-
+
+A comment in a comment
+
+{-
+
+Can we go deeper?
+
+-}
+
+
+-}
+
+-}
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
diff --git a/test/data/parser/ok_013.expr b/test/data/parser/ok_013.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_013.expr
@@ -0,0 +1,17 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_014.clp b/test/data/parser/ok_014.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_014.clp
@@ -0,0 +1,3 @@
+
+timezone +2:00
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
diff --git a/test/data/parser/ok_014.expr b/test/data/parser/ok_014.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_014.expr
@@ -0,0 +1,10 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 +0200`,
+ entryEnd =
+ `2025-10-02 22:59:06 +0200`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/parser/ok_014_raw.expr b/test/data/parser/ok_014_raw.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_014_raw.expr
@@ -0,0 +1,19 @@
+RawAst {
+ rawAstCurrentFilePath =
+ "test/data/parser/ok_014.clp",
+ rawAstTypeDecls = [],
+ rawAstEntriesOrTZ = [
+ TZDecl `+0200`,
+ RawEntries
+ [
+ RawEntry {
+ rawEntryStart =
+ `2025-10-02 22:59:05`,
+ rawEntryEnd = _×_
+ `2025-10-02 22:59:06`
+ (SrcSpan
+ "test/data/parser/ok_014.clp"
+ (SrcPosition 3 25)
+ (SrcPosition 3 44)),
+ rawEntryMetadata = Map.fromList
+ []}]]}
diff --git a/test/data/parser/ok_015.clp b/test/data/parser/ok_015.clp
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_015.clp
@@ -0,0 +1,11 @@
+
+timezone +2:00
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+-- Timezone change
+-- Same local time but in a later time zone, so +8:00 happened first
+
+timezone +8:00
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:05 ... 2025-10-02 22:59:06
diff --git a/test/data/parser/ok_015.expr b/test/data/parser/ok_015.expr
new file mode 100644
--- /dev/null
+++ b/test/data/parser/ok_015.expr
@@ -0,0 +1,24 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 +0800`,
+ entryEnd =
+ `2025-10-02 22:59:06 +0800`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 +0800`,
+ entryEnd =
+ `2025-10-02 22:59:06 +0800`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:05 +0200`,
+ entryEnd =
+ `2025-10-02 22:59:06 +0200`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/query/001.clp b/test/data/query/001.clp
new file mode 100644
--- /dev/null
+++ b/test/data/query/001.clp
@@ -0,0 +1,13 @@
+
+2025-10-02 22:58:05 ... 2025-10-02 22:59:06
+
+2025-10-02 22:59:50 ... 2025-10-02 23:05:00
+ -- a inner comment
+ -- I can mess up the indent as long it's indented
+ -- another inner comment
+ foo:bar
+ bar:baz
+
+
+-- This is a comment
+
diff --git a/test/data/query/001_after_complete.expr b/test/data/query/001_after_complete.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/001_after_complete.expr
@@ -0,0 +1,14 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:50 UTC`,
+ entryEnd =
+ `2025-10-02 23:05:00 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/query/001_after_truncate.expr b/test/data/query/001_after_truncate.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/001_after_truncate.expr
@@ -0,0 +1,14 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:55 UTC`,
+ entryEnd =
+ `2025-10-02 23:05:00 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/query/001_before_complete.expr b/test/data/query/001_before_complete.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/001_before_complete.expr
@@ -0,0 +1,10 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:58:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/query/001_before_truncate.expr b/test/data/query/001_before_truncate.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/001_before_truncate.expr
@@ -0,0 +1,21 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:58:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:50 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:55 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/query/001_foobar.expr b/test/data/query/001_foobar.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/001_foobar.expr
@@ -0,0 +1,14 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:50 UTC`,
+ entryEnd =
+ `2025-10-02 23:05:00 UTC`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/query/001_notfoobar.expr b/test/data/query/001_notfoobar.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/001_notfoobar.expr
@@ -0,0 +1,10 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:58:05 UTC`,
+ entryEnd =
+ `2025-10-02 22:59:06 UTC`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/query/002.clp b/test/data/query/002.clp
new file mode 100644
--- /dev/null
+++ b/test/data/query/002.clp
@@ -0,0 +1,16 @@
+
+timezone +08:00
+
+2025-10-02 22:58:05 ... 2025-10-02 22:59:06
+
+timezone +02:00
+2025-10-02 22:59:50 ... 2025-10-02 23:05:00
+ -- a inner comment
+ -- I can mess up the indent as long it's indented
+ -- another inner comment
+ foo:bar
+ bar:baz
+
+
+-- This is a comment
+
diff --git a/test/data/query/002_after_complete.expr b/test/data/query/002_after_complete.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/002_after_complete.expr
@@ -0,0 +1,14 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:50 +0200`,
+ entryEnd =
+ `2025-10-02 23:05:00 +0200`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/query/002_after_truncate.expr b/test/data/query/002_after_truncate.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/002_after_truncate.expr
@@ -0,0 +1,14 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:55 +0200`,
+ entryEnd =
+ `2025-10-02 23:05:00 +0200`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]
diff --git a/test/data/query/002_before_complete.expr b/test/data/query/002_before_complete.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/002_before_complete.expr
@@ -0,0 +1,10 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:58:05 +0800`,
+ entryEnd =
+ `2025-10-02 22:59:06 +0800`,
+ entryMetadata = Map.fromList
+ []}]
diff --git a/test/data/query/002_before_truncate.expr b/test/data/query/002_before_truncate.expr
new file mode 100644
--- /dev/null
+++ b/test/data/query/002_before_truncate.expr
@@ -0,0 +1,21 @@
+_×_
+ []
+ [
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:58:05 +0800`,
+ entryEnd =
+ `2025-10-02 22:59:06 +0800`,
+ entryMetadata = Map.fromList
+ []},
+ ResolvedEntry {
+ entryStart =
+ `2025-10-02 22:59:50 +0200`,
+ entryEnd =
+ `2025-10-02 22:59:55 +0200`,
+ entryMetadata = Map.fromList
+ [
+ _×_ "bar" (NE.fromList ["baz"]),
+ _×_
+ "foo"
+ (NE.fromList ["bar"])]}]