swithc to form keyboard shortcut

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/build-app.yaml

@@ -3,14 +3,13 @@ name: Electron app
 on:
   push:
     tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
     # branches:
     #   - production
 
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -33,31 +32,72 @@ jobs:
       - name: yarn install
         run: |
           yarn install
+      - name: setCurrentVersion
+        run: |
+          yarn setCurrentVersion
       - name: Publish
         run: |
           yarn run build:app
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
 
-      - name: Copy artifacts Linux, MacOs
-        if: matrix.os != 'windows-2016'
+      - name: generatePadFile
         run: |
-          mkdir artifacts
-          mv app/dist/*.deb artifacts/dbgate-linux.deb || true
-          mv app/dist/*.AppImage artifacts/dbgate-linux.AppImage || true
-          mv app/dist/*.dmg artifacts/dbgate-mac.dmg || true
+          yarn generatePadFile
 
-          mv app/dist/*.deb artifacts || true
-          mv app/dist/*.AppImage artifacts || true
-          mv app/dist/*.dmg artifacts || true          
+      - name: Copy artifacts
+        run: |
+          mkdir artifacts          
 
-          mv app/dist/latest.yml artifacts/latest.yml || true
-      - name: Copy artifacts Win
+          cp app/dist/*.deb artifacts/dbgate-latest.deb || true
+          cp app/dist/*.AppImage artifacts/dbgate-latest.AppImage || true
+          cp app/dist/*.exe artifacts/dbgate-latest.exe || true
+          cp app/dist/*.dmg artifacts/dbgate-latest.dmg || true
+
+          mv app/dist/*.exe artifacts/ || true
+          mv app/dist/*.AppImage artifacts/ || true
+          mv app/dist/*.deb artifacts/ || true
+          mv app/dist/*.dmg artifacts/ || true
+
+      # - name: Copy artifacts Linux, MacOs
+      #   if: matrix.os != 'windows-2016'
+      #   run: |
+      #     mkdir artifacts
+
+      #     cp app/dist/*.AppImage artifacts/ || true
+      #     cp app/dist/*.dmg artifacts/ || true
+      #     cp app/dist/*.deb artifacts/ || true
+
+      #     mv app/dist/*.deb artifacts/dbgate-linux.deb || true
+      #     mv app/dist/*.AppImage artifacts/dbgate-linux.AppImage || true
+      #     mv app/dist/*.dmg artifacts/dbgate-mac.dmg || true
+
+      # - name: Copy artifacts Win
+      #   if: matrix.os == 'windows-2016'
+      #   run: |
+      #     mkdir artifacts
+
+      #     cp app/dist/*.exe artifacts/ || true
+
+      #     mv app/dist/*.exe artifacts/dbgate-windows.exe
+
+      #     mv app/dist/latest.yml artifacts/latest.yml || true
+
+      - name: Copy latest.yml (windows)
         if: matrix.os == 'windows-2016'
         run: |
-          mkdir artifacts
-          mv app/dist/*.exe artifacts/dbgate-windows.exe
-          mv app/dist/*.zip artifacts/dbgate-windows.zip
+          mv app/dist/latest.yml artifacts/latest.yml || true
+          mv app/dist/dbgate-pad.xml artifacts/ || true
 
-          mv app/dist/*.exe artifacts || true          
+      - name: Copy latest-linux.yml
+        if: matrix.os == 'ubuntu-18.04'
+        run: |
+          mv app/dist/latest-linux.yml artifacts/latest-linux.yml || true
+
+      - name: Copy latest-mac.yml
+        if: matrix.os == 'macOS-10.14'
+        run: |
+          mv app/dist/latest-mac.yml artifacts/latest-mac.yml || true
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
@@ -69,7 +109,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: "artifacts/**"
+          files: 'artifacts/**'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -82,4 +122,4 @@ jobs:
       #     tag_name: ${{ github.ref }}
       #     release_name: Release ${{ github.ref }}
       #     draft: false
-      #     prerelease: false
+      #     prerelease: false

.github/workflows/build-docker.yaml

@@ -37,6 +37,9 @@ jobs:
       - name: yarn install
         run: |
           yarn install
+      - name: setCurrentVersion
+        run: |
+          yarn setCurrentVersion
       - name: Prepare docker image
         run: |
           yarn run prepare:docker

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- 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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 <https://www.gnu.org/licenses/>.
-
-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:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<https://www.gnu.org/licenses/>.
-
-  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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,40 +1,33 @@
 [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![Donate](https://img.shields.io/badge/donate-paypal-blue.svg)](https://paypal.me/JanProchazkaCz/30eur)
+[![NPM version](https://img.shields.io/npm/v/dbgate-api.svg)](https://www.npmjs.com/package/dbgate-api)
 
 # DbGate - database administration tool
 
 DbGate is fast and efficient database administration tool. It is focused to work with data (filtering, editing, master/detail views etc.)
 
-**Try it online** - https://dbgate.org
+**Try it online** - https://demo.dbgate.org - online demo application
 
-## Currently implemented features
+## Features
 * Support for Microsoft SQL Server, Postgre SQL, MySQL
-* Table data browsing - filtering, sorting, adding related columns using foreign keys
+* Table data browsing - filtering, sorting, related columns using foreign keys
 * Master/detail views
 * Browsing objects - tables, views, procedures, functions
 * Table data editing, with SQL change script preview
-* SQL editor, execute SQL script, SQL code formatter
+* SQL editor, execute SQL script, SQL code formatter, SQL code completion, SQL join wizard
 * Runs as application for Windows, Linux and Mac. Or in Docker container on server and in web Browser on client.
+* Import, export from/to CSV, Excel, JSON
+* Free table editor - quick table data editing (cleanup data after import/before export, prototype tables etc.)
+* Archives - backup your data in JSON files on local filesystem (or on DbGate server, when using web application)
+* Light and dark theme
 * For detailed info, how to run DbGate in docker container, visit [docker hub](https://hub.docker.com/r/dbgate/dbgate)
-
-## Current support for database engines
-| Action | Microsoft SQL Server | Postgre SQL | MySQL |
-|---|---|---|---|
-| Tables | yes | yes | yes |
-| Columns | yes | yes | yes |
-| Primary keys | yes | yes | yes |
-| Foreign keys | yes | yes | yes |
-| Run query | yes | yes | yes |
-| Data types | yes | no | no |
-| Views | yes | no | no |
-| Stored procedures | yes | no | no |
-| Functions | yes | no | no |
+* Extensible plugin architecture
 
 ![Screenshot](https://raw.githubusercontent.com/dbshell/dbgate/master/screenshot.png)
 
 ## Design goals
-* Application simplicity - DbGate takes the best and only the best from old [DbGate](http://www.jenasoft.com/dbgate), [DatAdmin](http://www.jenasoft.com/datadmin) and [DbMouse](http://www.jenasoft.com/dbmouse) . First will be implemented the most used features from this software.
-* Minimal dependencies - so that the software can be developed in future without problems with obsolete libraries
+* Application simplicity - DbGate takes the best and only the best from old [DbGate](http://www.jenasoft.com/dbgate), [DatAdmin](http://www.jenasoft.com/datadmin) and [DbMouse](http://www.jenasoft.com/dbmouse) .
+* Minimal dependencies
     * Frontend - React, styled-components, socket.io
     * Backend - NodeJs, ExpressJs, socket.io, database connection drivers
     * JavaScript + TypeScript
@@ -42,18 +35,39 @@ DbGate is fast and efficient database administration tool. It is focused to work
     * There is plan to incorporate SQLite to support work with local datasets
 * Platform independed - will run as web application in single docker container on server, or as application using Electron platform on Linux, Windows and Mac
 
-## How Can I Contribute?
-You're welcome to contribute to this project! Especially with these topics:
+## Plugins
+Plugins are standard NPM packages published on [npmjs.com](https://www.npmjs.com).  
+See all [existing DbGate plugins](https://www.npmjs.com/search?q=keywords:dbgateplugin).  
+Visit [dbgate generator homepage](https://github.com/dbshell/generator-dbgate) to see, how to create your own plugin.  
 
+Currently following extensions can be implemented using plugins:
+- File format parsers/writers
+- Database engine connectors
+
+## How Can I Contribute?
+You're welcome to contribute to this project! Below are some ideas, how to contribute:
+
+* Create plugins for new import/export formats
 * Bug fixing
 * Test Mac edition
-* Styles, graphics
-* Better MySQL, Postgre SQL support
+* Improve linux package build, add to APT repository
+* Auto-upgrade of electron application
 
 Any help is appreciated!
 
 Feel free to report issues and open merge requests.
 
+## Roadmap
+
+| Feature | Complexity | Schedule |
+|---|---|---|
+| Query designer | medium | december 2020 |
+| Table designer (structure editor) | big | january 2021 |
+| Filter SQL result sets | small | november 2020 |
+| Filtering, sorting in free table editor | small | november 2020 |
+| Using tedious driver instead of mssql | small | january 2021 |
+| Support for SQLite | big | 2021 |
+
 ## How to run development environment
 
 ```sh
@@ -90,11 +104,15 @@ yarn start:app:local
 ```
 
 ## Packages
-* api - backend, Javascript, ExpressJS
-* datalib - TypeScript library for utility classes
-* electron - application (JavaScript)
-* engines - drivers for database engine (mssql, mysql, postgres), analysing database structure, creating specific queries (JavaScript)
-* filterparser - TypeScript library for parsing data filter expressions using parsimmon
-* sqltree - JSON representation of SQL query, functions converting to SQL (TypeScript)
-* types - common TypeScript definitions
-* web - frontend in React (JavaScript)
+Some dbgate packages can be used also without DbGate. You can find them on [NPM repository](https://www.npmjs.com/search?q=keywords:dbgate)
+
+* [api](https://github.com/dbshell/dbgate/tree/master/packages/api) - backend, Javascript, ExpressJS [![NPM version](https://img.shields.io/npm/v/dbgate-api.svg)](https://www.npmjs.com/package/dbgate-api)
+* [datalib](https://github.com/dbshell/dbgate/tree/master/packages/datalib) - TypeScript library for utility classes
+* [app](https://github.com/dbshell/dbgate/tree/master/app) - application (JavaScript)
+structure, creating specific queries (JavaScript) [![NPM version](https://img.shields.io/npm/v/dbgate-engines.svg)](https://www.npmjs.com/package/dbgate-engines)
+* [filterparser](https://github.com/dbshell/dbgate/tree/master/packages/filterparser) - TypeScript library for parsing data filter expressions using parsimmon
+* [sqltree](https://github.com/dbshell/dbgate/tree/master/packages/sqltree) - JSON representation of SQL query, functions converting to SQL (TypeScript) [![NPM version](https://img.shields.io/npm/v/dbgate-sqltree.svg)](https://www.npmjs.com/package/dbgate-sqltree)
+* [types](https://github.com/dbshell/dbgate/tree/master/packages/types) - common TypeScript definitions [![NPM version](https://img.shields.io/npm/v/dbgate-types.svg)](https://www.npmjs.com/package/dbgate-types)
+* [web](https://github.com/dbshell/dbgate/tree/master/packages/web) - frontend in React (JavaScript)
+* [tools](https://github.com/dbshell/dbgate/tree/master/packages/tools) - various tools [![NPM version](https://img.shields.io/npm/v/dbgate-tools.svg)](https://www.npmjs.com/package/dbgate-tools)
+

app/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/dbgate-pad-template.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XML_DIZ_INFO>
+  <MASTER_PAD_VERSION_INFO>
+    <MASTER_PAD_VERSION>3.01</MASTER_PAD_VERSION>
+    <MASTER_PAD_EDITOR>PADManager 2.0.46</MASTER_PAD_EDITOR>
+    <MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
+  </MASTER_PAD_VERSION_INFO>
+  <Company_Info>
+    <Company_Name>JenaSoft</Company_Name>
+    <Address_1>Vratislavska 396</Address_1>
+    <Address_2>Praha 8</Address_2>
+    <City_Town>Prague</City_Town>
+    <State_Province/>
+    <Zip_Postal_Code>18100</Zip_Postal_Code>
+    <Country>Czech Republic</Country>
+    <Company_WebSite_URL>https://dbgate.org/</Company_WebSite_URL>
+    <Contact_Info>
+      <Contact_First_Name>Jan</Contact_First_Name>
+      <Contact_Last_Name>Prochazka</Contact_Last_Name>
+      <Contact_Email>jenasoft.database@gmail.com</Contact_Email>
+      <Author_First_Name>Jan</Author_First_Name>
+      <Author_Last_Name>Prochazka</Author_Last_Name>
+      <Author_Email>jenasoft.database@gmail.com</Author_Email>
+    </Contact_Info>
+    <Support_Info>
+      <Sales_Email>jenasoft.database@gmail.com</Sales_Email>
+      <Support_Email>jenasoft.database@gmail.com</Support_Email>
+      <General_Email>jenasoft.database@gmail.com</General_Email>
+      <Sales_Phone/>
+      <Support_Phone/>
+      <General_Phone/>
+      <Fax_Phone/>
+    </Support_Info>
+  </Company_Info>
+  <Site>
+    <Site_FORM>Y</Site_FORM>
+    <Site_VERSION>1.0</Site_VERSION>
+    <Site_URL>https://dbgate.org/</Site_URL>
+    <Site_DESCRIPTION>This PAD extension allows you to add your site info into your PAD file. This info can be used by site submission software or by web directories themselves.</Site_DESCRIPTION>
+    <Site_Contact_Email>jenasoft.database@gmail.com</Site_Contact_Email>
+    <Site_Contact_First_Name>Jan</Site_Contact_First_Name>
+    <Site_Contact_Last_Name>Prochazka</Site_Contact_Last_Name>
+    <Site_Description_100>Database tools - effecient data manipulation</Site_Description_100>
+    <Site_Description_250>Database tools - effecient data manipulation, import, export, filtering, master/detail, query designer</Site_Description_250>
+    <Site_Description_450>Database tools - effecient data manipulation, import, export, filtering, master/detail, query designer</Site_Description_450>
+    <Site_Site_URL>https://dbgate.org/</Site_Site_URL>
+    <Site_Site_Title>DbGate</Site_Site_Title>
+    <Site_Keywords>database, manager, organizer, explorer, mssql, sqlserver, tsql, sql, mysql, postgre, postgresql,  export, import, filter</Site_Keywords>
+  </Site>
+  <Program_Info>
+    <Program_Name>DbGate</Program_Name>
+    <Program_Version>#VERSION#</Program_Version>
+    <Program_Release_Month>#MONTH#</Program_Release_Month>
+    <Program_Release_Day>#DAY#</Program_Release_Day>
+    <Program_Release_Year>#YEAR#</Program_Release_Year>
+    <Program_Cost_Dollars>0.00</Program_Cost_Dollars>
+    <Program_Type>Freeware</Program_Type>
+    <Program_Release_Status>Major Update</Program_Release_Status>
+    <Program_Install_Support>Install and Uninstall</Program_Install_Support>
+    <Program_OS_Support>Linux,Linux Gnome,Linux GPL,Linux Open Source,Mac OS X,Win7 x64,WinOther</Program_OS_Support>
+    <Program_Language>English</Program_Language>
+    <Program_Change_Info>Query designer</Program_Change_Info>
+    <Program_System_Requirements></Program_System_Requirements>
+    <Program_Category_Class>Business::Databases &amp; Tools</Program_Category_Class>
+    <File_Info>
+      <File_Size_Bytes>#SIZE_BYTES#</File_Size_Bytes>
+      <File_Size_K>#SIZE_KB#</File_Size_K>
+      <File_Size_MB>#SIZE_MB#</File_Size_MB>
+      <Filename_Versioned/>
+      <Filename_Previous/>
+      <Filename_Generic/>
+      <Filename_Long/>
+    </File_Info>
+    <Expire_Info>
+      <Has_Expire_Info>N</Has_Expire_Info>
+      <Expire_Based_On>Days</Expire_Based_On>
+      <Expire_Count/>
+      <Expire_Other_Info/>
+      <Expire_Month/>
+      <Expire_Day/>
+      <Expire_Year/>
+    </Expire_Info>
+    <Program_Categories>Business &amp; Finance :: Database Managers,Programming :: Databases &amp; Networks,Programming :: SQL</Program_Categories>
+    <Limitations>No limitations</Limitations>
+    <Program_Cost_Other_Code/>
+    <Program_Cost_Other/>
+    <Awards/>
+    <Program_Specific_Category/>
+    <Includes_JAVA_VM/>
+    <Includes_VB_Runtime/>
+    <Includes_DirectX/>
+  </Program_Info>
+  <Web_Info>
+    <Application_URLs>
+      <Application_Info_URL>https://dbgate.org/</Application_Info_URL>
+      <Application_Screenshot_URL>https://raw.githubusercontent.com/dbshell/dbgate/master/screenshot.png</Application_Screenshot_URL>
+      <Application_Icon_URL>https://github.com/dbshell/dbgate/raw/master/app/icon.png</Application_Icon_URL>
+      <Application_XML_File_URL>https://github.com/dbshell/dbgate/releases/latest/download/dbgate-pad.xml</Application_XML_File_URL>
+      <Application_Order_URL></Application_Order_URL>
+    </Application_URLs>
+    <Download_URLs>
+      <Primary_Download_URL>https://github.com/dbshell/dbgate/releases/latest/download/dbgate-latest.exe</Primary_Download_URL>
+      <Secondary_Download_URL></Secondary_Download_URL>
+      <Additional_Download_URL_1/>
+      <Additional_Download_URL_2/>
+    </Download_URLs>
+  </Web_Info>
+  <Permissions>
+    <Distribution_Permissions>This product can be freely distributed through the Internet. To put it onto a CD, please contact jenasoft.database@gmail.com</Distribution_Permissions>
+    <EULA>MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.</EULA>
+  </Permissions>
+  <Program_Descriptions>
+    <English>
+      <Keywords>sql, management, tool, microsoft, sql, mssql, postgres, postgresql, mysql, csv, data, export, import, javascript, database</Keywords>
+      <Char_Desc_45>Modern data manipulation tool</Char_Desc_45>
+      <Char_Desc_80>Modern cross-platform data manipulation tool</Char_Desc_80>
+      <Char_Desc_250>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL. Query designer. Master/detail views. Advanced data filtering. Export, import. Exports can be saved as jobs</Char_Desc_250>
+      <Char_Desc_450>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL. Query designer. Charts. Master/detail views. Advanced data filtering. Export, import. Exports can be saved as jobs</Char_Desc_450>
+      <Char_Desc_2000>
+Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL
+Main features: 
+  Quick database browser.
+  Database editor, view and and views, stored procedures, functions, triggers, table relations. 
+  Export, import - CSV, MS Excel
+  Query designer
+  Advanced data filtering. 
+  Export, import. 
+  JavaScript data scripting.
+  Run queries, code completion. 
+  Display data from referenced tables. 
+  Create charts, supports for active charts - are refreshed when underlying source is changed
+</Char_Desc_2000>
+    </English>
+  </Program_Descriptions>
+</XML_DIZ_INFO>

app/package.json

@@ -1,34 +1,54 @@
 {
   "name": "dbgate",
-  "version": "3.7.22",
+  "version": "3.8.28",
   "private": true,
   "author": "Jan Prochazka <jenasoft.database@gmail.com>",
   "dependencies": {
+    "electron-log": "^4.3.1",
     "electron-store": "^5.1.1",
-    "electron-updater": "^4.3.1"
+    "electron-updater": "^4.3.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dbshell/dbgate.git"
   },
   "build": {
     "appId": "org.dbgate",
     "mac": {
       "category": "database",
-      "icon": "icon512.png"
+      "icon": "icon512.png",
+      "artifactName": "dbgate-mac-${version}.${ext}",
+      "publish": [
+        "github"
+      ]
     },
     "linux": {
       "target": [
         "AppImage",
         "deb"
       ],
-      "icon": "icon512.png"
+      "icon": "icon.png",
+      "artifactName": "dbgate-linux-${version}.${ext}",
+      "category": "Development",
+      "synopsis": "Database administration tool for MS SQL, MySQL and PostgreSQL",
+      "publish": [
+        "github"
+      ]
     },
     "win": {
       "target": [
         "nsis"
       ],
-      "icon": "icon.ico"
+      "artifactName": "dbgate-windows-${version}.${ext}",
+      "icon": "icon.ico",
+      "publish": [
+        "github"
+      ]
     },
     "files": [
       "packages",
-      "src"
+      "src",
+      "icon.png"
     ]
   },
   "homepage": "./",
@@ -45,7 +65,7 @@
   "devDependencies": {
     "copyfiles": "^2.2.0",
     "cross-env": "^6.0.3",
-    "electron": "8.1.1",
-    "electron-builder": "22.4.1"
+    "electron": "11.1.1",
+    "electron-builder": "22.9.1"
   }
 }

app/src/electron.js

@@ -2,8 +2,10 @@ const electron = require('electron');
 const os = require('os');
 const { Menu } = require('electron');
 const { fork } = require('child_process');
-var { autoUpdater } = require('electron-updater');
+const { autoUpdater } = require('electron-updater');
 const Store = require('electron-store');
+const log = require('electron-log');
+
 // Module to control application life.
 const app = electron.app;
 // Module to create native browser window.
@@ -19,6 +21,9 @@ const store = new Store();
 let mainWindow;
 let splashWindow;
 
+log.transports.file.level = 'debug';
+autoUpdater.logger = log;
+
 function hideSplash() {
   if (splashWindow) {
     splashWindow.destroy();
@@ -99,6 +104,12 @@ function buildMenu() {
             require('electron').shell.openExternal('https://hub.docker.com/r/dbgate/dbgate');
           },
         },
+        {
+          label: 'About',
+          click() {
+            mainWindow.webContents.executeJavaScript(`dbgate_showAbout()`);
+          },
+        },
       ],
     },
   ];
@@ -108,15 +119,17 @@ function buildMenu() {
 
 function createWindow() {
   const bounds = store.get('winBounds');
+
   mainWindow = new BrowserWindow({
     width: 1200,
     height: 800,
     title: 'DbGate',
-    icon: os.platform() == 'win32' ? 'icon.ico' : 'icon512.png',
     ...bounds,
+    icon: os.platform() == 'win32' ? 'icon.ico' : path.resolve(__dirname, '../icon.png'),
     show: false,
     webPreferences: {
       nodeIntegration: true,
+      enableRemoteModule: true,
     },
   });
 
@@ -137,6 +150,9 @@ function createWindow() {
       store.set('winBounds', mainWindow.getBounds());
     });
     mainWindow.loadURL(startUrl);
+    if (os.platform() == 'linux') {
+      mainWindow.setIcon(path.resolve(__dirname, '../icon.png'));
+    }
   }
 
   splashWindow = new BrowserWindow({

app/yarn.lock

@@ -7,13 +7,13 @@
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
   integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
 
-"@develar/schema-utils@~2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz#eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"
-  integrity sha512-qjCqB4ctMig9Gz5bd6lkdFr3bO6arOdQqptdBSpF1ZpCnjofieCciEzkoS9ujY9cMGyllYSCSmBJ3x9OKHXzoA==
+"@develar/schema-utils@~2.6.5":
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
+  integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==
   dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
 
 "@electron/get@^1.0.1":
   version "1.9.0"
@@ -53,10 +53,10 @@
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
   integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
 
-"@types/fs-extra@^8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.0.tgz#1114834b53c3914806cd03b3304b37b3bd221a4d"
-  integrity sha512-UoOfVEzAUpeSPmjm7h1uk5MH6KZma2z2O7a75onTGjnNvAvMVrPzPL/vBbT65iIGHWj6rokwfmYcmxmlSf2uwg==
+"@types/fs-extra@^9.0.1":
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab"
+  integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig==
   dependencies:
     "@types/node" "*"
 
@@ -70,31 +70,29 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz#3501e6f09b954de9c404671cefdbcc5d9d7c45f6"
   integrity sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==
 
-"@types/semver@^7.1.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.2.0.tgz#0d72066965e910531e1db4621c15d0ca36b8d83b"
-  integrity sha512-TbB0A8ACUWZt3Y6bQPstW9QNbhNeebdgLX4T/ZfkrswAfUzRiXrgd9seol+X379Wa589Pu4UEx9Uok0D4RjRCQ==
-  dependencies:
-    "@types/node" "*"
+"@types/semver@^7.3.1":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
+  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
 
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
-"@types/yargs@^15.0.4":
-  version "15.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"
-  integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==
+"@types/yargs@^15.0.5":
+  version "15.0.12"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.12.tgz#6234ce3e3e3fa32c5db301a170f96a599c960d74"
+  integrity sha512-f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw==
   dependencies:
     "@types/yargs-parser" "*"
 
-ajv-keywords@^3.1.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
-  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+ajv-keywords@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.1.0, ajv@^6.10.2:
+ajv@^6.10.2:
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
   integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
@@ -104,6 +102,16 @@ ajv@^6.1.0, ajv@^6.10.2:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.0:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ansi-align@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
@@ -121,7 +129,7 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
-ansi-styles@^3.2.0:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -136,37 +144,37 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-app-builder-bin@3.5.5:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.5.tgz#c83200dccd8df5ccb2a5adcd41b2a76bacfb531a"
-  integrity sha512-ZcHzJ9Xl+azPqdKzXZKdRZmkNmbxHHZyl4cbobNf8qMQpoPChpcov8riVrZSbu/0cT/JqJ8LOwJjy1OAwbChaQ==
+app-builder-bin@3.5.10:
+  version "3.5.10"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"
+  integrity sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ==
 
-app-builder-lib@22.4.1, app-builder-lib@~22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.4.1.tgz#9d73b2834e434fb65fc9571ae3fed3c1470b6915"
-  integrity sha512-epwUzIM+2pcdy/If9koTP74CKx4v7xGPj75a2Z5cM4rrGN9yVZ3eDUBbfF0e0qE4Qmcv5pd0BAZJ26bGm8NWsQ==
+app-builder-lib@22.9.1:
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c"
+  integrity sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A==
   dependencies:
     "7zip-bin" "~5.0.3"
-    "@develar/schema-utils" "~2.1.0"
+    "@develar/schema-utils" "~2.6.5"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "22.4.1"
-    builder-util-runtime "8.6.2"
+    builder-util "22.9.1"
+    builder-util-runtime "8.7.2"
     chromium-pickle-js "^0.2.0"
-    debug "^4.1.1"
-    ejs "^3.0.1"
-    electron-publish "22.4.1"
-    fs-extra "^8.1.0"
-    hosted-git-info "^3.0.4"
+    debug "^4.3.0"
+    ejs "^3.1.5"
+    electron-publish "22.9.1"
+    fs-extra "^9.0.1"
+    hosted-git-info "^3.0.5"
     is-ci "^2.0.0"
-    isbinaryfile "^4.0.4"
-    js-yaml "^3.13.1"
+    isbinaryfile "^4.0.6"
+    js-yaml "^3.14.0"
     lazy-val "^1.0.4"
     minimatch "^3.0.4"
     normalize-package-data "^2.5.0"
-    read-config-file "5.0.2"
+    read-config-file "6.0.0"
     sanitize-filename "^1.6.3"
-    semver "^7.1.3"
+    semver "^7.3.2"
     temp-file "^3.3.7"
 
 argparse@^1.0.7:
@@ -181,6 +189,11 @@ async-exit-hook@^2.0.1:
   resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"
   integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==
 
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -235,39 +248,31 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-builder-util-runtime@8.6.2:
-  version "8.6.2"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.2.tgz#8270e15b012d8d3b110f3e327b0fd8b0e07b1686"
-  integrity sha512-9QnIBISfhgQ2BxtRLidVqf/v5HD73vSKZDllpUmGd2L6VORGQk7cZAPmPtw4HQM3gPBelyVJ5yIjMNZ8xjmd1A==
+builder-util-runtime@8.7.2:
+  version "8.7.2"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
+  integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA==
   dependencies:
     debug "^4.1.1"
     sax "^1.2.4"
 
-builder-util-runtime@8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.0.tgz#e48ad004835c8284662e8eaf47a53468c66e8e8d"
-  integrity sha512-G1AqqVM2vYTrSFR982c1NNzwXKrGLQjVjaZaWQdn4O6Z3YKjdMDofw88aD9jpyK9ZXkrCxR0tI3Qe9wNbyTlXg==
-  dependencies:
-    debug "^4.1.1"
-    sax "^1.2.4"
-
-builder-util@22.4.1, builder-util@~22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.4.1.tgz#49cce9f06a62cdccda66d5efa82077040fa1f462"
-  integrity sha512-+ysLc7cC4w6P7rBxmZ5X2aU3QvcwFoWCl1us+mcUKdsGmJAtFUMPJqueeptdxjyPrPShIUOKHzA8uk5A3d1fHg==
+builder-util@22.9.1:
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af"
+  integrity sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw==
   dependencies:
     "7zip-bin" "~5.0.3"
     "@types/debug" "^4.1.5"
-    "@types/fs-extra" "^8.1.0"
-    app-builder-bin "3.5.5"
+    "@types/fs-extra" "^9.0.1"
+    app-builder-bin "3.5.10"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "8.6.2"
-    chalk "^3.0.0"
-    debug "^4.1.1"
-    fs-extra "^8.1.0"
+    builder-util-runtime "8.7.2"
+    chalk "^4.1.0"
+    debug "^4.3.0"
+    fs-extra "^9.0.1"
     is-ci "^2.0.0"
-    js-yaml "^3.13.1"
-    source-map-support "^0.5.16"
+    js-yaml "^3.14.0"
+    source-map-support "^0.5.19"
     stat-mode "^1.0.0"
     temp-file "^3.3.7"
 
@@ -289,6 +294,15 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@@ -297,6 +311,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chromium-pickle-js@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
@@ -321,14 +343,14 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
+    wrap-ansi "^7.0.0"
 
 clone-response@^1.0.2:
   version "1.0.2"
@@ -476,6 +498,13 @@ debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -510,17 +539,16 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
-dmg-builder@22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.4.1.tgz#ab80d3d6e4ed8a1d38beddbfe97c8f7a794dd932"
-  integrity sha512-hEemh7n0zoVt7zPPwvn7iOttP03oENjJ4ApttPmt8oDnX8T4q42MjGWyDlLkPMplMJfoTxkkNqmm296f0OYM8Q==
+dmg-builder@22.9.1:
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f"
+  integrity sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ==
   dependencies:
-    app-builder-lib "~22.4.1"
-    bluebird-lst "^1.0.9"
-    builder-util "~22.4.1"
-    fs-extra "^8.1.0"
-    iconv-lite "^0.5.1"
-    js-yaml "^3.13.1"
+    app-builder-lib "22.9.1"
+    builder-util "22.9.1"
+    fs-extra "^9.0.1"
+    iconv-lite "^0.6.2"
+    js-yaml "^3.14.0"
     sanitize-filename "^1.6.3"
 
 dot-prop@^5.0.0, dot-prop@^5.2.0:
@@ -545,44 +573,51 @@ duplexer3@^0.1.4:
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
   integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
-ejs@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz#30c8f6ee9948502cc32e85c37a3f8b39b5a614a5"
-  integrity sha512-cuIMtJwxvzumSAkqaaoGY/L6Fc/t6YvoP9/VIaK0V/CyqKLEQ8sqODmYfy/cjXEdZ9+OOL8TecbJu+1RsofGDw==
-
-electron-builder@22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.4.1.tgz#7a7a2cbd9955c90cecc36de32ecba7f565265bab"
-  integrity sha512-13CjZcGeJS+c3EKRwFT/Oty5Niif5g1FwDioBLEbjkPCPQgxdtDsr+rJtCu9qxkiKDYpAoPS+t/clNk0efONvQ==
+ejs@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b"
+  integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==
   dependencies:
-    "@types/yargs" "^15.0.4"
-    app-builder-lib "22.4.1"
+    jake "^10.6.1"
+
+electron-builder@22.9.1:
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60"
+  integrity sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA==
+  dependencies:
+    "@types/yargs" "^15.0.5"
+    app-builder-lib "22.9.1"
     bluebird-lst "^1.0.9"
-    builder-util "22.4.1"
-    builder-util-runtime "8.6.2"
-    chalk "^3.0.0"
-    dmg-builder "22.4.1"
-    fs-extra "^8.1.0"
+    builder-util "22.9.1"
+    builder-util-runtime "8.7.2"
+    chalk "^4.1.0"
+    dmg-builder "22.9.1"
+    fs-extra "^9.0.1"
     is-ci "^2.0.0"
     lazy-val "^1.0.4"
-    read-config-file "5.0.2"
+    read-config-file "6.0.0"
     sanitize-filename "^1.6.3"
-    update-notifier "^4.1.0"
-    yargs "^15.1.0"
+    update-notifier "^4.1.1"
+    yargs "^16.0.3"
 
-electron-publish@22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.4.1.tgz#a7fcf166786f7d5957f19a70ee8389f219769ba5"
-  integrity sha512-nwKNum3KXm+01rtWX2pc1jhazdzDy2zYnQx+zmXphZchjd6UOMX3ZN0xyZUCKugw5ZliflT6LkgbrcBXBtYD3A==
+electron-log@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.3.1.tgz#1405fef9d4e6964a5fdb8790a69163aa237ffe91"
+  integrity sha512-S/0CMjYjgyWUsZ3d27VvErPaI5W4oILp4jfeCuN4DhDqrJW6jKRUD2PxFfTdeZEIjM7+fttGg7A61rPcAcZC1w==
+
+electron-publish@22.9.1:
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e"
+  integrity sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w==
   dependencies:
-    "@types/fs-extra" "^8.1.0"
+    "@types/fs-extra" "^9.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "~22.4.1"
-    builder-util-runtime "8.6.2"
-    chalk "^3.0.0"
-    fs-extra "^8.1.0"
+    builder-util "22.9.1"
+    builder-util-runtime "8.7.2"
+    chalk "^4.1.0"
+    fs-extra "^9.0.1"
     lazy-val "^1.0.4"
-    mime "^2.4.4"
+    mime "^2.4.6"
 
 electron-store@^5.1.1:
   version "5.1.1"
@@ -592,23 +627,23 @@ electron-store@^5.1.1:
     conf "^6.2.1"
     type-fest "^0.7.1"
 
-electron-updater@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.1.tgz#9d485b6262bc56fcf7ee62b1dc1b3b105a3e96a7"
-  integrity sha512-UDC5AHCgeiHJYDYWZG/rsl1vdAFKqI/Lm7whN57LKAk8EfhTewhcEHzheRcncLgikMcQL8gFo1KeX51tf5a5Wg==
+electron-updater@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.5.tgz#4fb36f593a031c87ea07ee141c9f064d5deffb15"
+  integrity sha512-5jjN7ebvfj1cLI0VZMdCnJk6aC4bP+dy7ryBf21vArR0JzpRVk0OZHA2QBD+H5rm6ZSeDYHOY6+8PrMEqJ4wlQ==
   dependencies:
-    "@types/semver" "^7.1.0"
-    builder-util-runtime "8.7.0"
-    fs-extra "^9.0.0"
-    js-yaml "^3.13.1"
+    "@types/semver" "^7.3.1"
+    builder-util-runtime "8.7.2"
+    fs-extra "^9.0.1"
+    js-yaml "^3.14.0"
     lazy-val "^1.0.4"
     lodash.isequal "^4.5.0"
-    semver "^7.1.3"
+    semver "^7.3.2"
 
-electron@8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.1.1.tgz#737a5af03c7b4af60b49dff7bfe1203fcbd5bf89"
-  integrity sha512-t+5zzFo7VOgckJc9YpImHJkpqeWxwpmEjywWbAa4IT5MULS7h1XU52H9gMswK/y8xc5lBNwxLhJSty/15+gi1A==
+electron@11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.1.tgz#188f036f8282798398dca9513e9bb3b10213e3aa"
+  integrity sha512-tlbex3xosJgfileN6BAQRotevPRXB/wQIq48QeQ08tUJJrXwE72c8smsM/hbHx5eDgnbfJ2G3a60PmRjHU2NhA==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -646,11 +681,21 @@ es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-goat@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
   integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
 
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
 escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
@@ -688,6 +733,13 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+filelist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb"
+  integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==
+  dependencies:
+    minimatch "^3.0.4"
+
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -695,14 +747,6 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
-  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
-  dependencies:
-    locate-path "^5.0.0"
-    path-exists "^4.0.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -712,10 +756,10 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
-  integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
+fs-extra@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
   dependencies:
     at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
@@ -727,7 +771,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -817,6 +861,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -832,24 +881,24 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-hosted-git-info@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.4.tgz#be4973eb1fd2737b11c9c7c19380739bb249f60d"
-  integrity sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==
+hosted-git-info@^3.0.5:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c"
+  integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==
   dependencies:
-    lru-cache "^5.1.1"
+    lru-cache "^6.0.0"
 
 http-cache-semantics@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-iconv-lite@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
-  integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
   dependencies:
-    safer-buffer ">= 2.1.2 < 3"
+    safer-buffer ">= 2.1.2 < 3.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
@@ -875,9 +924,9 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 is-ci@^2.0.0:
   version "2.0.0"
@@ -939,16 +988,26 @@ isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isbinaryfile@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.4.tgz#6803f81a8944201c642b6e17da041e24deb78712"
-  integrity sha512-pEutbN134CzcjlLS1myKX/uxNjwU5eBVSprvkpv3+3dqhBHUZLIWJQowC40w5c0Zf19vBY8mrZl88y5J4RAPbQ==
+isbinaryfile@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
+jake@^10.6.1:
+  version "10.8.2"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"
+  integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A==
+  dependencies:
+    async "0.9.x"
+    chalk "^2.4.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
 js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -957,6 +1016,14 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.14.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
@@ -977,12 +1044,12 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
-  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
+json5@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
-    minimist "^1.2.0"
+    minimist "^1.2.5"
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -1027,22 +1094,15 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-locate-path@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
-  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
-  dependencies:
-    p-locate "^4.1.0"
-
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
   integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
 
 lodash@^4.17.10:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
 lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
@@ -1054,12 +1114,12 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    yallist "^3.0.2"
+    yallist "^4.0.0"
 
 make-dir@^3.0.0:
   version "3.0.2"
@@ -1075,10 +1135,10 @@ matcher@^2.1.0:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-mime@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
+mime@^2.4.6:
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
+  integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -1102,7 +1162,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.2.0:
+minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -1119,7 +1179,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -1179,7 +1239,7 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
   integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
@@ -1193,13 +1253,6 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
-p-locate@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
-  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
-  dependencies:
-    p-limit "^2.2.0"
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -1220,11 +1273,6 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -1307,16 +1355,15 @@ rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-config-file@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.2.tgz#55e005e5a447a9ce5806358d7b22cb7cefb6436d"
-  integrity sha512-tVt1lsiSjs+FtL/vtfCivqtKR1UNk3BB3uPJQvJqkgtAYDvZjo0xyXFYSVmzaTcO+Jdi5G7O2K2vDV+p1M/oug==
+read-config-file@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
+  integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
   dependencies:
     dotenv "^8.2.0"
     dotenv-expand "^5.1.0"
-    fs-extra "^8.1.0"
     js-yaml "^3.13.1"
-    json5 "^2.1.1"
+    json5 "^2.1.2"
     lazy-val "^1.0.4"
 
 readable-stream@^2.2.2, readable-stream@~2.3.6:
@@ -1397,7 +1444,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -1436,11 +1483,18 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.2, semver@^7.1.3:
+semver@^7.1.2:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
   integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
 
+semver@^7.3.2:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 serialize-error@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-5.0.0.tgz#a7ebbcdb03a5d71a6ed8461ffe0fc1a1afed62ac"
@@ -1470,10 +1524,10 @@ signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-source-map-support@^0.5.16:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+source-map-support@^0.5.19:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -1580,6 +1634,13 @@ sumchecker@^3.0.1:
   dependencies:
     debug "^4.1.0"
 
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -1664,10 +1725,10 @@ universalify@^1.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
   integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
 
-update-notifier@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz#4866b98c3bc5b5473c020b1250583628f9a328f3"
-  integrity sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==
+update-notifier@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3"
+  integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==
   dependencies:
     boxen "^4.2.0"
     chalk "^3.0.0"
@@ -1743,10 +1804,10 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
@@ -1782,10 +1843,15 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yallist@^3.0.2:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+y18n@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yargs-parser@^13.1.2:
   version "13.1.2"
@@ -1795,13 +1861,10 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.0:
-  version "18.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.0.tgz#1b0ab1118ebd41f68bb30e729f4c83df36ae84c3"
-  integrity sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yargs-parser@^20.2.2:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
 yargs@^13.2.4:
   version "13.3.2"
@@ -1819,22 +1882,18 @@ yargs@^13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^15.1.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976"
-  integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==
+yargs@^16.0.3:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
     string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
 
 yauzl@2.4.1:
   version "2.4.1"

generatePadFile.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const path = require('path');
+const packageJson = fs.readFileSync('app/package.json', { encoding: 'utf-8' });
+const json = JSON.parse(packageJson);
+const { version } = json;
+
+const template = fs.readFileSync('app/dbgate-pad-template.xml', { encoding: 'utf-8' });
+
+const date = new Date();
+let size = 0;
+
+const files = fs.readdirSync('app/dist');
+for (const file of files) {
+  if (file.endsWith('.exe')) {
+    const stats = fs.statSync(path.join('app', 'dist', file));
+    size = stats.size;
+  }
+}
+
+const padContent = template
+  .replace('#VERSION#', version)
+  .replace('#YEAR#', date.getFullYear())
+  .replace('#MONTH#', (date.getMonth() + 1).toString().padStart(2, '0'))
+  .replace('#DAY#', date.getDate().toString().padStart(2, '0'))
+  .replace('#SIZE_BYTES#', size)
+  .replace('#SIZE_KB#', Math.round(size / 1024))
+  .replace('#SIZE_MB#', Math.round(size / 1024 / 1024));
+
+if (size > 0) {
+  fs.writeFileSync('app/dist/dbgate-pad.xml', padContent, 'utf-8');
+}

package.json

@@ -1,27 +1,30 @@
 {
   "private": true,
-  "name": "@dbgate/all",
+  "name": "dbgate-all",
   "workspaces": [
     "packages/*"
   ],
   "scripts": {
-    "start:api": "yarn workspace @dbgate/api start",
-    "start:api:portal": "yarn workspace @dbgate/api start:portal",
-    "start:web": "yarn workspace @dbgate/web start",
-    "start:sqltree": "yarn workspace @dbgate/sqltree start",
-    "start:tools": "yarn workspace @dbgate/tools start",
-    "start:datalib": "yarn workspace @dbgate/datalib start",
-    "start:filterparser": "yarn workspace @dbgate/filterparser start",
-    "build:sqltree": "yarn workspace @dbgate/sqltree build",
-    "build:datalib": "yarn workspace @dbgate/datalib build",
-    "build:filterparser": "yarn workspace @dbgate/filterparser build",
-    "build:tools": "yarn workspace @dbgate/tools build",
+    "start:api": "yarn workspace dbgate-api start",
+    "start:api:portal": "yarn workspace dbgate-api start:portal",
+    "start:api:covid": "yarn workspace dbgate-api start:covid",
+    "start:web": "yarn workspace dbgate-web start",
+    "start:sqltree": "yarn workspace dbgate-sqltree start",
+    "start:tools": "yarn workspace dbgate-tools start",
+    "start:datalib": "yarn workspace dbgate-datalib start",
+    "start:filterparser": "yarn workspace dbgate-filterparser start",
+    "build:sqltree": "yarn workspace dbgate-sqltree build",
+    "build:datalib": "yarn workspace dbgate-datalib build",
+    "build:filterparser": "yarn workspace dbgate-filterparser build",
+    "build:tools": "yarn workspace dbgate-tools build",
     "build:lib": "yarn build:tools && yarn build:sqltree && yarn build:filterparser && yarn build:datalib",
     "build:app": "cd app && yarn install && yarn build",
-    "build:api": "yarn workspace @dbgate/api build",
-    "build:web:docker": "yarn workspace @dbgate/web build:docker",
+    "build:api": "yarn workspace dbgate-api build",
+    "build:web:docker": "yarn workspace dbgate-web build:docker",
     "build:app:local": "cd app && yarn build:local",
     "start:app:local": "cd app && yarn start:local",
+    "setCurrentVersion": "node setCurrentVersion",
+    "generatePadFile": "node generatePadFile",
 
     "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/build/* docker -u 2 && copyfiles \"packages/web/build/**/*\" docker -u 2",
     "prepare:docker": "yarn build:web:docker && yarn build:api && yarn copy:docker:build",
