diff --git a/package-lock.json b/package-lock.json index 8019b831..29b8c76b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -145,18 +145,49 @@ } }, "@openstapps/configuration": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@openstapps/configuration/-/configuration-0.0.2.tgz", - "integrity": "sha512-4FXtufJ/RdA2Lq+bypxqQO8jJHuOYPjKd5H5UZ6xNVkecDRuvklV+gRcyyHmhSJGt/vlPzytNAj2PfqhPphc9A==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@openstapps/configuration/-/configuration-0.5.1.tgz", + "integrity": "sha512-jTKOdHTCRnFQ+XfRJot0zSkX0ZcZGN2CNHRdZ0VMqHLu4wpVOG9wdznDtRsM50JRxv3CWjSTuFYZjspVIWWa4g==", "dev": true, "requires": { - "tslint": "5.11.0" + "@types/node": "10.12.15", + "commander": "2.19.0", + "tslint": "5.12.0", + "tslint-eslint-rules": "5.4.0" + }, + "dependencies": { + "@types/node": { + "version": "10.12.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.15.tgz", + "integrity": "sha512-9kROxduaN98QghwwHmxXO2Xz3MaWf+I1sLVAA6KJDF5xix+IyXVhds0MAfdNwtcpSrzhaTsNB0/jnL86fgUhqA==", + "dev": true + }, + "tslint": { + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.0.tgz", + "integrity": "sha512-CKEcH1MHUBhoV43SA/Jmy1l24HJJgI0eyLbBNSRyFlsQvb9v6Zdq+Nz2vEOH00nC5SUx4SneJ59PZUS/ARcokQ==", + "dev": true, + "requires": { + "babel-code-frame": "^6.22.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.7.0", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.27.2" + } + } } }, "@openstapps/core": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.0.2.tgz", - "integrity": "sha512-gr2HnsbSwyKI68CAjSdYGftuO1ADwwlJaAxXRv7j8hQLvYuMzs40GwXxwmx6ZzDMMiNPFd0OrkmOxoIAVhhZEA==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@openstapps/core/-/core-0.3.0.tgz", + "integrity": "sha512-ljGYPWXiG4JMV2ZaJQmYK6hQbiXlRPAZwYzcMBTI5m/9Y6tXudawiCDP8EFcZj6OXCQ2tnkEP7Bhwic7flu2Eg==", "requires": { "@types/geojson": "1.0.6", "@types/json-patch": "0.0.30", @@ -165,15 +196,22 @@ } }, "@openstapps/logger": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@openstapps/logger/-/logger-0.0.3.tgz", - "integrity": "sha512-Q1kghyVNIXepfuLcdy2gFygI6jpxTBV0oqwM46hqzST4w/DNmDnzpScVQNQf5C0PhLUihPNhpjLnu6i7ujIX3g==", + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/@openstapps/logger/-/logger-0.0.5.tgz", + "integrity": "sha512-XzWt+5h4Y7ki0IFXrIuT7Qc6CHU+5QmrS0bf9wzP+OQ0qiEGb4KoJ3/y5CiXCebI3JC2wPJsUDpKYitV+kLWCQ==", "requires": { "@types/circular-json": "0.4.0", - "@types/node": "10.12.10", + "@types/node": "10.12.18", "@types/nodemailer": "4.6.5", "circular-json": "0.5.9", - "nodemailer": "4.7.0" + "nodemailer": "5.1.1" + }, + "dependencies": { + "@types/node": { + "version": "10.12.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz", + "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==" + } } }, "@types/caseless": { @@ -257,9 +295,9 @@ } }, "@types/handlebars": { - "version": "4.0.39", - "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.39.tgz", - "integrity": "sha512-vjaS7Q0dVqFp85QhyPSZqDKnTTCemcSHNHFvDdalO1s0Ifz5KuE64jQD5xoUkfdWwF4WpqdJEl7LsWH8rzhKJA==", + "version": "4.0.40", + "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.40.tgz", + "integrity": "sha512-sGWNtsjNrLOdKha2RV1UeF8+UbQnPSG7qbe5wwbni0mw4h2gHXyPFUMOC+xwGirIiiydM/HSqjDO4rk6NFB18w==", "dev": true }, "@types/highlight.js": { @@ -274,9 +312,9 @@ "integrity": "sha512-MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw==" }, "@types/lodash": { - "version": "4.14.118", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.118.tgz", - "integrity": "sha512-iiJbKLZbhSa6FYRip/9ZDX6HXhayXLDGY2Fqws9cOkEQ6XeKfaxB0sC541mowZJueYyMnVUmmG+al5/4fCDrgw==", + "version": "4.14.120", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.120.tgz", + "integrity": "sha512-jQ21kQ120mo+IrDs1nFNVm/AsdFxIx2+vZ347DbogHJPd/JzKNMOqU6HCYin1W6v8l5R9XSO2/e9cxmn7HAnVw==", "dev": true }, "@types/marked": { @@ -298,18 +336,18 @@ "dev": true }, "@types/nock": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@types/nock/-/nock-9.3.0.tgz", - "integrity": "sha512-ZHf/X8rTQ5Tb1rHjxIJYqm55uO265agE3G7NoSXVa2ep+EcJXgB2fsme+zBvK7MhrxTwkC/xkB6THyv50u0MGw==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/@types/nock/-/nock-9.3.1.tgz", + "integrity": "sha512-eOVHXS5RnWOjTVhu3deCM/ruy9E6JCgeix2g7wpFiekQh3AaEAK1cz43tZDukKmtSmQnwvSySq7ubijCA32I7Q==", "dev": true, "requires": { "@types/node": "*" } }, "@types/node": { - "version": "10.12.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.10.tgz", - "integrity": "sha512-8xZEYckCbUVgK8Eg7lf5Iy4COKJ5uXlnIOnePN0WUwSQggy9tolM+tDJf7wMOnT/JT/W9xDYIaYggt3mRV2O5w==" + "version": "10.12.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz", + "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==" }, "@types/nodemailer": { "version": "4.6.5", @@ -332,9 +370,9 @@ } }, "@types/shelljs": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.0.tgz", - "integrity": "sha512-vs1hCC8RxLHRu2bwumNyYRNrU3o8BtZhLysH5A4I98iYmA2APl6R3uNQb5ihl+WiwH0xdC9LLO+vRrXLs/Kyxg==", + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.1.tgz", + "integrity": "sha512-1lQw+48BuVgp6c1+z8EMipp18IdnV2dLh6KQGwOm+kJy9nPjEkaqRKmwbDNEYf//EKBvKcwOC6V2cDrNxVoQeQ==", "dev": true, "requires": { "@types/glob": "*", @@ -392,6 +430,12 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "dev": true }, + "arg": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz", + "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==", + "dev": true + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -486,7 +530,7 @@ }, "chalk": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { @@ -499,7 +543,7 @@ }, "strip-ansi": { "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { @@ -644,9 +688,9 @@ "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==" }, "cli-progress": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-2.1.0.tgz", - "integrity": "sha512-mY0GFIADTooScUe8ERTiQjJoOvXv1z0SzA8gzKO8imLqB7tBwEnNN10gWHcKoltDL4gLdi1GGoPEbxxbvJtR4A==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-2.1.1.tgz", + "integrity": "sha512-TSJw3LY9ZRSis7yYzQ7flIdtQMbacd9oYoiFphJhI4SzgmqF0zErO+uNv0lbUjk1L4AGfHQJ4OVYYzW+JV66KA==", "requires": { "colors": "^1.1.2", "string-width": "^2.1.1" @@ -685,9 +729,9 @@ "dev": true }, "colors": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz", - "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==" + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", + "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==" }, "combined-stream": { "version": "1.0.7", @@ -1002,6 +1046,30 @@ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, + "doctrine": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=", + "dev": true, + "requires": { + "esutils": "^1.1.6", + "isarray": "0.0.1" + }, + "dependencies": { + "esutils": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz", + "integrity": "sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=", + "dev": true + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + } + } + }, "dot-prop": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz", @@ -1539,9 +1607,9 @@ "dev": true }, "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, "invert-kv": { @@ -1668,9 +1736,9 @@ "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz", + "integrity": "sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -2001,9 +2069,9 @@ "dev": true }, "moment": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "ms": { "version": "2.0.0", @@ -2018,9 +2086,9 @@ "dev": true }, "nock": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.2.tgz", - "integrity": "sha512-uWrdlRzG28SXM5yqYsUHfYBRqljF8P6aTRDh6Y5kTgs/Q4GB59QWlpiegmDHQouvmX/rDyKkC/nk+k4nA+QPNw==", + "version": "10.0.6", + "resolved": "https://registry.npmjs.org/nock/-/nock-10.0.6.tgz", + "integrity": "sha512-b47OWj1qf/LqSQYnmokNWM8D88KvUl2y7jT0567NB3ZBAZFz2bWp2PC81Xn7u8F2/vJxzkzNZybnemeFa7AZ2w==", "dev": true, "requires": { "chai": "^4.1.2", @@ -2035,9 +2103,9 @@ }, "dependencies": { "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" @@ -2052,9 +2120,9 @@ } }, "nodemailer": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz", - "integrity": "sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-5.1.1.tgz", + "integrity": "sha512-hKGCoeNdFL2W7S76J/Oucbw0/qRlfG815tENdhzcqTpSjKgAN91mFOqU2lQUflRRxFM7iZvCyaFcAR9noc/CqQ==" }, "normalize-package-data": { "version": "2.4.0", @@ -3395,9 +3463,9 @@ "dev": true }, "progress": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", - "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, "propagate": { @@ -3543,12 +3611,12 @@ "dev": true }, "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", + "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "^1.0.6" } }, "safe-buffer": { @@ -3612,9 +3680,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", - "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -3824,27 +3892,16 @@ "dev": true }, "ts-node": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz", - "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.0.2.tgz", + "integrity": "sha512-MosTrinKmaAcWgO8tqMjMJB22h+sp3Rd1i4fdoWY4mhBDekOwIAKI/bzmRi7IcbCmjquccYg2gcF6NBkLgr0Tw==", "dev": true, "requires": { - "arrify": "^1.0.0", - "buffer-from": "^1.1.0", + "arg": "^4.1.0", "diff": "^3.1.0", "make-error": "^1.1.1", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", "source-map-support": "^0.5.6", - "yn": "^2.0.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } + "yn": "^3.0.0" } }, "tslib": { @@ -3854,9 +3911,9 @@ "dev": true }, "tslint": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", - "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", + "version": "5.12.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz", + "integrity": "sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -3873,6 +3930,34 @@ "tsutils": "^2.27.2" } }, + "tslint-eslint-rules": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz", + "integrity": "sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==", + "dev": true, + "requires": { + "doctrine": "0.7.2", + "tslib": "1.9.0", + "tsutils": "^3.0.0" + }, + "dependencies": { + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==", + "dev": true + }, + "tsutils": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.7.0.tgz", + "integrity": "sha512-n+e+3q7Jx2kfZw7tjfI9axEIWBY0sFMOlC+1K70X0SeXpO/UYSB+PN+E9tIJNqViB7oiXQdqD7dNchnvoneZew==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, "tsutils": { "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", @@ -3902,9 +3987,9 @@ "dev": true }, "typedoc": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.13.0.tgz", - "integrity": "sha512-jQWtvPcV+0fiLZAXFEe70v5gqjDO6pJYJz4mlTtmGJeW2KRoIU/BEfktma6Uj8Xii7UakuZjbxFewl3UYOkU/w==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.14.2.tgz", + "integrity": "sha512-aEbgJXV8/KqaVhcedT7xG6d2r+mOvB5ep3eIz1KuB5sc4fDYXcepEEMdU7XSqLFO5hVPu0nllHi1QxX2h/QlpQ==", "dev": true, "requires": { "@types/fs-extra": "^5.0.3", @@ -3916,14 +4001,14 @@ "@types/shelljs": "^0.8.0", "fs-extra": "^7.0.0", "handlebars": "^4.0.6", - "highlight.js": "^9.0.0", + "highlight.js": "^9.13.1", "lodash": "^4.17.10", "marked": "^0.4.0", "minimatch": "^3.0.0", "progress": "^2.0.0", "shelljs": "^0.8.2", "typedoc-default-themes": "^0.5.0", - "typescript": "3.1.x" + "typescript": "3.2.x" } }, "typedoc-default-themes": { @@ -3933,9 +4018,9 @@ "dev": true }, "typescript": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", - "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", + "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", "dev": true }, "uglify-js": { @@ -4125,9 +4210,9 @@ } }, "yn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz", - "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.0.0.tgz", + "integrity": "sha512-+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q==", "dev": true } } diff --git a/package.json b/package.json index 1c471fce..fd72964e 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "scripts": { "build": "npm run tslint && npm run compile && npm run documentation", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", + "check-configuration": "openstapps-configuration", "compile": "rm -rf lib/* && tsc && sed -i '1i#!/usr/bin/env node' lib/cli.js", "documentation": "typedoc --includeDeclarations --excludeExternals --mode modules --out docs src", "prepareOnly": "npm run build", @@ -12,40 +13,40 @@ }, "description": "Node.js library to interact with the StApps backend service", "dependencies": { - "@openstapps/core": "0.0.2", - "@openstapps/logger": "0.0.3", + "@openstapps/core": "0.3.0", + "@openstapps/logger": "0.0.5", "@types/cli-progress": "1.8.0", - "@types/node": "10.12.10", + "@types/node": "10.12.18", "@types/request": "2.48.1", "@types/uuid": "3.4.4", "async-pool-native": "0.1.0", - "cli-progress": "2.1.0", + "cli-progress": "2.1.1", "commander": "2.19.0", - "moment": "2.22.2", + "moment": "2.24.0", "request": "2.88.0", "uuid": "3.3.2" }, "license": "GPL-3.0-only", "devDependencies": { - "@openstapps/configuration": "0.0.2", + "@openstapps/configuration": "0.5.1", "@types/chai": "4.1.7", "@types/chai-as-promised": "7.1.0", "@types/chai-spies": "1.0.0", "@types/mocha": "5.2.5", - "@types/nock": "9.3.0", + "@types/nock": "9.3.1", "chai": "4.2.0", "chai-as-promised": "7.1.1", "chai-spies": "1.0.0", "conventional-changelog-cli": "2.0.11", "mocha": "5.2.0", "mocha-typescript": "1.1.17", - "nock": "10.0.2", + "nock": "10.0.6", "nyc": "13.1.0", - "source-map-support": "0.5.9", - "ts-node": "7.0.1", - "tslint": "5.11.0", - "typedoc": "0.13.0", - "typescript": "3.1.6" + "source-map-support": "0.5.10", + "ts-node": "8.0.2", + "tslint": "5.12.1", + "typedoc": "0.14.2", + "typescript": "3.2.4" }, "author": "Karl-Philipp Wulfert ", "contributors": [ @@ -54,7 +55,7 @@ "Jovan Krunic " ], "peerDependencies": { - "@openstapps/core": "~0.0.2" + "@openstapps/core": "~0.3.0" }, "repository": { "type": "git", @@ -66,26 +67,26 @@ "main": "lib/client.js", "typings": "lib/index.d.ts", "nyc": { - "check-coverage": true, - "per-file": true, - "lines": 95, - "statements": 95, - "functions": 95, + "all": true, "branches": 95, - "include": [ - "src" - ], + "check-coverage": true, "exclude": [ + "src/test/**/*.spec.ts", "src/cli.ts" ], "extension": [ ".ts" ], + "functions": 95, + "include": [ + "src" + ], + "lines": 95, + "per-file": true, "reporter": [ "html", "text-summary" ], - "sourceMap": true, - "all": true + "statements": 95 } } diff --git a/src/bulk.ts b/src/bulk.ts index cfb2649b..3c46263e 100644 --- a/src/bulk.ts +++ b/src/bulk.ts @@ -19,7 +19,7 @@ import { SCBulkDoneRoute, SCBulkResponse, SCThings, - SCThingTypes, + SCThingType, } from '@openstapps/core'; import {Client} from './client'; import {BulkWithMultipleTypesError} from './errors'; @@ -46,7 +46,7 @@ export class Bulk { * @see Client.bulk */ constructor( - private type: SCThingTypes, + private type: SCThingType, private client: Client, private bulkResponse: SCBulkResponse, ) { diff --git a/src/connectorClient.ts b/src/connectorClient.ts index df29e1f1..42da9427 100644 --- a/src/connectorClient.ts +++ b/src/connectorClient.ts @@ -18,7 +18,7 @@ import { SCLicensePlate, SCNamespaces, SCThings, - SCThingTypes, + SCThingType, SCThingUpdateResponse, SCThingUpdateRoute, } from '@openstapps/core'; @@ -78,7 +78,7 @@ export class ConnectorClient extends Client { * @param source Source identifier (should be unique per actual data source) * @param timeout Timeout in seconds when the bulk should expire */ - async bulk(type: SCThingTypes, source: string, timeout?: number): Promise> { + async bulk(type: SCThingType, source: string, timeout?: number): Promise> { // set default value for timeout to one hour if (typeof timeout !== 'number') { timeout = 3600; diff --git a/src/copy.ts b/src/copy.ts index fffb7976..30bba652 100644 --- a/src/copy.ts +++ b/src/copy.ts @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SCSearchRequest, SCThingTypes} from '@openstapps/core'; +import {SCSearchRequest, SCThingType} from '@openstapps/core'; import {asyncPool} from 'async-pool-native/dist/async-pool'; import {Bar} from 'cli-progress'; import {Client} from './client'; @@ -47,7 +47,7 @@ export interface CopyOptions { /** * StAppsCore type to copy */ - type: SCThingTypes; + type: SCThingType; /** * StApps version identifier to copy data for diff --git a/test/bulk.spec.ts b/test/bulk.spec.ts index 4f5a7ea7..0bca9222 100644 --- a/test/bulk.spec.ts +++ b/test/bulk.spec.ts @@ -12,9 +12,9 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {SCBulkAddRoute, SCBulkDoneRoute, SCDish, SCMessage} from '@openstapps/core'; -import * as chai from 'chai'; +import {SCBulkAddRoute, SCBulkDoneRoute, SCDish, SCMessage, SCThingOriginType, SCThingType} from '@openstapps/core'; import {expect} from 'chai'; +import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as chaiSpies from 'chai-spies'; import {suite, test} from 'mocha-typescript'; @@ -46,11 +46,11 @@ export class BulkSpec { expect(client.invokeRoute).not.to.have.been.called(); - const bulk = new Bulk('dish', client, { + const bulk = new Bulk(SCThingType.Dish, client, { expiration: moment().add(3600, 'seconds').format(), source: 'foo', state: 'in progress', - type: 'dish', + type: SCThingType.Dish, uid: 'bar', }); @@ -62,8 +62,9 @@ export class BulkSpec { origin: { indexed: moment().format(), name: 'bar', + type: SCThingOriginType.Remote, }, - type: 'dish', + type: SCThingType.Dish, uid: 'foo', }; @@ -76,11 +77,11 @@ export class BulkSpec { @test async addFails() { - const bulk = new Bulk('dish', client, { + const bulk = new Bulk(SCThingType.Dish, client, { expiration: moment().add(3600, 'seconds').format(), source: 'foo', state: 'in progress', - type: 'dish', + type: SCThingType.Dish, uid: 'bar', }); @@ -93,8 +94,9 @@ export class BulkSpec { origin: { indexed: moment().format(), name: 'bar', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }; @@ -108,11 +110,11 @@ export class BulkSpec { @test async construct() { expect(() => { - return new Bulk('dish', client, { + return new Bulk(SCThingType.Dish, client, { expiration: moment().add(3600, 'seconds').format(), source: 'foo', state: 'in progress', - type: 'dish', + type: SCThingType.Dish, uid: 'bar', }); }).not.to.throw(); @@ -126,11 +128,11 @@ export class BulkSpec { expect(client.invokeRoute).not.to.have.been.called(); - const bulk = new Bulk('dish', client, { + const bulk = new Bulk(SCThingType.Dish, client, { expiration: moment().add(3600, 'seconds').format(), source: 'foo', state: 'in progress', - type: 'dish', + type: SCThingType.Dish, uid: 'bar', }); diff --git a/test/client.spec.ts b/test/client.spec.ts index e4df5106..53569b5f 100644 --- a/test/client.spec.ts +++ b/test/client.spec.ts @@ -24,9 +24,11 @@ import { SCSearchRequest, SCSearchResponse, SCSearchRoute, + SCThingOriginType, + SCThingType, } from '@openstapps/core'; -import * as chai from 'chai'; import {expect} from 'chai'; +import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as chaiSpies from 'chai-spies'; import {suite, test} from 'mocha-typescript'; @@ -145,8 +147,9 @@ export class ClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }; await client.feedback(feedback); @@ -170,8 +173,9 @@ export class ClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }; @@ -255,8 +259,9 @@ export class ClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }; diff --git a/test/connectorClient.spec.ts b/test/connectorClient.spec.ts index f2b358a4..2ff863e8 100644 --- a/test/connectorClient.spec.ts +++ b/test/connectorClient.spec.ts @@ -22,6 +22,8 @@ import { SCMessage, SCThingUpdateResponse, SCThingUpdateRoute, + SCThingType, + SCThingOriginType, } from '@openstapps/core'; import * as chai from 'chai'; import {expect} from 'chai'; @@ -61,7 +63,7 @@ export class ConnectorClientSpec { expiration: moment().add(1800, 'seconds').format(), source: 'foo', state: 'in progress', - type: 'message', + type: SCThingType.Message, uid: 'foo', }, headers: {}, @@ -72,13 +74,13 @@ export class ConnectorClientSpec { expect(httpClient.request).not.to.have.been.called(); const connectorClient = new ConnectorClient(httpClient, 'http://localhost'); - await connectorClient.bulk('message', 'foo', 1800); + await connectorClient.bulk(SCThingType.Message, 'foo', 1800); expect(httpClient.request).to.have.been.first.called.with({ body: { expiration: moment().add(1800, 'seconds').format(), source: 'foo', - type: 'message', + type: SCThingType.Message, }, headers: {}, method: bulkRoute.method, @@ -94,7 +96,7 @@ export class ConnectorClientSpec { expiration: moment().add(3600, 'seconds').format(), source: 'foo', state: 'in progress', - type: 'message', + type: SCThingType.Message, uid: 'foo', }, headers: {}, @@ -105,13 +107,13 @@ export class ConnectorClientSpec { expect(httpClient.request).not.to.have.been.called(); const connectorClient = new ConnectorClient(httpClient, 'http://localhost'); - await connectorClient.bulk('message', 'foo'); + await connectorClient.bulk(SCThingType.Message, 'foo'); expect(httpClient.request).to.have.been.first.called.with({ body: { expiration: moment().add(3600, 'seconds').format(), source: 'foo', - type: 'message', + type: SCThingType.Message, }, headers: {}, method: bulkRoute.method, @@ -131,8 +133,9 @@ export class ConnectorClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }, { @@ -144,8 +147,9 @@ export class ConnectorClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'bar', }, ]; @@ -160,7 +164,7 @@ export class ConnectorClientSpec { expiration: moment().add(3600, 'seconds').format(), source: 'copy', state: 'in progress', - type: 'message', + type: SCThingType.Message, uid: 'foo', }, headers: {}, @@ -190,7 +194,7 @@ export class ConnectorClientSpec { body: { expiration: moment().add(3600, 'seconds').format(), source: 'copy', - type: 'message', + type: SCThingType.Message, }, headers: {}, method: bulkRoute.method, @@ -216,8 +220,9 @@ export class ConnectorClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }, { @@ -229,8 +234,9 @@ export class ConnectorClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'bar', }, ]; @@ -245,7 +251,7 @@ export class ConnectorClientSpec { expiration: moment().add(3600, 'seconds').format(), source: 'stapps-api', state: 'in progress', - type: 'message', + type: SCThingType.Message, uid: 'foo', }, headers: {}, @@ -275,7 +281,7 @@ export class ConnectorClientSpec { body: { expiration: moment().add(3600, 'seconds').format(), source: 'stapps-api', - type: 'message', + type: SCThingType.Message, }, headers: {}, method: bulkRoute.method, @@ -310,8 +316,9 @@ export class ConnectorClientSpec { origin: { indexed: 'foo', name: 'foo', + type: SCThingOriginType.Remote, }, - type: 'message', + type: SCThingType.Message, uid: 'foo', }; @@ -333,7 +340,7 @@ export class ConnectorClientSpec { headers: {}, method: thingUpdateRoute.method, url: new URL('http://localhost' + thingUpdateRoute.getUrlFragment({ - TYPE: 'message', + TYPE: SCThingType.Message, UID: 'foo', })), }); diff --git a/test/copy.spec.ts b/test/copy.spec.ts index faff7f25..bd2b6130 100644 --- a/test/copy.spec.ts +++ b/test/copy.spec.ts @@ -22,6 +22,7 @@ import { SCSearchRequest, SCSearchResponse, SCSearchRoute, + SCThingType, } from '@openstapps/core'; import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; @@ -76,7 +77,7 @@ export class CopySpec { indexed: moment().format(), name: 'bar', }, - type: 'dish', + type: SCThingType.Dish, uid: 'foo', }], facets: [], @@ -119,7 +120,7 @@ export class CopySpec { from: 'http://foo.bar', source: 'stapps-copy', to: 'http://localhost', - type: 'dish', + type: SCThingType.Dish, version: 'foo.bar.foobar', }); } @@ -147,7 +148,7 @@ export class CopySpec { indexed: moment().format(), name: 'bar', }, - type: 'dish', + type: SCThingType.Dish, uid: 'foo', }], facets: [], @@ -190,7 +191,7 @@ export class CopySpec { from: 'http://foo.bar', source: 'stapps-copy', to: 'http://localhost', - type: 'dish', + type: SCThingType.Dish, version: 'foo.bar.foobar', }).should.be.rejectedWith(ApiError); }