npm - @budibase/server - Versions diffs - 1.0.49 → 1.0.50-alpha.0 - Mend

@budibase/server 1.0.49 → 1.0.50-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (381) hide show

package/__mocks__/arangojs.ts +1 -1
package/__mocks__/aws-sdk.ts +4 -4
package/__mocks__/mongodb.ts +4 -5
package/__mocks__/mssql.ts +3 -3
package/__mocks__/node-fetch.ts +2 -1
package/__mocks__/pg.ts +3 -5
package/builder/assets/index.c0cc369d.css +6 -0
package/builder/assets/{index.2c37968e.js → index.ff2bad21.js} +252 -249
package/builder/assets/{vendor.f9faf6ab.js → vendor.5ad9695a.js} +202 -106
package/builder/index.html +3 -3
package/coverage/clover.xml +3105 -2814
package/coverage/coverage-final.json +106 -101
package/coverage/lcov-report/api/controllers/analytics.js.html +1 -1
package/coverage/lcov-report/api/controllers/apikeys.js.html +1 -1
package/coverage/lcov-report/api/controllers/application.js.html +257 -152
package/coverage/lcov-report/api/controllers/auth.js.html +22 -13
package/coverage/lcov-report/api/controllers/automation.js.html +39 -69
package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
package/coverage/lcov-report/api/controllers/cloud.js.html +8 -11
package/coverage/lcov-report/api/controllers/component.js.html +13 -16
package/coverage/lcov-report/api/controllers/datasource.js.html +81 -51
package/coverage/lcov-report/api/controllers/dev.js.html +6 -6
package/coverage/lcov-report/api/controllers/index.html +78 -78
package/coverage/lcov-report/api/controllers/integration.js.html +1 -1
package/coverage/lcov-report/api/controllers/layout.js.html +9 -9
package/coverage/lcov-report/api/controllers/metadata.js.html +6 -21
package/coverage/lcov-report/api/controllers/migrations.js.html +119 -0
package/coverage/lcov-report/api/controllers/permission.js.html +19 -19
package/coverage/lcov-report/api/controllers/query/index.html +10 -10
package/coverage/lcov-report/api/controllers/query/index.js.html +38 -35
package/coverage/lcov-report/api/controllers/query/validation.js.html +6 -6
package/coverage/lcov-report/api/controllers/role.js.html +16 -16
package/coverage/lcov-report/api/controllers/routing.js.html +7 -10
package/coverage/lcov-report/api/controllers/row/external.js.html +48 -141
package/coverage/lcov-report/api/controllers/row/index.html +55 -40
package/coverage/lcov-report/api/controllers/row/index.js.html +26 -26
package/coverage/lcov-report/api/controllers/row/internal.js.html +118 -226
package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +52 -34
package/coverage/lcov-report/api/controllers/row/staticFormula.js.html +548 -0
package/coverage/lcov-report/api/controllers/row/utils.js.html +47 -62
package/coverage/lcov-report/api/controllers/screen.js.html +15 -21
package/coverage/lcov-report/api/controllers/script.js.html +4 -4
package/coverage/lcov-report/api/controllers/table/bulkFormula.js.html +599 -0
package/coverage/lcov-report/api/controllers/table/external.js.html +25 -34
package/coverage/lcov-report/api/controllers/table/index.html +58 -43
package/coverage/lcov-report/api/controllers/table/index.js.html +58 -82
package/coverage/lcov-report/api/controllers/table/internal.js.html +81 -66
package/coverage/lcov-report/api/controllers/table/utils.js.html +218 -110
package/coverage/lcov-report/api/controllers/templates.js.html +1 -1
package/coverage/lcov-report/api/controllers/user.js.html +79 -76
package/coverage/lcov-report/api/controllers/view/exporters.js.html +4 -4
package/coverage/lcov-report/api/controllers/view/index.html +16 -16
package/coverage/lcov-report/api/controllers/view/index.js.html +27 -33
package/coverage/lcov-report/api/controllers/view/utils.js.html +35 -20
package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +7 -7
package/coverage/lcov-report/api/controllers/webhook.js.html +34 -28
package/coverage/lcov-report/api/index.html +1 -1
package/coverage/lcov-report/api/index.js.html +8 -8
package/coverage/lcov-report/api/routes/analytics.js.html +1 -1
package/coverage/lcov-report/api/routes/apikeys.js.html +1 -1
package/coverage/lcov-report/api/routes/application.js.html +1 -1
package/coverage/lcov-report/api/routes/auth.js.html +1 -1
package/coverage/lcov-report/api/routes/automation.js.html +1 -1
package/coverage/lcov-report/api/routes/backup.js.html +1 -1
package/coverage/lcov-report/api/routes/cloud.js.html +1 -1
package/coverage/lcov-report/api/routes/component.js.html +1 -1
package/coverage/lcov-report/api/routes/datasource.js.html +1 -1
package/coverage/lcov-report/api/routes/deploy.js.html +1 -1
package/coverage/lcov-report/api/routes/dev.js.html +1 -1
package/coverage/lcov-report/api/routes/index.html +18 -18
package/coverage/lcov-report/api/routes/index.js.html +3 -3
package/coverage/lcov-report/api/routes/integration.js.html +1 -1
package/coverage/lcov-report/api/routes/layout.js.html +1 -1
package/coverage/lcov-report/api/routes/metadata.js.html +1 -1
package/coverage/lcov-report/api/routes/{hosting.js.html → migrations.js.html} +17 -14
package/coverage/lcov-report/api/routes/permission.js.html +1 -1
package/coverage/lcov-report/api/routes/query.js.html +1 -1
package/coverage/lcov-report/api/routes/role.js.html +1 -1
package/coverage/lcov-report/api/routes/routing.js.html +1 -1
package/coverage/lcov-report/api/routes/row.js.html +1 -1
package/coverage/lcov-report/api/routes/screen.js.html +1 -1
package/coverage/lcov-report/api/routes/script.js.html +1 -1
package/coverage/lcov-report/api/routes/static.js.html +17 -2
package/coverage/lcov-report/api/routes/table.js.html +1 -1
package/coverage/lcov-report/api/routes/templates.js.html +1 -1
package/coverage/lcov-report/api/routes/user.js.html +1 -1
package/coverage/lcov-report/api/routes/view.js.html +1 -1
package/coverage/lcov-report/api/routes/webhook.js.html +1 -1
package/coverage/lcov-report/automations/actions.js.html +24 -24
package/coverage/lcov-report/automations/automationUtils.js.html +7 -10
package/coverage/lcov-report/automations/bullboard.js.html +16 -16
package/coverage/lcov-report/automations/index.html +18 -18
package/coverage/lcov-report/automations/index.js.html +1 -1
package/coverage/lcov-report/automations/steps/bash.js.html +6 -6
package/coverage/lcov-report/automations/steps/createRow.js.html +13 -22
package/coverage/lcov-report/automations/steps/delay.js.html +4 -4
package/coverage/lcov-report/automations/steps/deleteRow.js.html +11 -20
package/coverage/lcov-report/automations/steps/discord.js.html +7 -7
package/coverage/lcov-report/automations/steps/executeQuery.js.html +6 -6
package/coverage/lcov-report/automations/steps/executeScript.js.html +6 -6
package/coverage/lcov-report/automations/steps/filter.js.html +7 -7
package/coverage/lcov-report/automations/steps/index.html +13 -13
package/coverage/lcov-report/automations/steps/integromat.js.html +5 -5
package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +8 -8
package/coverage/lcov-report/automations/steps/queryRows.js.html +10 -10
package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +5 -5
package/coverage/lcov-report/automations/steps/serverLog.js.html +3 -3
package/coverage/lcov-report/automations/steps/slack.js.html +5 -5
package/coverage/lcov-report/automations/steps/updateRow.js.html +7 -7
package/coverage/lcov-report/automations/steps/utils.js.html +3 -3
package/coverage/lcov-report/automations/steps/zapier.js.html +5 -5
package/coverage/lcov-report/automations/triggerInfo/app.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/cron.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
package/coverage/lcov-report/automations/triggerInfo/index.js.html +8 -8
package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +2 -2
package/coverage/lcov-report/automations/triggers.js.html +61 -55
package/coverage/lcov-report/automations/utils.js.html +54 -42
package/coverage/lcov-report/constants/index.html +5 -5
package/coverage/lcov-report/constants/index.js.html +53 -26
package/coverage/lcov-report/constants/layouts.js.html +5 -5
package/coverage/lcov-report/constants/screens.js.html +4 -4
package/coverage/lcov-report/db/client.js.html +18 -18
package/coverage/lcov-report/db/inMemoryView.js.html +7 -7
package/coverage/lcov-report/db/index.html +15 -15
package/coverage/lcov-report/db/index.js.html +3 -3
package/coverage/lcov-report/db/linkedRows/LinkController.js.html +25 -37
package/coverage/lcov-report/db/linkedRows/index.html +27 -27
package/coverage/lcov-report/db/linkedRows/index.js.html +51 -96
package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +42 -42
package/coverage/lcov-report/db/newid.js.html +4 -4
package/coverage/lcov-report/db/utils.js.html +87 -87
package/coverage/lcov-report/events/AutomationEmitter.js.html +1 -1
package/coverage/lcov-report/events/index.html +1 -1
package/coverage/lcov-report/events/index.js.html +5 -5
package/coverage/lcov-report/events/utils.js.html +3 -3
package/coverage/lcov-report/index.html +135 -120
package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
package/coverage/lcov-report/integrations/tests/index.html +1 -1
package/coverage/lcov-report/middleware/appInfo.js.html +1 -1
package/coverage/lcov-report/middleware/authorized.js.html +173 -65
package/coverage/lcov-report/middleware/builder.js.html +10 -10
package/coverage/lcov-report/middleware/currentapp.js.html +95 -83
package/coverage/lcov-report/middleware/index.html +38 -38
package/coverage/lcov-report/middleware/joi-validator.js.html +3 -3
package/coverage/lcov-report/middleware/resourceId.js.html +1 -1
package/coverage/lcov-report/middleware/selfhost.js.html +1 -1
package/coverage/lcov-report/middleware/usageQuota.js.html +281 -53
package/coverage/lcov-report/middleware/utils.js.html +2 -2
package/coverage/lcov-report/threads/automation.js.html +30 -24
package/coverage/lcov-report/threads/index.html +26 -26
package/coverage/lcov-report/threads/index.js.html +10 -10
package/coverage/lcov-report/threads/query.js.html +39 -24
package/coverage/lcov-report/threads/utils.js.html +14 -14
package/coverage/lcov-report/utilities/bcrypt.js.html +1 -1
package/coverage/lcov-report/utilities/budibaseDir.js.html +7 -7
package/coverage/lcov-report/utilities/centralPath.js.html +4 -4
package/coverage/lcov-report/utilities/csvParser.js.html +6 -6
package/coverage/lcov-report/utilities/global.js.html +58 -49
package/coverage/lcov-report/utilities/index.html +37 -37
package/coverage/lcov-report/utilities/index.js.html +43 -73
package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +8 -8
package/coverage/lcov-report/utilities/queue/index.html +1 -1
package/coverage/lcov-report/utilities/routing/index.html +1 -1
package/coverage/lcov-report/utilities/routing/index.js.html +7 -7
package/coverage/lcov-report/utilities/rowProcessor/index.html +27 -27
package/coverage/lcov-report/utilities/rowProcessor/index.js.html +97 -103
package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +75 -27
package/coverage/lcov-report/utilities/scriptRunner.js.html +5 -5
package/coverage/lcov-report/utilities/security.js.html +8 -8
package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
package/coverage/lcov-report/utilities/usageQuota/index.html +141 -0
package/coverage/lcov-report/utilities/usageQuota/index.js.html +359 -0
package/coverage/lcov-report/utilities/usageQuota/rows.js.html +305 -0
package/coverage/lcov-report/{api/controllers/hosting.js.html → utilities/usageQuota/usageQuoteReset.js.html} +36 -48
package/coverage/lcov-report/utilities/users.js.html +9 -9
package/coverage/lcov-report/utilities/workerRequests.js.html +43 -112
package/coverage/lcov.info +5010 -4425
package/dist/api/controllers/application.js +90 -60
package/dist/api/controllers/auth.js +8 -5
package/dist/api/controllers/automation.js +14 -19
package/dist/api/controllers/cloud.js +2 -3
package/dist/api/controllers/component.js +3 -4
package/dist/api/controllers/datasource.js +20 -10
package/dist/api/controllers/deploy/Deployment.js +3 -6
package/dist/api/controllers/deploy/index.js +12 -13
package/dist/api/controllers/dev.js +5 -5
package/dist/api/controllers/layout.js +3 -3
package/dist/api/controllers/metadata.js +4 -4
package/dist/api/controllers/migrations.js +21 -0
package/dist/api/controllers/permission.js +4 -4
package/dist/api/controllers/query/import/index.js +4 -6
package/dist/api/controllers/query/index.js +11 -10
package/dist/api/controllers/role.js +5 -5
package/dist/api/controllers/routing.js +5 -6
package/dist/api/controllers/row/ExternalRequest.js +90 -67
package/dist/api/controllers/row/external.js +14 -22
package/dist/api/controllers/row/internal.js +55 -93
package/dist/api/controllers/row/internalSearch.js +23 -17
package/dist/api/controllers/row/staticFormula.js +147 -0
package/dist/api/controllers/row/utils.js +13 -14
package/dist/api/controllers/screen.js +5 -7
package/dist/api/controllers/static/index.js +62 -16
package/dist/api/controllers/table/bulkFormula.js +159 -0
package/dist/api/controllers/table/external.js +7 -10
package/dist/api/controllers/table/index.js +16 -13
package/dist/api/controllers/table/internal.js +22 -16
package/dist/api/controllers/table/utils.js +62 -35
package/dist/api/controllers/user.js +43 -43
package/dist/api/controllers/view/index.js +8 -10
package/dist/api/controllers/view/utils.js +9 -4
package/dist/api/controllers/webhook.js +10 -8
package/dist/api/routes/index.js +2 -2
package/dist/api/routes/migrations.js +9 -0
package/dist/api/routes/static.js +2 -1
package/dist/api/routes/tests/utilities/TestFunctions.js +37 -17
package/dist/app.js +35 -5
package/dist/automations/automationUtils.js +2 -3
package/dist/automations/steps/createRow.js +3 -5
package/dist/automations/steps/deleteRow.js +1 -4
package/dist/automations/steps/updateRow.js +1 -1
package/dist/automations/triggers.js +27 -25
package/dist/automations/utils.js +10 -5
package/dist/constants/index.js +7 -0
package/dist/db/linkedRows/LinkController.js +3 -7
package/dist/db/linkedRows/index.js +16 -27
package/dist/db/linkedRows/linkUtils.js +6 -6
package/dist/db/views/staticViews.js +9 -10
package/dist/definitions/datasource.js +1 -0
package/dist/environment.js +4 -1
package/dist/integrations/base/sql.js +62 -21
package/dist/integrations/googlesheets.js +340 -0
package/dist/integrations/index.js +3 -0
package/dist/integrations/utils.js +60 -9
package/dist/middleware/authorized.js +57 -30
package/dist/middleware/builder.js +2 -2
package/dist/middleware/currentapp.js +41 -37
package/dist/middleware/usageQuota.js +82 -15
package/dist/migrations/functions/appUrls.js +46 -0
package/dist/migrations/functions/quotas1.js +50 -0
package/dist/migrations/functions/usageQuotas/index.js +20 -0
package/dist/migrations/functions/usageQuotas/syncApps.js +29 -0
package/dist/migrations/functions/usageQuotas/syncRows.js +33 -0
package/dist/migrations/functions/userEmailViewCasing.js +24 -0
package/dist/migrations/index.js +62 -0
package/dist/package.json +8 -5
package/dist/tests/utilities/TestConfiguration.js +80 -50
package/dist/threads/automation.js +13 -11
package/dist/threads/query.js +15 -11
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/utilities/fileSystem/index.js +4 -3
package/dist/utilities/global.js +15 -12
package/dist/utilities/index.js +7 -17
package/dist/utilities/routing/index.js +5 -5
package/dist/utilities/rowProcessor/index.js +23 -17
package/dist/utilities/rowProcessor/utils.js +14 -4
package/dist/utilities/{usageQuota.js → usageQuota/index.js} +45 -31
package/dist/utilities/usageQuota/rows.js +78 -0
package/dist/utilities/usageQuota/usageQuoteReset.js +16 -0
package/dist/utilities/users.js +3 -3
package/dist/utilities/workerRequests.js +4 -24
package/nodemon.json +1 -1
package/package.json +9 -6
package/scripts/integrations/mssql/data/Dockerfile +1 -1
package/scripts/integrations/mssql/data/setup.sql +17 -4
package/scripts/integrations/postgres/init.sql +11 -6
package/scripts/likeCypress.ts +1 -1
package/src/api/controllers/application.js +85 -50
package/src/api/controllers/auth.js +8 -5
package/src/api/controllers/automation.js +13 -23
package/src/api/controllers/cloud.js +2 -3
package/src/api/controllers/component.js +3 -4
package/src/api/controllers/datasource.js +21 -11
package/src/api/controllers/deploy/Deployment.js +3 -7
package/src/api/controllers/deploy/index.js +20 -13
package/src/api/controllers/dev.js +5 -5
package/src/api/controllers/layout.js +3 -3
package/src/api/controllers/metadata.js +4 -9
package/src/api/controllers/migrations.js +13 -0
package/src/api/controllers/permission.js +4 -4
package/src/api/controllers/query/import/index.ts +4 -6
package/src/api/controllers/query/import/tests/index.spec.js +2 -1
package/src/api/controllers/query/index.js +11 -10
package/src/api/controllers/role.js +5 -5
package/src/api/controllers/routing.js +5 -6
package/src/api/controllers/row/ExternalRequest.ts +67 -43
package/src/api/controllers/row/external.js +27 -58
package/src/api/controllers/row/internal.js +54 -90
package/src/api/controllers/row/internalSearch.js +23 -17
package/src/api/controllers/row/staticFormula.js +156 -0
package/src/api/controllers/row/utils.js +13 -18
package/src/api/controllers/screen.js +5 -7
package/src/api/controllers/static/index.js +66 -15
package/src/api/controllers/table/bulkFormula.js +173 -0
package/src/api/controllers/table/external.js +7 -10
package/src/api/controllers/table/index.js +20 -28
package/src/api/controllers/table/internal.js +24 -19
package/src/api/controllers/table/utils.js +78 -42
package/src/api/controllers/user.js +46 -45
package/src/api/controllers/view/index.js +8 -10
package/src/api/controllers/view/utils.js +9 -4
package/src/api/controllers/webhook.js +10 -8
package/src/api/routes/index.js +2 -2
package/src/api/routes/migrations.js +14 -0
package/src/api/routes/static.js +5 -0
package/src/api/routes/tests/application.spec.js +2 -2
package/src/api/routes/tests/auth.spec.js +1 -2
package/src/api/routes/tests/automation.spec.js +1 -0
package/src/api/routes/tests/misc.spec.js +0 -1
package/src/api/routes/tests/routing.spec.js +21 -12
package/src/api/routes/tests/row.spec.js +7 -4
package/src/api/routes/tests/static.spec.js +98 -0
package/src/api/routes/tests/utilities/TestFunctions.js +39 -17
package/src/app.ts +18 -5
package/src/automations/automationUtils.js +2 -3
package/src/automations/steps/createRow.js +2 -5
package/src/automations/steps/deleteRow.js +1 -4
package/src/automations/steps/updateRow.js +1 -1
package/src/automations/triggers.js +33 -31
package/src/automations/utils.js +9 -5
package/src/constants/index.js +9 -0
package/src/db/linkedRows/LinkController.js +3 -7
package/src/db/linkedRows/index.js +16 -31
package/src/db/linkedRows/linkUtils.js +6 -6
package/src/db/tests/linkController.spec.js +0 -1
package/src/db/tests/linkTests.spec.js +5 -6
package/src/db/views/staticViews.js +8 -10
package/src/definitions/common.ts +3 -0
package/src/definitions/datasource.ts +3 -0
package/src/environment.js +4 -1
package/src/integrations/base/sql.ts +75 -29
package/src/integrations/googlesheets.ts +353 -0
package/src/integrations/index.ts +3 -0
package/src/integrations/tests/sql.spec.js +16 -0
package/src/integrations/utils.ts +75 -12
package/src/middleware/authorized.js +66 -30
package/src/middleware/builder.js +2 -2
package/src/middleware/currentapp.js +50 -46
package/src/middleware/tests/authorized.spec.js +13 -6
package/src/middleware/tests/currentapp.spec.js +6 -0
package/src/middleware/tests/usageQuota.spec.js +18 -24
package/src/middleware/usageQuota.js +93 -17
package/src/migrations/functions/appUrls.ts +34 -0
package/src/migrations/functions/quotas1.ts +20 -0
package/src/migrations/functions/tests/appUrls.spec.js +29 -0
package/src/migrations/functions/tests/quotas1.spec.js +27 -0
package/src/migrations/functions/tests/userEmailViewCasing.spec.js +25 -0
package/src/migrations/functions/usageQuotas/index.ts +8 -0
package/src/migrations/functions/usageQuotas/syncApps.ts +18 -0
package/src/migrations/functions/usageQuotas/syncRows.ts +22 -0
package/src/migrations/functions/usageQuotas/tests/syncApps.spec.js +37 -0
package/src/migrations/functions/usageQuotas/tests/syncRows.spec.js +43 -0
package/src/migrations/functions/userEmailViewCasing.ts +13 -0
package/src/migrations/index.ts +56 -0
package/src/module.d.ts +3 -0
package/src/tests/utilities/TestConfiguration.js +82 -55
package/src/threads/automation.js +17 -15
package/src/threads/query.js +17 -12
package/src/utilities/fileSystem/index.js +4 -3
package/src/utilities/global.js +15 -12
package/src/utilities/index.js +7 -17
package/src/utilities/routing/index.js +5 -5
package/src/utilities/rowProcessor/index.js +25 -27
package/src/utilities/rowProcessor/utils.js +23 -7
package/src/utilities/tests/usageQuota/usageQuota.spec.js +72 -0
package/src/utilities/usageQuota/index.js +93 -0
package/src/utilities/usageQuota/rows.js +75 -0
package/src/utilities/usageQuota/usageQuoteReset.js +18 -0
package/src/utilities/users.js +3 -3
package/src/utilities/workerRequests.js +4 -27
package/tsconfig.json +2 -1
package/builder/assets/index.39e01193.css +0 -1
package/dist/api/controllers/hosting.js +0 -30
package/dist/api/routes/hosting.js +0 -11
package/src/api/controllers/hosting.js +0 -22
package/src/api/routes/hosting.js +0 -13
package/src/api/routes/tests/hosting.spec.js +0 -36
package/src/utilities/usageQuota.js +0 -73