@@ -29,8 +32,8 @@
     "prepare": "yarn build:lib",
     "start": "concurrently --kill-others-on-fail \"yarn start:api\" \"yarn start:web\"",
     "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\"",
-    "ts:api": "yarn workspace @dbgate/api ts",
-    "ts:web": "yarn workspace @dbgate/web ts",
+    "ts:api": "yarn workspace dbgate-api ts",
+    "ts:web": "yarn workspace dbgate-web ts",
     "ts": "yarn ts:api && yarn ts:web",
     "postinstall": "patch-package"
   },

packages/api/.covid-env

@@ -0,0 +1,12 @@
+CONNECTIONS=mysql
+
+LABEL_mysql=MySql
+SERVER_mysql=dbgate.org
+USER_mysql=reader
+PASSWORD_mysql=CovidReader2020
+PORT_mysql=3326
+ENGINE_mysql=mysql@dbgate-plugin-mysql
+SINGLE_CONNECTION=mysql
+SINGLE_DATABASE=covid
+
+PERMISSIONS=files/charts/read

packages/api/.env

@@ -15,7 +15,7 @@ PORT_postgres=5433
 ENGINE_postgres=postgres
 
 TOOLBAR=home
-ICON_home=fas fa-home
+ICON_home=mdi mdi-home
 TITLE_home=Home
 PAGE_home=home.html
 STARTUP_PAGES=home

packages/api/.eslintrc.js

@@ -1,21 +0,0 @@
-module.exports = {
-  env: {
-    node: true,
-    commonjs: true,
-    es6: true,
-    jquery: false,
-    jest: true,
-    jasmine: true,
-  },
-  extends: 'eslint:recommended',
-  globals: {
-    Atomics: 'readonly',
-    SharedArrayBuffer: 'readonly',
-  },
-  parserOptions: {
-    ecmaVersion: 2018,
-  },
-  rules: {
-    'no-unused-vars': 'warn',
-  },
-};

packages/api/.npmignore

@@ -0,0 +1,2 @@
+dist
+.vscode

packages/api/.yarnrc

@@ -0,0 +1,2 @@
+version-tag-prefix packages-api-v
+version-git-message "packages-api v%s"

packages/api/README.md

