EdgeApp · peachbits · Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022
diff --git a/package.json b/package.json
@@ -8,13 +8,14 @@
   "author": "",
   "main": "build/index.js",
   "scripts": {
-    "build": "sucrase -q -t typescript,imports -d ./lib ./src",
-    "clean": "rimraf lib",   
+    "build.lib": "sucrase -q -t typescript,imports -d ./lib ./src",
+    "build.types": "tsc",
+    "clean": "rm -rf lib",   
     "compile": "tsc",
     "fix": "npm run lint -- --fix",
     "lint": "eslint --ext .js,.ts .",
-    "precommit": "lint-staged && tsc",
-    "prepare": "husky install",
+    "precommit": "lint-staged && yarn prepare",
+    "prepare": "npm-run-all clean -p build.*",
     "start-server": "node -r sucrase/register src/server/index.ts",
     "server:pm2": "pm2 start build/server/index.js --name server --log logs/server.log --time",
     "server": "node build/server.js"

diff --git a/src/api/router.ts b/src/api/router.ts
@@ -1,10 +1,5 @@
 import { asArray, asObject, asString, asUnknown } from 'cleaners'
-import {
-  type HttpRequest,
-  type HttpResponse,
-  pickMethod,
-  pickPath
-} from 'serverlet'
+import { HttpRequest, HttpResponse, pickMethod, pickPath } from 'serverlet'
 
 import {
   jsonResponse,

diff --git a/src/api/server.ts b/src/api/server.ts
@@ -1,7 +1,7 @@
 import bodyParser from 'body-parser'
 import compression from 'compression'
 import cors from 'cors'
-import express, { type RequestHandler } from 'express'
+import express, { RequestHandler } from 'express'
 import morgan from 'morgan'
 
 import { asServerConfig } from '../config'

diff --git a/src/couchSetup.ts b/src/couchSetup.ts
@@ -79,13 +79,14 @@ export async function setupDatabases(
     replicatorSetup: syncedReplicators,
     disableWatching
   }
+  const uri = connection.config.url
 
-  await setupDatabase(connection, settingsSetup, options)
+  await setupDatabase(uri, settingsSetup, options)
   await Promise.all([
-    setupDatabase(connection, apiKeysSetup, options),
-    setupDatabase(connection, thresholdsSetup, options),
-    setupDatabase(connection, devicesSetup, options),
-    setupDatabase(connection, usersSetup, options),
-    setupDatabase(connection, defaultsSetup, options)
+    setupDatabase(uri, apiKeysSetup, options),
+    setupDatabase(uri, thresholdsSetup, options),
+    setupDatabase(uri, devicesSetup, options),
+    setupDatabase(uri, usersSetup, options),
+    setupDatabase(uri, defaultsSetup, options)
   ])
 }
diff --git a/src/models/User.ts b/src/models/User.ts
@@ -40,7 +40,6 @@ export class User extends Base implements ReturnType<typeof asUser> {
   public devices: ReturnType<typeof asUserDevices>
   public notifications: ReturnType<typeof asUserNotifications>
 
-  // @ts-expect-error
   constructor(...args) {
     super(...args)
 

diff --git a/src/models/User/views.ts b/src/models/User/views.ts
@@ -2,7 +2,6 @@ declare function emit(...args: any[]): void
 
 export const views = {
   filter: {
-    // @ts-expect-error
     byCurrency(doc) {
       var notifs = doc.notifications
       if (notifs && notifs.enabled && notifs.currencyCodes) {

diff --git a/src/models/base.ts b/src/models/base.ts
@@ -26,11 +26,9 @@ export class Base implements ReturnType<typeof asModelData> {
 
     return new Proxy(this, {
       set(target: Base, key: PropertyKey, value: any): any {
-        // @ts-expect-error
         return key in target ? (target[key] = value) : target.set(key, value)
       },
       get(target: Base, key: PropertyKey): any {
-        // @ts-expect-error
         return key in target ? target[key] : target.get(key)
       }
     })
@@ -106,7 +104,6 @@ export class Base implements ReturnType<typeof asModelData> {
   }
 
   public get(key: PropertyKey): any {
-    // @ts-expect-error
     return this.dataValues[key]
   }
 
@@ -115,12 +112,10 @@ export class Base implements ReturnType<typeof asModelData> {
       for (const prop in key) {
         // eslint-disable-next-line no-prototype-builtins
         if (key.hasOwnProperty(prop)) {
-          // @ts-expect-error
           this.dataValues[prop] = key[prop]
         }
       }
     } else {
-      // @ts-expect-error
       this.dataValues[key] = value
     }
 

diff --git a/yarn.lock b/yarn.lock
@@ -600,11 +600,6 @@ any-promise@^1.0.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
   integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
 
-arg@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
-  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -695,7 +690,7 @@ axios-cookiejar-support@^1.0.1:
     is-redirect "^1.0.0"
     pify "^5.0.0"
 
-axios@^0.21.2:
+axios@^0.21.1, axios@^0.21.2:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
@@ -826,7 +821,7 @@ cleaner-config@^0.1.8:
     minimist "^1.2.5"
     sucrase "^3.17.1"
 
-cleaners@^0.3.12, cleaners@^0.3.8:
+cleaners@^0.3.11, cleaners@^0.3.12, cleaners@^0.3.8:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/cleaners/-/cleaners-0.3.12.tgz#0e99ef2460a59ed87550a60bdfc441b1696ff9cb"
   integrity sha512-bK7IvvYyhfy30S3VKmWi/YVWp0MUH1pEYfdtbjCpQiIzy8gmP9GCXv6AVZENDHbpcRHqMnZONs3ieyJMh3zvVw==
@@ -991,6 +986,14 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cron-parser@^2.18.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-2.18.0.tgz#de1bb0ad528c815548371993f81a54e5a089edcf"
+  integrity sha512-s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==
+  dependencies:
+    is-nan "^1.3.0"
+    moment-timezone "^0.5.31"
+
 cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2260,6 +2263,14 @@ is-map@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
   integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
 
+is-nan@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -2691,6 +2702,11 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
+[email protected]:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/long-timeout/-/long-timeout-0.1.1.tgz#9721d788b47e0bcb5a24c2e2bee1a0da55dab514"
+  integrity sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==
+
 long@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
@@ -2864,6 +2880,17 @@ [email protected]:
     qs "^6.10.3"
     tough-cookie "^4.0.0"
 
+nano@^9.0.4:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/nano/-/nano-9.0.5.tgz#2b767819f612907a3ac09b21f2929d4097407262"
+  integrity sha512-fEAhwAdXh4hDDnC8cYJtW6D8ivOmpvFAqT90+zEuQREpRkzA/mJPcI4EKv15JUdajaqiLTXNoKK6PaRF+/06DQ==
+  dependencies:
+    "@types/tough-cookie" "^4.0.0"
+    axios "^0.21.1"
+    axios-cookiejar-support "^1.0.1"
+    qs "^6.9.4"
+    tough-cookie "^4.0.0"
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -2906,6 +2933,15 @@ node-forge@^0.9.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.1.tgz#775368e6846558ab6676858a4d8c6e8d16c677b5"
   integrity sha512-G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ==
 
+node-schedule@^1.3.2:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/node-schedule/-/node-schedule-1.3.3.tgz#f8e01c5fb9597f09ecf9c4c25d6938e5e7a06f48"
+  integrity sha512-uF9Ubn6luOPrcAYKfsXWimcJ1tPFtQ8I85wb4T3NgJQrXazEzojcFZVk46ZlLHby3eEJChgkV/0T689IsXh2Gw==
+  dependencies:
+    cron-parser "^2.18.0"
+    long-timeout "0.1.1"
+    sorted-array-functions "^1.3.0"
+
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -3332,7 +3368,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.10.3:
+qs@^6.10.3, qs@^6.9.4:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
   integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
@@ -3673,6 +3709,11 @@ socks@~2.3.2:
     ip "1.1.5"
     smart-buffer "^4.1.0"
 
+sorted-array-functions@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz#8605695563294dffb2c9796d602bd8459f7a0dd5"
+  integrity sha512-2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==
+
 source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -3861,7 +3902,7 @@ stubs@^3.0.0:
   resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
   integrity sha1-6NK6H6nJBXAwPAMLaQD31fiavls=
 
-sucrase@^3.17.1:
+sucrase@^3.17.1, sucrase@^3.21.0:
   version "3.23.0"
   resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.23.0.tgz#2a7fa80a04f055fb2e95d2aead03fec1dba52838"
   integrity sha512-xgC1xboStzGhCnRywlBf/DLmkC+SkdAKqrNCDsxGrzM0phR5oUxoFKiQNrsc2D8wDdAm03iLbSZqjHDddo3IzQ==
@@ -3989,18 +4030,6 @@ ts-interface-checker@^0.1.9:
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
-ts-node@^9.0.0:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
-  integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
-  dependencies:
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    source-map-support "^0.5.17"
-    yn "3.1.1"
-
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"