package/coverage/lcov-report/api/controllers/application.js.html CHANGED Viewed

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.02% </span>
+                <span class="strong">79.71% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>142/182</span>
+                <span class='fraction'>165/207</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">56.94% </span>
+                <span class="strong">55.12% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>41/72</span>
+                <span class='fraction'>43/78</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">85% </span>
+                <span class="strong">88.46% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>17/20</span>
+                <span class='fraction'>23/26</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.88% </span>
+                <span class="strong">80.09% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>142/180</span>
+                <span class='fraction'>161/201</span>
             </div>
@@ -471,19 +471,53 @@
 <a name='L412'></a><a href='#L412'>412</a>
 <a name='L413'></a><a href='#L413'>413</a>
 <a name='L414'></a><a href='#L414'>414</a>
-<a name='L415'></a><a href='#L415'>415</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
+<a name='L415'></a><a href='#L415'>415</a>
+<a name='L416'></a><a href='#L416'>416</a>
+<a name='L417'></a><a href='#L417'>417</a>
+<a name='L418'></a><a href='#L418'>418</a>
+<a name='L419'></a><a href='#L419'>419</a>
+<a name='L420'></a><a href='#L420'>420</a>
+<a name='L421'></a><a href='#L421'>421</a>
+<a name='L422'></a><a href='#L422'>422</a>
+<a name='L423'></a><a href='#L423'>423</a>
+<a name='L424'></a><a href='#L424'>424</a>
+<a name='L425'></a><a href='#L425'>425</a>
+<a name='L426'></a><a href='#L426'>426</a>
+<a name='L427'></a><a href='#L427'>427</a>
+<a name='L428'></a><a href='#L428'>428</a>
+<a name='L429'></a><a href='#L429'>429</a>
+<a name='L430'></a><a href='#L430'>430</a>
+<a name='L431'></a><a href='#L431'>431</a>
+<a name='L432'></a><a href='#L432'>432</a>
+<a name='L433'></a><a href='#L433'>433</a>
+<a name='L434'></a><a href='#L434'>434</a>
+<a name='L435'></a><a href='#L435'>435</a>
+<a name='L436'></a><a href='#L436'>436</a>
+<a name='L437'></a><a href='#L437'>437</a>
+<a name='L438'></a><a href='#L438'>438</a>
+<a name='L439'></a><a href='#L439'>439</a>
+<a name='L440'></a><a href='#L440'>440</a>
+<a name='L441'></a><a href='#L441'>441</a>
+<a name='L442'></a><a href='#L442'>442</a>
+<a name='L443'></a><a href='#L443'>443</a>
+<a name='L444'></a><a href='#L444'>444</a>
+<a name='L445'></a><a href='#L445'>445</a>
+<a name='L446'></a><a href='#L446'>446</a>
+<a name='L447'></a><a href='#L447'>447</a>
+<a name='L448'></a><a href='#L448'>448</a>
+<a name='L449'></a><a href='#L449'>449</a>
+<a name='L450'></a><a href='#L450'>450</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -491,52 +525,56 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">205x</span>
+<span class="cline-any cline-yes">205x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">390x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">410x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">205x</span>
+<span class="cline-any cline-yes">205x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -546,43 +584,57 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">193x</span>
+<span class="cline-any cline-yes">203x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">198x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">190x</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">190x</span>
-<span class="cline-any cline-yes">187x</span>
+<span class="cline-any cline-yes">198x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">198x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">190x</span>
-<span class="cline-any cline-yes">187x</span>
+<span class="cline-any cline-yes">198x</span>
+<span class="cline-any cline-yes">198x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">190x</span>
-<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">198x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">197x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">733x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">175x</span>
-<span class="cline-any cline-yes">175x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">197x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">197x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">733x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">175x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -591,18 +643,18 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -610,13 +662,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-yes">10x</span>
@@ -641,8 +693,7 @@
 <span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -657,51 +708,56 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">194x</span>