@@ -0,0 +1,114 @@
+# dbgate-api
+
+Allows run DbGate data-manipulation scripts.
+
+## Installation
+
+    yarn add dbgate-api
+
+## Usage
+
+This example exports table Customer info CSV file.
+
+```javascript
+const dbgateApi = require('dbgate-api');
+const dbgatePluginMssql = require("dbgate-plugin-mssql");
+const dbgatePluginCsv = require("dbgate-plugin-csv");
+
+dbgateApi.registerPlugins(dbgatePluginMssql);
+
+async function run() {
+  const reader = await dbgateApi.tableReader({
+    connection: { server: 'localhost', engine: 'mssql', user: 'sa', password: 'xxxx', database: 'Chinook' },
+    schemaName: 'dbo',
+    pureName: 'Customer',
+  });
+  const writer = await dbgatePluginCsv.shellApi.writer({ fileName: 'Customer.csv' });
+  await dbgateApi.copyStream(reader, writer);
+
+  console.log('Finished job script');
+}
+dbgateApi.runScript(run);
+
+```
+
+Silly example, runs without any dependencies. Copy [fakeObjectReader](https://github.com/dbshell/dbgate/blob/master/packages/api/src/shell/fakeObjectReader.js) to [consoleObjectWriter](https://github.com/dbshell/dbgate/blob/master/packages/api/src/shell/consoleObjectWriter.js) .
+
+```javascript
+
+const dbgateApi = require('dbgate-api');
+async function run() {
+  const reader = await dbgateApi.fakeObjectReader();
+  const writer = await dbgateApi.consoleObjectWriter();
+  await dbgateApi.copyStream(reader, writer);
+  console.log('Finished job script');
+}
+dbgateApi.runScript(run);
+
+```
+
+## dbgateApi functions
+
+### dbgateApi.copyStream
+Copies data from reader into writer. Reader and writer should be created from functions listed below.
+```js
+  await dbgateApi.copyStream(reader, writer);
+```
+
+### dbgateApi.tableReader
+Reads table or view.
+```js
+  const reader = await dbgateApi.tableReader({
+    connection: { server: 'localhost', engine: 'mssql' | 'postgres' | 'mysql', user: 'root', password: 'xxxx', database: 'DB_NAME' },
+    schemaName: 'dbo',
+    pureName: 'Customer',
+  });
+```
+
+### dbgateApi.queryReader
+Executes query and reads its result.
+```js
+  const reader = await dbgateApi.tableReader({
+    connection: { server: 'localhost', engine: 'mssql' | 'postgres' | 'mysql', user: 'root', password: 'xxxx', database: 'DB_NAME' },
+    sql: 'SELECT * FROM Album',
+  });
+```
+
+### dbgateApi.tableWriter
+Imports data into table. Options are optional, default values are false.
+- dropIfExists - if table already exists, it is dropped before import
+- truncate - delete table content before import
+- createIfNotExists - create table, if not exists
+```js
+  const reader = await dbgateApi.tableWriter({
+    connection: { server: 'localhost', engine: 'mssql' | 'postgres' | 'mysql', user: 'root', password: 'xxxx', database: 'DB_NAME' },
+    schemaName: 'dbo',
+    pureName: 'Customer',
+    options: {
+      dropIfExists: false,
+      truncate: false,
+      createIfNotExists: false,
+    }
+  });
+```
+
+### dbgateApi.jsonLinesReader
+Reads JSON lines data file. On first line could be structure. Every line contains one row as JSON serialized object.
+```js
+  const reader = await dbgateApi.jsonLinesReader({
+    fileName: 'test.jsonl',
+    encoding: 'utf-8',
+    header: true,
+    limitRows: null
+  });
+```
+
+### dbgateApi.jsonLinesWriter
+Writes JSON lines data file. On first line could be structure. Every line contains one row as JSON serialized object.
+```js
+  const reader = await dbgateApi.jsonLinesWriter({
+    fileName: 'test.jsonl',
+    encoding: 'utf-8',
+    header: true
+  });
+```

packages/api/package.json

@@ -1,11 +1,23 @@
 {
-  "name": "@dbgate/api",
+  "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "0.1.0",
-  "private": true,
+  "version": "1.0.7",
+  "homepage": "https://dbgate.org/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dbshell/dbgate.git"
+  },
+  "funding": "https://www.paypal.com/paypalme/JanProchazkaCz/30eur",
+  "author": "Jan Prochazka",
+  "license": "GPL",
+  "keywords": [
+    "sql",
+    "json",
+    "import",
+    "export",
+    "dbgate"
+  ],
   "dependencies": {
-    "@dbgate/engines": "^0.1.0",
-    "@dbgate/sqltree": "^0.1.0",
     "async-lock": "^1.2.4",
     "axios": "^0.19.0",
     "body-parser": "^1.19.0",
@@ -13,30 +25,33 @@
     "byline": "^5.0.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "csv": "^5.3.2",
+    "dbgate-sqltree": "^1.0.0",
+    "dbgate-tools": "^1.0.0",
     "eslint": "^6.8.0",
-    "exceljs": "^4.0.1",
     "express": "^4.17.1",
     "express-basic-auth": "^1.2.0",
+    "express-fileupload": "^1.2.0",
     "find-free-port": "^2.0.0",
     "fs-extra": "^8.1.0",
     "http": "^0.0.0",
     "line-reader": "^0.4.0",
-    "mssql": "^6.0.1",
-    "mysql": "^2.17.1",
+    "lodash": "^4.17.15",
+    "ncp": "^2.0.0",
     "nedb-promises": "^4.0.1",
-    "pg": "^7.17.0",
-    "pg-query-stream": "^3.1.1"
+    "node-cron": "^2.0.3",
+    "tar": "^6.0.5",
+    "uuid": "^3.4.0"
   },
   "scripts": {
     "start": "nodemon src/index.js",
     "start:portal": "env-cmd nodemon src/index.js",
+    "start:covid": "env-cmd -f .covid-env nodemon src/index.js",
     "ts": "tsc",
     "build": "webpack"
   },
   "devDependencies": {
-    "@dbgate/types": "^0.1.0",
     "@types/lodash": "^4.14.149",
+    "dbgate-types": "^1.0.0",
     "env-cmd": "^10.1.0",
     "nodemon": "^2.0.2",
     "typescript": "^3.7.4",

packages/api/src/controllers/archive.js

@@ -1,7 +1,12 @@
 const fs = require('fs-extra');
+const stream = require('stream');
+const readline = require('readline');
 const path = require('path');
+const { formatWithOptions } = require('util');
 const { archivedir } = require('../utility/directories');
 const socket = require('../utility/socket');
+const JsonLinesDatastore = require('../utility/JsonLinesDatastore');
+const { saveFreeTableData } = require('../utility/freeTableStorage');
 
 module.exports = {
   folders_meta: 'get',
@@ -30,7 +35,9 @@ module.exports = {
 
   files_meta: 'get',
   async files({ folder }) {
-    const files = await fs.readdir(path.join(archivedir(), folder));
+    const dir = path.join(archivedir(), folder);
+    if (!(await fs.exists(dir))) return [];
+    const files = await fs.readdir(dir);
     return files
       .filter((name) => name.endsWith('.jsonl'))
       .map((name) => ({
@@ -61,4 +68,31 @@ module.exports = {
     await fs.rmdir(path.join(archivedir(), folder), { recursive: true });
     socket.emitChanged(`archive-folders-changed`);
   },
+
+  saveFreeTable_meta: 'post',
+  async saveFreeTable({ folder, file, data }) {
+    saveFreeTableData(path.join(archivedir(), folder, `${file}.jsonl`), data);
+    return true;
+  },
+
+  loadFreeTable_meta: 'post',
+  async loadFreeTable({ folder, file }) {
+    return new Promise((resolve, reject) => {
+      const fileStream = fs.createReadStream(path.join(archivedir(), folder, `${file}.jsonl`));
+      const liner = readline.createInterface({
+        input: fileStream,
+      });
+      let structure = null;
+      const rows = [];
+      liner.on('line', (line) => {
+        const data = JSON.parse(line);
+        if (structure) rows.push(data);
+        else structure = data;
+      });
+      liner.on('close', () => {
+        resolve({ structure, rows });
+        fileStream.close();
+      });
+    });
+  },
 };

packages/api/src/controllers/config.js

@@ -1,20 +1,34 @@
+const currentVersion = require('../currentVersion');
+
 module.exports = {
   get_meta: 'get',
   async get() {
-    const toolbarButtons = process.env.TOOLBAR;
-    const toolbar = toolbarButtons
-      ? toolbarButtons.split(',').map((name) => ({
-          name,
-          icon: process.env[`ICON_${name}`],
-          title: process.env[`TITLE_${name}`],
-          page: process.env[`PAGE_${name}`],
-        }))
-      : null;
-    const startupPages = process.env.STARTUP_PAGES ? process.env.STARTUP_PAGES.split(',') : [];
+    // const toolbarButtons = process.env.TOOLBAR;
+    // const toolbar = toolbarButtons
+    //   ? toolbarButtons.split(',').map((name) => ({
+    //       name,
+    //       icon: process.env[`ICON_${name}`],
+    //       title: process.env[`TITLE_${name}`],
+    //       page: process.env[`PAGE_${name}`],
+    //     }))
+    //   : null;
+    // const startupPages = process.env.STARTUP_PAGES ? process.env.STARTUP_PAGES.split(',') : [];
+    const permissions = process.env.PERMISSIONS ? process.env.PERMISSIONS.split(',') : null;
+    const singleDatabase =
+      process.env.SINGLE_CONNECTION && process.env.SINGLE_DATABASE
+        ? {
+            conid: process.env.SINGLE_CONNECTION,
+            database: process.env.SINGLE_DATABASE,
+          }
+        : null;
+
     return {
       runAsPortal: !!process.env.CONNECTIONS,
-      toolbar,
-      startupPages,
+      // toolbar,
+      // startupPages,
+      singleDatabase,
+      permissions,
+      ...currentVersion,
     };
   },
 };

packages/api/src/controllers/databaseConnections.js

@@ -2,12 +2,12 @@ const uuidv1 = require('uuid/v1');
 const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
-const DatabaseAnalyser = require('@dbgate/engines/default/DatabaseAnalyser');
+const { DatabaseAnalyser } = require('dbgate-tools');
 
 module.exports = {
-  /** @type {import('@dbgate/types').OpenedDatabaseConnection[]} */
+  /** @type {import('dbgate-types').OpenedDatabaseConnection[]} */
   opened: [],
-  closed: [],
+  closed: {},
   requests: {},
 
   handle_structure(conid, database, { structure }) {
@@ -28,6 +28,7 @@ module.exports = {
   handle_status(conid, database, { status }) {
     const existing = this.opened.find((x) => x.conid == conid && x.database == database);
     if (!existing) return;
+    if (existing.status == status) return;
     existing.status = status;
     socket.emitChanged(`database-status-changed-${conid}-${database}`);
   },
@@ -39,7 +40,7 @@ module.exports = {
     if (existing) return existing;
     const connection = await connections.get({ conid });
     const subprocess = fork(process.argv[1], ['databaseConnectionProcess']);
-    const lastClosed = this.closed.find((x) => x.conid == conid && x.database == database);
+    const lastClosed = this.closed[`${conid}/${database}`];
     const newOpened = {
       conid,
       database,
@@ -67,7 +68,7 @@ module.exports = {
     return newOpened;
   },
 
-  /** @param {import('@dbgate/types').OpenedDatabaseConnection} conn */
+  /** @param {import('dbgate-types').OpenedDatabaseConnection} conn */
   sendRequest(conn, message) {
     const msgid = uuidv1();
     const promise = new Promise((resolve, reject) => {
@@ -89,6 +90,8 @@ module.exports = {
   async status({ conid, database }) {
     const existing = this.opened.find((x) => x.conid == conid && x.database == database);
     if (existing) return existing.status;
+    const lastClosed = this.closed[`${conid}/${database}`];
+    if (lastClosed) return lastClosed.status;
     return {
       name: 'error',
       message: 'Not connected',
@@ -118,7 +121,7 @@ module.exports = {
       existing.disconnected = true;
       if (kill) existing.subprocess.kill();
       this.opened = this.opened.filter((x) => x.conid != conid || x.database != database);
-      this.closed[conid] = {
+      this.closed[`${conid}/${database}`] = {
         status: {
           ...existing.status,
           name: 'error',

packages/api/src/controllers/files.js

@@ -1,19 +1,99 @@
-const exceljs = require('exceljs');
-const _ = require('lodash');
+const fs = require('fs-extra');
+const path = require('path');
+const { filesdir } = require('../utility/directories');
+const hasPermission = require('../utility/hasPermission');
+const socket = require('../utility/socket');
+const scheduler = require('./scheduler');
+
+function serialize(format, data) {
+  if (format == 'text') return data;
+  if (format == 'json') return JSON.stringify(data);
+  throw new Error(`Invalid format: ${format}`);
+}
+
+function deserialize(format, text) {
+  if (format == 'text') return text;
+  if (format == 'json') return JSON.parse(text);
+  throw new Error(`Invalid format: ${format}`);
+}
 
 module.exports = {
-  openedReaders: {},
+  list_meta: 'get',
+  async list({ folder }) {
+    if (!hasPermission(`files/${folder}/read`)) return [];
+    const dir = path.join(filesdir(), folder);
+    if (!(await fs.exists(dir))) return [];
+    const files = (await fs.readdir(dir)).map((file) => ({ folder, file }));
+    return files;
+  },
 
-  analyseExcel_meta: 'get',
-  async analyseExcel({ filePath }) {
-    const workbook = new exceljs.Workbook();
-    await workbook.xlsx.readFile(filePath);
-    return {
-      tables: workbook.worksheets.map((sheet) => {
-        const header = sheet.getRow(1);
-        const columns = _.range(header.cellCount).map((index) => ({ columnName: header.getCell(index + 1).value }));
-        return { pureName: sheet.name, columns };
-      }),
-    };
+  listAll_meta: 'get',
+  async listAll() {
+    const folders = await fs.readdir(filesdir());
+    const res = [];
+    for (const folder of folders) {
+      if (!hasPermission(`files/${folder}/read`)) continue;
+      const dir = path.join(filesdir(), folder);
+      const files = (await fs.readdir(dir)).map((file) => ({ folder, file }));
+      res.push(...files);
+    }
+    return res;
+  },
+
+  delete_meta: 'post',
+  async delete({ folder, file }) {
+    if (!hasPermission(`files/${folder}/write`)) return;
+    await fs.unlink(path.join(filesdir(), folder, file));
+    socket.emitChanged(`files-changed-${folder}`);
+    socket.emitChanged(`all-files-changed`);
+  },
+
+  rename_meta: 'post',
+  async rename({ folder, file, newFile }) {
+    if (!hasPermission(`files/${folder}/write`)) return;
+    await fs.rename(path.join(filesdir(), folder, file), path.join(filesdir(), folder, newFile));
+    socket.emitChanged(`files-changed-${folder}`);
+    socket.emitChanged(`all-files-changed`);
+  },
+
+  load_meta: 'post',
+  async load({ folder, file, format }) {
+    if (!hasPermission(`files/${folder}/read`)) return null;
+    const text = await fs.readFile(path.join(filesdir(), folder, file), { encoding: 'utf-8' });
+    return deserialize(format, text);
+  },
+
+  save_meta: 'post',
+  async save({ folder, file, data, format }) {
+    if (!hasPermission(`files/${folder}/write`)) return;
+    const dir = path.join(filesdir(), folder);
+    if (!(await fs.exists(dir))) {
+      await fs.mkdir(dir);
+    }
+    await fs.writeFile(path.join(dir, file), serialize(format, data));
+    socket.emitChanged(`files-changed-${folder}`);
+    socket.emitChanged(`all-files-changed`);
+    if (folder == 'shell') {
+      scheduler.reload();
+    }
+  },
+
+  favorites_meta: 'get',
+  async favorites() {
+    if (!hasPermission(`files/favorites/read`)) return [];
+    const dir = path.join(filesdir(), 'favorites');
+    if (!(await fs.exists(dir))) return [];
+    const files = await fs.readdir(dir);
+    const res = [];
+    for (const file of files) {
+      const filePath = path.join(dir, file);
+      const text = await fs.readFile(filePath, { encoding: 'utf-8' });
+      res.push({
+        file,
+        folder: 'favorites',
+        ...JSON.parse(text),
+      });
+    }
+    return res;
   },
 };

packages/api/src/controllers/jsldata.js

@@ -1,7 +1,8 @@
 const fs = require('fs');
 const lineReader = require('line-reader');
-const { off } = require('process');
+const _ = require('lodash');
 const DatastoreProxy = require('../utility/DatastoreProxy');
+const { saveFreeTableData } = require('../utility/freeTableStorage');
 const getJslFileName = require('../utility/getJslFileName');
 const JsonLinesDatastore = require('../utility/JsonLinesDatastore');
 const socket = require('../utility/socket');
@@ -111,10 +112,10 @@ module.exports = {
     return null;
   },
 
-  getRows_meta: 'get',
-  async getRows({ jslid, offset, limit }) {
+  getRows_meta: 'post',
+  async getRows({ jslid, offset, limit, filters }) {
     const datastore = await this.ensureDatastore(jslid);
-    return datastore.getRows(offset, limit);
+    return datastore.getRows(offset, limit, _.isEmpty(filters) ? null : filters);
   },
 
   getStats_meta: 'get',
@@ -138,4 +139,10 @@ module.exports = {
     //   socket.emit(`jsldata-stats-${stats.jslid}`, stats);
     // }
   },
+
+  saveFreeTable_meta: 'post',
+  async saveFreeTable({ jslid, data }) {
+    saveFreeTableData(getJslFileName(jslid), data);
+    return true;
+  },
 };

packages/api/src/controllers/plugins.js

@@ -0,0 +1,154 @@
+const fs = require('fs-extra');
+const axios = require('axios');
+const path = require('path');
+const { pluginsdir, datadir } = require('../utility/directories');
+const socket = require('../utility/socket');
+const requirePlugin = require('../shell/requirePlugin');
+const downloadPackage = require('../utility/downloadPackage');
+const hasPermission = require('../utility/hasPermission');
+
+// async function loadPackageInfo(dir) {
+//   const readmeFile = path.join(dir, 'README.md');
+//   const packageFile = path.join(dir, 'package.json');
+
+//   if (!(await fs.exists(packageFile))) {
+//     return null;
+//   }
+
+//   let readme = null;
+//   let manifest = null;
+//   if (await fs.exists(readmeFile)) readme = await fs.readFile(readmeFile, { encoding: 'utf-8' });
+//   if (await fs.exists(packageFile)) manifest = JSON.parse(await fs.readFile(packageFile, { encoding: 'utf-8' }));
+//   return {
+//     readme,
+//     manifest,
+//   };
+// }
+
+const preinstallPlugins = [
+  'dbgate-plugin-mssql',
+  'dbgate-plugin-mysql',
+  'dbgate-plugin-postgres',
+  'dbgate-plugin-csv',
+  'dbgate-plugin-excel',
+];
+
+module.exports = {
+  script_meta: 'get',
+  async script({ packageName }) {
+    const file = path.join(pluginsdir(), packageName, 'dist', 'frontend.js');
+    const data = await fs.readFile(file, {
+      encoding: 'utf-8',
+    });
+    return data;
+  },
+
+  search_meta: 'get',
+  async search({ filter }) {
+    // DOCS: https://github.com/npm/registry/blob/master/docs/REGISTRY-API.md#get-v1search
+    const resp = await axios.default.get(
+      `http://registry.npmjs.com/-/v1/search?text=${encodeURIComponent(filter)}+keywords:dbgateplugin&size=25&from=0`
+    );
+    const { objects } = resp.data || {};
+    return (objects || []).map((x) => x.package);
+  },
+
+  info_meta: 'get',
+  async info({ packageName }) {
+    try {
+      const infoResp = await axios.default.get(`https://registry.npmjs.org/${packageName}`);
+      const { latest } = infoResp.data['dist-tags'];
+      const manifest = infoResp.data.versions[latest];
+      const { readme } = infoResp.data;
+
+      return {
+        readme,
+        manifest,
+      };
+    } catch (err) {
+      return {
+        state: 'error',
+        error: err.message,
+      };
+    }
+
+    // const dir = path.join(pluginstmpdir(), packageName);
+    // if (!(await fs.exists(dir))) {
+    //   await downloadPackage(packageName, dir);
+    // }
+    // return await loadPackageInfo(dir);
+    // return await {
+    //   ...loadPackageInfo(dir),
+    //   installed: loadPackageInfo(path.join(pluginsdir(), packageName)),
+    // };
+  },
+
+  installed_meta: 'get',
+  async installed() {
+    const files = await fs.readdir(pluginsdir());
+    const res = [];
+    for (const packageName of files) {
+      const manifest = await fs
+        .readFile(path.join(pluginsdir(), packageName, 'package.json'))
+        .then((x) => JSON.parse(x));
+      const readmeFile = path.join(pluginsdir(), packageName, 'README.md');
+      if (await fs.exists(readmeFile)) {
+        manifest.readme = await fs.readFile(readmeFile, { encoding: 'utf-8' });
+      }
+      res.push(manifest);
+    }
+    return res;
+    // const res = await Promise.all(
+    //   files.map((packageName) =>
+    //     fs.readFile(path.join(pluginsdir(), packageName, 'package.json')).then((x) => JSON.parse(x))
+    //   )
+    // );
+  },
+
+  install_meta: 'post',
+  async install({ packageName }) {
+    if (!hasPermission(`plugins/install`)) return;
+    const dir = path.join(pluginsdir(), packageName);
+    if (!(await fs.exists(dir))) {
+      await downloadPackage(packageName, dir);
+    }
+    socket.emitChanged(`installed-plugins-changed`);
+  },
+
+  uninstall_meta: 'post',
+  async uninstall({ packageName }) {
+    if (!hasPermission(`plugins/install`)) return;
+    const dir = path.join(pluginsdir(), packageName);
+    await fs.rmdir(dir, { recursive: true });
+    socket.emitChanged(`installed-plugins-changed`);
+    this.removedPlugins.push(packageName);
+    await fs.writeFile(path.join(datadir(), 'removed-plugins'), this.removedPlugins.join('\n'));
+  },
+
+  command_meta: 'post',
+  async command({ packageName, command, args }) {
+    const content = requirePlugin(packageName);
+    return content.commands[command](args);
+  },
+
+  async _init() {
+    const installed = await this.installed();
+    try {
+      this.removedPlugins = (await fs.readFile(path.join(datadir(), 'removed-plugins'), { encoding: 'utf-8' })).split(
+        '\n'
+      );
+    } catch (err) {
+      this.removedPlugins = [];
+    }
+    for (const packageName of preinstallPlugins) {
+      if (this.removedPlugins.includes(packageName)) continue;
+      if (installed.find((x) => x.name == packageName)) continue;
+      try {
+        console.log('Preinstalling plugin', packageName);
+        await this.install({ packageName });
+      } catch (err) {
+        console.error('Error preinstalling plugin', packageName, err);
+      }
+    }
+  },
+};

packages/api/src/controllers/runners.js

@@ -5,23 +5,53 @@ const uuidv1 = require('uuid/v1');
 const byline = require('byline');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
-const { rundir, uploadsdir } = require('../utility/directories');
+const { rundir, uploadsdir, pluginsdir } = require('../utility/directories');
+const { extractShellApiPlugins, extractShellApiFunctionName } = require('dbgate-tools');
+
+function extractPlugins(script) {
+  const requireRegex = /\s*\/\/\s*@require\s+([^\s]+)\s*\n/g;
+  const matches = [...script.matchAll(requireRegex)];
+  return matches.map((x) => x[1]);
+}
+
+const requirePluginsTemplate = (plugins) =>
+  plugins
+    .map(
+      (packageName) => `const ${_.camelCase(packageName)} = require(process.env.PLUGIN_${_.camelCase(packageName)});\n`
+    )
+    .join('') + `dbgateApi.registerPlugins(${plugins.map((x) => _.camelCase(x)).join(',')});\n`;
 
 const scriptTemplate = (script) => `
-const dbgateApi = require(process.env.DBGATE_API || "@dbgate/api");
+const dbgateApi = require(process.env.DBGATE_API);
+${requirePluginsTemplate(extractPlugins(script))}
 require=null;
 async function run() {
 ${script}
+await dbgateApi.finalizer.run();
+console.log('Finished job script');
+}
+dbgateApi.runScript(run);
+`;
+
+const loaderScriptTemplate = (functionName, props, runid) => `
+const dbgateApi = require(process.env.DBGATE_API);
+${requirePluginsTemplate(extractShellApiPlugins(functionName, props))}
+require=null;
+async function run() {
+const reader=await ${extractShellApiFunctionName(functionName)}(${JSON.stringify(props)});
+const writer=await dbgateApi.collectorWriter({runid: '${runid}'});
+await dbgateApi.copyStream(reader, writer);
 }
 dbgateApi.runScript(run);
 `;
 
 module.exports = {
-  /** @type {import('@dbgate/types').OpenedRunner[]} */
+  /** @type {import('dbgate-types').OpenedRunner[]} */
   opened: [],
+  requests: {},
 
   dispatchMessage(runid, message) {
-    // console.log('DISPATCHING', message);
+    if (message) console.log('...', message.message);
     if (_.isString(message)) {
       socket.emit(`runner-info-${runid}`, {
         message,
@@ -40,19 +70,34 @@ module.exports = {
 
   handle_ping() {},
 
-  start_meta: 'post',
-  async start({ script }) {
-    const runid = uuidv1();
+  handle_freeData(runid, { freeData }) {
+    const [resolve, reject] = this.requests[runid];
+    resolve(freeData);
+    delete this.requests[runid];
+  },
+
+  rejectRequest(runid, error) {
+    if (this.requests[runid]) {
+      const [resolve, reject] = this.requests[runid];
+      reject(error);
+      delete this.requests[runid];
+    }
+  },
+
+  startCore(runid, scriptText) {
     const directory = path.join(rundir(), runid);
     const scriptFile = path.join(uploadsdir(), runid + '.js');
-    fs.writeFileSync(`${scriptFile}`, scriptTemplate(script));
+    fs.writeFileSync(`${scriptFile}`, scriptText);
     fs.mkdirSync(directory);
+    const pluginNames = fs.readdirSync(pluginsdir());
     console.log(`RUNNING SCRIPT ${scriptFile}`);
+    // const subprocess = fork(scriptFile, ['--checkParent', '--max-old-space-size=8192'], {
     const subprocess = fork(scriptFile, ['--checkParent'], {
       cwd: directory,
       stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
       env: {
         DBGATE_API: process.argv[1],
+        ..._.fromPairs(pluginNames.map((name) => [`PLUGIN_${_.camelCase(name)}`, path.join(pluginsdir(), name)])),
       },
     });
     const pipeDispatcher = (severity) => (data) =>
@@ -61,9 +106,13 @@ module.exports = {
     byline(subprocess.stdout).on('data', pipeDispatcher('info'));
     byline(subprocess.stderr).on('data', pipeDispatcher('error'));
     subprocess.on('exit', (code) => {
+      this.rejectRequest(runid, { message: 'No data retured, maybe input data source is too big' });
+      console.log('... EXIT process', code);
       socket.emit(`runner-done-${runid}`, code);
     });
     subprocess.on('error', (error) => {
+      this.rejectRequest(runid, { message: error && (error.message || error.toString()) });
+      console.error('... ERROR subprocess', error);
       this.dispatchMessage({
         severity: 'error',
         message: error.toString(),
@@ -81,6 +130,12 @@ module.exports = {
     return newOpened;
   },
 
+  start_meta: 'post',
+  async start({ script }) {
+    const runid = uuidv1();
+    return this.startCore(runid, scriptTemplate(script));
+  },
+
   cancel_meta: 'post',
   async cancel({ runid }) {
     const runner = this.opened.find((x) => x.runid == runid);
@@ -106,4 +161,14 @@ module.exports = {
     }
     return res;
   },
+
+  loadReader_meta: 'post',
+  async loadReader({ functionName, props }) {
+    const promise = new Promise((resolve, reject) => {
+      const runid = uuidv1();
+      this.requests[runid] = [resolve, reject];
+      this.startCore(runid, loaderScriptTemplate(functionName, props, runid));
+    });
+    return promise;
+  },
 };

packages/api/src/controllers/scheduler.js

@@ -0,0 +1,43 @@
+const { filesdir } = require('../utility/directories');
+const fs = require('fs-extra');
+const path = require('path');
+const cron = require('node-cron');
+const runners = require('./runners');
+const hasPermission = require('../utility/hasPermission');
+
+const scheduleRegex = /\s*\/\/\s*@schedule\s+([^\n]+)\n/;
+
+module.exports = {
+  tasks: [],
+
+  async unload() {
+    this.tasks.forEach((x) => x.destroy());
+    this.tasks = [];
+  },
+
+  async processFile(file) {
+    const text = await fs.readFile(file, { encoding: 'utf-8' });
+    const match = text.match(scheduleRegex);
+    if (!match) return;
+    const pattern = match[1];
+    if (!cron.validate(pattern)) return;
+    console.log(`Schedule script ${file} with pattern ${pattern}`);
+    const task = cron.schedule(pattern, () => runners.start({ script: text }));
+    this.tasks.push(task);
+  },
+
+  async reload() {
+    if (!hasPermission('files/shell/read')) return;
+    const shellDir = path.join(filesdir(), 'shell');
+    await this.unload();
+    if (!(await fs.exists(shellDir))) return;
+    const files = await fs.readdir(shellDir);
+    for (const file of files) {
+      await this.processFile(path.join(shellDir, file));
+    }
+  },
+
+  async _init() {
+    this.reload();
+  },
+};

packages/api/src/controllers/serverConnections.js

@@ -19,9 +19,6 @@ module.exports = {
     existing.status = status;
     socket.emitChanged(`server-status-changed`);
   },
-  handle_error(conid, { error }) {
-    console.log(`Error in server connection ${conid}: ${error}`);
-  },
   handle_ping() {},
 
   async ensureOpened(conid) {

packages/api/src/controllers/sessions.js

@@ -6,7 +6,7 @@ const { fork } = require('child_process');
 const jsldata = require('./jsldata');
 
 module.exports = {
-  /** @type {import('@dbgate/types').OpenedSession[]} */
+  /** @type {import('dbgate-types').OpenedSession[]} */
   opened: [],
 
   // handle_error(sesid, props) {
@@ -95,15 +95,15 @@ module.exports = {
     return { state: 'ok' };
   },
 
-  cancel_meta: 'post',
-  async cancel({ sesid }) {
-    const session = this.opened.find((x) => x.sesid == sesid);
-    if (!session) {
-      throw new Error('Invalid session');
-    }
-    session.subprocess.send({ msgtype: 'cancel' });
-    return { state: 'ok' };
-  },
+  // cancel_meta: 'post',
+  // async cancel({ sesid }) {
+  //   const session = this.opened.find((x) => x.sesid == sesid);
+  //   if (!session) {
+  //     throw new Error('Invalid session');
+  //   }
+  //   session.subprocess.send({ msgtype: 'cancel' });
+  //   return { state: 'ok' };
+  // },
 
   kill_meta: 'post',
   async kill({ sesid }) {
@@ -112,6 +112,7 @@ module.exports = {
       throw new Error('Invalid session');
     }
     session.subprocess.kill();
+    this.dispatchMessage(sesid, 'Connection closed');
     return { state: 'ok' };
   },
 

packages/api/src/controllers/uploads.js

@@ -0,0 +1,28 @@
+const path = require('path');
+const { uploadsdir } = require('../utility/directories');
+const uuidv1 = require('uuid/v1');
+
+module.exports = {
+  upload_meta: {
+    method: 'post',
+    raw: true,
+  },
+  upload(req, res) {
+    const { data } = req.files || {};
+    if (!data) {
+      res.json(null);
+      return;
+    }
+    const uploadName = uuidv1();
+    const filePath = path.join(uploadsdir(), uploadName);
+    console.log(`Uploading file ${data.name}, size=${data.size}`);
+
+    data.mv(filePath, () => {
+      res.json({
+        originalName: data.name,
+        uploadName,
+        filePath,
+      });
+    });
+  },
+};

packages/api/src/currentVersion.js

@@ -0,0 +1,5 @@
+
+module.exports = { 
+  version: '3.8.6',
+  buildTime: '2020-12-10T11:14:01.053Z'
+};

packages/api/src/main.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const basicAuth = require('express-basic-auth');
 const bodyParser = require('body-parser');
+const fileUpload = require('express-fileupload');
 const http = require('http');
 const cors = require('cors');
 const io = require('socket.io');
@@ -19,8 +20,11 @@ const sessions = require('./controllers/sessions');
 const runners = require('./controllers/runners');
 const jsldata = require('./controllers/jsldata');
 const config = require('./controllers/config');
-const files = require('./controllers/files');
 const archive = require('./controllers/archive');
+const uploads = require('./controllers/uploads');
+const plugins = require('./controllers/plugins');
+const files = require('./controllers/files');
+const scheduler = require('./controllers/scheduler');
 
 const { rundir } = require('./utility/directories');
 
@@ -47,6 +51,13 @@ function start(argument = null) {
   app.use(cors());
   app.use(bodyParser.json({ limit: '50mb' }));
 
+  app.use(
+    '/uploads',
+    fileUpload({
+      limits: { fileSize: 4 * 1024 * 1024 },
+    })
+  );
+
   useController(app, '/connections', connections);
   useController(app, '/server-connections', serverConnections);
   useController(app, '/database-connections', databaseConnections);
@@ -55,12 +66,15 @@ function start(argument = null) {
   useController(app, '/runners', runners);
   useController(app, '/jsldata', jsldata);
   useController(app, '/config', config);
-  useController(app, '/files', files);
   useController(app, '/archive', archive);
+  useController(app, '/uploads', uploads);
+  useController(app, '/plugins', plugins);
+  useController(app, '/files', files);
+  useController(app, '/scheduler', scheduler);
 
-  if (process.env.PAGES_DIRECTORY) {
-    app.use('/pages', express.static(process.env.PAGES_DIRECTORY));
-  }
+  // if (process.env.PAGES_DIRECTORY) {
+  //   app.use('/pages', express.static(process.env.PAGES_DIRECTORY));
+  // }
 
   app.use('/runners/data', express.static(rundir()));
 

packages/api/src/proc/connectProcess.js

@@ -1,13 +1,12 @@
-const engines = require('@dbgate/engines');
-const driverConnect = require('../utility/driverConnect');
 const childProcessChecker = require('../utility/childProcessChecker');
+const requireEngineDriver = require('../utility/requireEngineDriver');
 
 function start() {
   childProcessChecker();
   process.on('message', async (connection) => {
     try {
-      const driver = engines(connection);
-      const conn = await driverConnect(driver, connection);
+      const driver = requireEngineDriver(connection);
+      const conn = await driver.connect(connection);
       const res = await driver.getVersion(conn);
       process.send({ msgtype: 'connected', ...res });
     } catch (e) {

packages/api/src/proc/databaseConnectionProcess.js

@@ -1,7 +1,6 @@
-const engines = require('@dbgate/engines');
 const stableStringify = require('json-stable-stringify');
-const driverConnect = require('../utility/driverConnect');
 const childProcessChecker = require('../utility/childProcessChecker');
+const requireEngineDriver = require('../utility/requireEngineDriver');
 
 let systemConnection;
 let storedConnection;
@@ -26,19 +25,20 @@ async function checkedAsyncCall(promise) {
 }
 
 async function handleFullRefresh() {
-  const driver = engines(storedConnection);
+  const driver = requireEngineDriver(storedConnection);
   analysedStructure = await checkedAsyncCall(driver.analyseFull(systemConnection));
   process.send({ msgtype: 'structure', structure: analysedStructure });
   setStatusName('ok');
 }
 
 async function handleIncrementalRefresh() {
-  const driver = engines(storedConnection);
+  const driver = requireEngineDriver(storedConnection);
   const newStructure = await checkedAsyncCall(driver.analyseIncremental(systemConnection, analysedStructure));
   if (newStructure != null) {
     analysedStructure = newStructure;
     process.send({ msgtype: 'structure', structure: analysedStructure });
   }
+  setStatusName('ok');
 }
 
 function setStatus(status) {
@@ -58,8 +58,8 @@ async function handleConnect({ connection, structure }) {
   lastPing = new Date().getTime();
 
   if (!structure) setStatusName('pending');
-  const driver = engines(storedConnection);
-  systemConnection = await checkedAsyncCall(driverConnect(driver, storedConnection));
+  const driver = requireEngineDriver(storedConnection);
+  systemConnection = await checkedAsyncCall(driver.connect(storedConnection));
   if (structure) {
     analysedStructure = structure;
     handleIncrementalRefresh();
@@ -82,7 +82,7 @@ function waitConnected() {
 
 async function handleQueryData({ msgid, sql }) {
   await waitConnected();
-  const driver = engines(storedConnection);
+  const driver = requireEngineDriver(storedConnection);
   try {
     const res = await driver.query(systemConnection, sql);
     process.send({ msgtype: 'response', msgid, ...res });

packages/api/src/proc/serverConnectionProcess.js

@@ -1,7 +1,6 @@
-const engines = require('@dbgate/engines');
 const stableStringify = require('json-stable-stringify');
-const driverConnect = require('../utility/driverConnect');
 const childProcessChecker = require('../utility/childProcessChecker');
+const requireEngineDriver = require('../utility/requireEngineDriver');
 
 let systemConnection;
 let storedConnection;
@@ -10,7 +9,7 @@ let lastStatus = null;
 let lastPing = null;
 
 async function handleRefresh() {
-  const driver = engines(storedConnection);
+  const driver = requireEngineDriver(storedConnection);
   try {
     const databases = await driver.listDatabases(systemConnection);
     setStatusName('ok');
@@ -46,9 +45,9 @@ async function handleConnect(connection) {
   setStatusName('pending');
   lastPing = new Date().getTime();
 
-  const driver = engines(storedConnection);
+  const driver = requireEngineDriver(storedConnection);
   try {
-    systemConnection = await driverConnect(driver, storedConnection);
+    systemConnection = await driver.connect(storedConnection);
     handleRefresh();
     setInterval(handleRefresh, 30 * 1000);
   } catch (err) {
@@ -66,8 +65,8 @@ function handlePing() {
 }
 
 async function handleCreateDatabase({ name }) {
-  const driver = engines(storedConnection);
-  systemConnection = await driverConnect(driver, storedConnection);
+  const driver = requireEngineDriver(storedConnection);
+  systemConnection = await driver.connect(storedConnection);
   console.log(`RUNNING SCRIPT: CREATE DATABASE ${driver.dialect.quoteIdentifier(name)}`);
   await driver.query(systemConnection, `CREATE DATABASE ${driver.dialect.quoteIdentifier(name)}`);
   await handleRefresh();
@@ -97,8 +96,11 @@ function start() {
   process.on('message', async (message) => {
     try {
       await handleMessage(message);
-    } catch (e) {
-      process.send({ msgtype: 'error', error: e.message });
+    } catch (err) {
+      setStatus({
+        name: 'error',
+        message: err.message,
+      });
     }
   });
 }

packages/api/src/proc/sessionProcess.js

@@ -1,4 +1,3 @@
-const engines = require('@dbgate/engines');
 const uuidv1 = require('uuid/v1');
 const path = require('path');
 const fs = require('fs');
@@ -6,13 +5,13 @@ const _ = require('lodash');
 const childProcessChecker = require('../utility/childProcessChecker');
 const goSplit = require('../utility/goSplit');
 
-const driverConnect = require('../utility/driverConnect');
 const { jsldir } = require('../utility/directories');
+const requireEngineDriver = require('../utility/requireEngineDriver');
 
 let systemConnection;
 let storedConnection;
 let afterConnectCallbacks = [];
-let currentHandlers = [];
+// let currentHandlers = [];
 
 class TableWriter {
   constructor(columns, resultIndex) {
@@ -65,17 +64,20 @@ class TableWriter {
 }
 
 class StreamHandler {
-  constructor(resultIndex) {
+  constructor(resultIndexHolder, resolve) {
     this.recordset = this.recordset.bind(this);
     this.row = this.row.bind(this);
     // this.error = this.error.bind(this);
     this.done = this.done.bind(this);
     this.info = this.info.bind(this);
-    // use this for cancelling
-    this.stream = null;
+
+    // use this for cancelling - not implemented
+    // this.stream = null;
+    
     this.plannedStats = false;
-    this.resultIndex = resultIndex;
-    currentHandlers = [...currentHandlers, this];
+    this.resultIndexHolder = resultIndexHolder;
+    this.resolve = resolve;
+    // currentHandlers = [...currentHandlers, this];
   }
 
   closeCurrentWriter() {
@@ -87,7 +89,8 @@ class StreamHandler {
 
   recordset(columns) {
     this.closeCurrentWriter();
-    this.currentWriter = new TableWriter(columns, this.resultIndex);
+    this.currentWriter = new TableWriter(columns, this.resultIndexHolder.value);
+    this.resultIndexHolder.value += 1;
 
     // this.writeCurrentStats();
 
@@ -108,30 +111,37 @@ class StreamHandler {
   // }
   done(result) {
     this.closeCurrentWriter();
-    process.send({ msgtype: 'done', result });
-    currentHandlers = currentHandlers.filter((x) => x != this);
+    // currentHandlers = currentHandlers.filter((x) => x != this);
+    this.resolve();
   }
   info(info) {
     process.send({ msgtype: 'info', info });
   }
 }
 
+function handleStream(driver, resultIndexHolder, sql) {
+  return new Promise((resolve, reject) => {
+    const handler = new StreamHandler(resultIndexHolder, resolve);
+    driver.stream(systemConnection, sql, handler);
+  });
+}
+
 async function handleConnect(connection) {
   storedConnection = connection;
 
-  const driver = engines(storedConnection);
-  systemConnection = await driverConnect(driver, storedConnection);
+  const driver = requireEngineDriver(storedConnection);
+  systemConnection = await driver.connect(storedConnection);
   for (const [resolve] of afterConnectCallbacks) {
     resolve();
   }
   afterConnectCallbacks = [];
 }
 
-function handleCancel() {
-  for (const handler of currentHandlers) {
-    if (handler.stream) handler.stream.cancel();
-  }
-}
+// function handleCancel() {
+//   for (const handler of currentHandlers) {
+//     if (handler.stream) handler.stream.cancel();
+//   }
+// }
 
 function waitConnected() {
   if (systemConnection) return Promise.resolve();
@@ -142,21 +152,25 @@ function waitConnected() {
 
 async function handleExecuteQuery({ sql }) {
   await waitConnected();
-  const driver = engines(storedConnection);
+  const driver = requireEngineDriver(storedConnection);
 
-  let resultIndex = 0;
+  const resultIndexHolder = {
+    value: 0,
+  };
   for (const sqlItem of goSplit(sql)) {
-    const handler = new StreamHandler(resultIndex);
-    const stream = await driver.stream(systemConnection, sqlItem, handler);
-    handler.stream = stream;
-    resultIndex += 1;
+    await handleStream(driver, resultIndexHolder, sqlItem);
+    // const handler = new StreamHandler(resultIndex);
+    // const stream = await driver.stream(systemConnection, sqlItem, handler);
+    // handler.stream = stream;
+    // resultIndex = handler.resultIndex;
   }
+  process.send({ msgtype: 'done' });
 }
 
 const messageHandlers = {
   connect: handleConnect,
   executeQuery: handleExecuteQuery,
-  cancel: handleCancel,
+  // cancel: handleCancel,
 };
 
 async function handleMessage({ msgtype, ...other }) {

packages/api/src/shell/archiveReader.js

@@ -2,9 +2,9 @@ const path = require('path');
 const { archivedir } = require('../utility/directories');
 const jsonLinesReader = require('./jsonLinesReader');
 
-function archiveReader({ folderName, fileName }) {
+function archiveReader({ folderName, fileName, ...other }) {
   const jsonlFile = path.join(archivedir(), folderName, `${fileName}.jsonl`);
-  const res = jsonLinesReader({ fileName: jsonlFile });
+  const res = jsonLinesReader({ fileName: jsonlFile, ...other });
   return res;
 }
 

packages/api/src/shell/archiveWriter.js

@@ -1,11 +1,16 @@
 const path = require('path');
-const { archivedir, ensureDirectory } = require('../utility/directories');
+const fs = require('fs');
+const { archivedir } = require('../utility/directories');
 // const socket = require('../utility/socket');
 const jsonLinesWriter = require('./jsonLinesWriter');
 
 function archiveWriter({ folderName, fileName }) {
-  if (folderName == 'default') ensureDirectory(path.join(archivedir(), folderName));
-  const jsonlFile = path.join(archivedir(), folderName, `${fileName}.jsonl`);
+  const dir = path.join(archivedir(), folderName);
+  if (!fs.existsSync(dir)) {
+    console.log(`Creating directory ${dir}`);
+    fs.mkdirSync(dir);
+  }
+  const jsonlFile = path.join(dir, `${fileName}.jsonl`);
   const res = jsonLinesWriter({ fileName: jsonlFile });
   // socket.emitChanged(`archive-files-changed-${folderName}`);
   return res;

packages/api/src/shell/collectorWriter.js

@@ -0,0 +1,33 @@
+const stream = require('stream');
+
+class CollectorWriterStream extends stream.Writable {
+  constructor(options) {
+    super(options);
+    this.rows = [];
+    this.structure = null;
+    this.runid = options.runid;
+  }
+  _write(chunk, enc, next) {
+    if (!this.structure) this.structure = chunk;
+    else this.rows.push(chunk);
+    next();
+  }
+
+  _final(callback) {
+    process.send({
+      msgtype: 'freeData',
+      runid: this.runid,
+      freeData: { rows: this.rows, structure: this.structure },
+    });
+    callback();
+  }
+}
+
+async function collectorWriter({ runid }) {
+  return new CollectorWriterStream({
+    objectMode: true,
+    runid,
+  });
+}
+
+module.exports = collectorWriter;

packages/api/src/shell/csvReader.js

@@ -1,54 +0,0 @@
-const _ = require('lodash');
-const csv = require('csv');
-const fs = require('fs');
-const stream = require('stream');
-
-class CsvPrepareStream extends stream.Transform {
-  constructor({ header }) {
-    super({ objectMode: true });
-    this.structure = null;
-    this.header = header;
-  }
-  _transform(chunk, encoding, done) {
-    if (this.structure) {
-      this.push(
-        _.zipObject(
-          this.structure.columns.map((x) => x.columnName),
-          chunk
-        )
-      );
-      done();
-    } else {
-      if (this.header) {
-        this.structure = { columns: chunk.map((columnName) => ({ columnName })) };
-        this.push(this.structure);
-      } else {
-        this.structure = { columns: chunk.map((value, index) => ({ columnName: `col${index + 1}` })) };
-        this.push(this.structure);
-        this.push(
-          _.zipObject(
-            this.structure.columns.map((x) => x.columnName),
-            chunk
-          )
-        );
-      }
-      done();
-    }
-  }
-}
-
-async function csvReader({ fileName, encoding = 'utf-8', header = true, delimiter, quoted }) {
-  console.log(`Reading file ${fileName}`);
-  const csvStream = csv.parse({
-    // @ts-ignore
-    delimiter,
-    quoted,
-  });
-  const fileStream = fs.createReadStream(fileName, encoding);
-  const csvPrepare = new CsvPrepareStream({ header });
-  fileStream.pipe(csvStream);
-  csvStream.pipe(csvPrepare);
-  return csvPrepare;
-}
-
-module.exports = csvReader;

packages/api/src/shell/csvWriter.js

@@ -1,36 +0,0 @@
-const csv = require('csv');
-const fs = require('fs');
-const stream = require('stream');
-
-class CsvPrepareStream extends stream.Transform {
-  constructor({ header }) {
-    super({ objectMode: true });
-    this.structure = null;
-    this.header = header;
-  }
-  _transform(chunk, encoding, done) {
-    if (this.structure) {
-      this.push(this.structure.columns.map((col) => chunk[col.columnName]));
-      done();
-    } else {
-      this.structure = chunk;
-      if (this.header) {
-        this.push(chunk.columns.map((x) => x.columnName));
-      }
-      done();
-    }
-  }
-}
-
-async function csvWriter({ fileName, encoding = 'utf-8', header = true, delimiter, quoted }) {
-  console.log(`Writing file ${fileName}`);
-  const csvPrepare = new CsvPrepareStream({ header });
-  const csvStream = csv.stringify({ delimiter, quoted });
-  const fileStream = fs.createWriteStream(fileName, encoding);
-  csvPrepare.pipe(csvStream);
-  csvStream.pipe(fileStream);
-  csvPrepare['finisher'] = fileStream;
-  return csvPrepare;
-}
-
-module.exports = csvWriter;

packages/api/src/shell/download.js

@@ -0,0 +1,15 @@
+const path = require('path');
+const uuidv1 = require('uuid/v1');
+const { uploadsdir } = require('../utility/directories');
+const { downloadFile } = require('../utility/downloader');
+
+async function download(url) {
+  if (url && url.match(/(^http:\/\/)|(^https:\/\/)/)) {
+    const tmpFile = path.join(uploadsdir(), uuidv1());
+    await downloadFile(url, tmpFile);
+    return tmpFile;
+  }
+  return url;
+}
+
+module.exports = download;

packages/api/src/shell/excelSheetReader.js

@@ -1,40 +0,0 @@
-const exceljs = require('exceljs');
-const stream = require('stream');
-const _ = require('lodash');
-
-const loadedWorkbooks = {};
-
-async function loadWorkbook(fileName) {
-  let workbook = loadedWorkbooks[fileName];
-  if (workbook) return workbook;
-  console.log(`Loading excel ${fileName}`);
-  workbook = new exceljs.Workbook();
-  await workbook.xlsx.readFile(fileName);
-  loadedWorkbooks[fileName] = workbook;
-  return workbook;
-}
-
-async function excelSheetReader({ fileName, sheetName }) {
-  const workbook = await loadWorkbook(fileName);
-  const sheet = workbook.getWorksheet(sheetName);
-
-  const pass = new stream.PassThrough({
-    objectMode: true,
-  });
-  const header = sheet.getRow(1);
-  const structure = {
-    columns: _.range(header.cellCount).map((index) => ({ columnName: header.getCell(index + 1).value })),
-  };
-  pass.write(structure);
-  for (let rowIndex = 2; rowIndex <= sheet.rowCount; rowIndex++) {
-    const row = sheet.getRow(rowIndex);
-    const rowData = _.fromPairs(structure.columns.map((col, index) => [col.columnName, row.getCell(index + 1).value]));
-    if (_.isEmpty(_.omitBy(rowData, (v) => v == null || v.toString().trim().length == 0))) continue;
-    pass.write(rowData);
-  }
-  pass.end();
-
-  return pass;
-}
-
-module.exports = excelSheetReader;

packages/api/src/shell/executeQuery.js

@@ -0,0 +1,19 @@
+const goSplit = require('../utility/goSplit');
+const requireEngineDriver = require('../utility/requireEngineDriver');
+
+async function executeQuery({ connection, sql }) {
+  console.log(`Execute query ${sql}`);
+
+  const driver = requireEngineDriver(connection);
+  const pool = await driver.connect(connection);
+  console.log(`Connected.`);
+
+  for (const sqlItem of goSplit(sql)) {
+    console.log('Executing query', sqlItem);
+    await driver.query(pool, sqlItem);
+  }
+
+  console.log(`Query finished`);
+}
+
+module.exports = executeQuery;

packages/api/src/shell/finalizer.js

@@ -0,0 +1,12 @@
+const finalizers = [];
+
+module.exports = {
+  async run() {
+    for (const func of finalizers) {
+      await func();
+    }
+  },
+  register(func) {
+    finalizers.push(func);
+  },
+};

packages/api/src/shell/index.js

@@ -1,28 +1,29 @@
 const queryReader = require('./queryReader');
-const csvWriter = require('./csvWriter');
-const csvReader = require('./csvReader');
 const runScript = require('./runScript');
 const tableWriter = require('./tableWriter');
 const tableReader = require('./tableReader');
 const copyStream = require('./copyStream');
 const fakeObjectReader = require('./fakeObjectReader');
 const consoleObjectWriter = require('./consoleObjectWriter');
-const excelSheetReader = require('./excelSheetReader');
 const jsonLinesWriter = require('./jsonLinesWriter');
 const jsonLinesReader = require('./jsonLinesReader');
 const jslDataReader = require('./jslDataReader');
 const archiveWriter = require('./archiveWriter');
 const archiveReader = require('./archiveReader');
+const collectorWriter = require('./collectorWriter');
+const finalizer = require('./finalizer');
+const registerPlugins = require('./registerPlugins');
+const requirePlugin = require('./requirePlugin');
+const download = require('./download');
+const executeQuery = require('./executeQuery');
+const loadFile = require('./loadFile');
 
-module.exports = {
+const dbgateApi = {
   queryReader,
-  csvWriter,
-  csvReader,
   runScript,
   tableWriter,
   tableReader,
   copyStream,
-  excelSheetReader,
   jsonLinesWriter,
   jsonLinesReader,
   fakeObjectReader,
@@ -30,4 +31,14 @@ module.exports = {
   jslDataReader,
   archiveWriter,
   archiveReader,
+  collectorWriter,
+  finalizer,
+  download,
+  registerPlugins,
+  executeQuery,
+  loadFile,
 };
+
+requirePlugin.initialize(dbgateApi);
+
+module.exports = dbgateApi;

packages/api/src/shell/jslDataReader.js

@@ -1,9 +1,9 @@
 const getJslFileName = require('../utility/getJslFileName');
 const jsonLinesReader = require('./jsonLinesReader');
 
-function jslDataReader({ jslid }) {
+function jslDataReader({ jslid, ...other }) {
   const fileName = getJslFileName(jslid);
-  return jsonLinesReader({ fileName });
+  return jsonLinesReader({ fileName, ...other });
 }
 
 module.exports = jslDataReader;

packages/api/src/shell/jsonLinesReader.js

@@ -3,10 +3,12 @@ const stream = require('stream');
 const byline = require('byline');
 
 class ParseStream extends stream.Transform {
-  constructor({ header }) {
+  constructor({ header, limitRows }) {
     super({ objectMode: true });
     this.header = header;
     this.wasHeader = false;
+    this.limitRows = limitRows;
+    this.rowsWritten = 0;
   }
   _transform(chunk, encoding, done) {
     const obj = JSON.parse(chunk);
@@ -14,17 +16,20 @@ class ParseStream extends stream.Transform {
       if (!this.header) this.push({ columns: Object.keys(obj).map((columnName) => ({ columnName })) });
       this.wasHeader = true;
     }
-    this.push(obj);
+    if (!this.limitRows || this.rowsWritten < this.limitRows) {
+      this.push(obj);
+      this.rowsWritten += 1;
+    }
     done();
   }
 }
 
-async function jsonLinesReader({ fileName, encoding = 'utf-8', header = true }) {
+async function jsonLinesReader({ fileName, encoding = 'utf-8', header = true, limitRows = undefined }) {
   console.log(`Reading file ${fileName}`);
 
   const fileStream = fs.createReadStream(fileName, encoding);
   const liner = byline(fileStream);
-  const parser = new ParseStream({ header });
+  const parser = new ParseStream({ header, limitRows });
   liner.pipe(parser);
   return parser;
 }

packages/api/src/shell/loadFile.js

@@ -0,0 +1,10 @@
+const fs = require('fs-extra');
+const path = require('path');
+const { filesdir } = require('../utility/directories');
+
+async function loadFile(file) {
+  const text = await fs.readFile(path.join(filesdir(), file), { encoding: 'utf-8' });
+  return text;
+}
+
+module.exports = loadFile;

packages/api/src/shell/queryReader.js

@@ -1,12 +1,10 @@
-const driverConnect = require('../utility/driverConnect');
-
-const engines = require('@dbgate/engines');
+const requireEngineDriver = require("../utility/requireEngineDriver");
 
 async function queryReader({ connection, sql }) {
   console.log(`Reading query ${sql}`);
 
-  const driver = engines(connection);
-  const pool = await driverConnect(driver, connection);
+  const driver = requireEngineDriver(connection);
+  const pool = await driver.connect(connection);
   console.log(`Connected.`);
   return await driver.readQuery(pool, sql);
 }

packages/api/src/shell/registerPlugins.js

@@ -0,0 +1,9 @@
+const requirePlugin = require('./requirePlugin');
+
+function registerPlugins(...plugins) {
+  for (const plugin of plugins) {
+    requirePlugin(plugin.packageName, plugin);
+  }
+}
+
+module.exports = registerPlugins;

packages/api/src/shell/requirePlugin.js

@@ -0,0 +1,37 @@
+const path = require('path');
+const { pluginsdir } = require('../utility/directories');
+
+const loadedPlugins = {};
+
+const dbgateEnv = {
+  dbgateApi: null,
+};
+
+function requirePlugin(packageName, requiredPlugin = null) {
+  if (!packageName) throw new Error('Missing packageName in plugin');
+  if (loadedPlugins[packageName]) return loadedPlugins[packageName];
+
+  if (requiredPlugin == null) {
+    let module;
+    const modulePath = path.join(pluginsdir(), packageName, 'dist', 'backend.js');
+    console.log(`Loading module ${packageName} from ${modulePath}`);
+    try {
+      // @ts-ignore
+      module = __non_webpack_require__(modulePath);
+    } catch (err) {
+      console.error('Failed load webpacked module', err);
+      module = require(modulePath);
+    }
+    requiredPlugin = module.__esModule ? module.default : module;
+  }
+  loadedPlugins[packageName] = requiredPlugin;
+  if (requiredPlugin.initialize) requiredPlugin.initialize(dbgateEnv);
+
+  return requiredPlugin;
+}
+
+requirePlugin.initialize = (value) => {
+  dbgateEnv.dbgateApi = value;
+};
+
+module.exports = requirePlugin;

packages/api/src/shell/tableReader.js

@@ -1,11 +1,9 @@
-const { quoteFullName } = require('@dbgate/tools');
-const driverConnect = require('../utility/driverConnect');
+const { quoteFullName, fullNameToString } = require('dbgate-tools');
+const requireEngineDriver = require('../utility/requireEngineDriver');
 
-const engines = require('@dbgate/engines');
-
-async function queryReader({ connection, pureName, schemaName }) {
-  const driver = engines(connection);
-  const pool = await driverConnect(driver, connection);
+async function tableReader({ connection, pureName, schemaName }) {
+  const driver = requireEngineDriver(connection);
+  const pool = await driver.connect(connection);
   console.log(`Connected.`);
 
   const fullName = { pureName, schemaName };
@@ -13,16 +11,20 @@ async function queryReader({ connection, pureName, schemaName }) {
   const table = await driver.analyseSingleObject(pool, fullName, 'tables');
   const query = `select * from ${quoteFullName(driver.dialect, fullName)}`;
   if (table) {
-    console.log(`Reading table ${table.pureName}`);
+    // @ts-ignore
+    console.log(`Reading table ${fullNameToString(table)}`);
+    // @ts-ignore
     return await driver.readQuery(pool, query, table);
   }
   const view = await driver.analyseSingleObject(pool, fullName, 'views');
   if (view) {
-    console.log(`Reading view ${view.pureName}`);
+    // @ts-ignore
+    console.log(`Reading view ${fullNameToString(view)}`);
+    // @ts-ignore
     return await driver.readQuery(pool, query, view);
   }
 
   return await driver.readQuery(pool, query);
 }
 
-module.exports = queryReader;
+module.exports = tableReader;

packages/api/src/shell/tableWriter.js

@@ -1,12 +1,11 @@
-const driverConnect = require('../utility/driverConnect');
-
-const engines = require('@dbgate/engines');
+const { fullNameToString } = require('dbgate-tools');
+const requireEngineDriver = require('../utility/requireEngineDriver');
 
 async function tableWriter({ connection, schemaName, pureName, ...options }) {
-  console.log(`Write table ${schemaName}.${pureName}`);
+  console.log(`Writing table ${fullNameToString({ schemaName, pureName })}`);
 
-  const driver = engines(connection);
-  const pool = await driverConnect(driver, connection);
+  const driver = requireEngineDriver(connection);
+  const pool = await driver.connect(connection);
   console.log(`Connected.`);
   return await driver.writeTable(pool, { schemaName, pureName }, options);
 }

packages/api/src/utility/JsonLinesDatastore.js

@@ -1,6 +1,25 @@
 const lineReader = require('line-reader');
 const AsyncLock = require('async-lock');
 const lock = new AsyncLock();
+const stableStringify = require('json-stable-stringify');
+const { evaluateCondition } = require('dbgate-sqltree');
+
+async function fetchNextLine(reader) {
+  return new Promise((resolve, reject) => {
+    if (!reader.hasNextLine()) {
+      resolve(null);
+      return;
+    }
+
+    reader.nextLine((err, line) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(line);
+      }
+    });
+  });
+}
 
 class JsonLinesDatastore {
   constructor(file) {
@@ -9,6 +28,7 @@ class JsonLinesDatastore {
     this.readedDataRowCount = 0;
     this.readedSchemaRow = false;
     this.notifyChangedCallback = null;
+    this.currentFilter = null;
   }
 
   _closeReader() {
@@ -17,6 +37,7 @@ class JsonLinesDatastore {
     this.reader = null;
     this.readedDataRowCount = 0;
     this.readedSchemaRow = false;
+    this.currentFilter = null;
     reader.close(() => {});
   }
 
@@ -39,46 +60,92 @@ class JsonLinesDatastore {
     );
   }
 
-  _readLine() {
-    return new Promise((resolve, reject) => {
-      const reader = this.reader;
-      if (!reader.hasNextLine()) {
-        resolve(null);
-        return;
+  async _readLine(parse) {
+    for (;;) {
+      const line = await fetchNextLine(this.reader);
+      if (!line) {
+        // EOF
+        return null;
       }
-      reader.nextLine((err, line) => {
-        if (this.readedSchemaRow) this.readedDataRowCount += 1;
-        else this.readedSchemaRow = true;
-        if (err) reject(err);
-        resolve(line);
-      });
-    });
+
+      if (!this.readedSchemaRow) {
+        this.readedSchemaRow = true;
+        return true;
+      }
+      if (this.currentFilter) {
+        const parsedLine = JSON.parse(line);
+        if (evaluateCondition(this.currentFilter, parsedLine)) {
+          this.readedDataRowCount += 1;
+          return parse ? parsedLine : true;
+        }
+      } else {
+        this.readedDataRowCount += 1;
+        return parse ? JSON.parse(line) : true;
+      }
+    }
+
+    // return new Promise((resolve, reject) => {
+    //   const reader = this.reader;
+    //   if (!reader.hasNextLine()) {
+    //     resolve(null);
+    //     return;
+    //   }
+
+    //   reader.nextLine((err, line) => {
+    //     if (err) {
+    //       reject(err);
+    //       return;
+    //     }
+    //     if (!this.readedSchemaRow) {
+    //       this.readedSchemaRow = true;
+    //       resolve(true);
+    //       return;
+    //     }
+    //     if (this.currentFilter) {
+    //       const parsedLine = JSON.parse(line);
+    //       if (evaluateCondition(this.currentFilter, parsedLine)) {
+    //         console.log('TRUE');
+    //         resolve(parse ? parsedLine : true);
+    //         this.readedDataRowCount += 1;
+    //         return;
+    //       } else {
+    //         console.log('FALSE');
+    //         // skip row
+    //         return;
+    //       }
+    //     }
+
+    //     this.readedDataRowCount += 1;
+    //     resolve(parse ? JSON.parse(line) : true);
+    //   });
+    // });
   }
 
-  async _ensureReader(offset) {
-    if (this.readedDataRowCount > offset) {
+  async _ensureReader(offset, filter) {
+    if (this.readedDataRowCount > offset || stableStringify(filter) != stableStringify(this.currentFilter)) {
       this._closeReader();
     }
     if (!this.reader) {
       const reader = await this._openReader();
       this.reader = reader;
+      this.currentFilter = filter;
     }
     if (!this.readedSchemaRow) {
-      await this._readLine(); // skip structure
+      await this._readLine(false); // skip structure
     }
     while (this.readedDataRowCount < offset) {
-      await this._readLine();
+      await this._readLine(false);
     }
   }
 
-  async getRows(offset, limit) {
+  async getRows(offset, limit, filter) {
     const res = [];
     await lock.acquire('reader', async () => {
-      await this._ensureReader(offset);
+      await this._ensureReader(offset, filter);
       for (let i = 0; i < limit; i += 1) {
-        const line = await this._readLine();
+        const line = await this._readLine(true);
         if (line == null) break;
-        res.push(JSON.parse(line));
+        res.push(line);
       }
     });
     // console.log('RETURN', res.length);

packages/api/src/utility/cleanDirectory.js

@@ -0,0 +1,24 @@
+const fs = require('fs-extra');
+const path = require('path');
+const ageSeconds = 3600;
+
+async function cleanDirectory(directory) {
+  const files = await fs.readdir(directory);
+  const now = new Date().getTime();
+
+  for (const file of files) {
+    const full = path.join(directory, file);
+    const stat = await fs.stat(full);
+    const mtime = stat.mtime.getTime();
+    const expirationTime = mtime + ageSeconds * 1000;
+    if (now > expirationTime) {
+      if (stat.isDirectory()) {
+        await fs.rmdir(full, { recursive: true });
+      } else {
+        await fs.unlink(full);
+      }
+    }
+  }
+}
+
+module.exports = cleanDirectory;

packages/api/src/utility/directories.js

@@ -1,11 +1,15 @@
 const os = require('os');
 const path = require('path');
 const fs = require('fs');
+const cleanDirectory = require('./cleanDirectory');
 
 const createDirectories = {};
-
-const ensureDirectory = (dir) => {
+const ensureDirectory = (dir, clean) => {
   if (!createDirectories[dir]) {
+    if (clean && fs.existsSync(dir)) {
+      console.log(`Cleaning directory ${dir}`);
+      cleanDirectory(dir);
+    }
     if (!fs.existsSync(dir)) {
       console.log(`Creating directory ${dir}`);
       fs.mkdirSync(dir);
@@ -21,17 +25,19 @@ function datadir() {
   return dir;
 }
 
-const dirFunc = (dirname) => () => {
+const dirFunc = (dirname, clean = false) => () => {
   const dir = path.join(datadir(), dirname);
-  ensureDirectory(dir);
+  ensureDirectory(dir, clean);
 
   return dir;
 };
 
-const jsldir = dirFunc('jsl');
-const rundir = dirFunc('run');
-const uploadsdir = dirFunc('uploads');
+const jsldir = dirFunc('jsl', true);
+const rundir = dirFunc('run', true);
+const uploadsdir = dirFunc('uploads', true);
+const pluginsdir = dirFunc('plugins');
 const archivedir = dirFunc('archive');
+const filesdir = dirFunc('files');
 
 module.exports = {
   datadir,
@@ -40,4 +46,6 @@ module.exports = {
   uploadsdir,
   archivedir,
   ensureDirectory,
+  pluginsdir,
+  filesdir,
 };

packages/api/src/utility/downloadPackage.js

@@ -0,0 +1,52 @@
+// const pacote = require('pacote');
+const axios = require('axios');
+// const tarballExtract = require('tarball-extract');
+const uuidv1 = require('uuid/v1');
+const path = require('path');
+const fs = require('fs');
+const zlib = require('zlib');
+const tar = require('tar');
+const ncp = require('ncp').ncp;
+const { uploadsdir } = require('./directories');
+const { downloadFile } = require('./downloader');
+
+function extractTarball(tmpFile, destination) {
+  return new Promise((resolve, reject) => {
+    fs.createReadStream(tmpFile)
+      .pipe(zlib.createGunzip())
+      .pipe(tar.extract({ cwd: destination }))
+      .on('error', (err) => reject(err))
+      .on('end', () => resolve());
+  });
+}
+
+
+function copyDirectory(source, target) {
+  return new Promise((resolve, reject) => {
+    ncp(source, target, (err) => {
+      if (err) reject(err);
+      resolve();
+    });
+  });
+}
+
+async function downloadPackage(packageName, directory) {
+  // await pacote.extract(packageName, directory);
+  const infoResp = await axios.default.get(`https://registry.npmjs.org/${packageName}`);
+
+  const { latest } = infoResp.data['dist-tags'] || {};
+  if (!latest) return false;
+
+  const tarball = infoResp.data.versions[latest].dist.tarball;
+
+  const tmpFile = path.join(uploadsdir(), uuidv1() + '.tgz');
+  await downloadFile(tarball, tmpFile);
+  const tmpDir = path.join(uploadsdir(), uuidv1());
+  fs.mkdirSync(tmpDir);
+  await extractTarball(tmpFile, tmpDir);
+  await copyDirectory(path.join(tmpDir, 'package'), directory);
+
+  return true;
+}
+
+module.exports = downloadPackage;

packages/api/src/utility/downloader.js

@@ -0,0 +1,25 @@
+const axios = require('axios');
+const fs = require('fs');
+
+function saveStreamToFile(pipedStream, fileName) {
+  return new Promise((resolve, reject) => {
+    const fileStream = fs.createWriteStream(fileName);
+    fileStream.on('close', () => resolve());
+    pipedStream.pipe(fileStream);
+  });
+}
+
+async function downloadFile(url, file) {
+  console.log(`Downloading ${url} into ${file}`);
+  const tarballResp = await axios.default({
+    method: 'get',
+    url,
+    responseType: 'stream',
+  });
+  await saveStreamToFile(tarballResp.data, file);
+}
+
+module.exports = {
+  saveStreamToFile,
+  downloadFile,
+};

packages/api/src/utility/driverConnect.js

@@ -1,21 +0,0 @@
-const mssql = require('mssql');
-const mysql = require('mysql');
-const pg = require('pg');
-const pgQueryStream = require('pg-query-stream');
-const fs = require('fs');
-const stream = require('stream');
-
-const nativeModules = {
-  mssql,
-  mysql,
-  pg,
-  pgQueryStream,
-  fs,
-  stream,
-};
-
-function driverConnect(driver, connection) {
-  return driver.connect(nativeModules, connection);
-}
-
-module.exports = driverConnect;

packages/api/src/utility/freeTableStorage.js

@@ -0,0 +1,15 @@
+const fs = require('fs-extra');
+
+async function saveFreeTableData(file, data) {
+  const { structure, rows } = data;
+  const fileStream = fs.createWriteStream(file);
+  await fileStream.write(JSON.stringify(structure) + '\n');
+  for (const row of rows) {
+    await fileStream.write(JSON.stringify(row) + '\n');
+  }
+  await fileStream.close();
+}
+
+module.exports = {
+  saveFreeTableData,
+};

packages/api/src/utility/hasPermission.js

@@ -0,0 +1,12 @@
+const { compilePermissions, testPermission } = require('dbgate-tools');
+
+let compiled = undefined;
+
+function hasPermission(tested) {
+  if (compiled === undefined) {
+    compiled = compilePermissions(process.env.PERMISSIONS);
+  }
+  return testPermission(tested, compiled);
+}
+
+module.exports = hasPermission;

packages/api/src/utility/requireEngineDriver.js

@@ -0,0 +1,24 @@
+const _ = require('lodash');
+const requirePlugin = require('../shell/requirePlugin');
+
+
+/** @returns {import('dbgate-types').EngineDriver} */
+function requireEngineDriver(connection) {
+  let engine = null;
+  if (_.isString(connection)) {
+    engine = connection;
+  } else if (_.isPlainObject(connection)) {
+    engine = connection.engine;
+  }
+  if (!engine) {
+    throw new Error('Could not get driver from connection');
+  }
+  if (engine.includes('@')) {
+    const [shortName, packageName] = engine.split('@');
+    const plugin = requirePlugin(packageName);
+    return plugin.driver;
+  }
+  throw new Error(`Could not found engine driver ${engine}`);
+}
+
+module.exports = requireEngineDriver;

packages/api/webpack.config.js

@@ -14,9 +14,9 @@ var config = {
     libraryTarget: 'commonjs2',
   },
 
-  optimization: {
-    minimize: false,
-  },
+  // optimization: {
+  //   minimize: false,
+  // },
 
   //   module: {
   //     rules: [
@@ -29,7 +29,7 @@ var config = {
   plugins: [
     new webpack.IgnorePlugin({
       checkResource(resource) {
-        const lazyImports = ['pg-native', 'uws'];
+        const lazyImports = ['uws'];
         if (!lazyImports.includes(resource)) {
           return false;
         }

packages/datalib/package.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.1.0",
-  "name": "@dbgate/datalib",
+  "version": "1.0.0",
+  "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
@@ -12,11 +12,11 @@
     "lib"
   ],
   "dependencies": {
-    "@dbgate/sqltree": "^0.1.0",
-    "@dbgate/filterparser": "^0.1.0"
+    "dbgate-sqltree": "^1.0.0",
+    "dbgate-filterparser": "^1.0.0"
   },
   "devDependencies": {
-    "@dbgate/types": "^0.1.0",
+    "dbgate-types": "^1.0.0",
     "@types/node": "^13.7.0",
     "typescript": "^3.7.5"
   }

packages/datalib/src/ChangeSet.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-import { Command, Insert, Update, Delete, UpdateField, Condition, AllowIdentityInsert } from '@dbgate/sqltree';
-import { NamedObjectInfo, DatabaseInfo } from '@dbgate/types';
+import { Command, Insert, Update, Delete, UpdateField, Condition, AllowIdentityInsert } from 'dbgate-sqltree';
+import { NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
 
 export interface ChangeSetItem {
   pureName: string;

packages/datalib/src/FormViewDisplay.ts

@@ -0,0 +1,25 @@
+import _ from 'lodash';
+import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig';
+import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { parseFilter, getFilterType } from 'dbgate-filterparser';
+import { filterName } from './filterName';
+import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
+import { Expression, Select, treeToSql, dumpSqlSelect, Condition } from 'dbgate-sqltree';
+import { isTypeLogical } from 'dbgate-tools';
+import { ChangeCacheFunc, ChangeConfigFunc, DisplayColumn } from './GridDisplay';
+
+export class FormViewDisplay {
+  isLoadedCorrectly = true;
+  columns: DisplayColumn[];
+  public baseTable: TableInfo;
+
+  constructor(
+    public config: GridConfig,
+    protected setConfig: ChangeConfigFunc,
+    public cache: GridCache,
+    protected setCache: ChangeCacheFunc,
+    public driver?: EngineDriver,
+    public dbinfo: DatabaseInfo = null
+  ) {}
+
+}

packages/datalib/src/FreeTableGridDisplay.ts

@@ -0,0 +1,44 @@
+import _ from 'lodash';
+import { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types';
+import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
+import { GridConfig, GridCache } from './GridConfig';
+import { FreeTableModel } from './FreeTableModel';
+
+export class FreeTableGridDisplay extends GridDisplay {
+  constructor(
+    public model: FreeTableModel,
+    config: GridConfig,
+    setConfig: ChangeConfigFunc,
+    cache: GridCache,
+    setCache: ChangeCacheFunc
+  ) {
+    super(config, setConfig, cache, setCache);
+    this.columns = this.getDisplayColumns(model);
+    this.filterable = false;
+    this.sortable = false;
+  }
+
+  getDisplayColumns(model: FreeTableModel) {
+    return (
+      model?.structure?.columns
+        ?.map((col) => this.getDisplayColumn(col))
+        ?.map((col) => ({
+          ...col,
+          isChecked: this.isColumnChecked(col),
+        })) || []
+    );
+  }
+
+  getDisplayColumn( col: ColumnInfo) {
+    const uniquePath = [col.columnName];
+    const uniqueName = uniquePath.join('.');
+    return {
+      ...col,
+      pureName: 'data',
+      schemaName: '',
+      headerText: col.columnName,
+      uniqueName,
+      uniquePath,
+    };
+  }
+}

packages/datalib/src/FreeTableModel.ts

@@ -0,0 +1,27 @@
+import { TableInfo } from 'dbgate-types';
+
+export interface FreeTableModel {
+  structure: TableInfo;
+  rows: any[];
+}
+
+export function createFreeTableModel() {
+  return {
+    structure: {
+      columns: [
+        {
+          columnName: 'col1',
+        },
+      ],
+      foreignKeys: [],
+    },
+    rows: [
+      {
+        col1: 'val1',
+      },
+      {
+        col1: 'val2',
+      },
+    ],
+  };
+}

packages/datalib/src/GridConfig.ts

@@ -1,5 +1,5 @@
 import { DisplayColumn } from './GridDisplay';
-import { TableInfo } from '@dbgate/types';
+import { TableInfo } from 'dbgate-types';
 
 export interface GridConfigColumns {
   hiddenColumns: string[];
@@ -29,6 +29,8 @@ export interface GridConfig extends GridConfigColumns {
   grouping: { [uniqueName: string]: GroupFunc };
   childConfig?: GridConfig;
   reference?: GridReferenceDefinition;
+  isFormView?: boolean;
+  formViewKey?: { [uniqueName: string]: string };
 }
 
 export interface GridCache {

packages/datalib/src/GridDisplay.ts

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig';
-import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from '@dbgate/types';
-import { parseFilter, getFilterType } from '@dbgate/filterparser';
+import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { parseFilter, getFilterType } from 'dbgate-filterparser';
 import { filterName } from './filterName';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
-import { Expression, Select, treeToSql, dumpSqlSelect } from '@dbgate/sqltree';
-import { isTypeLogical } from '@dbgate/tools';
+import { Expression, Select, treeToSql, dumpSqlSelect, Condition } from 'dbgate-sqltree';
+import { isTypeLogical } from 'dbgate-tools';
 
 export interface DisplayColumn {
   schemaName: string;
@@ -58,6 +58,7 @@ export abstract class GridDisplay {
   filterable = false;
   editable = false;
   isLoadedCorrectly = true;
+  supportsReload = false;
 
   setColumnVisibility(uniquePath: string[], isVisible: boolean) {
     const uniqueName = uniquePath.join('.');
@@ -76,6 +77,10 @@ export abstract class GridDisplay {
     }));
   }
 
+  get hasReferences() {
+    return false;
+  }
+
   get focusedColumn() {
     return this.config.focusedColumn;
   }
@@ -419,6 +424,7 @@ export abstract class GridDisplay {
   }
 
   getPageQuery(offset: number, count: number) {
+    if (!this.driver) return null;
     const select = this.createSelect();
     if (!select) return null;
     if (this.driver.dialect.rangeSelect) select.range = { offset: offset, limit: count };
@@ -427,9 +433,10 @@ export abstract class GridDisplay {
     return sql;
   }
 
-  getExportQuery() {
+  getExportQuery(postprocessSelect = null) {
     const select = this.createSelect({ isExport: true });
     if (!select) return null;
+    if (postprocessSelect) postprocessSelect(select);
     const sql = treeToSql(this.driver, select, dumpSqlSelect);
     return sql;
   }
@@ -482,4 +489,49 @@ export abstract class GridDisplay {
     const sql = treeToSql(this.driver, select, dumpSqlSelect);
     return sql;
   }
+
+  compileFilters(): Condition {
+    const filters = this.config && this.config.filters;
+    if (!filters) return null;
+    const conditions = [];
+    for (const name in filters) {
+      const column = this.columns.find((x) => (x.columnName = name));
+      if (!column) continue;
+      const filterType = getFilterType(column.dataType);
+      try {
+        const condition = parseFilter(filters[name], filterType);
+        const replaced = _.cloneDeepWith(condition, (expr: Expression) => {
+          if (expr.exprType == 'placeholder')
+            return {
+              exprType: 'column',
+              columnName: column.columnName,
+            };
+        });
+        conditions.push(replaced);
+      } catch (err) {
+        // filter parse error - ignore filter
+      }
+    }
+    if (conditions.length == 0) return null;
+    return {
+      conditionType: 'and',
+      conditions,
+    };
+  }
+
+  switchToFormView(rowData) {
+    if (!this.baseTable) return;
+    const { primaryKey } = this.baseTable;
+    if (!primaryKey) return;
+    const { columns } = primaryKey;
+
+    this.setConfig((cfg) => ({
+      ...cfg,
+      isFormView: true,
+      formViewKey: _.pick(
+        rowData,
+        columns.map((x) => x.columnName)
+      ),
+    }));
+  }
 }

packages/datalib/src/JslGridDisplay.ts

@@ -1,5 +1,5 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
-import { QueryResultColumn } from '@dbgate/types';
+import { QueryResultColumn } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 
 export class JslGridDisplay extends GridDisplay {
@@ -13,6 +13,8 @@ export class JslGridDisplay extends GridDisplay {
   ) {
     super(config, setConfig, cache, setCache, null);
 
+    this.filterable = true;
+
     this.columns = columns
       .map((col) => ({
         columnName: col.columnName,

packages/datalib/src/MacroDefinition.ts

@@ -0,0 +1,22 @@
+import _ from 'lodash';
+
+export interface MacroArgument {
+  type: 'text' | 'select';
+  label: string;
+  name: string;
+}
+
+export interface MacroDefinition {
+  title: string;
+  name: string;
+  group: string;
+  description?: string;
+  type: 'transformValue';
+  code: string;
+  args?: MacroArgument[];
+}
+
+export interface MacroSelectedCell {
+  column: string;
+  row: number;
+}

packages/datalib/src/TableFormViewDisplay.ts

@@ -0,0 +1,251 @@
+import { FormViewDisplay } from './FormViewDisplay';
+import _ from 'lodash';
+import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
+import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { GridConfig, GridCache, createGridCache } from './GridConfig';
+import {
+  Expression,
+  Select,
+  treeToSql,
+  dumpSqlSelect,
+  mergeConditions,
+  Condition,
+  OrderByExpression,
+} from 'dbgate-sqltree';
+import { filterName } from './filterName';
+import { TableGridDisplay } from './TableGridDisplay';
+import stableStringify from 'json-stable-stringify';
+import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
+
+export class TableFormViewDisplay extends FormViewDisplay {
+  // use utility functions from GridDisplay and publish result in FromViewDisplat interface
+  private gridDisplay: TableGridDisplay;
+
+  constructor(
+    public tableName: NamedObjectInfo,
+    driver: EngineDriver,
+    config: GridConfig,
+    setConfig: ChangeConfigFunc,
+    cache: GridCache,
+    setCache: ChangeCacheFunc,
+    dbinfo: DatabaseInfo
+  ) {
+    super(config, setConfig, cache, setCache, driver, dbinfo);
+    this.gridDisplay = new TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo);
+
+    this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly;
+    this.columns = this.gridDisplay.columns;
+    this.baseTable = this.gridDisplay.baseTable;
+  }
+
+  getPrimaryKeyEqualCondition(row = null): Condition {
+    if (!row) row = this.config.formViewKey;
+    if (!row) return null;
+    const { primaryKey } = this.gridDisplay.baseTable;
+    if (!primaryKey) return null;
+    return {
+      conditionType: 'and',
+      conditions: primaryKey.columns.map(({ columnName }) => ({
+        conditionType: 'binary',
+        operator: '=',
+        left: {
+          exprType: 'column',
+          columnName,
+          source: {
+            alias: 'basetbl',
+          },
+        },
+        right: {
+          exprType: 'value',
+          value: this.config.formViewKey[columnName],
+        },
+      })),
+    };
+  }
+
+  getPrimaryKeyOperatorCondition(operator): Condition {
+    if (!this.config.formViewKey) return null;
+    const conditions = [];
+
+    const { primaryKey } = this.gridDisplay.baseTable;
+    if (!primaryKey) return null;
+    for (let index = 0; index < primaryKey.columns.length; index++) {
+      conditions.push({
+        conditionType: 'and',
+        conditions: [
+          ...primaryKey.columns.slice(0, index).map(({ columnName }) => ({
+            conditionType: 'binary',
+            operator: '=',
+            left: {
+              exprType: 'column',
+              columnName,
+              source: {
+                alias: 'basetbl',
+              },
+            },
+            right: {
+              exprType: 'value',
+              value: this.config.formViewKey[columnName],
+            },
+          })),
+          ...primaryKey.columns.slice(index).map(({ columnName }) => ({
+            conditionType: 'binary',
+            operator: operator,
+            left: {
+              exprType: 'column',
+              columnName,
+              source: {
+                alias: 'basetbl',
+              },
+            },
+            right: {
+              exprType: 'value',
+              value: this.config.formViewKey[columnName],
+            },
+          })),
+        ],
+      });
+    }
+
+    if (conditions.length == 1) {
+      return conditions[0];
+    }
+
+    return {
+      conditionType: 'or',
+      conditions,
+    };
+  }
+
+  getSelect() {
+    if (!this.driver) return null;
+    const select = this.gridDisplay.createSelect();
+    if (!select) return null;
+    select.topRecords = 1;
+    return select;
+  }
+
+  getCurrentRowQuery() {
+    const select = this.getSelect();
+    if (!select) return null;
+
+    select.where = mergeConditions(select.where, this.getPrimaryKeyEqualCondition());
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  getCountSelect() {
+    const select = this.getSelect();
+    if (!select) return null;
+    select.orderBy = null;
+    select.columns = [
+      {
+        exprType: 'raw',
+        sql: 'COUNT(*)',
+        alias: 'count',
+      },
+    ];
+    select.topRecords = null;
+    return select;
+  }
+
+  getCountQuery() {
+    if (!this.driver) return null;
+    const select = this.getCountSelect();
+    if (!select) return null;
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  getBeforeCountQuery() {
+    if (!this.driver) return null;
+    const select = this.getCountSelect();
+    if (!select) return null;
+    select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('<'));
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  extractKey(row) {
+    if (!row || !this.gridDisplay.baseTable || !this.gridDisplay.baseTable.primaryKey) {
+      return null;
+    }
+    const formViewKey = _.pick(
+      row,
+      this.gridDisplay.baseTable.primaryKey.columns.map((x) => x.columnName)
+    );
+    return formViewKey;
+  }
+
+  navigate(row) {
+    const formViewKey = this.extractKey(row);
+    this.setConfig((cfg) => ({
+      ...cfg,
+      formViewKey,
+    }));
+  }
+
+  isLoadedCurrentRow(row) {
+    console.log('isLoadedCurrentRow', row, this.config.formViewKey);
+    if (!row) return false;
+    const formViewKey = this.extractKey(row);
+    return stableStringify(formViewKey) == stableStringify(this.config.formViewKey);
+  }
+
+  navigateRowQuery(commmand: 'begin' | 'previous' | 'next' | 'end') {
+    if (!this.driver) return null;
+    const select = this.gridDisplay.createSelect();
+    if (!select) return null;
+    const { primaryKey } = this.gridDisplay.baseTable;
+
+    function getOrderBy(direction): OrderByExpression[] {
+      return primaryKey.columns.map(({ columnName }) => ({
+        exprType: 'column',
+        columnName,
+        direction,
+      }));
+    }
+
+    select.topRecords = 1;
+    switch (commmand) {
+      case 'begin':
+        select.orderBy = getOrderBy('ASC');
+        break;
+      case 'end':
+        select.orderBy = getOrderBy('DESC');
+        break;
+      case 'previous':
+        select.orderBy = getOrderBy('DESC');
+        select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('<'));
+        break;
+      case 'next':
+        select.orderBy = getOrderBy('ASC');
+        select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('>'));
+        break;
+    }
+
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  getChangeSetRow(row): ChangeSetRowDefinition {
+    if (!this.baseTable) return null;
+    return {
+      pureName: this.baseTable.pureName,
+      schemaName: this.baseTable.schemaName,
+      condition: this.extractKey(row),
+    };
+  }
+
+  getChangeSetField(row, uniqueName): ChangeSetFieldDefinition {
+    const col = this.columns.find((x) => x.uniqueName == uniqueName);
+    if (!col) return null;
+    if (!this.baseTable) return null;
+    if (this.baseTable.pureName != col.pureName || this.baseTable.schemaName != col.schemaName) return null;
+    return {
+      ...this.getChangeSetRow(row),
+      uniqueName: uniqueName,
+      columnName: col.columnName,
+    };
+  }
+}

packages/datalib/src/TableGridDisplay.ts

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
-import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from '@dbgate/types';
+import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
 import { GridConfig, GridCache, createGridCache } from './GridConfig';
-import { Expression, Select, treeToSql, dumpSqlSelect } from '@dbgate/sqltree';
+import { Expression, Select, treeToSql, dumpSqlSelect } from 'dbgate-sqltree';
 import { filterName } from './filterName';
 
 export class TableGridDisplay extends GridDisplay {
@@ -32,6 +32,7 @@ export class TableGridDisplay extends GridDisplay {
     this.filterable = true;
     this.sortable = true;
     this.editable = true;
+    this.supportsReload = true;
     this.baseTable = this.table;
     if (this.table && this.table.columns) {
       this.changeSetKeyFields = this.table.primaryKey
@@ -218,4 +219,11 @@ export class TableGridDisplay extends GridDisplay {
       }
     }
   }
+
+  get hasReferences() {
+    if (!this.table) return false;
+    if (this.table.foreignKeys && this.table.foreignKeys.length > 0) return true;
+    if (this.table.dependencies && this.table.dependencies.length > 0) return true;
+    return false;
+  }
 }

packages/datalib/src/ViewGridDisplay.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
-import { EngineDriver, ViewInfo, ColumnInfo } from '@dbgate/types';
+import { EngineDriver, ViewInfo, ColumnInfo } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
 
 export class ViewGridDisplay extends GridDisplay {
@@ -16,7 +16,8 @@ export class ViewGridDisplay extends GridDisplay {
     this.columns = this.getDisplayColumns(view);
     this.filterable = true;
     this.sortable = true;
-    this.editable = true;
+    this.editable = false;
+    this.supportsReload = true;
   }
 
   getDisplayColumns(view: ViewInfo) {

packages/datalib/src/index.ts

@@ -1,7 +1,13 @@
-export * from "./GridDisplay";
-export * from "./GridConfig";
-export * from "./TableGridDisplay";
-export * from "./ViewGridDisplay";
-export * from "./JslGridDisplay";
-export * from "./ChangeSet";
-export * from "./filterName";
+export * from './GridDisplay';
+export * from './GridConfig';
+export * from './TableGridDisplay';
+export * from './ViewGridDisplay';
+export * from './JslGridDisplay';
+export * from './ChangeSet';
+export * from './filterName';
+export * from './FreeTableGridDisplay';
+export * from './FreeTableModel';
+export * from './MacroDefinition';
+export * from './runMacro';
+export * from './FormViewDisplay';
+export * from './TableFormViewDisplay';

packages/datalib/src/runMacro.ts

@@ -0,0 +1,185 @@
+import { FreeTableModel } from './FreeTableModel';
+import _ from 'lodash';
+import uuidv1 from 'uuid/v1';
+import uuidv4 from 'uuid/v4';
+import moment from 'moment';
+import { MacroDefinition, MacroSelectedCell } from './MacroDefinition';
+
+const getMacroFunction = {
+  transformValue: (code) => `
+(value, args, modules, rowIndex, row, columnName) => {
+    ${code}
+}
+`,
+  transformRows: (code) => `
+(rows, args, modules, selectedCells, cols, columns) => {
+  ${code}
+}
+`,
+  transformData: (code) => `
+(rows, args, modules, selectedCells, cols, columns) => {
+  ${code}
+}
+`,
+};
+
+const modules = {
+  lodash: _,
+  uuidv1,
+  uuidv4,
+  moment,
+};
+
+function runTramsformValue(
+  func,
+  macroArgs: {},
+  data: FreeTableModel,
+  preview: boolean,
+  selectedCells: MacroSelectedCell[],
+  errors: string[] = []
+) {
+  const selectedRows = _.groupBy(selectedCells, 'row');
+  const rows = data.rows.map((row, rowIndex) => {
+    const selectedRow = selectedRows[rowIndex];
+    if (selectedRow) {
+      const modifiedFields = [];
+      let res = null;
+      for (const cell of selectedRow) {
+        const { column } = cell;
+        const oldValue = row[column];
+        let newValue = oldValue;
+        try {
+          newValue = func(oldValue, macroArgs, modules, rowIndex, row, column);
+        } catch (err) {
+          errors.push(`Error processing column ${column} on row ${rowIndex}: ${err.message}`);
+        }
+        if (newValue != oldValue) {
+          if (res == null) {
+            res = { ...row };
+          }
+          res[column] = newValue;
+          if (preview) modifiedFields.push(column);
+        }
+      }
+      if (res) {
+        if (modifiedFields.length > 0) {
+          return {
+            ...res,
+            __modifiedFields: new Set(modifiedFields),
+          };
+        }
+        return res;
+      }
+      return row;
+    } else {
+      return row;
+    }
+  });
+
+  return {
+    structure: data.structure,
+    rows,
+  };
+}
+
+function removePreviewRowFlags(rows) {
+  rows = rows.filter((row) => row.__rowStatus != 'deleted');
+  rows = rows.map((row) => {
+    if (row.__rowStatus || row.__modifiedFields || row.__insertedFields || row.__deletedFields)
+      return _.omit(row, ['__rowStatus', '__modifiedFields', '__insertedFields', '__deletedFields']);
+    return row;
+  });
+  return rows;
+}
+
+function runTramsformRows(
+  func,
+  macroArgs: {},
+  data: FreeTableModel,
+  preview: boolean,
+  selectedCells: MacroSelectedCell[],
+  errors: string[] = []
+) {
+  let rows = data.rows;
+  try {
+    rows = func(
+      data.rows,
+      macroArgs,
+      modules,
+      selectedCells,
+      data.structure.columns.map((x) => x.columnName),
+      data.structure.columns
+    );
+    if (!preview) {
+      rows = removePreviewRowFlags(rows);
+    }
+  } catch (err) {
+    errors.push(`Error processing rows: ${err.message}`);
+  }
+  return {
+    structure: data.structure,
+    rows,
+  };
+}
+
+function runTramsformData(
+  func,
+  macroArgs: {},
+  data: FreeTableModel,
+  preview: boolean,
+  selectedCells: MacroSelectedCell[],
+  errors: string[] = []
+) {
+  try {
+    let { rows, columns, cols } = func(
+      data.rows,
+      macroArgs,
+      modules,
+      selectedCells,
+      data.structure.columns.map((x) => x.columnName),
+      data.structure.columns
+    );
+    if (cols && !columns) {
+      columns = cols.map((columnName) => ({ columnName }));
+    }
+    columns = _.uniqBy(columns, 'columnName');
+    if (!preview) {
+      rows = removePreviewRowFlags(rows);
+    }
+    return {
+      structure: { columns },
+      rows,
+    };
+  } catch (err) {
+    errors.push(`Error processing data: ${err.message}`);
+  }
+  return data;
+}
+
+export function runMacro(
+  macro: MacroDefinition,
+  macroArgs: {},
+  data: FreeTableModel,
+  preview: boolean,
+  selectedCells: MacroSelectedCell[],
+  errors: string[] = []
+): FreeTableModel {
+  let func;
+  try {
+    func = eval(getMacroFunction[macro.type](macro.code));
+  } catch (err) {
+    errors.push(`Error compiling macro ${macro.name}: ${err.message}`);
+    return data;
+  }
+  if (macro.type == 'transformValue') {
+    return runTramsformValue(func, macroArgs, data, preview, selectedCells, errors);
+  }
+  if (macro.type == 'transformRows') {
+    return runTramsformRows(func, macroArgs, data, preview, selectedCells, errors);
+  }
+  if (macro.type == 'transformData') {
+    // @ts-ignore
+    return runTramsformData(func, macroArgs, data, preview, selectedCells, errors);
+  }
+  return data;
+}

packages/engines/default/DatabaseAnalyser.js

@@ -1,125 +0,0 @@
-const _ = require('lodash');
-const fp = require('lodash/fp');
-
-class DatabaseAnalyser {
-  /**
-   *
-   * @param {import('@dbgate/types').EngineDriver} driver
-   */
-  constructor(pool, driver) {
-    this.pool = pool;
-    this.driver = driver;
-    // this.result = DatabaseAnalyser.createEmptyStructure();
-    /** @type {import('@dbgate/types').DatabaseInfo} */
-    this.structure = null;
-    /** import('@dbgate/types').DatabaseModification[]) */
-    this.modifications = null;
-    this.singleObjectFilter = null;
-  }
-
-  async _runAnalysis() {
-    return DatabaseAnalyser.createEmptyStructure();
-  }
-
-  /** @returns {Promise<import('@dbgate/types').DatabaseModification[]>} */
-  async getModifications() {
-    if (this.structure == null) throw new Error('DatabaseAnalyse.getModifications - structure must be filled');
-
-    return null;
-  }
-
-  async fullAnalysis() {
-    return this._runAnalysis();
-  }
-
-  async incrementalAnalysis(structure) {
-    this.structure = structure;
-
-    this.modifications = await this.getModifications();
-    if (this.modifications == null) {
-      // modifications not implemented, perform full analysis
-      this.structure = null;
-      return this._runAnalysis();
-    }
-    if (this.modifications.length == 0) return null;
-    console.log('DB modifications detected:', this.modifications);
-    return this._runAnalysis();
-  }
-
-  mergeAnalyseResult(newlyAnalysed, extractObjectId) {
-    if (this.structure == null) {
-      return {
-        ...DatabaseAnalyser.createEmptyStructure(),
-        ...newlyAnalysed,
-      };
-    }
-
-    const res = {};
-    for (const field of ['tables', 'views', 'functions', 'procedures', 'triggers']) {
-      const removedIds = this.modifications
-        .filter((x) => x.action == 'remove' && x.objectTypeField == field)
-        .map((x) => extractObjectId(x));
-      const newArray = newlyAnalysed[field] || [];
-      const addedChangedIds = newArray.map((x) => extractObjectId(x));
-      const removeAllIds = [...removedIds, ...addedChangedIds];
-      res[field] = _.sortBy(
-        [...this.structure[field].filter((x) => !removeAllIds.includes(extractObjectId(x))), ...newArray],
-        (x) => x.pureName
-      );
-    }
-
-    return res;
-
-    // const {tables,views, functions, procedures, triggers} = this.structure;
-
-    // return {
-    //   tables:
-    // }
-  }
-
-  // findObjectById(id) {
-  //   return this.structure.tables.find((x) => x.objectId == id);
-  // }
-}
-
-/** @returns {import('@dbgate/types').DatabaseInfo} */
-DatabaseAnalyser.createEmptyStructure = () => ({
-  tables: [],
-  views: [],
-  functions: [],
-  procedures: [],
-  triggers: [],
-  schemas: [],
-});
-
-DatabaseAnalyser.byTableFilter = (table) => (x) => x.pureName == table.pureName && x.schemaName == x.schemaName;
-
-DatabaseAnalyser.extractPrimaryKeys = (table, pkColumns) => {
-  const filtered = pkColumns.filter(DatabaseAnalyser.byTableFilter(table));
-  if (filtered.length == 0) return undefined;
-  return {
-    ..._.pick(filtered[0], ['constraintName', 'schemaName', 'pureName']),
-    constraintType: 'primaryKey',
-    columns: filtered.map(fp.pick('columnName')),
-  };
-};
-
-DatabaseAnalyser.extractForeignKeys = (table, fkColumns) => {
-  const grouped = _.groupBy(fkColumns.filter(DatabaseAnalyser.byTableFilter(table)), 'constraintName');
-  return _.keys(grouped).map((constraintName) => ({
-    constraintName,
-    constraintType: 'foreignKey',
-    ..._.pick(grouped[constraintName][0], [
-      'constraintName',
-      'schemaName',
-      'pureName',
-      'refSchemaName',
-      'refTableName',
-      'updateAction',
-      'deleteAction',
-    ]),
-    columns: grouped[constraintName].map(fp.pick(['columnName', 'refColumnName'])),
-  }));
-};
-
-module.exports = DatabaseAnalyser;

packages/engines/index.d.ts

@@ -1,7 +0,0 @@
-import types from "@dbgate/types";
-
-declare function getDriver(
-  connection: string | { engine: string }
-): types.EngineDriver;
-
-export = getDriver;

packages/engines/index.js

@@ -1,24 +0,0 @@
-const _ = require("lodash");
-const mssql = require("./mssql");
-const mysql = require("./mysql");
-const postgres = require("./postgres");
-
-const drivers = {
-  mssql,
-  mysql,
-  postgres
-};
-
-function getDriver(connection) {
-  if (_.isString(connection)) {
-    return drivers[connection];
-  }
-  if (_.isPlainObject(connection)) {
-    const { engine } = connection;
-    if (engine) {
-      return drivers[engine];
-    }
-  }
-  throw new Error(`Cannot extract engine from ${connection}`);
-}
-module.exports = getDriver;

packages/engines/mssql/MsSqlAnalyser.js

@@ -1,212 +0,0 @@
-const fp = require('lodash/fp');
-const _ = require('lodash');
-const sql = require('./sql');
-
-const DatabaseAnalyser = require('../default/DatabaseAnalyser');
-const { filter } = require('lodash');
-const { isTypeString, isTypeNumeric } = require('@dbgate/tools');
-
-function objectTypeToField(type) {
-  switch (type.trim()) {
-    case 'U':
-      return 'tables';
-    case 'V':
-      return 'views';
-    case 'P':
-      return 'procedures';
-    case 'IF':
-    case 'FN':
-    case 'TF':
-      return 'functions';
-    case 'TR':
-      return 'triggers';
-    default:
-      return null;
-  }
-}
-
-function getColumnInfo({
-  isNullable,
-  isIdentity,
-  columnName,
-  dataType,
-  charMaxLength,
-  numericPrecision,
-  numericScale,
-}) {
-  let fullDataType = dataType;
-  if (charMaxLength && isTypeString(dataType)) fullDataType = `${dataType}(${charMaxLength})`;
-  if (numericPrecision && numericScale && isTypeNumeric(dataType))
-    fullDataType = `${dataType}(${numericPrecision},${numericScale})`;
-  return {
-    columnName,
-    dataType: fullDataType,
-    notNull: !isNullable,
-    autoIncrement: !!isIdentity,
-  };
-}
-
-class MsSqlAnalyser extends DatabaseAnalyser {
-  constructor(pool, driver) {
-    super(pool, driver);
-    this.singleObjectId = null;
-  }
-
-  createQuery(resFileName, typeFields) {
-    let res = sql[resFileName];
-    if (this.singleObjectFilter) {
-      const { typeField } = this.singleObjectFilter;
-      if (!this.singleObjectId) return null;
-      if (!typeFields || !typeFields.includes(typeField)) return null;
-      return res.replace('=[OBJECT_ID_CONDITION]', ` = ${this.singleObjectId}`);
-    }
-    if (!this.modifications || !typeFields || this.modifications.length == 0) {
-      res = res.replace('=[OBJECT_ID_CONDITION]', ' is not null');
-    } else {
-      const filterIds = this.modifications
-        .filter((x) => typeFields.includes(x.objectTypeField) && (x.action == 'add' || x.action == 'change'))
-        .map((x) => x.objectId);
-      if (filterIds.length == 0) {
-        res = res.replace('=[OBJECT_ID_CONDITION]', ' = 0');
-      } else {
-        res = res.replace('=[OBJECT_ID_CONDITION]', ` in (${filterIds.join(',')})`);
-      }
-    }
-    return res;
-  }
-
-  async getSingleObjectId() {
-    if (this.singleObjectFilter) {
-      const { schemaName, pureName, typeField } = this.singleObjectFilter;
-      const fullName = schemaName ? `[${schemaName}].[${pureName}]` : pureName;
-      const resId = await this.driver.query(this.pool, `SELECT OBJECT_ID('${fullName}') AS id`);
-      this.singleObjectId = resId.rows[0].id;
-    }
-  }
-
-  async _runAnalysis() {
-    await this.getSingleObjectId();
-    const tablesRows = await this.driver.query(this.pool, this.createQuery('tables', ['tables']));
-    const columnsRows = await this.driver.query(this.pool, this.createQuery('columns', ['tables']));
-    const pkColumnsRows = await this.driver.query(this.pool, this.createQuery('primaryKeys', ['tables']));
-    const fkColumnsRows = await this.driver.query(this.pool, this.createQuery('foreignKeys', ['tables']));
-    const schemaRows = await this.driver.query(this.pool, this.createQuery('getSchemas'));
-
-    const schemas = schemaRows.rows;
-
-    const sqlCodeRows = await this.driver.query(
-      this.pool,
-      this.createQuery('loadSqlCode', ['views', 'procedures', 'functions', 'triggers'])
-    );
-    const getCreateSql = (row) =>
-      sqlCodeRows.rows
-        .filter((x) => x.pureName == row.pureName && x.schemaName == row.schemaName)
-        .map((x) => x.codeText)
-        .join('');
-    const viewsRows = await this.driver.query(this.pool, this.createQuery('views', ['views']));
-    const programmableRows = await this.driver.query(
-      this.pool,
-      this.createQuery('programmables', ['procedures', 'functions'])
-    );
-    const viewColumnRows = await this.driver.query(this.pool, this.createQuery('viewColumns', ['views']));
-
-    const tables = tablesRows.rows.map((row) => ({
-      ...row,
-      columns: columnsRows.rows.filter((col) => col.objectId == row.objectId).map(getColumnInfo),
-      primaryKey: DatabaseAnalyser.extractPrimaryKeys(row, pkColumnsRows.rows),
-      foreignKeys: DatabaseAnalyser.extractForeignKeys(row, fkColumnsRows.rows),
-    }));
-
-    const views = viewsRows.rows.map((row) => ({
-      ...row,
-      createSql: getCreateSql(row),
-      columns: viewColumnRows.rows.filter((col) => col.objectId == row.objectId).map(getColumnInfo),
-    }));
-
-    const procedures = programmableRows.rows
-      .filter((x) => x.sqlObjectType.trim() == 'P')
-      .map((row) => ({
-        ...row,
-        createSql: getCreateSql(row),
-      }));
-
-    const functions = programmableRows.rows
-      .filter((x) => ['FN', 'IF', 'TF'].includes(x.sqlObjectType.trim()))
-      .map((row) => ({
-        ...row,
-        createSql: getCreateSql(row),
-      }));
-
-    return this.mergeAnalyseResult(
-      {
-        tables,
-        views,
-        procedures,
-        functions,
-        schemas,
-      },
-      (x) => x.objectId
-    );
-  }
-
-  getDeletedObjectsForField(idArray, objectTypeField) {
-    return this.structure[objectTypeField]
-      .filter((x) => !idArray.includes(x.objectId))
-      .map((x) => ({
-        oldName: _.pick(x, ['schemaName', 'pureName']),
-        objectId: x.objectId,
-        action: 'remove',
-        objectTypeField,
-      }));
-  }
-
-  getDeletedObjects(idArray) {
-    return [
-      ...this.getDeletedObjectsForField(idArray, 'tables'),
-      ...this.getDeletedObjectsForField(idArray, 'views'),
-      ...this.getDeletedObjectsForField(idArray, 'procedures'),
-      ...this.getDeletedObjectsForField(idArray, 'functions'),
-      ...this.getDeletedObjectsForField(idArray, 'triggers'),
-    ];
-  }
-
-  async getModifications() {
-    const modificationsQueryData = await this.driver.query(this.pool, this.createQuery('modifications'));
-    // console.log('MOD - SRC', modifications);
-    // console.log(
-    //   'MODs',
-    //   this.structure.tables.map((x) => x.modifyDate)
-    // );
-    const modifications = modificationsQueryData.rows.map((x) => {
-      const { type, objectId, modifyDate, schemaName, pureName } = x;
-      const field = objectTypeToField(type);
-      if (!this.structure[field]) return null;
-      // @ts-ignore
-      const obj = this.structure[field].find((x) => x.objectId == objectId);
-
-      // object not modified
-      if (obj && Math.abs(new Date(modifyDate).getTime() - new Date(obj.modifyDate).getTime()) < 1000) return null;
-
-      /** @type {import('@dbgate/types').DatabaseModification} */
-      const action = obj
-        ? {
-            newName: { schemaName, pureName },
-            oldName: _.pick(obj, ['schemaName', 'pureName']),
-            action: 'change',
-            objectTypeField: field,
-            objectId,
-          }
-        : {
-            newName: { schemaName, pureName },
-            action: 'add',
-            objectTypeField: field,
-            objectId,
-          };
-      return action;
-    });
-
-    return [..._.compact(modifications), ...this.getDeletedObjects(modificationsQueryData.rows.map((x) => x.objectId))];
-  }
-}
-
-module.exports = MsSqlAnalyser;

packages/engines/mssql/MsSqlDumper.js

@@ -1,54 +0,0 @@
-const SqlDumper = require('../default/SqlDumper');
-
-class MsSqlDumper extends SqlDumper {
-  autoIncrement() {
-    this.put(' ^identity');
-  }
-
-  putStringValue(value) {
-    if (/[^\u0000-\u00ff]/.test(value)) {
-      this.putRaw('N');
-    }
-    super.putStringValue(value);
-  }
-
-  allowIdentityInsert(table, allow) {
-    this.putCmd('^set ^identity_insert %f %k;&n', table, allow ? 'on' : 'off');
-  }
-
-  /** @param type {import('@dbgate/types').TransformType} */
-  transform(type, dumpExpr) {
-    switch (type) {
-      case 'GROUP:YEAR':
-      case 'YEAR':
-        this.put('^datepart(^year, %c)', dumpExpr);
-        break;
-      case 'MONTH':
-        this.put('^datepart(^month, %c)', dumpExpr);
-        break;
-      case 'DAY':
-        this.put('^datepart(^day, %c)', dumpExpr);
-        break;
-      case 'GROUP:MONTH':
-        this.put(
-          "^convert(^varchar(100), ^datepart(^year, %c)) + '-' + ^convert(^varchar(100), ^datepart(^month, %c))",
-          dumpExpr,
-          dumpExpr
-        );
-        break;
-      case 'GROUP:DAY':
-        this.put(
-          "^convert(^varchar(100), ^datepart(^year, %c)) + '-' + ^convert(^varchar(100), ^datepart(^month, %c))+'-' + ^convert(^varchar(100), ^datepart(^day, %c))",
-          dumpExpr,
-          dumpExpr,
-          dumpExpr
-        );
-        break;
-      default:
-        dumpExpr();
-        break;
-    }
-  }
-}
-
-module.exports = MsSqlDumper;

packages/engines/mssql/createBulkInsertStream.js

@@ -1,48 +0,0 @@
-const createBulkInsertStreamBase = require('../default/createBulkInsertStreamBase');
-
-/**
- *
- * @param {import('@dbgate/types').EngineDriver} driver
- */
-function createBulkInsertStream(driver, mssql, stream, pool, name, options) {
-  const writable = createBulkInsertStreamBase(driver, stream, pool, name, options);
-
-  const fullName = name.schemaName ? `[${name.schemaName}].[${name.pureName}]` : name.pureName;
-
-  writable.send = async () => {
-    if (!writable.templateColumns) {
-      const fullNameQuoted = name.schemaName
-        ? `${driver.dialect.quoteIdentifier(name.schemaName)}.${driver.dialect.quoteIdentifier(name.pureName)}`
-        : driver.dialect.quoteIdentifier(name.pureName);
-
-      const respTemplate = await pool.request().query(`SELECT * FROM ${fullNameQuoted} WHERE 1=0`);
-      writable.templateColumns = respTemplate.recordset.toTable().columns;
-    }
-
-    const rows = writable.buffer;
-    writable.buffer = [];
-    const table = new mssql.Table(fullName);
-    // table.create = options.createIfNotExists;
-    for (const column of this.columnNames) {
-      const tcol = writable.templateColumns.find((x) => x.name == column);
-      // console.log('TCOL', tcol);
-      // console.log('TYPE', tcol.type, mssql.Int);
-      // table.columns.add(column, tcol ? tcol.type : mssql.NVarChar(mssql.MAX));
-      table.columns.add(column, tcol ? tcol.type : mssql.NVarChar(mssql.MAX), {
-        nullable: tcol.nullable,
-        length: tcol.length,
-        precision: tcol.precision,
-        scale: tcol.scale,
-      });
-    }
-    for (const row of rows) {
-      table.rows.add(...this.columnNames.map((col) => row[col]));
-    }
-    const request = pool.request();
-    await request.bulk(table);
-  };
-
-  return writable;
-}
-
-module.exports = createBulkInsertStream;

packages/engines/mssql/index.js

@@ -1,210 +0,0 @@
-const _ = require('lodash');
-const MsSqlAnalyser = require('./MsSqlAnalyser');
-const MsSqlDumper = require('./MsSqlDumper');
-const createBulkInsertStream = require('./createBulkInsertStream');
-const driverBase = require('../default/driverBase');
-
-/** @type {import('@dbgate/types').SqlDialect} */
-const dialect = {
-  limitSelect: true,
-  rangeSelect: true,
-  offsetFetchRangeSyntax: true,
-  stringEscapeChar: "'",
-  fallbackDataType: 'nvarchar(max)',
-  quoteIdentifier(s) {
-    return `[${s}]`;
-  },
-};
-
-function extractColumns(columns) {
-  const mapper = {};
-  const res = _.sortBy(_.values(columns), 'index').map((col) => ({
-    ...col,
-    columnName: col.name,
-    notNull: !col.nullable,
-  }));
-
-  const generateName = () => {
-    let index = 1;
-    while (res.find((x) => x.columnName == `col${index}`)) index += 1;
-    return `col${index}`;
-  };
-
-  // const groups = _.groupBy(res, 'columnName');
-  // for (const colname of _.keys(groups)) {
-  //   if (groups[colname].length == 1) continue;
-  //   mapper[colname] = [];
-  //   for (const col of groups[colname]) {
-  //     col.columnName = generateName();
-  //     mapper[colname].push(colname);
-  //   }
-  // }
-
-  for (const col of res) {
-    if (!col.columnName) {
-      const newName = generateName();
-      mapper[col.columnName] = newName;
-      col.columnName = newName;
-    }
-  }
-
-  return [res, mapper];
-}
-
-/** @type {import('@dbgate/types').EngineDriver} */
-const driver = {
-  ...driverBase,
-  analyserClass: MsSqlAnalyser,
-  dumperClass: MsSqlDumper,
-  async connect(nativeModules, { server, port, user, password, database }) {
-    const pool = new nativeModules.mssql.ConnectionPool({
-      server,
-      port,
-      user,
-      password,
-      database,
-      requestTimeout: 1000 * 3600,
-      options: {
-        enableArithAbort: true,
-      },
-    });
-    await pool.connect();
-    pool._nativeModules = nativeModules;
-    return pool;
-  },
-  // @ts-ignore
-  async query(pool, sql) {
-    if (sql == null) {
-      return {
-        rows: [],
-        columns: [],
-      };
-    }
-    const resp = await pool.request().query(sql);
-    // console.log(Object.keys(resp.recordset));
-    // console.log(resp);
-    const res = {};
-
-    if (resp.recordset) {
-      const [columns] = extractColumns(resp.recordset.columns);
-      res.columns = columns;
-      res.rows = resp.recordset;
-    }
-    if (resp.rowsAffected) {
-      res.rowsAffected = _.sum(resp.rowsAffected);
-    }
-    return res;
-  },
-  async stream(pool, sql, options) {
-    const request = await pool.request();
-    let currentMapper = null;
-
-    const handleInfo = (info) => {
-      const { message, lineNumber, procName } = info;
-      options.info({
-        message,
-        line: lineNumber,
-        procedure: procName,
-        time: new Date(),
-        severity: 'info',
-      });
-    };
-
-    const handleDone = (result) => {
-      // console.log('RESULT', result);
-      options.done(result);
-    };
-
-    const handleRow = (row) => {
-      // if (currentMapper) {
-      //   for (const colname of _.keys(currentMapper)) {
-      //     let index = 0;
-      //     for (const newcolname of currentMapper[colname]) {
-      //       row[newcolname] = row[colname][index];
-      //       index += 1;
-      //     }
-      //     delete row[colname];
-      //   }
-      // }
-      if (currentMapper) {
-        row = { ...row };
-        for (const colname of _.keys(currentMapper)) {
-          const newcolname = currentMapper[colname];
-          row[newcolname] = row[colname];
-          if (_.isArray(row[newcolname])) row[newcolname] = row[newcolname].join(',');
-          delete row[colname];
-        }
-      }
-
-      options.row(row);
-    };
-
-    const handleRecordset = (columns) => {
-      const [extractedColumns, mapper] = extractColumns(columns);
-      currentMapper = mapper;
-      options.recordset(extractedColumns);
-    };
-
-    const handleError = (error) => {
-      const { message, lineNumber, procName } = error;
-      options.info({
-        message,
-        line: lineNumber,
-        procedure: procName,
-        time: new Date(),
-        severity: 'error',
-      });
-    };
-
-    request.stream = true;
-    request.on('recordset', handleRecordset);
-    request.on('row', handleRow);
-    request.on('error', handleError);
-    request.on('done', handleDone);
-    request.on('info', handleInfo);
-    request.query(sql);
-
-    return request;
-  },
-  async readQuery(pool, sql, structure) {
-    const request = await pool.request();
-    const { stream } = pool._nativeModules;
-
-    const pass = new stream.PassThrough({
-      objectMode: true,
-      highWaterMark: 100,
-    });
-
-    request.stream = true;
-    request.on('recordset', (driverColumns) => {
-      const [columns, mapper] = extractColumns(driverColumns);
-      pass.write(structure || { columns });
-    });
-    request.on('row', (row) => pass.write(row));
-    request.on('error', (err) => {
-      console.error(err);
-      pass.end();
-    });
-    request.on('done', () => pass.end());
-
-    request.query(sql);
-
-    return pass;
-  },
-  async writeTable(pool, name, options) {
-    const { stream, mssql } = pool._nativeModules;
-    return createBulkInsertStream(this, mssql, stream, pool, name, options);
-  },
-  async getVersion(pool) {
-    const { version } = (await this.query(pool, 'SELECT @@VERSION AS version')).rows[0];
-    return { version };
-  },
-  async listDatabases(pool) {
-    const { rows } = await this.query(pool, 'SELECT name FROM sys.databases order by name');
-    return rows;
-  },
-  dialect,
-  engine: 'mssql',
-};
-
-module.exports = driver;

packages/engines/mssql/sql/columns.js

@@ -1,20 +0,0 @@
-module.exports = `
-select c.name as columnName, t.name as dataType, c.object_id as objectId, c.is_identity as isIdentity,
-	c.max_length as maxLength, c.precision, c.scale, c.is_nullable as isNullable,
-	col.CHARACTER_MAXIMUM_LENGTH as charMaxLength,
-	d.definition as defaultValue, d.name as defaultConstraint,
-	m.definition as computedExpression, m.is_persisted as isPersisted, c.column_id as columnId, 
-	col.NUMERIC_PRECISION as numericPrecision,
-	col.NUMERIC_SCALE as numericScale,
-	-- TODO only if version >= 2008
-	c.is_sparse as isSparse
-from sys.columns c
-inner join sys.types t on c.system_type_id = t.system_type_id and c.user_type_id = t.user_type_id
-inner join sys.objects o on c.object_id = o.object_id
-INNER JOIN sys.schemas u ON u.schema_id=o.schema_id 
-INNER JOIN INFORMATION_SCHEMA.COLUMNS col ON col.TABLE_NAME = o.name AND col.TABLE_SCHEMA = u.name and col.COLUMN_NAME = c.name
-left join sys.default_constraints d on c.default_object_id = d.object_id
-left join sys.computed_columns m on m.object_id = c.object_id and m.column_id = c.column_id
-where o.type = 'U' and o.object_id =[OBJECT_ID_CONDITION]
-order by c.column_id
-`;

packages/engines/mssql/sql/foreignKeys.js

@@ -1,40 +0,0 @@
-module.exports = `
-SELECT
-    schemaName = FK.TABLE_SCHEMA,
-    pureName = FK.TABLE_NAME,
-    columnName = CU.COLUMN_NAME,
-
-    refSchemaName = ISNULL(IXS.name, PK.TABLE_SCHEMA),
-    refTableName = ISNULL(IXT.name, PK.TABLE_NAME),
-    refColumnName = IXCC.name,
-
-    constraintName = C.CONSTRAINT_NAME,
-    updateAction = rc.UPDATE_RULE,
-    deleteAction = rc.DELETE_RULE,
-
-    objectId = o.object_id 
-
-FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS C
-INNER JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS FK ON C.CONSTRAINT_NAME = FK.CONSTRAINT_NAME
-
-LEFT JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS PK ON C.UNIQUE_CONSTRAINT_NAME = PK.CONSTRAINT_NAME
-LEFT JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE CU ON C.CONSTRAINT_NAME = CU.CONSTRAINT_NAME
---LEFT JOIN (
---SELECT i1.TABLE_NAME, i2.COLUMN_NAME
---FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS i1
---INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE i2 ON i1.CONSTRAINT_NAME = i2.CONSTRAINT_NAME
---WHERE i1.CONSTRAINT_TYPE = 'PRIMARY KEY'
---) PT ON PT.TABLE_NAME = PK.TABLE_NAME
-INNER JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc ON FK.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
-
-LEFT JOIN sys.indexes IX ON IX.name = C.UNIQUE_CONSTRAINT_NAME
-LEFT JOIN sys.objects IXT ON IXT.object_id = IX.object_id
-LEFT JOIN sys.index_columns IXC ON IX.index_id = IXC.index_id and IX.object_id = IXC.object_id
-LEFT JOIN sys.columns IXCC ON IXCC.column_id = IXC.column_id AND IXCC.object_id = IXC.object_id
-LEFT JOIN sys.schemas IXS ON IXT.schema_id = IXS.schema_id
-
-inner join sys.objects o on FK.TABLE_NAME = o.name
-inner join sys.schemas s on o.schema_id = s.schema_id and FK.TABLE_SCHEMA = s.name
-
-where o.object_id =[OBJECT_ID_CONDITION]
-`;

packages/engines/mssql/sql/getSchemas.js

@@ -1 +0,0 @@
-module.exports = `select schema_id as objectId, name as schemaName from sys.schemas`;

packages/engines/mssql/sql/index.js

@@ -1,23 +0,0 @@
-const columns = require('./columns');
-const foreignKeys = require('./foreignKeys');
-const primaryKeys = require('./primaryKeys');
-const tables = require('./tables');
-const modifications = require('./modifications');
-const loadSqlCode = require('./loadSqlCode');
-const views = require('./views');
-const programmables = require('./programmables');
-const viewColumns = require('./viewColumns');
-const getSchemas = require('./getSchemas');
-
-module.exports = {
-  columns,
-  tables,
-  foreignKeys,
-  primaryKeys,
-  modifications,
-  loadSqlCode,
-  views,
-  programmables,
-  viewColumns,
-  getSchemas,
-};

packages/engines/mssql/sql/loadSqlCode.js

@@ -1,8 +0,0 @@
-module.exports = `
-select s.name as pureName, u.name as schemaName, c.text AS codeText
-    from sys.objects s
-    inner join sys.syscomments c on s.object_id = c.id
-    inner join sys.schemas u on u.schema_id = s.schema_id
-where (s.object_id =[OBJECT_ID_CONDITION])
-order by u.name, s.name, c.colid
-`;

packages/engines/mssql/sql/modifications.js

@@ -1,6 +0,0 @@
-module.exports = `
-select o.object_id as objectId, o.modify_date as modifyDate, o.type, o.name as pureName, s.name as schemaName
-from sys.objects o 
-inner join sys.schemas s on o.schema_id = s.schema_id
-where o.type in ('U', 'V', 'P', 'IF', 'FN', 'TF') -- , 'TR' - triggers disabled
-`;

packages/engines/mssql/sql/primaryKeys.js

@@ -1,14 +0,0 @@
-module.exports = `
-select o.object_id, pureName = t.Table_Name, schemaName = t.Table_Schema, columnName = c.Column_Name, constraintName=t.constraint_name from 
-    INFORMATION_SCHEMA.TABLE_CONSTRAINTS t,
-    sys.objects o,
-    sys.schemas s,
-    INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE c
-where
-    c.Constraint_Name = t.Constraint_Name
-    and t.table_name = o.name 
-    and o.schema_id = s.schema_id and t.Table_Schema = s.name
-    and c.Table_Name = t.Table_Name
-    and Constraint_Type = 'PRIMARY KEY'
-	and o.object_id =[OBJECT_ID_CONDITION]
-`;

packages/engines/mssql/sql/programmables.js

@@ -1,6 +0,0 @@
-module.exports = `
-select o.name as pureName, s.name as schemaName, o.object_id as objectId, o.create_date as createDate, o.modify_date as modifyDate, o.type as sqlObjectType
-from sys.objects o 
-inner join sys.schemas s on o.schema_id = s.schema_id
-where o.type in ('P', 'IF', 'FN', 'TF') and o.object_id =[OBJECT_ID_CONDITION]
-`;

packages/engines/mssql/sql/tables.js

@@ -1,8 +0,0 @@
-module.exports = `
-select
-	o.name as pureName, s.name as schemaName, o.object_id as objectId,
-	o.create_date as createDate, o.modify_date as modifyDate 
-from sys.tables o
-inner join sys.schemas s on o.schema_id = s.schema_id
-where o.object_id =[OBJECT_ID_CONDITION]
-`;

packages/engines/mssql/sql/viewColumns.js

@@ -1,18 +0,0 @@
-module.exports = `
-select 
-    o.object_id AS objectId,
-    col.TABLE_SCHEMA as schemaName, 
-    col.TABLE_NAME as pureName, 
-	col.COLUMN_NAME as columnName,
-	col.IS_NULLABLE as isNullable,
-	col.DATA_TYPE as dataType,
-	col.CHARACTER_MAXIMUM_LENGTH as charMaxLength,
-	col.NUMERIC_PRECISION as precision,
-	col.NUMERIC_SCALE as scale,
-	col.COLUMN_DEFAULT
-FROM sys.objects o 
-INNER JOIN sys.schemas u ON u.schema_id=o.schema_id 
-INNER JOIN INFORMATION_SCHEMA.COLUMNS col ON col.TABLE_NAME = o.name AND col.TABLE_SCHEMA = u.name
-WHERE o.type in ('V') and o.object_id =[OBJECT_ID_CONDITION]    
-order by col.ORDINAL_POSITION
-`;

packages/engines/mssql/sql/views.js

@@ -1,10 +0,0 @@
-module.exports = `
-SELECT 
-	o.name as pureName,
-	u.name as schemaName,
-	o.object_id as objectId,
-	o.create_date as createDate,
-	o.modify_date as modifyDate
-FROM sys.objects o INNER JOIN sys.schemas u ON u.schema_id=o.schema_id 
-WHERE type in ('V') and o.object_id =[OBJECT_ID_CONDITION]
-`;

packages/engines/mysql/MySqlAnalyser.js

@@ -1,214 +0,0 @@
-const fp = require('lodash/fp');
-const _ = require('lodash');
-const sql = require('./sql');
-
-const DatabaseAnalayser = require('../default/DatabaseAnalyser');
-const { isTypeString, isTypeNumeric } = require('@dbgate/tools');
-const { rangeStep } = require('lodash/fp');
-
-function getColumnInfo({
-  isNullable,
-  extra,
-  columnName,
-  dataType,
-  charMaxLength,
-  numericPrecision,
-  numericScale,
-  defaultValue,
-}) {
-  let fullDataType = dataType;
-  if (charMaxLength && isTypeString(dataType)) fullDataType = `${dataType}(${charMaxLength})`;
-  if (numericPrecision && numericScale && isTypeNumeric(dataType))
-    fullDataType = `${dataType}(${numericPrecision},${numericScale})`;
-  return {
-    notNull: !isNullable || isNullable == 'NO' || isNullable == 'no',
-    autoIncrement: extra && extra.toLowerCase().includes('auto_increment'),
-    columnName,
-    dataType: fullDataType,
-    defaultValue,
-  };
-}
-
-function objectTypeToField(type) {
-  if (type == 'VIEW') return 'views';
-  if (type == 'BASE TABLE') return 'tables';
-  return null;
-}
-
-class MySqlAnalyser extends DatabaseAnalayser {
-  constructor(pool, driver) {
-    super(pool, driver);
-  }
-
-  createQuery(resFileName, typeFields) {
-    let res = sql[resFileName];
-    if (this.singleObjectFilter) {
-      const { typeField, pureName } = this.singleObjectFilter;
-      if (!typeFields || !typeFields.includes(typeField)) return null;
-      res = res.replace('=[OBJECT_NAME_CONDITION]', ` = '${pureName}'`).replace('#DATABASE#', this.pool._database_name);
-      return res;
-    }
-    if (!this.modifications || !typeFields || this.modifications.length == 0) {
-      res = res.replace('=[OBJECT_NAME_CONDITION]', ' is not null');
-    } else {
-      const filterNames = this.modifications
-        .filter((x) => typeFields.includes(x.objectTypeField) && (x.action == 'add' || x.action == 'change'))
-        .map((x) => x.newName && x.newName.pureName)
-        .filter(Boolean);
-      if (filterNames.length == 0) {
-        res = res.replace('=[OBJECT_NAME_CONDITION]', ' IS NULL');
-      } else {
-        res = res.replace('=[OBJECT_NAME_CONDITION]', ` in (${filterNames.map((x) => `'${x}'`).join(',')})`);
-      }
-    }
-    res = res.replace('#DATABASE#', this.pool._database_name);
-    return res;
-  }
-
-  getRequestedViewNames(allViewNames) {
-    if (this.singleObjectFilter) {
-      const { typeField, pureName } = this.singleObjectFilter;
-      if (typeField == 'views') return [pureName];
-    }
-    if (this.modifications) {
-      return this.modifications.filter((x) => x.objectTypeField == 'views').map((x) => x.newName.pureName);
-    }
-    return allViewNames;
-  }
-
-  async getViewTexts(allViewNames) {
-    const res = {};
-    for (const viewName of this.getRequestedViewNames(allViewNames)) {
-      const resp = await this.driver.query(this.pool, `SHOW CREATE VIEW \`${viewName}\``);
-      res[viewName] = resp.rows[0]['Create View'];
-    }
-    return res;
-  }
-
-  async _runAnalysis() {
-    const tables = await this.driver.query(this.pool, this.createQuery('tables', ['tables']));
-    const columns = await this.driver.query(this.pool, this.createQuery('columns', ['tables', 'views']));
-    const pkColumns = await this.driver.query(this.pool, this.createQuery('primaryKeys', ['tables']));
-    const fkColumns = await this.driver.query(this.pool, this.createQuery('foreignKeys', ['tables']));
-    const views = await this.driver.query(this.pool, this.createQuery('views', ['views']));
-    const programmables = await this.driver.query(
-      this.pool,
-      this.createQuery('programmables', ['procedures', 'functions'])
-    );
-
-    const viewTexts = await this.getViewTexts(views.rows.map((x) => x.pureName));
-
-    return this.mergeAnalyseResult(
-      {
-        tables: tables.rows.map((table) => ({
-          ...table,
-          columns: columns.rows.filter((col) => col.pureName == table.pureName).map(getColumnInfo),
-          primaryKey: DatabaseAnalayser.extractPrimaryKeys(table, pkColumns.rows),
-          foreignKeys: DatabaseAnalayser.extractForeignKeys(table, fkColumns.rows),
-        })),
-        views: views.rows.map((view) => ({
-          ...view,
-          columns: columns.rows.filter((col) => col.pureName == view.pureName).map(getColumnInfo),
-          createSql: viewTexts[view.pureName],
-          requiresFormat: true,
-        })),
-        procedures: programmables.rows.filter((x) => x.objectType == 'PROCEDURE').map(fp.omit(['objectType'])),
-        functions: programmables.rows.filter((x) => x.objectType == 'FUNCTION').map(fp.omit(['objectType'])),
-      },
-      (x) => x.pureName
-    );
-  }
-
-  getDeletedObjectsForField(nameArray, objectTypeField) {
-    return this.structure[objectTypeField]
-      .filter((x) => !nameArray.includes(x.pureName))
-      .map((x) => ({
-        oldName: _.pick(x, ['pureName']),
-        action: 'remove',
-        objectTypeField,
-      }));
-  }
-
-  getDeletedObjects(nameArray) {
-    return [
-      ...this.getDeletedObjectsForField(nameArray, 'tables'),
-      ...this.getDeletedObjectsForField(nameArray, 'views'),
-      ...this.getDeletedObjectsForField(nameArray, 'procedures'),
-      ...this.getDeletedObjectsForField(nameArray, 'functions'),
-      ...this.getDeletedObjectsForField(nameArray, 'triggers'),
-    ];
-  }
-
-  async getModifications() {
-    const tableModificationsQueryData = await this.driver.query(this.pool, this.createQuery('tableModifications'));
-    const procedureModificationsQueryData = await this.driver.query(
-      this.pool,
-      this.createQuery('procedureModifications')
-    );
-    const functionModificationsQueryData = await this.driver.query(
-      this.pool,
-      this.createQuery('functionModifications')
-    );
-
-    const allModifications = _.compact([
-      ...tableModificationsQueryData.rows.map((x) => {
-        if (x.objectType == 'BASE TABLE') return { ...x, objectTypeField: 'tables' };
-        if (x.objectType == 'VIEW') return { ...x, objectTypeField: 'views' };
-        return null;
-      }),
-      ...procedureModificationsQueryData.rows.map((x) => ({
-        objectTypeField: 'procedures',
-        modifyDate: x.Modified,
-        pureName: x.Name,
-      })),
-      ...functionModificationsQueryData.rows.map((x) => ({
-        objectTypeField: 'functions',
-        modifyDate: x.Modified,
-        pureName: x.Name,
-      })),
-    ]);
-
-    // console.log('allModifications', allModifications);
-    // console.log(
-    //   'DATES',
-    //   this.structure.procedures.map((x) => x.modifyDate)
-    // );
-    // console.log('MOD - SRC', modifications);
-    // console.log(
-    //   'MODs',
-    //   this.structure.tables.map((x) => x.modifyDate)
-    // );
-    const modifications = allModifications.map((x) => {
-      const { objectType, modifyDate, pureName } = x;
-      const field = objectTypeToField(objectType);
-
-      if (!field || !this.structure[field]) return null;
-      // @ts-ignore
-      const obj = this.structure[field].find((x) => x.pureName == pureName);
-
-      // object not modified
-      if (obj && Math.abs(new Date(modifyDate).getTime() - new Date(obj.modifyDate).getTime()) < 1000) return null;
-
-      // console.log('MODIFICATION OF ', field, pureName, modifyDate, obj.modifyDate);
-
-      /** @type {import('@dbgate/types').DatabaseModification} */
-      const action = obj
-        ? {
-            newName: { pureName },
-            oldName: _.pick(obj, ['pureName']),
-            action: 'change',
-            objectTypeField: field,
-          }
-        : {
-            newName: { pureName },
-            action: 'add',
-            objectTypeField: field,
-          };
-      return action;
-    });
-
-    return [..._.compact(modifications), ...this.getDeletedObjects([...allModifications.map((x) => x.pureName)])];
-  }
-}
-
-module.exports = MySqlAnalyser;

packages/engines/mysql/MySqlDumper.js

@@ -1,30 +0,0 @@
-const SqlDumper = require('../default/SqlDumper');
-
-class MySqlDumper extends SqlDumper {
-  /** @param type {import('@dbgate/types').TransformType} */
-  transform(type, dumpExpr) {
-    switch (type) {
-      case 'GROUP:YEAR':
-      case 'YEAR':
-        this.put('^year(%c)', dumpExpr);
-        break;
-      case 'MONTH':
-        this.put('^month(%c)', dumpExpr);
-        break;
-      case 'DAY':
-        this.put('^day(%c)', dumpExpr);
-        break;
-      case 'GROUP:MONTH':
-        this.put("^date_format(%c, '%s')", dumpExpr, '%Y-%m');
-        break;
-      case 'GROUP:DAY':
-        this.put("^date_format(%c, '%s')", dumpExpr, '%Y-%m-%d');
-        break;
-      default:
-        dumpExpr();
-        break;
-    }
-  }
-}
-
-module.exports = MySqlDumper;

packages/engines/mysql/index.js

@@ -1,153 +0,0 @@
-const driverBase = require('../default/driverBase');
-const MySqlAnalyser = require('./MySqlAnalyser');
-const MySqlDumper = require('./MySqlDumper');
-
-/** @type {import('@dbgate/types').SqlDialect} */
-const dialect = {
-  rangeSelect: true,
-  stringEscapeChar: '\\',
-  fallbackDataType: 'longtext',
-  quoteIdentifier(s) {
-    return '`' + s + '`';
-  },
-};
-
-function extractColumns(fields) {
-  if (fields)
-    return fields.map((col) => ({
-      columnName: col.name,
-    }));
-  return null;
-}
-
-/** @type {import('@dbgate/types').EngineDriver} */
-const driver = {
-  ...driverBase,
-  analyserClass: MySqlAnalyser,
-  dumperClass: MySqlDumper,
-
-  async connect(nativeModules, { server, port, user, password, database }) {
-    const connection = nativeModules.mysql.createConnection({
-      host: server,
-      port,
-      user,
-      password,
-      database,
-    });
-    connection._database_name = database;
-    connection._nativeModules = nativeModules;
-    return connection;
-  },
-  async query(connection, sql) {
-    if (sql == null) {
-      return {
-        rows: [],
-        columns: [],
-      };
-    }
-    return new Promise((resolve, reject) => {
-      connection.query(sql, function (error, results, fields) {
-        if (error) reject(error);
-        resolve({ rows: results, columns: extractColumns(fields) });
-      });
-    });
-  },
-  async stream(connection, sql, options) {
-    const query = connection.query(sql);
-
-    // const handleInfo = (info) => {
-    //   const { message, lineNumber, procName } = info;
-    //   options.info({
-    //     message,
-    //     line: lineNumber,
-    //     procedure: procName,
-    //     time: new Date(),
-    //     severity: 'info',
-    //   });
-    // };
-
-    const handleEnd = (result) => {
-      // console.log('RESULT', result);
-      options.done(result);
-    };
-
-    const handleRow = (row) => {
-      options.row(row);
-    };
-
-    const handleFields = (columns) => {
-      console.log('FIELDS', columns[0].name);
-      options.recordset(extractColumns(columns));
-    };
-
-    const handleError = (error) => {
-      console.log('ERROR', error);
-      const { message, lineNumber, procName } = error;
-      options.info({
-        message,
-        line: lineNumber,
-        procedure: procName,
-        time: new Date(),
-        severity: 'error',
-      });
-    };
-
-    query.on('error', handleError).on('fields', handleFields).on('result', handleRow).on('end', handleEnd);
-
-    return query;
-  },
-  async readQuery(connection, sql, structure) {
-    const query = connection.query(sql);
-    const { stream } = connection._nativeModules;
-
-    const pass = new stream.PassThrough({
-      objectMode: true,
-      highWaterMark: 100,
-    });
-
-    query
-      .on('error', (err) => {
-        console.error(err);
-        pass.end();
-      })
-      .on('fields', (fields) => pass.write(structure || { columns: extractColumns(fields) }))
-      .on('result', (row) => pass.write(row))
-      .on('end', () => pass.end());
-
-    return pass;
-  },
-  async getVersion(connection) {
-    const { rows } = await this.query(connection, "show variables like 'version'");
-    const version = rows[0].Value;
-    return { version };
-  },
-  // async analyseFull(pool) {
-  //   const analyser = new MySqlAnalyser(pool, this);
-  //   return analyser.fullAnalysis();
-  // },
-  // async analyseIncremental(pool, structure) {
-  //   const analyser = new MySqlAnalyser(pool, this);
-  //   return analyser.incrementalAnalysis(structure);
-  // },
-  // async analyseSingleObject(pool, name, typeField = 'tables') {
-  //   const analyser = new MySqlAnalyser(pool, this);
-  //   analyser.singleObjectFilter = { ...name, typeField };
-  //   const res = await analyser.fullAnalysis();
-  //   return res.tables[0];
-  // },
-  // // @ts-ignore
-  // analyseSingleTable(pool, name) {
-  //   return this.analyseSingleObject(pool, name, 'tables');
-  // },
-  async listDatabases(connection) {
-    const { rows } = await this.query(connection, 'show databases');
-    return rows.map((x) => ({ name: x.Database }));
-  },
-  // createDumper() {
-  //   return new MySqlDumper(this);
-  // },
-  dialect,
-  engine: 'mysql',
-};
-
-module.exports = driver;

packages/engines/mysql/sql/columns.js

@@ -1,15 +0,0 @@
-module.exports = `
-select 
-	TABLE_NAME as pureName, 
-	COLUMN_NAME as columnName,
-	IS_NULLABLE as isNullable,
-	DATA_TYPE as dataType,
-	CHARACTER_MAXIMUM_LENGTH as charMaxLength,
-	NUMERIC_PRECISION as numericPrecision,
-	NUMERIC_SCALE as numericScale,
-	COLUMN_DEFAULT as defaultValue,
-	EXTRA as extra
-from INFORMATION_SCHEMA.COLUMNS
-where TABLE_SCHEMA = '#DATABASE#' and TABLE_NAME =[OBJECT_NAME_CONDITION]
-order by ORDINAL_POSITION
-`;

packages/engines/mysql/sql/foreignKeys.js

@@ -1,17 +0,0 @@
-module.exports = `
-select 
-	REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME as constraintName,
-	REFERENTIAL_CONSTRAINTS.TABLE_NAME as pureName,
-	REFERENTIAL_CONSTRAINTS.UPDATE_RULE as updateAction,
-	REFERENTIAL_CONSTRAINTS.DELETE_RULE as deleteAction,
-	REFERENTIAL_CONSTRAINTS.REFERENCED_TABLE_NAME as refTableName,
-	KEY_COLUMN_USAGE.COLUMN_NAME as columnName,
-	KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME as refColumnName
-from INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
-inner join INFORMATION_SCHEMA.KEY_COLUMN_USAGE 
-	on REFERENTIAL_CONSTRAINTS.TABLE_NAME = KEY_COLUMN_USAGE.TABLE_NAME 
-	and REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME = KEY_COLUMN_USAGE.CONSTRAINT_NAME
-	and REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA = KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA
-where REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA = '#DATABASE#' and REFERENTIAL_CONSTRAINTS.TABLE_NAME =[OBJECT_NAME_CONDITION]
-order by KEY_COLUMN_USAGE.ORDINAL_POSITION
-`;