diff --git a/.gitignore b/.gitignore index de197c8d..ccf8c40c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ node_modules /report .antlr /.nyc_output -.env* \ No newline at end of file +.env* +*.db +*.db-journal diff --git a/package-lock.json b/package-lock.json index 87ab9f05..2c899fe9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1523,6 +1523,12 @@ "integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==", "dev": true }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -1635,6 +1641,22 @@ "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz", "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==" }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "dev": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -1963,6 +1985,16 @@ "safe-buffer": "^5.1.1" } }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "optional": true, + "requires": { + "inherits": "~2.0.0" + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -2149,6 +2181,12 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -2251,6 +2289,12 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, "collect-v8-coverage": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", @@ -2280,6 +2324,11 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -2341,6 +2390,12 @@ } } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -2850,6 +2905,12 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", @@ -2917,6 +2978,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, "denque": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz", @@ -2939,6 +3006,12 @@ "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==", "dev": true }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "dev": true + }, "detect-newline": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", @@ -4273,6 +4346,15 @@ "null-check": "^1.0.0" } }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "dev": true, + "requires": { + "minipass": "^2.6.0" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -4285,6 +4367,31 @@ "dev": true, "optional": true }, + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, + "optional": true, + "requires": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -4297,6 +4404,59 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, "generate-function": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz", @@ -4923,6 +5083,12 @@ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -5050,6 +5216,15 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "ignore-walk": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } + }, "import-fresh": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", @@ -7418,6 +7593,25 @@ "kind-of": "^6.0.3" } }, + "minipass": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", + "dev": true, + "requires": { + "minipass": "^2.9.0" + } + }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -7514,6 +7708,28 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "needle": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz", + "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==", + "dev": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } + } + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -7531,12 +7747,68 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "node-addon-api": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", + "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==", + "dev": true + }, "node-fetch": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", "dev": true }, + "node-gyp": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "dev": true, + "optional": true, + "requires": { + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true, + "optional": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "optional": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -7564,6 +7836,76 @@ "which": "^2.0.2" } }, + "node-pre-gyp": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", + "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", + "dev": true, + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" + }, + "dependencies": { + "nopt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", + "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", + "dev": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + } + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "optional": true, + "requires": { + "abbrev": "1" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -7590,6 +7932,32 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "npm-bundled": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "dev": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", + "dev": true + }, + "npm-packlist": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", + "dev": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" + } + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -7607,6 +7975,18 @@ } } }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, "null-check": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", @@ -7791,12 +8171,28 @@ "word-wrap": "^1.2.3" } }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, "p-each-series": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", @@ -8121,6 +8517,26 @@ "unpipe": "1.0.0" } }, + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "dev": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + } + } + }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -9167,6 +9583,17 @@ "integrity": "sha512-bxrJ/9rqJ2SA6hpHnSodRjKBugZHewRvNTITTt74W1VZWmzODjdS68yQW0/J9oC0NWKylHEtV1ptkoTyOYO4Tw==", "dev": true }, + "sqlite3": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.0.tgz", + "integrity": "sha512-rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw==", + "dev": true, + "requires": { + "node-addon-api": "2.0.0", + "node-gyp": "3.x", + "node-pre-gyp": "^0.11.0" + } + }, "sshpk": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", @@ -9498,6 +9925,18 @@ "string-width": "^3.0.0" } }, + "tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, + "optional": true, + "requires": { + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + } + }, "terminal-link": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", @@ -10214,6 +10653,42 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "^1.0.2 || 2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -10351,6 +10826,12 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, "yargonaut": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz", diff --git a/package.json b/package.json index 4f1ce265..d3d8bc01 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "@odata/metadata": "^0.1.14", "@odata/parser": "^0.2.1", "body-parser": "^1.19.0", + "colors": "^1.4.0", "cors": "^2.8.5", "debug": "^4.1.1", "deepmerge": "^4.2.2", @@ -58,11 +59,11 @@ }, "devDependencies": { "@odata/client": "^2.10.2", - "@types/express": "^4.17.8", "@types/body-parser": "1.19.0", "@types/cors": "^2.8.7", "@types/debug": "^4.1.5", "@types/event-stream": "^3.3.34", + "@types/express": "^4.17.8", "@types/jest": "^26.0.14", "@types/jsonstream": "^0.8.30", "@types/mongodb": "^3.5.27", @@ -83,6 +84,7 @@ "request-promise": "^4.2.6", "rimraf": "^3.0.2", "sql.js": "^1.3.0", + "sqlite3": "^5.0.0", "standard-version": "^9.0.0", "stream-buffers": "^3.0.2", "ts-jest": "^26.3.0", diff --git a/src/type/index.ts b/src/type/index.ts index 56f1a523..b3ed9a97 100644 --- a/src/type/index.ts +++ b/src/type/index.ts @@ -4,6 +4,7 @@ export * from './connection'; export * from './decorators'; export * from './entity'; export * from './hooks'; +export * from './migrate'; export * from './server'; export * from './service'; export * from './visitor'; diff --git a/src/type/migrate.ts b/src/type/migrate.ts new file mode 100644 index 00000000..2b461bda --- /dev/null +++ b/src/type/migrate.ts @@ -0,0 +1,128 @@ +// @ts-nocheck +import { sleep } from '@newdash/newdash'; +import 'colors'; +import { Column, ConnectionOptions, createConnection, Entity, PrimaryColumn } from 'typeorm'; +import { StartupError } from '../error'; +import { createLogger } from '../logger'; + +const logger = createLogger('migrate'); + +@Entity() +class DatabaseConfiguration { + + @PrimaryColumn() + id: string; + + @Column('simple-json') + value: any; + +} + +export interface DBConfiguration { + version: { + lock: { + locked: boolean; + lockedOn: Date; + }, + versionNumber: number + } +} + +const INIT_DB_CONFIG: DBConfiguration = { + version: { + lock: { locked: false, lockedOn: null }, + versionNumber: 0 + } +}; + +export function buildConnectionConfiguration(connectionOptions: Partial): ConnectionOptions { + return { + ...connectionOptions, + cache: undefined, + dropSchema: false, + synchronize: true, + entities: [DatabaseConfiguration] + }; +} + + +export async function getDBConfiguration(connectionOptions: Partial): Promise { + + const conn = await createConnection(buildConnectionConfiguration(connectionOptions)); + const configRepo = conn.getRepository(DatabaseConfiguration); + + const allConfigList = await configRepo.find(); + + const configs = {}; + + allConfigList.forEach((config) => { configs[config.id] = config.value; }); + + await conn.close(); + + if (allConfigList.length == 0) { return INIT_DB_CONFIG; } + + return configs; + +} + +export async function saveDBConfiguration(connectionOptions: Partial, configs: DBConfiguration) { + + const conn = await createConnection(buildConnectionConfiguration(connectionOptions)); + const configRepo = conn.getRepository(DatabaseConfiguration); + + await configRepo.save(Object.entries(configs).map((entry) => ({ id: entry[0], value: entry[1] }))); + await conn.close(); + +} + +export async function syncEntities(connectionOptions: Partial, entities: Array) { + const conn = await createConnection({ ...connectionOptions, dropSchema: false, synchronize: false, entities }); + await conn.driver.createSchemaBuilder().build(); + await conn.close(); +} + + +export async function migrate(connectionOptions: Partial, versionNumber: number = 1):Promise { + const { entities } = connectionOptions; + + let dbConfigs: DBConfiguration; + + for (let idx = 0; idx < 3; idx++) { + dbConfigs = await getDBConfiguration(connectionOptions); + if (dbConfigs.version.lock.locked == false) { break; } + await sleep(60 * 1000); + } + + const { version } = dbConfigs; + const { lock } = version; + + if (lock.locked) { + logger('lock database failed'); + throw new StartupError('Can not lock database.'); + } + + // if provided version is newer that server recorded + if (versionNumber > version.versionNumber) { + lock.locked = true; + lock.lockedOn = new Date(); + // lock + await saveDBConfiguration(connectionOptions, dbConfigs); + logger('acquire migration lock'); + + try { + await syncEntities(connectionOptions, entities); + logger(`migrate database schema from version '${version.versionNumber}' to version '${versionNumber}'`); + version.versionNumber = versionNumber; + } finally { + // release lock + lock.locked = false; + lock.lockedOn = null; + await saveDBConfiguration(connectionOptions, dbConfigs); + logger('release lock'); + } + + return true; + } + + return false; +} diff --git a/src/type/server.ts b/src/type/server.ts index f452552f..434e6ee7 100644 --- a/src/type/server.ts +++ b/src/type/server.ts @@ -16,7 +16,7 @@ import { Class } from './types'; const logger = createLogger('type:server'); type InstanceType = T extends new (...args: any) => infer R ? R : any; -type TypedODataItems = typeof BaseODataModel | typeof BaseHookProcessor +type TypedODataItems = typeof BaseODataModel | typeof BaseHookProcessor | any /** * typed odata server @@ -64,6 +64,11 @@ export class TypedODataServer extends ODataServer { return { services, tx }; }; + /** + * get server owned connection + */ + static abstract getConnection(): Connection; + } @@ -110,7 +115,9 @@ export async function createTypedODataServer(connection: any, ...configurations: logger(`create typed odata server with connection name: %s`, connName); - const serverType = class extends TypedODataServer { }; + const serverType = class extends TypedODataServer { + static getConnection() { return connObj; } + }; const iContainer = serverType.getInjectContainer(); diff --git a/test/type/integration.spec.ts b/test/type/integration.spec.ts index 6ea0f142..ad837914 100644 --- a/test/type/integration.spec.ts +++ b/test/type/integration.spec.ts @@ -1,4 +1,3 @@ -import { shutdown } from '../utils/server'; import { Class, RelStudentClassAssignment, SchoolEntities, Student, Teacher } from './school_model'; import { createServerAndClient, createTmpConnection } from './utils'; @@ -9,12 +8,10 @@ describe('Typed OData Server Integration Test Suite', () => { const conn = await createTmpConnection({ name: 'typed_service_int_test', entityPrefix: 'unit_int_', - synchronize: true, - // logging: true, entities: SchoolEntities }); - const { server, client } = await createServerAndClient(conn, ...SchoolEntities); + const { server, client, shutdownServer } = await createServerAndClient(conn, ...SchoolEntities); try { const students = client.getEntitySet('Students'); @@ -108,7 +105,9 @@ describe('Typed OData Server Integration Test Suite', () => { }); } finally { - await shutdown(server); + + await shutdownServer(); + } diff --git a/test/type/migrate.spec.ts b/test/type/migrate.spec.ts new file mode 100644 index 00000000..1b4d6928 --- /dev/null +++ b/test/type/migrate.spec.ts @@ -0,0 +1,59 @@ +// @ts-nocheck +import { QueryFailedError } from 'typeorm'; +import { ConnectionOptions, createTypedODataServer, IncKeyProperty, migrate, ODataModel } from '../../src'; +import { createTmpMigrateConnOpt } from './utils'; + +describe('Server Test Suite', () => { + + + it('should throw error when model is not sync', async () => { + + @ODataModel() + class V1 { @IncKeyProperty() id: number; } + + const opt: ConnectionOptions = createTmpMigrateConnOpt({ + name: 'server_creation_test_00', + entities: [V1] + }); + + expect(opt.synchronize).toBeUndefined(); + + const server = await createTypedODataServer(opt, V1); + + const { services: [v1Service] } = await server.getServicesWithNewContext(V1); + + await expect(() => v1Service.create({})).rejects.toThrow(QueryFailedError); // table not found + + }); + + + it('should works file with migration', async () => { + + @ODataModel() + class V1 { @IncKeyProperty() id: number; } + + const opt: ConnectionOptions = createTmpMigrateConnOpt({ + name: 'server_creation_test_01', + entities: [V1] + }); + + expect(opt.synchronize).toBeUndefined(); + + expect(await migrate(opt, 1)).toBe(true); + expect(await migrate(opt, 1)).toBe(false); // no migration on version no change + + const server = await createTypedODataServer(opt, V1); + + const { services: [v1Service] } = await server.getServicesWithNewContext(V1); + + const obj = await v1Service.create({}); + + expect(obj.id).not.toBeUndefined(); + + await server.getConnection().close(); // close connection + + expect(await migrate(opt, 1)).toBe(false); // no migration on version no change + + }); + +}); diff --git a/test/type/relationship.spec.ts b/test/type/relationship.spec.ts index 39b412bf..6635dbc7 100644 --- a/test/type/relationship.spec.ts +++ b/test/type/relationship.spec.ts @@ -21,8 +21,6 @@ describe('RelationShip Test Suite', () => { const conn = await createTmpConnection({ name: 'relationship_test', entityPrefix: 'unit_rel_01_', - synchronize: true, - // logging: true, entities: [Node] }); diff --git a/test/type/utils.ts b/test/type/utils.ts index d4a80f4c..7586bb9f 100644 --- a/test/type/utils.ts +++ b/test/type/utils.ts @@ -2,16 +2,16 @@ import { OData, ODataV4 } from '@odata/client'; import '@odata/client/lib/polyfill'; import { Server } from 'http'; +import * as os from 'os'; +import * as path from 'path'; import { Connection, ConnectionOptions, createConnection } from 'typeorm'; import { v4 } from 'uuid'; import { createTypedODataServer, TypedODataServer } from '../../src'; import { randomPort } from '../utils/randomPort'; -import { ready } from '../utils/server'; +import { ready, shutdown } from '../utils/server'; -export const createTmpConnection = (opt?: Partial) => { - const randomPrefix = v4().split('-').pop(); - - let defaultOpt: ConnectionOptions; +const createTmpDefaultOption = () => { + let defaultOpt = undefined; if (process.env.MYSQL_USER) { defaultOpt = { @@ -48,28 +48,79 @@ export const createTmpConnection = (opt?: Partial) => { encrypt: Boolean(process.env.HANA_CLOUD_VERIFY), sslValidateCertificate: Boolean(process.env.HANA_CLOUD_VERIFY), - pool: { - requestTimeout: 30 * 1000 - } + pool: { requestTimeout: 30 * 1000 } }; - } else { + } + + return defaultOpt; +}; + +export const createTmpMigrateConnOpt = (opt?: Partial) => { + + const randomPrefix = v4().split('-').pop(); + + let defaultOpt: ConnectionOptions = createTmpDefaultOption(); + + if (defaultOpt == undefined) { defaultOpt = { - type: 'sqljs' + type : 'sqlite', + database : tmpdir(`${v4()}.db`) }; } - return createConnection(Object.assign( + const combinedOpt = Object.assign( + defaultOpt, + opt, + { + entityPrefix: `t_${randomPrefix.slice(0, 5)}_${opt.entityPrefix || 'def'}`, + logging: Boolean(process.env.TEST_DB_LOG) + } + ); + + return combinedOpt; +}; + + +export const createTmpConnOpt = (opt?: Partial) => { + + const randomPrefix = v4().split('-').pop(); + + let defaultOpt: ConnectionOptions = createTmpDefaultOption(); + + if (defaultOpt == undefined) { + defaultOpt = { type: 'sqljs' }; + } + + const combinedOpt = Object.assign( defaultOpt, opt, { synchronize: true, - entityPrefix: `t_${randomPrefix.slice(0, 5)}_${opt.entityPrefix || 'default'}`, + entityPrefix: `t_${randomPrefix.slice(0, 5)}_${opt.entityPrefix || 'def'}`, logging: Boolean(process.env.TEST_DB_LOG) } - )); + ); + + return combinedOpt; +}; + +export const createTmpConnection = async (opt?: Partial) => { + + const combinedOpt = createTmpConnOpt(opt); + + return createConnection(combinedOpt); + }; -interface R { server: Server, client: ODataV4, odata: typeof TypedODataServer } +interface R { + server: Server, + client: ODataV4, + odata: typeof TypedODataServer, + /** + * shut down server & close db connection + */ + shutdownServer: () => Promise +} export async function createServerAndClient(conn: Partial, ...items: any[]): Promise export async function createServerAndClient(conn: Connection, ...items: any[]): Promise @@ -87,7 +138,15 @@ export async function createServerAndClient(conn, ...items: any[]) { return { odata: s, server: httpServer, - client + client, + shutdownServer: async () => { + await shutdown(httpServer); + await s.getConnection().close(); + } }; }; + +export function tmpdir(...parts: Array) { + return path.join(os.tmpdir(), ...parts); +} diff --git a/tsconfig.base.json b/tsconfig.base.json index cd1cdfe4..55f16358 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -17,7 +17,6 @@ "allowJs": true, "charset": "utf-8", "lib": [ - "DOM", "ES2015", "ES2016", "ES2017",