-<span class="cline-any cline-yes">194x</span>
-<span class="cline-any cline-yes">194x</span>
-<span class="cline-any cline-yes">194x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">204x</span>
+<span class="cline-any cline-yes">204x</span>
+<span class="cline-any cline-yes">204x</span>
+<span class="cline-any cline-yes">204x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">204x</span>
+<span class="cline-any cline-yes">202x</span>
+<span class="cline-any cline-yes">202x</span>
+<span class="cline-any cline-yes">202x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">194x</span>
-<span class="cline-any cline-yes">192x</span>
-<span class="cline-any cline-yes">192x</span>
-<span class="cline-any cline-yes">192x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">204x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">194x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -716,32 +772,46 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -763,7 +833,7 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -786,7 +856,7 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">11x</span>
@@ -805,7 +875,7 @@
 <span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -815,6 +885,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -854,8 +925,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -874,19 +944,18 @@
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33x</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">185x</span>
-<span class="cline-any cline-yes">370x</span>
-<span class="cline-any cline-yes">370x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">195x</span>
+<span class="cline-any cline-yes">390x</span>
+<span class="cline-any cline-yes">390x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">185x</span>
+<span class="cline-any cline-yes">195x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const CouchDB = require("../../db")
-const env = require("../../environment")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const env = require("../../environment")
 const packageJson = require("../../../package.json")
 const {
   createLinkView,
@@ -916,14 +985,11 @@ const { processObject } = require("@budibase/string-templates")
 const {
   getAllApps,
   isDevAppID,
-  getDeployedAppID,
+  getProdAppID,
   Replication,
 } = require("@budibase/backend-core/db")
 const { USERS_TABLE_SCHEMA } = require("../../constants")
-const {
-  getDeployedApps,
-  removeAppFromUserRoles,
-} = require("../../utilities/workerRequests")
+const { removeAppFromUserRoles } = require("../../utilities/workerRequests")
 const { clientLibraryPath, stringToReadStream } = require("../../utilities")
 const { getAllLocks } = require("../../utilities/redis")
 const {
@@ -935,11 +1001,17 @@ const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 const { syncGlobalUsers } = require("./user")
 const { app: appCache } = require("@budibase/backend-core/cache")
 const { cleanupAutomations } = require("../../automations/utils")
+const {
+  getAppDB,
+  getProdAppDB,
+  updateAppId,
+} = require("@budibase/backend-core/context")
 &nbsp;
 const URL_REGEX_SLASH = /\/|\\/g
 &nbsp;
 // utility function, need to do away with this
-async function getLayouts(db) {
+async function getLayouts() {
+  const db = getAppDB()
   return (
     await db.allDocs(
       getLayoutParams(null, {
@@ -949,7 +1021,8 @@ async function getLayouts(db) {
   ).rows.map(row =&gt; row.doc)
 }
 &nbsp;
-async function getScreens(db) {
+async function getScreens() {
+  const db = getAppDB()
   return (
     await db.allDocs(
       getScreenParams(null, {
@@ -965,37 +1038,51 @@ function getUserRoleId(ctx) {
     : ctx.user.role._id
 }
 &nbsp;
-async function getAppUrlIfNotInUse(ctx) {
+exports.getAppUrl = ctx =&gt; {
+  // construct the url
   let url
   <span class="missing-if-branch" title="if path not taken" >I</span>if (ctx.request.body.url) {
+    // if the url is provided, use that
 <span class="cstat-no" title="statement not covered" >    url = encodeURI(ctx.request.body.url)</span>
   } else if (ctx.request.body.name) {
+    // otherwise use the name
     url = encodeURI(`${ctx.request.body.name}`)
   }
   if (url) {
     url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase()
   }
-  if (!env.SELF_HOSTED) {
-    return url
+  return url
+}
+&nbsp;
+const checkAppUrl = (ctx, apps, url, currentAppId) =&gt; {
+  if (currentAppId) {
+    apps = apps.filter(app =&gt; app.appId !== currentAppId)
   }
-  const deployedApps = await getDeployedApps()
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (
-    url &amp;&amp;
-    deployedApps[url] != null &amp;&amp;
-<span class="branch-2 cbranch-no" title="branch not covered" >    ctx.params != null </span>&amp;&amp;
-<span class="branch-3 cbranch-no" title="branch not covered" >    deployedApps[url].appId !== ctx.params.appId</span>
-  ) {
-<span class="cstat-no" title="statement not covered" >    ctx.throw(400, "App name/URL is already in use.")</span>
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (apps.some(app =&gt; app.url === url)) {
+<span class="cstat-no" title="statement not covered" >    ctx.throw(400, "App URL is already in use.")</span>
+  }
+}
+&nbsp;
+const checkAppName = (ctx, apps, name, currentAppId) =&gt; {
+  // TODO: Replace with Joi
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (!name) {
+<span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Name is required")</span>
+  }
+  if (currentAppId) {
+    apps = apps.filter(app =&gt; app.appId !== currentAppId)
+  }
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (apps.some(app =&gt; app.name === name)) {
+<span class="cstat-no" title="statement not covered" >    ctx.throw(400, "App name is already in use.")</span>
   }
-  return url
 }
 &nbsp;
 async function createInstance(template) {
   const tenantId = isMultiTenant() ? <span class="branch-0 cbranch-no" title="branch not covered" >getTenantId() </span>: null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
+  updateAppId(appId)
 &nbsp;
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   await db.put({
     _id: "_design/database",
     // view collation information, read before writing any complex views:
@@ -1005,9 +1092,9 @@ async function createInstance(template) {
 &nbsp;
   // NOTE: indexes need to be created before any tables/templates
   // add view for linked rows
-  await createLinkView(appId)
-  await createRoutingView(appId)
-  await createAllSearchIndex(appId)
+  await createLinkView()
+  await createRoutingView()
+  await createAllSearchIndex()
 &nbsp;
   // replicate the template data to the instance DB
   // this is currently very hard to test, downloading and importing template files
@@ -1033,7 +1120,7 @@ async function createInstance(template) {
 exports.fetch = async ctx =&gt; {
   const dev = ctx.query &amp;&amp; ctx.query.status === AppStatus.DEV
   const all = ctx.query &amp;&amp; ctx.query.status === AppStatus.ALL
-  const apps = await getAllApps(CouchDB, { dev, all })
+  const apps = await getAllApps({ dev, all })
 &nbsp;
   // get the locks for all the dev apps
   if (dev || <span class="branch-1 cbranch-no" title="branch not covered" >all)</span> {
@@ -1056,12 +1143,11 @@ exports.fetch = async ctx =&gt; {
 }
 &nbsp;
 exports.fetchAppDefinition = async ctx =&gt; {
-  const db = new CouchDB(ctx.params.appId)
-  const layouts = await getLayouts(db)
+  const layouts = await getLayouts()
   const userRoleId = getUserRoleId(ctx)
-  const accessController = new AccessController(ctx.params.appId)
+  const accessController = new AccessController()
   const screens = await accessController.checkScreensAccess(
-    await getScreens(db),
+    await getScreens(),
     userRoleId
   )
   ctx.body = {
@@ -1072,15 +1158,15 @@ exports.fetchAppDefinition = async ctx =&gt; {
 }
 &nbsp;
 exports.fetchAppPackage = async ctx =&gt; {
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
-  const layouts = await getLayouts(db)
-  let screens = await getScreens(db)
+  const layouts = await getLayouts()
+  let screens = await getScreens()
 &nbsp;
   // Only filter screens if the user is not a builder
   if (!(ctx.user.builder &amp;&amp; ctx.user.builder.global)) {
     const userRoleId = getUserRoleId(ctx)
-    const accessController = new AccessController(ctx.params.appId)
+    const accessController = new AccessController()
     screens = await accessController.checkScreensAccess(screens, userRoleId)
   }
 &nbsp;
@@ -1093,6 +1179,12 @@ exports.fetchAppPackage = async ctx =&gt; {
 }
 &nbsp;
 exports.create = async ctx =&gt; {
+  const apps = await getAllApps({ dev: true })
+  const name = ctx.request.body.name
+  checkAppName(ctx, apps, name)
+  const url = exports.getAppUrl(ctx)
+  checkAppUrl(ctx, apps, url)
+&nbsp;
   const { useTemplate, templateKey, templateString } = ctx.request.body
   const instanceConfig = {
     useTemplate,
@@ -1105,8 +1197,7 @@ exports.create = async ctx =&gt; {
   const instance = await createInstance(instanceConfig)
   const appId = instance._id
 &nbsp;
-  const url = await getAppUrlIfNotInUse(ctx)
-  const db = new CouchDB(appId)
+  const db = getAppDB()
   let _rev
   try {
     // if template there will be an existing doc
@@ -1122,7 +1213,7 @@ exports.create = async ctx =&gt; {
     type: "app",
     version: packageJson.version,
     componentLibraries: ["@budibase/standard-components"],
-    name: ctx.request.body.name,
+    name: name,
     url: url,
     template: ctx.request.body.template,
     instance: instance,
@@ -1149,15 +1240,29 @@ exports.create = async ctx =&gt; {
   ctx.body = newApplication
 }
 &nbsp;
+// This endpoint currently operates as a PATCH rather than a PUT
+// Thus name and url fields are handled only if present
 exports.update = async ctx =&gt; {
-  const data = await updateAppPackage(ctx, ctx.request.body, ctx.params.appId)
+  const apps = await getAllApps({ dev: true })
+  // validation
+  const name = ctx.request.body.name
+  if (name) {
+    checkAppName(ctx, apps, name, ctx.params.appId)
+  }
+  const url = await exports.getAppUrl(ctx)
+  if (url) {
+    checkAppUrl(ctx, apps, url, ctx.params.appId)
+    ctx.request.body.url = url
+  }
+&nbsp;
+  const data = await updateAppPackage(ctx.request.body, ctx.params.appId)
   ctx.status = 200
   ctx.body = data
 }
 &nbsp;
 exports.updateClient = async ctx =&gt; {
   // Get current app version
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
   const currentVersion = application.version
 &nbsp;
@@ -1172,14 +1277,14 @@ exports.updateClient = async ctx =&gt; {
     version: packageJson.version,
     revertableVersion: currentVersion,
   }
-  const data = await updateAppPackage(ctx, appPackageUpdates, ctx.params.appId)
+  const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
   ctx.status = 200
   ctx.body = data
 }
 &nbsp;
 exports.revertClient = async ctx =&gt; {
   // Check app can be reverted
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
   <span class="missing-if-branch" title="if path not taken" >I</span>if (!application.revertableVersion) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "There is no version to revert to")</span>
@@ -1195,13 +1300,13 @@ exports.revertClient = async ctx =&gt; {
     version: application.revertableVersion,
     revertableVersion: null,
   }
-  const data = await updateAppPackage(ctx, appPackageUpdates, ctx.params.appId)
+  const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
   ctx.status = 200
   ctx.body = data
 }
 &nbsp;
 exports.delete = async ctx =&gt; {
-  const db = new CouchDB(ctx.params.appId)
+  const db = getAppDB()
 &nbsp;
   const result = await db.destroy()
   /* istanbul ignore next */
@@ -1226,10 +1331,11 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
   }
 &nbsp;
   // replicate prod to dev
-  const prodAppId = <span class="cstat-no" title="statement not covered" >getDeployedAppID(appId)</span>
+  const prodAppId = <span class="cstat-no" title="statement not covered" >getProdAppID(appId)</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  try {</span>
-    const prodDb = <span class="cstat-no" title="statement not covered" >new CouchDB(prodAppId, { skip_setup: true })</span>
+    // specific case, want to make sure setup is skipped
+    const prodDb = <span class="cstat-no" title="statement not covered" >getProdAppDB({ skip_setup: true })</span>
     const info = <span class="cstat-no" title="statement not covered" >await prodDb.info()</span>
 <span class="cstat-no" title="statement not covered" >    if (info.error) <span class="cstat-no" title="statement not covered" >throw info.error</span></span>
   } catch (err) {
@@ -1257,7 +1363,7 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
   }
 &nbsp;
   // sync the users
-<span class="cstat-no" title="statement not covered" >  await syncGlobalUsers(appId)</span>
+<span class="cstat-no" title="statement not covered" >  await syncGlobalUsers()</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  if (error) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, error)</span>
@@ -1268,12 +1374,11 @@ exports.sync = <span class="fstat-no" title="function not covered" >as</span>ync
   }
 }
 &nbsp;
-const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
-  const url = await getAppUrlIfNotInUse(ctx)
-  const db = new CouchDB(appId)
+const updateAppPackage = async (appPackage, appId) =&gt; {
+  const db = getAppDB()
   const application = await db.get(DocumentTypes.APP_METADATA)
 &nbsp;
-  const newAppPackage = { ...application, ...appPackage, url }
+  const newAppPackage = { ...application, ...appPackage }
   if (appPackage._rev !== application._rev) {
     newAppPackage._rev = application._rev
   }
@@ -1289,7 +1394,7 @@ const updateAppPackage = async (ctx, appPackage, appId) =&gt; {
 }
 &nbsp;
 const createEmptyAppPackage = async (ctx, app) =&gt; {
-  const db = new CouchDB(app.appId)
+  const db = getAppDB()
 &nbsp;
   let screensAndLayouts = []
   for (let layout of BASE_LAYOUTS) {
@@ -1306,7 +1411,7 @@ const createEmptyAppPackage = async (ctx, app) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Feb 04 2022 12:19:28 GMT+0000 (Coordinated Universal Time)
+                at Mon Feb 07 2022 20:42:11 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>