diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/LOCALIZATION.md b/LOCALIZATION.md new file mode 100644 index 00000000..4ab1f387 --- /dev/null +++ b/LOCALIZATION.md @@ -0,0 +1,7 @@ + +# Localization in General Bots + +## .gbapp + +The localization is done by adding a strings.ts file to the root of the .gbapp package. + diff --git a/SAMPLES.md b/SAMPLES.md new file mode 100644 index 00000000..e69de29b diff --git a/package-lock.json b/package-lock.json index 29da2ceb..74d00b24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1059,40 +1059,56 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, - "@octokit/rest": { - "version": "15.17.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-15.17.0.tgz", - "integrity": "sha512-tN16FJOGBPxt9QtPfl8yVbbuik3bQ7EI66zcX2XDh05Wcs8t+7mVEE3SWtCeK/Qm0RTLCeFQgGzuvkbD2J6cEg==", + "@octokit/endpoint": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-3.1.1.tgz", + "integrity": "sha512-KPkoTvKwCTetu/UqonLs1pfwFO5HAqTv/Ksp9y4NAg//ZgUCpvJsT4Hrst85uEzJvkB8+LxKyR4Bfv2X8O4cmQ==", "dev": true, "requires": { - "before-after-hook": "^1.1.0", - "btoa-lite": "^1.0.0", - "debug": "^3.1.0", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.0", - "lodash": "^4.17.4", - "node-fetch": "^2.1.1", - "universal-user-agent": "^2.0.0", + "deepmerge": "3.0.0", + "is-plain-object": "^2.0.4", + "universal-user-agent": "^2.0.1", "url-template": "^2.0.8" + } + }, + "@octokit/request": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-2.2.0.tgz", + "integrity": "sha512-4P9EbwKZ4xfyupVMb3KVuHmM+aO2fye3nufjGKz/qDssvdJj9Rlx44O0FdFvUp4kIzToy3AHLTOulEIDAL+dpg==", + "dev": true, + "requires": { + "@octokit/endpoint": "^3.0.0", + "is-plain-object": "^2.0.4", + "node-fetch": "^2.3.0", + "universal-user-agent": "^2.0.1" }, "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" - } - }, "node-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.1.tgz", - "integrity": "sha512-ObXBpNCD3A/vYQiQtEWl7DuqjAXjfptYFuGHLdPl5U19/6kJuZV+8uMHLrkj3wJrJoyfg4nhgyFixZdaZoAiEQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", + "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==", "dev": true } } }, + "@octokit/rest": { + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.1.0.tgz", + "integrity": "sha512-/D1XokSycOE+prxxI2r9cxssiLMqcr+BsEUjdruC67puEEjNJjJoRIkuA1b20jOkX5Ue3Rz99Mu9rTnNmjetUA==", + "dev": true, + "requires": { + "@octokit/request": "2.2.0", + "before-after-hook": "^1.2.0", + "btoa-lite": "^1.0.0", + "lodash.get": "^4.4.2", + "lodash.pick": "^4.4.0", + "lodash.set": "^4.3.2", + "lodash.uniq": "^4.5.0", + "octokit-pagination-methods": "^1.1.0", + "universal-user-agent": "^2.0.0", + "url-template": "^2.0.8" + } + }, "@semantic-release/changelog": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-3.0.1.tgz", @@ -1243,12 +1259,12 @@ } }, "@semantic-release/github": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-5.2.1.tgz", - "integrity": "sha512-EVh5MCMOSl5WfOIum+k7fb7ZaDBcZAepPvtMrJOn8HKa9MERK6PgT76OKro+tReWjT1PnGiaKjofjyRC4BhN6Q==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-5.2.5.tgz", + "integrity": "sha512-myO00q84CyfyzaEZ4OdA7GOMCQKd+juZd5g2Cloh4jV6CyiMyWflZ629RH99wjAVUiwMKnvX2SQ5XPFvO1+FCw==", "dev": true, "requires": { - "@octokit/rest": "^15.13.1", + "@octokit/rest": "^16.0.1", "@semantic-release/error": "^2.2.0", "aggregate-error": "^1.0.0", "bottleneck": "^2.0.1", @@ -1277,9 +1293,9 @@ } }, "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", + "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", "dev": true } } @@ -1638,9 +1654,9 @@ } }, "@types/sequelize": { - "version": "4.27.30", - "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.30.tgz", - "integrity": "sha512-5DZCTnlLizi7Dk/sZ9ZWI3WxL1eUSH4Rpy5rie394GOIAYSYPBamexl1citj6ZgdbkaNXvJ+RuU1HmipUPA47w==", + "version": "4.27.32", + "resolved": "https://registry.npmjs.org/@types/sequelize/-/sequelize-4.27.32.tgz", + "integrity": "sha512-M4iFjZLXDdjqnyKaxz9I5XlVFr4/WBvFYyd8oLU5YsKcXGeppMl6nNo9EBsdDgOOirJcyH2JkJEUhbhegZ6MqA==", "dev": true, "requires": { "@types/bluebird": "*", @@ -2219,9 +2235,9 @@ } }, "azure-arm-resource": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.2.0.tgz", - "integrity": "sha512-1WYsma7061MNc3MnRuS8s+HdWfLEJkrozdj4qJpRh1KQkYUk2pC76ypqNKBL9DdaWgYkqpys7j6juuITRW/pnQ==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.2.1.tgz", + "integrity": "sha512-dtji3Eia9/TABcKzxWklTLh9zj24BtOkBObzxH4BAr/ZSFmyAtJA4lYXkjizEkPCS6XVsCiqsUJZtNrqQ8iTWA==", "requires": { "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5" @@ -2996,37 +3012,107 @@ } }, "botbuilder": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.5.tgz", - "integrity": "sha512-7OZqUqS3jhse2xq9wdG4jaE1mpPcsgQid+wPE2gv17/KwChHAZ5ZyXEmjoc6LP3Twmsapj6h0R4ni36bcst/xg==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.1.7.tgz", + "integrity": "sha512-AlZhvjeqiCpeWGN1TkqBi09l6f0spYIh0Xzc4rJYF8feCFi4k2FEYC1IpiiOAtYhEBeQ9SOGFcUUwPaLmsI3Xg==", "requires": { "@types/filenamify": "^2.0.1", "@types/node": "^9.3.0", "async-file": "^2.0.2", - "botbuilder-core": "^4.1.5", - "botframework-connector": "^4.1.5", + "botbuilder-core": "^4.1.7", + "botframework-connector": "^4.1.7", "filenamify": "^2.0.0", "rimraf": "^2.6.2" }, "dependencies": { + "@types/jsonwebtoken": { + "version": "7.2.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-7.2.8.tgz", + "integrity": "sha512-XENN3YzEB8D6TiUww0O8SRznzy1v+77lH7UmuN54xq/IHIsyWjWOzZuFFTtoiRuaE782uAoRwBe/wwow+vQXZw==", + "requires": { + "@types/node": "*" + } + }, "@types/node": { - "version": "9.6.36", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.36.tgz", - "integrity": "sha512-Fbw+AdRLL01vv7Rk7bYaNPecqmKoinJHGbpKnDpbUZmUj/0vj3nLqPQ4CNBzr3q2zso6Cq/4jHoCAdH78fvJrw==" + "version": "9.6.40", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.40.tgz", + "integrity": "sha512-M3HHoXXndsho/sTbQML2BJr7/uwNhMg8P0D4lb+UsM65JQZx268faiz9hKpY4FpocWqpwlLwa8vevw8hLtKjOw==" + }, + "base64url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", + "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" + }, + "botbuilder-core": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.1.7.tgz", + "integrity": "sha512-kfNOOpHVDLNdpYVMAefWjETXI4VsnDHgucEfKgANcCUrXmsYETlioHOCngUWLrFcaeVMJodeZvafIYl5NTgy0A==", + "requires": { + "assert": "^1.4.1", + "botframework-schema": "^4.1.7" + } + }, + "botframework-connector": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.1.7.tgz", + "integrity": "sha512-aIGY0acc/cMxmg1o+06HqReOjNC8qxbmPJDg+wDgaAwr85bSrDZE1CbyITcj2OqPG/QQ7VM3YzpPAZPlKkDWoQ==", + "requires": { + "@types/jsonwebtoken": "7.2.8", + "@types/node": "^9.3.0", + "@types/request": "^2.47.0", + "base64url": "^3.0.0", + "botframework-schema": "^4.1.7", + "jsonwebtoken": "8.0.1", + "ms-rest-azure-js": "1.0.176", + "ms-rest-js": "1.0.455", + "request": "^2.87.0", + "rsa-pem-from-mod-exp": "^0.8.4" + } + }, + "botframework-schema": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.1.7.tgz", + "integrity": "sha512-vPb5gHldmTIpUFx5uCdv/4XEsouMkXvSfQS2zsAC3VqAo29YESHYzNbr5HecRaUveb48NZ27+Djm0U0mLFxe9Q==", + "requires": { + "@types/node": "^9.3.0", + "ms-rest-js": "1.0.455" + } + }, + "ms-rest-azure-js": { + "version": "1.0.176", + "resolved": "https://registry.npmjs.org/ms-rest-azure-js/-/ms-rest-azure-js-1.0.176.tgz", + "integrity": "sha512-qtEBpSf/1nJ0/m1jGLkHISRnpOeHUp5n4SvzZRdFeYnGF4SQx9v/fl8a8ZwEmyujmgbUwyLNM9qKpH5PmW7pZg==", + "requires": { + "ms-rest-js": "^1.0.443", + "tslib": "^1.9.2" + } + }, + "ms-rest-js": { + "version": "1.0.455", + "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.455.tgz", + "integrity": "sha512-RUDnFFNhk4ZdvOACg0yfaxmp5OzNwUcTIwgh/rVBeuNzgA7hOoVh5zFW06XmOtaBHXL2Bu/vWoQtzloEUlv9tw==", + "requires": { + "axios": "^0.18.0", + "form-data": "^2.3.2", + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" + } } } }, "botbuilder-ai": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.1.5.tgz", - "integrity": "sha512-m9NGPsJ12dHey+/Or7516I4tj8EID1U8W2rnVwn3T9OpRMrL4XM9TloItNBqHhpAy1q7YfglxdsZP5721TMwvg==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.1.7.tgz", + "integrity": "sha512-TYYe7GrR9nZ55gJ+UBkbJnHea/LkJSwCjDuBncmRMsARGwxhYsBhLkkigY1Hzbl6+OuuPwZP/6OR0Xk9JzwgHA==", "requires": { "@microsoft/recognizers-text-date-time": "1.1.2", "@types/html-entities": "^1.2.16", "@types/node": "^9.3.0", "@types/request-promise-native": "^1.0.10", "azure-cognitiveservices-luis-runtime": "^1.0.0", - "botbuilder": "^4.1.5", + "botbuilder": "^4.1.7", "html-entities": "^1.2.1", "moment": "^2.20.1", "ms-rest": "^2.3.6", @@ -3036,29 +3122,29 @@ }, "dependencies": { "@types/node": { - "version": "9.6.36", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.36.tgz", - "integrity": "sha512-Fbw+AdRLL01vv7Rk7bYaNPecqmKoinJHGbpKnDpbUZmUj/0vj3nLqPQ4CNBzr3q2zso6Cq/4jHoCAdH78fvJrw==" + "version": "9.6.40", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.40.tgz", + "integrity": "sha512-M3HHoXXndsho/sTbQML2BJr7/uwNhMg8P0D4lb+UsM65JQZx268faiz9hKpY4FpocWqpwlLwa8vevw8hLtKjOw==" } } }, "botbuilder-azure": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.1.5.tgz", - "integrity": "sha512-3iyapL4wTm3D6QtkkQl4NbV8CtGzZjCetrWPLIrB04QBd6MM1AWIigAyo66KRl52O5/7k0KRpz0ZtIqwK4nRwA==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.1.7.tgz", + "integrity": "sha512-wdq+8Fgm8EscZqsg2lB+JJ4mtukQHOVm+mRpsgjFrYB84/SB0k3Z2wT4PHVNdNdvnSHAWOAXzigIJhPSIv9Hcw==", "requires": { "@types/node": "^9.3.0", "azure-storage": "^2.10.2", - "botbuilder": "^4.1.5", + "botbuilder": "^4.1.7", "documentdb": "1.14.5", "flat": "^4.0.0", "semaphore": "^1.1.0" }, "dependencies": { "@types/node": { - "version": "9.6.36", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.36.tgz", - "integrity": "sha512-Fbw+AdRLL01vv7Rk7bYaNPecqmKoinJHGbpKnDpbUZmUj/0vj3nLqPQ4CNBzr3q2zso6Cq/4jHoCAdH78fvJrw==" + "version": "9.6.40", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.40.tgz", + "integrity": "sha512-M3HHoXXndsho/sTbQML2BJr7/uwNhMg8P0D4lb+UsM65JQZx268faiz9hKpY4FpocWqpwlLwa8vevw8hLtKjOw==" } } }, @@ -3227,16 +3313,16 @@ } }, "botbuilder-dialogs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.1.5.tgz", - "integrity": "sha512-tLBe+clYg6VWsarR3a6NOzK8RqjJ3mXA4IBsQNSiqxIbEu/jjQTZ8OoZceye5rWfa67cbm2aihShqFB5WZX3nA==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.1.7.tgz", + "integrity": "sha512-XDR6HT5xJFMrepT5TOjuvDIz0/jpuemi4hGNjW7a0klucfXroSB3yFvg6aVinbjVE5uAejnEwoRAXevFZRg+RQ==", "requires": { "@microsoft/recognizers-text-choice": "1.1.2", "@microsoft/recognizers-text-date-time": "1.1.2", "@microsoft/recognizers-text-number": "1.1.2", "@microsoft/recognizers-text-suite": "1.1.2", "@types/node": "^9.3.0", - "botbuilder-core": "^4.1.5" + "botbuilder-core": "^4.1.7" }, "dependencies": { "@microsoft/recognizers-text-choice": { @@ -3274,9 +3360,40 @@ } }, "@types/node": { - "version": "9.6.36", - "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.36.tgz", - "integrity": "sha512-Fbw+AdRLL01vv7Rk7bYaNPecqmKoinJHGbpKnDpbUZmUj/0vj3nLqPQ4CNBzr3q2zso6Cq/4jHoCAdH78fvJrw==" + "version": "9.6.40", + "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.40.tgz", + "integrity": "sha512-M3HHoXXndsho/sTbQML2BJr7/uwNhMg8P0D4lb+UsM65JQZx268faiz9hKpY4FpocWqpwlLwa8vevw8hLtKjOw==" + }, + "botbuilder-core": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.1.7.tgz", + "integrity": "sha512-kfNOOpHVDLNdpYVMAefWjETXI4VsnDHgucEfKgANcCUrXmsYETlioHOCngUWLrFcaeVMJodeZvafIYl5NTgy0A==", + "requires": { + "assert": "^1.4.1", + "botframework-schema": "^4.1.7" + } + }, + "botframework-schema": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.1.7.tgz", + "integrity": "sha512-vPb5gHldmTIpUFx5uCdv/4XEsouMkXvSfQS2zsAC3VqAo29YESHYzNbr5HecRaUveb48NZ27+Djm0U0mLFxe9Q==", + "requires": { + "@types/node": "^9.3.0", + "ms-rest-js": "1.0.455" + } + }, + "ms-rest-js": { + "version": "1.0.455", + "resolved": "https://registry.npmjs.org/ms-rest-js/-/ms-rest-js-1.0.455.tgz", + "integrity": "sha512-RUDnFFNhk4ZdvOACg0yfaxmp5OzNwUcTIwgh/rVBeuNzgA7hOoVh5zFW06XmOtaBHXL2Bu/vWoQtzloEUlv9tw==", + "requires": { + "axios": "^0.18.0", + "form-data": "^2.3.2", + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" + } } } }, @@ -3687,6 +3804,17 @@ "safer-buffer": ">= 2.1.2 < 3" } }, + "pragmatismo-io-framework": { + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/pragmatismo-io-framework/-/pragmatismo-io-framework-1.0.18.tgz", + "integrity": "sha512-oHzUxNbxXJ9DieUj9DbhMpryPWLdmrnzsTHxG9/a8/UUMFpHal5TR4hzh6JPkQqjhPjktYyvy2R2fdQiz114WQ==", + "requires": { + "azure-cognitiveservices-textanalytics": "^2.0.0", + "azure-search": "^0.0.21", + "ms-rest-azure": "^2.5.9", + "url-join": "^4.0.0-m2.0" + } + }, "sequelize": { "version": "4.41.0", "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.41.0.tgz", @@ -3719,9 +3847,9 @@ } }, "bottleneck": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.13.0.tgz", - "integrity": "sha512-9YmZ0aiKta2OAxTujKCS/INjGWCIGWK4Ff1nQpgHnR4CTjlk9jcnpaHOjPnMZPtqRXkqwKdtxZgvJ9udsXylaw==", + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/bottleneck/-/bottleneck-2.13.2.tgz", + "integrity": "sha512-DVS4Uv7xr4Ql0w9valPBaueLRnEtBepeoevDhWO0LBhyihICJ7RySyzPfyvPswanrXAAbWaF8Zx4QpxmIxHa/g==", "dev": true }, "boxen": { @@ -4001,7 +4129,7 @@ "dependencies": { "callsites": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true } @@ -4530,9 +4658,9 @@ "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" }, "commitizen": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-3.0.4.tgz", - "integrity": "sha512-djR5F7RBsGALyUEm/B1H/85nsN4L1F5DhWN+9/efSwqHDSyhw2MK6MF2VRuD26PUqGkQbcUlYO61btkTWjcjVw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-3.0.5.tgz", + "integrity": "sha512-WB9sz7qudArOsW1ninU8YGLNoXLQ5lJBZf538iQ7i96SXAkqVMZdmPtSyN4WFPM5PjQR7rWxDa+hzfGIJfrXUg==", "dev": true, "requires": { "cachedir": "2.1.0", @@ -4646,7 +4774,7 @@ }, "shelljs": { "version": "0.7.6", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz", + "resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz", "integrity": "sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0=", "dev": true, "requires": { @@ -5050,9 +5178,9 @@ } }, "csv-parse": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-3.2.0.tgz", - "integrity": "sha512-1IBQ7PYHc5h6AXS4nyGsmicttbpUbNvlsgKxhvouh+kRaVug8xBWSiIeWdbPUQgjKG88hEGYjdU29fX73mo+6Q==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.0.1.tgz", + "integrity": "sha512-ehkwejEj05wwO7Q9JD+YSI6dNMIauHIroNU1RALrmRrqPoZIwRnfBtgq5GkU6i2RxZOJqjo3dtI1NrVSXvaimA==" }, "csv-parser": { "version": "1.12.1", @@ -5321,6 +5449,12 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, + "deepmerge": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.0.0.tgz", + "integrity": "sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==", + "dev": true + }, "defer-to-connect": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.1.tgz", @@ -5830,9 +5964,9 @@ } }, "env-ci": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/env-ci/-/env-ci-3.1.0.tgz", - "integrity": "sha512-+yFT8QX8W9bee0/fuzKvqt2vEhWvU3FXZ1P5xbveDq/EqcYLh4e0QNE16okUS3pawALDGXE9eCJPVeWY0/ilQA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/env-ci/-/env-ci-3.1.2.tgz", + "integrity": "sha512-qJ+ug5OEHEK6HyjhEB0z2tPJCmdvemQE3WUUYEe7qj7teZIJGjZK9elWB4kxE8qRdVHWl4aBvyVmX0Y5xlMbBw==", "dev": true, "requires": { "execa": "^1.0.0", @@ -6351,7 +6485,7 @@ }, "expand-range": { "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { @@ -7233,7 +7367,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -8153,9 +8288,9 @@ } }, "hook-std": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hook-std/-/hook-std-1.1.0.tgz", - "integrity": "sha512-aIyBZbZl3NS8XoSwIDQ+ZaiBuPOhhPWoBFA3QX0Q8hOMO8Tx4xGRTDnn/nl/LAtZWdieXzFC9ohAtTSnWrlHCQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hook-std/-/hook-std-1.2.0.tgz", + "integrity": "sha512-yntre2dbOAjgQ5yoRykyON0D9T96BfshR8IuiL/r3celeHD8I/76w4qo8m3z99houR4Z678jakV3uXrQdSvW/w==", "dev": true }, "hosted-git-info": { @@ -8998,9 +9133,9 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "issue-parser": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/issue-parser/-/issue-parser-3.0.0.tgz", - "integrity": "sha512-VWIhBdy0eOhlvpxOOMecBCHMpjx7lWVZcYpSzjD4dSdxptzI9TBR/cQEh057HL8+7jQKTLs+uCtezY/9VoveCA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/issue-parser/-/issue-parser-3.0.1.tgz", + "integrity": "sha512-5wdT3EE8Kq38x/hJD8QZCJ9scGoOZ5QnzwXyClkviSWTS+xOCE6hJ0qco3H5n5jCsFqpbofZCcMWqlXJzF72VQ==", "dev": true, "requires": { "lodash.capitalize": "^4.2.1", @@ -9542,6 +9677,12 @@ "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=" }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, "lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -9630,6 +9771,18 @@ "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=", + "dev": true + }, + "lodash.set": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", + "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=", + "dev": true + }, "lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -9657,6 +9810,12 @@ "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=", "dev": true }, + "lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "dev": true + }, "lodash.uniqby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz", @@ -9770,9 +9929,9 @@ } }, "macos-release": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz", - "integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz", + "integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A==", "dev": true }, "make-dir": { @@ -9836,9 +9995,9 @@ } }, "marked": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.5.1.tgz", - "integrity": "sha512-iUkBZegCZou4AdwbKTwSW/lNDcz5OuRSl3qdcl31Ia0B2QPG0Jn+tKblh/9/eP9/6+4h27vpoh8wel/vQOV0vw==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.5.2.tgz", + "integrity": "sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA==" }, "marked-terminal": { "version": "3.1.1", @@ -14917,6 +15076,12 @@ "isobject": "^3.0.1" } }, + "octokit-pagination-methods": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz", + "integrity": "sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==", + "dev": true + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -15009,13 +15174,13 @@ } }, "os-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz", - "integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz", + "integrity": "sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==", "dev": true, "requires": { - "macos-release": "^1.0.0", - "win-release": "^1.0.0" + "macos-release": "^2.0.0", + "windows-release": "^3.1.0" } }, "os-tmpdir": { @@ -15460,9 +15625,9 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "pragmatismo-io-framework": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/pragmatismo-io-framework/-/pragmatismo-io-framework-1.0.18.tgz", - "integrity": "sha512-oHzUxNbxXJ9DieUj9DbhMpryPWLdmrnzsTHxG9/a8/UUMFpHal5TR4hzh6JPkQqjhPjktYyvy2R2fdQiz114WQ==", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/pragmatismo-io-framework/-/pragmatismo-io-framework-1.0.19.tgz", + "integrity": "sha512-70RpF84fddSrMHPwWDQZLKjZoEwTyoqBAoGywVaXOaz7qi11bEWIxQgbDt26cclkQMkK1RfMBJvkH38t5l9lWA==", "requires": { "azure-cognitiveservices-textanalytics": "^2.0.0", "azure-search": "^0.0.21", @@ -16396,9 +16561,9 @@ "integrity": "sha1-Az1go60g7PLgCUDRT5eCNGV3QzU=" }, "semantic-release": { - "version": "15.12.0", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-15.12.0.tgz", - "integrity": "sha512-s8JQ0twxSTat4aIKy8AVPm6gP+2OlkMyyTGeeWFopOXQVa3Bg0LPNjdhsUL90MHvh9aVy9k0/ym4DWmOcGxOMQ==", + "version": "15.12.4", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-15.12.4.tgz", + "integrity": "sha512-po30Te9E26v3Qb/G9pXFO6lCTFO07zvliqH00vmfuCoAjl1Wpg9SKb9dXVFM7BTdg5Fr/KqbdOsqHkT7kR4FeQ==", "dev": true, "requires": { "@semantic-release/commit-analyzer": "^6.1.0", @@ -16646,9 +16811,9 @@ } }, "yargs": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.4.tgz", - "integrity": "sha512-f5esswlPO351AnejaO2A1ZZr0zesz19RehQKwiRDqWtrraWrJy16tsUIKgDXFMVytvNOHPVmTiaTh3wO67I0fQ==", + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", "dev": true, "requires": { "cliui": "^4.0.0", @@ -16662,13 +16827,13 @@ "string-width": "^2.0.0", "which-module": "^2.0.0", "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.0" + "yargs-parser": "^11.1.1" } }, "yargs-parser": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.0.tgz", - "integrity": "sha512-lGA5HsbjkpCfekDBHAhgE5OE8xEoqiUDylowr+BvhRCwG1xVYTsd8hx2CYC0NY4k9RIgJeybFTG2EZW4P2aN1w==", + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -17995,9 +18160,9 @@ } }, "tapable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz", - "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz", + "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==", "dev": true }, "tar": { @@ -18578,9 +18743,9 @@ "integrity": "sha1-pZUhTHKY24M57u7gg+TRC9jLjdk=" }, "ts-loader": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.0.tgz", - "integrity": "sha512-lGSNs7szRFj/rK9T1EQuayE3QNLg6izDUxt5jpmq0RG1rU2bapAt7E7uLckLCUPeO1jwxCiet2oRaWovc53UAg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.1.tgz", + "integrity": "sha512-fDDgpBH3SR8xlt2MasLdz3Yy611PQ/UY/KGyo7TgXhTRU/6sS8uGG0nJYnU1OdFBNKcoYbId1UTNaAOUn+i41g==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -18638,9 +18803,9 @@ } }, "tslint-microsoft-contrib": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.2.1.tgz", - "integrity": "sha512-PDYjvpo0gN9IfMULwKk0KpVOPMhU6cNoT9VwCOLeDl/QS8v8W2yspRpFFuUS7/c5EIH/n8ApMi8TxJAz1tfFUA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-6.0.0.tgz", + "integrity": "sha512-R//efwn+34IUjTJeYgNDAJdzG0jyLWIehygPt/PHuZAieTolFVS56FgeFW7DOLap9ghXzMiFPTmDgm54qaL7QA==", "dev": true, "requires": { "tsutils": "^2.27.2 <2.29.0" @@ -18749,6 +18914,11 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz", "integrity": "sha1-mtLCp6F5HxCoUuARL3e1cdzhDGY=" + }, + "typescript": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", + "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==" } } }, @@ -18763,17 +18933,17 @@ "integrity": "sha512-/VMawTW4NnUUsgq0o8O37y9MmXFaOCDrH1dvDg7SZUS5ZSpUPSILVWwGJP+7g4I8vKZ5bBKZKHfPIEA4xUC+PQ==" }, "typedoc-plugin-markdown": { - "version": "1.1.18", - "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-1.1.18.tgz", - "integrity": "sha512-hE/2wM3NzMY/6K2wLtW7koVALLvVYm7w0mx+GFH3Er5gTioEMrUtd70Yf6Mb88fG6IvUWx1mX10ZD/ZR0AXS2w==", + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-1.1.19.tgz", + "integrity": "sha512-dk1J9NHW3c1cMmcmTrw55U7ke6zadB3hZL7y7tkLQ6FeJGkz6SEMuexjVOq5rltuW7JeLqt1ngNKAwG9dXiMgQ==", "requires": { "turndown": "^5.0.1" } }, "typescript": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz", - "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.1.tgz", + "integrity": "sha512-jw7P2z/h6aPT4AENXDGjcfHTu5CSqzsbZc6YlUIebTyBAq8XaKp78x7VcSh30xwSCcsu5irZkYZUSFP1MrAMbg==" }, "typescript-eslint-parser": { "version": "16.0.1", @@ -18922,12 +19092,12 @@ } }, "universal-user-agent": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.0.1.tgz", - "integrity": "sha512-vz+heWVydO0iyYAa65VHD7WZkYzhl7BeNVy4i54p4TF8OMiLSXdbuQe4hm+fmWAsL+rVibaQHXfhvkw3c1Ws2w==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-2.0.2.tgz", + "integrity": "sha512-nOwvHWLH3dBazyuzbECPA5uVFNd7AlgviXRHgR4yf48QqitIvpdncRrxMbZNMpPPEfgz30I9ubd1XmiJiqsTrg==", "dev": true, "requires": { - "os-name": "^2.0.1" + "os-name": "^3.0.0" } }, "universalify": { @@ -19255,9 +19425,9 @@ "integrity": "sha1-/IBORYzEYACbGiuWa8iBfSV4rvs=" }, "whatwg-mimetype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.2.0.tgz", - "integrity": "sha512-5YSO1nMd5D1hY3WzAQV3PzZL83W3YeyR1yW9PcH26Weh1t+Vzh9B6XkDh7aXm83HBZ4nSMvkjvN2H2ySWIvBgw==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" }, "whatwg-url": { "version": "6.5.0", @@ -19332,13 +19502,30 @@ } } }, - "win-release": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz", - "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=", + "windows-release": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.1.0.tgz", + "integrity": "sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==", "dev": true, "requires": { - "semver": "^5.0.1" + "execa": "^0.10.0" + }, + "dependencies": { + "execa": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", + "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + } } }, "winston": { diff --git a/package.json b/package.json index b5b86b8b..2a3ab2e7 100644 --- a/package.json +++ b/package.json @@ -54,24 +54,24 @@ "async": "2.6.1", "async-promises": "0.2.1", "azure-arm-cognitiveservices": "2.4.0", - "azure-arm-resource": "7.2.0", + "azure-arm-resource": "7.2.1", "azure-arm-search": "^1.3.0-preview", "azure-arm-sql": "5.6.0", "azure-arm-website": "5.7.0", "bluebird": "^3.5.3", "body-parser": "1.18.3", - "botbuilder": "^4.1.5", - "botbuilder-ai": "^4.1.5", - "botbuilder-azure": "^4.1.5", + "botbuilder": "^4.1.7", + "botbuilder-ai": "^4.1.7", + "botbuilder-azure": "^4.1.7", "botbuilder-choices": "^4.0.0-preview1.2", - "botbuilder-dialogs": "^4.1.5", + "botbuilder-dialogs": "^4.1.7", "botbuilder-prompts": "^4.0.0-preview1.2", "botlib": "0.1.8", "chai": "4.2.0", "child_process": "^1.0.2", "chokidar": "2.0.4", "cli-spinner": "^0.2.8", - "csv-parse": "3.2.0", + "csv-parse": "4.0.1", "dotenv-extended": "2.3.0", "express": "4.16.4", "express-promise-router": "3.0.3", @@ -79,7 +79,7 @@ "fs-walk": "0.0.2", "ip": "^1.1.5", "localize": "0.4.7", - "marked": "0.5.1", + "marked": "0.5.2", "mocha": "5.2.0", "mocha-typescript": "1.1.17", "ms": "2.1.1", @@ -88,7 +88,7 @@ "ngrok": "^3.1.0", "nyc": "^13.1.0", "opn": "^5.4.0", - "pragmatismo-io-framework": "1.0.18", + "pragmatismo-io-framework": "1.0.19", "process-exists": "^3.1.0", "public-ip": "^2.4.0", "reflect-metadata": "0.1.12", @@ -105,8 +105,8 @@ "ts-node": "7.0.1", "typedoc": "0.13.0", "typedoc-plugin-external-module-name": "^1.1.3", - "typedoc-plugin-markdown": "^1.1.18", - "typescript": "3.1.6", + "typedoc-plugin-markdown": "^1.1.19", + "typescript": "3.2.1", "url-join": "4.0.0", "vbscript-to-typescript": "^1.0.8", "wait-until": "0.0.2", @@ -117,17 +117,17 @@ "@semantic-release/changelog": "^3.0.1", "@semantic-release/commit-analyzer": "^6.1.0", "@semantic-release/git": "^7.0.5", - "@semantic-release/github": "^5.2.1", + "@semantic-release/github": "^5.2.5", "@semantic-release/npm": "^5.1.1", "@semantic-release/release-notes-generator": "^7.1.4", "@types/chai": "4.1.7", "@types/mocha": "5.2.5", - "@types/sequelize": "4.27.30", + "@types/sequelize": "4.27.32", "@types/url-join": "0.8.2", "@types/winston": "2.4.4", "ban-sensitive-files": "1.9.2", "chai": "^4.2.0", - "commitizen": "^3.0.4", + "commitizen": "^3.0.5", "coveralls": "^3.0.2", "cz-conventional-changelog": "^2.1.0", "dependency-check": "3.2.1", @@ -138,12 +138,12 @@ "nsp": "3.2.1", "pre-git": "3.17.1", "prettier-standard": "8.0.1", - "semantic-release": "^15.12.0", + "semantic-release": "^15.12.4", "standard": "12.0.1", "travis-deploy-once": "5.0.9", - "ts-loader": "^5.3.0", + "ts-loader": "^5.3.1", "tslint": "^5.11.0", - "tslint-microsoft-contrib": "^5.2.1" + "tslint-microsoft-contrib": "^6.0.0" }, "eslintConfig": { "env": { diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts index a12f1910..12557e96 100644 --- a/packages/admin.gbapp/dialogs/AdminDialog.ts +++ b/packages/admin.gbapp/dialogs/AdminDialog.ts @@ -57,19 +57,27 @@ export class AdminDialog extends IGBDialog { const packageName = text.split(' ')[1]; const importer = new GBImporter(min.core); const deployer = new GBDeployer(min.core, importer); - await deployer.undeployPackageFromLocalPath( - min.instance, - UrlJoin('packages', packageName) - ); + await deployer.undeployPackageFromLocalPath(min.instance, UrlJoin('packages', packageName)); } public static async deployPackageCommand(min: GBMinInstance, text: string, deployer: GBDeployer) { const packageName = text.split(' ')[1]; const additionalPath = GBConfigService.get('ADDITIONAL_DEPLOY_PATH'); - await deployer.deployPackageFromLocalPath(min, - UrlJoin(additionalPath, packageName) - ); + await deployer.deployPackageFromLocalPath(min, UrlJoin(additionalPath, packageName)); } + + public static async rebuildIndexPackageCommand(min: GBMinInstance, text: string, deployer: GBDeployer) { + await deployer.rebuildIndex(min.instance); + } + + public static async addConnectionCommand(text: any, min: GBMinInstance) { + const packageName = text.split(' ')[1]; + const importer = new GBImporter(min.core); + const admin = new GBAdminService(min.core); + // TODO: await admin.addConnection + } + + /** * Setup dialogs flows and define services call. * @@ -87,23 +95,22 @@ export class AdminDialog extends IGBDialog { async step => { const locale = step.context.activity.locale; const prompt = Messages[locale].authenticate; - await step.prompt('textPrompt', prompt); - return await step.next(); + + return await step.prompt('textPrompt', prompt); }, async step => { const locale = step.context.activity.locale; const password = step.result; - if ( - password === GBConfigService.get('ADMIN_PASS') && - GBAdminService.StrongRegex.test(password) - ) { + + if (password === GBConfigService.get('ADMIN_PASS')) { await step.context.sendActivity(Messages[locale].welcome); - await step.prompt('textPrompt', Messages[locale].which_task); + + return await step.prompt('textPrompt', Messages[locale].which_task); } else { - await step.prompt('textPrompt', Messages[locale].wrong_password); - await step.endDialog(); + await step.context.sendActivity(Messages[locale].wrong_password); + + return await step.endDialog(); } - return await step.next(); }, async step => { const locale = step.context.activity.locale; @@ -114,20 +121,32 @@ export class AdminDialog extends IGBDialog { let unknownCommand = false; if (text === 'quit') { - await step.replaceDialog('/'); + return await step.replaceDialog('/'); } else if (cmdName === 'createFarm') { await AdminDialog.createFarmCommand(text, deployer); - await step.replaceDialog('/admin', { firstRun: false }); + + return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'deployPackage') { await AdminDialog.deployPackageCommand(min, text, deployer); - await step.replaceDialog('/admin', { firstRun: false }); + + return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'redeployPackage') { await AdminDialog.undeployPackageCommand(text, min); await AdminDialog.deployPackageCommand(min, text, deployer); - await step.replaceDialog('/admin', { firstRun: false }); + + return await step.replaceDialog('/admin', { firstRun: false }); + } else if (cmdName === 'rebuildIndex') { + await AdminDialog.rebuildIndexPackageCommand(min, text, deployer); + + return await step.replaceDialog('/admin', { firstRun: false }); + } else if (cmdName === 'addConnection') { + await AdminDialog.addConnectionCommand(min, text, deployer); + + return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'undeployPackage') { await AdminDialog.undeployPackageCommand(text, min); - await step.replaceDialog('/admin', { firstRun: false }); + + return await step.replaceDialog('/admin', { firstRun: false }); } else if (cmdName === 'setupSecurity') { await AdminDialog.setupSecurity(min, step); } else { @@ -137,13 +156,11 @@ export class AdminDialog extends IGBDialog { if (unknownCommand) { await step.context.sendActivity(Messages[locale].unknown_command); } else { - await step.context.sendActivity( - Messages[locale].finshed_working(cmdName) - ); + await step.context.sendActivity(Messages[locale].finshed_working(cmdName)); } await step.endDialog(); - await step.replaceDialog('/answer', { query: text }); - return await step.next(); + + return await step.replaceDialog('/answer', { query: text }); } ]) ); @@ -151,17 +168,9 @@ export class AdminDialog extends IGBDialog { private static async setupSecurity(min: any, step: any) { const locale = step.activity.locale; - const state = `${min.instance.instanceId}${Math.floor( - Math.random() * 1000000000 - )}`; - await min.adminService.setValue( - min.instance.instanceId, - 'AntiCSRFAttackState', - state - ); - const url = `https://login.microsoftonline.com/${ - min.instance.authenticatorTenant - }/oauth2/authorize?client_id=${ + const state = `${min.instance.instanceId}${Math.floor(Math.random() * 1000000000)}`; + await min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state); + const url = `https://login.microsoftonline.com/${min.instance.authenticatorTenant}/oauth2/authorize?client_id=${ min.instance.authenticatorClientId }&response_type=code&redirect_uri=${min.instance.botEndpoint}/${ min.instance.botId diff --git a/packages/analytics.gblib/index.ts b/packages/analytics.gblib/index.ts index 63ba890b..1c29bb77 100644 --- a/packages/analytics.gblib/index.ts +++ b/packages/analytics.gblib/index.ts @@ -43,22 +43,11 @@ import { GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; export class GBAnalyticsPackage implements IGBPackage { - public sysPackages: IGBPackage[] = null; - public loadPackage(core: IGBCoreService, sequelize: Sequelize): void { - - } - public unloadPackage(core: IGBCoreService): void { - - } - public loadBot(min: GBMinInstance): void { - - } - public unloadBot(min: GBMinInstance): void { - - } - public onNewSession(min: GBMinInstance, step: any): void { - - } + public loadPackage(core: IGBCoreService, sequelize: Sequelize): void {} + public unloadPackage(core: IGBCoreService): void {} + public loadBot(min: GBMinInstance): void {} + public unloadBot(min: GBMinInstance): void {} + public onNewSession(min: GBMinInstance, step: any): void {} } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 7dd5204b..6f520fdd 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -410,7 +410,7 @@ export class GBMinService { // Processes messages. } else if (context.activity.type === 'message') { // Checks for /admin request. - if (context.activity.text === 'vba') { + if (context.activity.text === 'alpha-vba') { min.sandbox.context = context; min.sandbox.step = step; min.sandbox['bot'].bind(min.sandbox); diff --git a/packages/default.gbdialog/bot.vbs b/packages/default.gbdialog/bot.vbs index 737f6ba3..d5ddca66 100644 --- a/packages/default.gbdialog/bot.vbs +++ b/packages/default.gbdialog/bot.vbs @@ -10,6 +10,9 @@ ' ' General Bots Copyright (c) Pragmatismo.io. All rights reserved. ' Licensed under the AGPL-3.0. +' +' This BASIC file is based on this JavaScript file by Rodrigo Ruotolo: +' -> http://jsfiddle.net/roderick/dym05hsy ' ' According to our dual licensing model, this program can be used either ' under the terms of the GNU Affero General Public License, version 3, @@ -31,6 +34,8 @@ ' '**************************************************************************** + + talk ("How many installments do you want to pay your Credit?") installments = hear () @@ -85,6 +90,8 @@ else end if + ' TODO: This must be reviewed in terms of financing logic. + nInstallments = parseInt(installments) vAmmount = parseFloat(ammount) initialPayment = parseFloat(vAmmount) * 0.3 ' 30% of the value diff --git a/packages/default.gbui/package-lock.json b/packages/default.gbui/package-lock.json index a586ba92..3dec0118 100644 --- a/packages/default.gbui/package-lock.json +++ b/packages/default.gbui/package-lock.json @@ -5621,11 +5621,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5638,15 +5640,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5749,7 +5754,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5759,6 +5765,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5771,17 +5778,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -5798,6 +5808,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5870,7 +5881,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5880,6 +5892,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5985,6 +5998,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -12279,6 +12293,14 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "5.5.12", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", + "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==", + "requires": { + "symbol-observable": "1.0.1" + } + }, "rxjs-compat": { "version": "6.3.3", "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.3.3.tgz",